Merge pull request #8728 from LalitNarayanYadav/refactor/strands-transpiler-pipeline

Refactor: Extract replaceIdentifierReferences and remove reliance on `this` in ASTCallbacks

Author: davepagurek

src/strands/strands_transpiler.js

@@ -235,6 +235,30 @@ function replaceReferences(node, tempVarMap) {
   internalReplaceReferences(node);
 }
 
+function replaceIdentifierReferences(node, oldName, newName) {
+  if (!node || typeof node !== 'object') return node;
+
+  const replaceInNode = (n) => {
+    if (!n || typeof n !== 'object') return n;
+    if (n.type === 'Identifier' && n.name === oldName) {
+      return { ...n, name: newName };
+    }
+    const newNode = { ...n };
+    for (const key in n) {
+      if (n.hasOwnProperty(key) && key !== 'parent') {
+        if (Array.isArray(n[key])) {
+          newNode[key] = n[key].map(replaceInNode);
+        } else if (typeof n[key] === 'object') {
+          newNode[key] = replaceInNode(n[key]);
+        }
+      }
+    }
+    return newNode;
+  };
+
+  return replaceInNode(node);
+}
+
 // Shared handler for both BinaryExpression and LogicalExpression —
 // both follow the same operator-to-method-call transformation pattern.
 function transformBinaryOrLogical(node, state, ancestors) {
@@ -863,8 +887,8 @@ const ASTCallbacks = {
     // Replace the update expression with the assignment expression
     Object.assign(node, assignmentExpr);
     delete node.prefix;
-    this.BinaryExpression(node.right, state, [...ancestors, node]);
-    this.AssignmentExpression(node, state, ancestors);
+    ASTCallbacks.BinaryExpression(node.right, state, [...ancestors, node]);
+    ASTCallbacks.AssignmentExpression(node, state, ancestors);
   },
   ForStatement(node, state, ancestors) {
     if (ancestors.some(a => nodeIsUniform(a) || nodeIsUniformCallbackFn(a, state.uniformCallbackNames))) {
@@ -921,7 +945,7 @@ const ASTCallbacks = {
     // Replace loop variable references with the parameter
     if (node.init?.type === 'VariableDeclaration') {
       const loopVarName = node.init.declarations[0].id.name;
-      conditionBody = this.replaceIdentifierReferences(conditionBody, loopVarName, uniqueLoopVar);
+      conditionBody = replaceIdentifierReferences(conditionBody, loopVarName, uniqueLoopVar);
     }
     const conditionAst = { type: 'Program', body: [{ type: 'ExpressionStatement', expression: conditionBody }] };
     conditionBody = conditionAst.body[0].expression;
@@ -939,7 +963,7 @@ const ASTCallbacks = {
       // Replace loop variable references with the parameter
       if (node.init?.type === 'VariableDeclaration') {
         const loopVarName = node.init.declarations[0].id.name;
-        updateExpr = this.replaceIdentifierReferences(updateExpr, loopVarName, uniqueLoopVar);
+        updateExpr = replaceIdentifierReferences(updateExpr, loopVarName, uniqueLoopVar);
       }
       const updateAst = { type: 'Program', body: [{ type: 'ExpressionStatement', expression: updateExpr }] };
       updateExpr = updateAst.body[0].expression;
@@ -978,7 +1002,7 @@ const ASTCallbacks = {
     // Replace loop variable references in the body
     if (node.init?.type === 'VariableDeclaration') {
       const loopVarName = node.init.declarations[0].id.name;
-      bodyBlock = this.replaceIdentifierReferences(bodyBlock, loopVarName, uniqueLoopVar);
+      bodyBlock = replaceIdentifierReferences(bodyBlock, loopVarName, uniqueLoopVar);
     }
 
     const bodyFunction = {
@@ -1214,33 +1238,8 @@ const ASTCallbacks = {
     delete node.update;
   },
 
-  // Helper method to replace identifier references in AST nodes
-  replaceIdentifierReferences(node, oldName, newName) {
-    if (!node || typeof node !== 'object') return node;
-
-    const replaceInNode = (n) => {
-      if (!n || typeof n !== 'object') return n;
-
-      if (n.type === 'Identifier' && n.name === oldName) {
-        return { ...n, name: newName };
-      }
-
-      // Create a copy and recursively process properties
-      const newNode = { ...n };
-      for (const key in n) {
-        if (n.hasOwnProperty(key) && key !== 'parent') {
-          if (Array.isArray(n[key])) {
-            newNode[key] = n[key].map(replaceInNode);
-          } else if (typeof n[key] === 'object') {
-            newNode[key] = replaceInNode(n[key]);
-          }
-        }
-      }
-      return newNode;
-    };
-
-    return replaceInNode(node);
-  }
+  
+  
 }
 
 // Helper function to check if a function body contains return statements in control flow