@grafema/core 0.1.0-alpha.5 → 0.1.1-alpha

package/src/plugins/analysis/ast/visitors/CallExpressionVisitor.ts

@@ -8,10 +8,83 @@
  * - Constructor calls: new Foo(), new Function()
  */
 
-import type { Node, CallExpression, NewExpression, Identifier, MemberExpression } from '@babel/types';
+import type { Node, CallExpression, NewExpression, Identifier, MemberExpression, ObjectExpression, ArrayExpression, ObjectProperty, SpreadElement } from '@babel/types';
 import type { NodePath } from '@babel/traverse';
 import { ASTVisitor, type VisitorModule, type VisitorCollections, type VisitorHandlers, type CounterRef } from './ASTVisitor.js';
 import { ExpressionEvaluator } from '../ExpressionEvaluator.js';
+import type { ArrayMutationInfo, ArrayMutationArgument, ObjectMutationInfo, ObjectMutationValue } from '../types.js';
+import { ScopeTracker } from '../../../../core/ScopeTracker.js';
+import { computeSemanticId } from '../../../../core/SemanticId.js';
+import { IdGenerator } from '../IdGenerator.js';
+import { NodeFactory } from '../../../../core/NodeFactory.js';
+import { ObjectLiteralNode } from '../../../../core/nodes/ObjectLiteralNode.js';
+import { ArrayLiteralNode } from '../../../../core/nodes/ArrayLiteralNode.js';
+import { getLine, getColumn } from '../utils/location.js';
+
+/**
+ * Object literal info for OBJECT_LITERAL nodes
+ */
+interface ObjectLiteralInfo {
+  id: string;
+  type: 'OBJECT_LITERAL';
+  file: string;
+  line: number;
+  column: number;
+  parentCallId?: string;
+  argIndex?: number;
+  isSpread?: boolean;
+}
+
+/**
+ * Object property info for HAS_PROPERTY edges
+ */
+interface ObjectPropertyInfo {
+  objectId: string;
+  propertyName: string;
+  valueNodeId?: string;
+  valueType: 'LITERAL' | 'VARIABLE' | 'CALL' | 'EXPRESSION' | 'OBJECT_LITERAL' | 'ARRAY_LITERAL' | 'SPREAD';
+  valueName?: string;
+  literalValue?: unknown;
+  file: string;
+  line: number;
+  column: number;
+  callLine?: number;
+  callColumn?: number;
+  nestedObjectId?: string;
+  nestedArrayId?: string;
+}
+
+/**
+ * Array literal info for ARRAY_LITERAL nodes
+ */
+interface ArrayLiteralInfo {
+  id: string;
+  type: 'ARRAY_LITERAL';
+  file: string;
+  line: number;
+  column: number;
+  parentCallId?: string;
+  argIndex?: number;
+}
+
+/**
+ * Array element info for HAS_ELEMENT edges
+ */
+interface ArrayElementInfo {
+  arrayId: string;
+  index: number;
+  valueNodeId?: string;
+  valueType: 'LITERAL' | 'VARIABLE' | 'CALL' | 'EXPRESSION' | 'OBJECT_LITERAL' | 'ARRAY_LITERAL' | 'SPREAD';
+  valueName?: string;
+  literalValue?: unknown;
+  file: string;
+  line: number;
+  column: number;
+  callLine?: number;
+  callColumn?: number;
+  nestedObjectId?: string;
+  nestedArrayId?: string;
+}
 
 /**
  * Argument info for PASSES_ARGUMENT edges
@@ -112,8 +185,16 @@ interface LiteralInfo {
 }
 
 export class CallExpressionVisitor extends ASTVisitor {
-  constructor(module: VisitorModule, collections: VisitorCollections) {
+  private scopeTracker?: ScopeTracker;
+
+  /**
+   * @param module - Current module being analyzed
+   * @param collections - Must contain arrays and counter refs
+   * @param scopeTracker - Optional ScopeTracker for semantic ID generation
+   */
+  constructor(module: VisitorModule, collections: VisitorCollections, scopeTracker?: ScopeTracker) {
     super(module, collections);
+    this.scopeTracker = scopeTracker;
   }
 
   /**
@@ -143,27 +224,130 @@ export class CallExpressionVisitor extends ASTVisitor {
         actualArg = arg.argument;  // Get the actual argument
       }
 
-      // Literal value
-      const literalValue = ExpressionEvaluator.extractLiteralValue(actualArg);
-      if (literalValue !== null) {
-        const literalId = `LITERAL#arg${index}#${module.file}#${argInfo.line}:${argInfo.column}:${literalCounterRef.value++}`;
-        literals.push({
-          id: literalId,
-          type: 'LITERAL',
-          value: literalValue,
-          valueType: typeof literalValue,
-          file: module.file,
-          line: argInfo.line,
-          column: argInfo.column,
-          parentCallId: callId,
-          argIndex: index
-        });
-        argInfo.targetType = 'LITERAL';
-        argInfo.targetId = literalId;
-        argInfo.literalValue = literalValue;
+      // Object literal - check BEFORE extractLiteralValue to handle object-typed args properly
+      if (actualArg.type === 'ObjectExpression') {
+        const objectExpr = actualArg as ObjectExpression;
+        // Initialize collections if not exist (must assign back to this.collections!)
+        if (!this.collections.objectLiteralCounterRef) {
+          this.collections.objectLiteralCounterRef = { value: 0 };
+        }
+        if (!this.collections.objectLiterals) {
+          this.collections.objectLiterals = [];
+        }
+        if (!this.collections.objectProperties) {
+          this.collections.objectProperties = [];
+        }
+        const objectLiteralCounterRef = this.collections.objectLiteralCounterRef as CounterRef;
+
+        // Use factory to create OBJECT_LITERAL node
+        const objectNode = ObjectLiteralNode.create(
+          module.file,
+          argInfo.line,
+          argInfo.column,
+          {
+            parentCallId: callId,
+            argIndex: index,
+            counter: objectLiteralCounterRef.value++
+          }
+        );
+        // Factory guarantees line is set, cast to ObjectLiteralInfo
+        (this.collections.objectLiterals as ObjectLiteralInfo[]).push(objectNode as unknown as ObjectLiteralInfo);
+        const objectId = objectNode.id;
+
+        // Extract properties
+        this.extractObjectProperties(
+          objectExpr,
+          objectId,
+          module,
+          this.collections.objectProperties as ObjectPropertyInfo[],
+          this.collections.objectLiterals as ObjectLiteralInfo[],
+          objectLiteralCounterRef,
+          literals as LiteralInfo[],
+          literalCounterRef
+        );
+
+        argInfo.targetType = 'OBJECT_LITERAL';
+        argInfo.targetId = objectId;
+      }
+      // Array literal - check BEFORE extractLiteralValue to handle array-typed args properly
+      else if (actualArg.type === 'ArrayExpression') {
+        const arrayExpr = actualArg as ArrayExpression;
+        // Initialize collections if not exist (must assign back to this.collections!)
+        if (!this.collections.arrayLiteralCounterRef) {
+          this.collections.arrayLiteralCounterRef = { value: 0 };
+        }
+        if (!this.collections.arrayLiterals) {
+          this.collections.arrayLiterals = [];
+        }
+        if (!this.collections.arrayElements) {
+          this.collections.arrayElements = [];
+        }
+        if (!this.collections.objectLiteralCounterRef) {
+          this.collections.objectLiteralCounterRef = { value: 0 };
+        }
+        if (!this.collections.objectLiterals) {
+          this.collections.objectLiterals = [];
+        }
+        if (!this.collections.objectProperties) {
+          this.collections.objectProperties = [];
+        }
+        const arrayLiteralCounterRef = this.collections.arrayLiteralCounterRef as CounterRef;
+
+        // Use factory to create ARRAY_LITERAL node
+        const arrayNode = ArrayLiteralNode.create(
+          module.file,
+          argInfo.line,
+          argInfo.column,
+          {
+            parentCallId: callId,
+            argIndex: index,
+            counter: arrayLiteralCounterRef.value++
+          }
+        );
+        // Factory guarantees line is set, cast to ArrayLiteralInfo
+        (this.collections.arrayLiterals as ArrayLiteralInfo[]).push(arrayNode as unknown as ArrayLiteralInfo);
+        const arrayId = arrayNode.id;
+
+        // Extract elements
+        this.extractArrayElements(
+          arrayExpr,
+          arrayId,
+          module,
+          this.collections.arrayElements as ArrayElementInfo[],
+          this.collections.arrayLiterals as ArrayLiteralInfo[],
+          arrayLiteralCounterRef,
+          this.collections.objectLiterals as ObjectLiteralInfo[],
+          this.collections.objectLiteralCounterRef as CounterRef,
+          this.collections.objectProperties as ObjectPropertyInfo[],
+          literals as LiteralInfo[],
+          literalCounterRef
+        );
+
+        argInfo.targetType = 'ARRAY_LITERAL';
+        argInfo.targetId = arrayId;
       }
-      // Variable reference
-      else if (actualArg.type === 'Identifier') {
+      // Literal value (primitives only - objects/arrays handled above)
+      else {
+        const literalValue = ExpressionEvaluator.extractLiteralValue(actualArg);
+        if (literalValue !== null) {
+          const literalId = `LITERAL#arg${index}#${module.file}#${argInfo.line}:${argInfo.column}:${literalCounterRef.value++}`;
+          literals.push({
+            id: literalId,
+            type: 'LITERAL',
+            value: literalValue,
+            valueType: typeof literalValue,
+            file: module.file,
+            line: argInfo.line,
+            column: argInfo.column,
+            parentCallId: callId,
+            argIndex: index
+          });
+          argInfo.targetType = 'LITERAL';
+          argInfo.targetId = literalId;
+          argInfo.literalValue = literalValue;
+        }
+        // Variable reference
+        else if (actualArg.type === 'Identifier') {
         argInfo.targetType = 'VARIABLE';
         argInfo.targetName = (actualArg as Identifier).name;  // Will be resolved in GraphBuilder
       }
@@ -196,25 +380,26 @@ export class CallExpressionVisitor extends ASTVisitor {
       else if (actualArg.type === 'BinaryExpression' || actualArg.type === 'LogicalExpression') {
         const expr = actualArg as { operator?: string; type: string };
         const operator = expr.operator || '?';
-        const exprName = `<${actualArg.type}:${operator}>`;
-        const expressionId = `EXPRESSION#${exprName}#${module.file}#${argInfo.line}:${argInfo.column}:${literalCounterRef.value++}`;
-
-        // Create EXPRESSION node
-        literals.push({
-          id: expressionId,
-          type: 'EXPRESSION',
-          expressionType: actualArg.type,
-          operator: operator,
-          name: exprName,
-          file: module.file,
-          line: argInfo.line,
-          column: argInfo.column,
-          parentCallId: callId,
-          argIndex: index
-        });
+        const counter = literalCounterRef.value++;
+
+        // Create EXPRESSION node via NodeFactory
+        const expressionNode = NodeFactory.createArgumentExpression(
+          actualArg.type,
+          module.file,
+          argInfo.line,
+          argInfo.column,
+          {
+            parentCallId: callId,
+            argIndex: index,
+            operator,
+            counter
+          }
+        );
+
+        literals.push(expressionNode as LiteralInfo);
 
         argInfo.targetType = 'EXPRESSION';
-        argInfo.targetId = expressionId;
+        argInfo.targetId = expressionNode.id;
         argInfo.expressionType = actualArg.type;
 
         // Track DERIVES_FROM edges for identifiers in expression
@@ -223,7 +408,7 @@ export class CallExpressionVisitor extends ASTVisitor {
         if (variableAssignments) {
           for (const identName of identifiers) {
             variableAssignments.push({
-              variableId: expressionId,
+              variableId: expressionNode.id,
               sourceId: null,
               sourceName: identName,
               sourceType: 'DERIVES_FROM_VARIABLE',
@@ -232,19 +417,12 @@ export class CallExpressionVisitor extends ASTVisitor {
           }
         }
       }
-      // Object literal
-      else if (actualArg.type === 'ObjectExpression') {
-        argInfo.targetType = 'OBJECT_LITERAL';
-      }
-      // Array literal
-      else if (actualArg.type === 'ArrayExpression') {
-        argInfo.targetType = 'ARRAY_LITERAL';
-      }
-      // Other expression types
+      // Other expression types (fallback for unhandled expression types)
       else {
         argInfo.targetType = 'EXPRESSION';
         argInfo.expressionType = actualArg.type;
       }
+      }
 
       callArguments.push(argInfo);
     });
@@ -298,34 +476,572 @@ export class CallExpressionVisitor extends ASTVisitor {
   }
 
   /**
-   * Get a stable scope ID for a function parent
-   * Format must match what FunctionVisitor creates:
-   * - FunctionDeclaration: FUNCTION#name#file#line
-   * - ArrowFunctionExpression: FUNCTION#name#file#line:col:counter
+   * Extract object properties and create ObjectPropertyInfo records
+   */
+  extractObjectProperties(
+    objectExpr: ObjectExpression,
+    objectId: string,
+    module: VisitorModule,
+    objectProperties: ObjectPropertyInfo[],
+    objectLiterals: ObjectLiteralInfo[],
+    objectLiteralCounterRef: CounterRef,
+    literals: LiteralInfo[],
+    literalCounterRef: CounterRef
+  ): void {
+    for (const prop of objectExpr.properties) {
+      const propLine = prop.loc?.start.line || 0;
+      const propColumn = prop.loc?.start.column || 0;
+
+      // Handle spread properties: { ...other }
+      if (prop.type === 'SpreadElement') {
+        const spreadArg = prop.argument;
+        const propertyInfo: ObjectPropertyInfo = {
+          objectId,
+          propertyName: '<spread>',
+          valueType: 'SPREAD',
+          file: module.file,
+          line: propLine,
+          column: propColumn
+        };
+
+        if (spreadArg.type === 'Identifier') {
+          propertyInfo.valueName = spreadArg.name;
+          propertyInfo.valueType = 'VARIABLE';
+        }
+
+        objectProperties.push(propertyInfo);
+        continue;
+      }
+
+      // Handle regular properties
+      if (prop.type === 'ObjectProperty') {
+        const objProp = prop as ObjectProperty;
+        let propertyName: string;
+
+        // Get property name
+        if (objProp.key.type === 'Identifier') {
+          propertyName = objProp.key.name;
+        } else if (objProp.key.type === 'StringLiteral') {
+          propertyName = objProp.key.value;
+        } else if (objProp.key.type === 'NumericLiteral') {
+          propertyName = String(objProp.key.value);
+        } else {
+          propertyName = '<computed>';
+        }
+
+        const propertyInfo: ObjectPropertyInfo = {
+          objectId,
+          propertyName,
+          file: module.file,
+          line: propLine,
+          column: propColumn,
+          valueType: 'EXPRESSION'
+        };
+
+        const value = objProp.value;
+
+        // Nested object literal - check BEFORE extractLiteralValue
+        if (value.type === 'ObjectExpression') {
+          // Use factory - do NOT pass argIndex for nested literals (uses 'obj' suffix)
+          const nestedObjectNode = ObjectLiteralNode.create(
+            module.file,
+            value.loc?.start.line || 0,
+            value.loc?.start.column || 0,
+            {
+              counter: objectLiteralCounterRef.value++
+            }
+          );
+          objectLiterals.push(nestedObjectNode as unknown as ObjectLiteralInfo);
+          const nestedObjectId = nestedObjectNode.id;
+
+          // Recursively extract nested properties
+          this.extractObjectProperties(
+            value,
+            nestedObjectId,
+            module,
+            objectProperties,
+            objectLiterals,
+            objectLiteralCounterRef,
+            literals,
+            literalCounterRef
+          );
+
+          propertyInfo.valueType = 'OBJECT_LITERAL';
+          propertyInfo.nestedObjectId = nestedObjectId;
+          propertyInfo.valueNodeId = nestedObjectId;
+        }
+        // Nested array literal - check BEFORE extractLiteralValue
+        else if (value.type === 'ArrayExpression') {
+          const arrayLiteralCounterRef = (this.collections.arrayLiteralCounterRef ?? { value: 0 }) as CounterRef;
+          const arrayLiterals = this.collections.arrayLiterals ?? [];
+          const arrayElements = this.collections.arrayElements ?? [];
+
+          // Use factory - do NOT pass argIndex for nested literals (uses 'arr' suffix)
+          const nestedArrayNode = ArrayLiteralNode.create(
+            module.file,
+            value.loc?.start.line || 0,
+            value.loc?.start.column || 0,
+            {
+              counter: arrayLiteralCounterRef.value++
+            }
+          );
+          (arrayLiterals as ArrayLiteralInfo[]).push(nestedArrayNode as unknown as ArrayLiteralInfo);
+          const nestedArrayId = nestedArrayNode.id;
+
+          // Recursively extract array elements
+          this.extractArrayElements(
+            value,
+            nestedArrayId,
+            module,
+            arrayElements as ArrayElementInfo[],
+            arrayLiterals as ArrayLiteralInfo[],
+            arrayLiteralCounterRef,
+            objectLiterals,
+            objectLiteralCounterRef,
+            objectProperties,
+            literals,
+            literalCounterRef
+          );
+
+          propertyInfo.valueType = 'ARRAY_LITERAL';
+          propertyInfo.nestedArrayId = nestedArrayId;
+          propertyInfo.valueNodeId = nestedArrayId;
+        }
+        // Literal value (primitives only - objects/arrays handled above)
+        else {
+          const literalValue = ExpressionEvaluator.extractLiteralValue(value);
+          if (literalValue !== null) {
+            const literalId = `LITERAL#${propertyName}#${module.file}#${propLine}:${propColumn}:${literalCounterRef.value++}`;
+            literals.push({
+              id: literalId,
+              type: 'LITERAL',
+              value: literalValue,
+              valueType: typeof literalValue,
+              file: module.file,
+              line: propLine,
+              column: propColumn,
+              parentCallId: objectId,
+              argIndex: 0
+            });
+            propertyInfo.valueType = 'LITERAL';
+            propertyInfo.valueNodeId = literalId;
+            propertyInfo.literalValue = literalValue;
+          }
+          // Variable reference
+          else if (value.type === 'Identifier') {
+            propertyInfo.valueType = 'VARIABLE';
+            propertyInfo.valueName = value.name;
+          }
+          // Call expression
+          else if (value.type === 'CallExpression') {
+            propertyInfo.valueType = 'CALL';
+            propertyInfo.callLine = value.loc?.start.line;
+            propertyInfo.callColumn = value.loc?.start.column;
+          }
+          // Other expressions
+          else {
+            propertyInfo.valueType = 'EXPRESSION';
+          }
+        }
+
+        objectProperties.push(propertyInfo);
+      }
+      // Handle object methods: { foo() {} }
+      else if (prop.type === 'ObjectMethod') {
+        const propertyName = prop.key.type === 'Identifier' ? prop.key.name : '<computed>';
+        objectProperties.push({
+          objectId,
+          propertyName,
+          valueType: 'EXPRESSION',
+          file: module.file,
+          line: propLine,
+          column: propColumn
+        });
+      }
+    }
+  }
+
+  /**
+   * Extract array elements and create ArrayElementInfo records
+   */
+  extractArrayElements(
+    arrayExpr: ArrayExpression,
+    arrayId: string,
+    module: VisitorModule,
+    arrayElements: ArrayElementInfo[],
+    arrayLiterals: ArrayLiteralInfo[],
+    arrayLiteralCounterRef: CounterRef,
+    objectLiterals: ObjectLiteralInfo[],
+    objectLiteralCounterRef: CounterRef,
+    objectProperties: ObjectPropertyInfo[],
+    literals: LiteralInfo[],
+    literalCounterRef: CounterRef
+  ): void {
+    arrayExpr.elements.forEach((element, index) => {
+      if (!element) return;  // Skip holes in arrays
+
+      const elemLine = element.loc?.start.line || 0;
+      const elemColumn = element.loc?.start.column || 0;
+
+      const elementInfo: ArrayElementInfo = {
+        arrayId,
+        index,
+        file: module.file,
+        line: elemLine,
+        column: elemColumn,
+        valueType: 'EXPRESSION'
+      };
+
+      // Handle spread elements: [...arr]
+      if (element.type === 'SpreadElement') {
+        const spreadArg = element.argument;
+        elementInfo.valueType = 'SPREAD';
+        if (spreadArg.type === 'Identifier') {
+          elementInfo.valueName = spreadArg.name;
+        }
+        arrayElements.push(elementInfo);
+        return;
+      }
+
+      // Nested object literal - check BEFORE extractLiteralValue
+      if (element.type === 'ObjectExpression') {
+        // Use factory - do NOT pass argIndex for nested literals (uses 'obj' suffix)
+        const nestedObjectNode = ObjectLiteralNode.create(
+          module.file,
+          elemLine,
+          elemColumn,
+          {
+            counter: objectLiteralCounterRef.value++
+          }
+        );
+        objectLiterals.push(nestedObjectNode as unknown as ObjectLiteralInfo);
+        const nestedObjectId = nestedObjectNode.id;
+
+        // Recursively extract properties
+        this.extractObjectProperties(
+          element,
+          nestedObjectId,
+          module,
+          objectProperties,
+          objectLiterals,
+          objectLiteralCounterRef,
+          literals,
+          literalCounterRef
+        );
+
+        elementInfo.valueType = 'OBJECT_LITERAL';
+        elementInfo.nestedObjectId = nestedObjectId;
+        elementInfo.valueNodeId = nestedObjectId;
+      }
+      // Nested array literal - check BEFORE extractLiteralValue
+      else if (element.type === 'ArrayExpression') {
+        // Use factory - do NOT pass argIndex for nested literals (uses 'arr' suffix)
+        const nestedArrayNode = ArrayLiteralNode.create(
+          module.file,
+          elemLine,
+          elemColumn,
+          {
+            counter: arrayLiteralCounterRef.value++
+          }
+        );
+        arrayLiterals.push(nestedArrayNode as unknown as ArrayLiteralInfo);
+        const nestedArrayId = nestedArrayNode.id;
+
+        // Recursively extract elements
+        this.extractArrayElements(
+          element,
+          nestedArrayId,
+          module,
+          arrayElements,
+          arrayLiterals,
+          arrayLiteralCounterRef,
+          objectLiterals,
+          objectLiteralCounterRef,
+          objectProperties,
+          literals,
+          literalCounterRef
+        );
+
+        elementInfo.valueType = 'ARRAY_LITERAL';
+        elementInfo.nestedArrayId = nestedArrayId;
+        elementInfo.valueNodeId = nestedArrayId;
+      }
+      // Literal value (primitives only - objects/arrays handled above)
+      else {
+        const literalValue = ExpressionEvaluator.extractLiteralValue(element);
+        if (literalValue !== null) {
+          const literalId = `LITERAL#elem${index}#${module.file}#${elemLine}:${elemColumn}:${literalCounterRef.value++}`;
+          literals.push({
+            id: literalId,
+            type: 'LITERAL',
+            value: literalValue,
+            valueType: typeof literalValue,
+            file: module.file,
+            line: elemLine,
+            column: elemColumn,
+            parentCallId: arrayId,
+            argIndex: index
+          });
+          elementInfo.valueType = 'LITERAL';
+          elementInfo.valueNodeId = literalId;
+          elementInfo.literalValue = literalValue;
+        }
+        // Variable reference
+        else if (element.type === 'Identifier') {
+          elementInfo.valueType = 'VARIABLE';
+          elementInfo.valueName = element.name;
+        }
+        // Call expression
+        else if (element.type === 'CallExpression') {
+          elementInfo.valueType = 'CALL';
+          elementInfo.callLine = element.loc?.start.line;
+          elementInfo.callColumn = element.loc?.start.column;
+        }
+        // Other expressions
+        else {
+          elementInfo.valueType = 'EXPRESSION';
+        }
+      }
+
+      arrayElements.push(elementInfo);
+    });
+  }
+
+  /**
+   * Detect array mutation calls (push, unshift, splice) and collect mutation info
+   * for later FLOWS_INTO edge creation in GraphBuilder
+   *
+   * REG-117: Added isNested, baseObjectName, propertyName for nested mutations
+   */
+  private detectArrayMutation(
+    callNode: CallExpression,
+    arrayName: string,
+    method: 'push' | 'unshift' | 'splice',
+    module: VisitorModule,
+    isNested?: boolean,
+    baseObjectName?: string,
+    propertyName?: string
+  ): void {
+    // Initialize collection if not exists
+    if (!this.collections.arrayMutations) {
+      this.collections.arrayMutations = [];
+    }
+    const arrayMutations = this.collections.arrayMutations as ArrayMutationInfo[];
+
+    const mutationArgs: ArrayMutationArgument[] = [];
+
+    // For splice, only arguments from index 2 onwards are insertions
+    // splice(start, deleteCount, item1, item2, ...)
+    callNode.arguments.forEach((arg, index) => {
+      // Skip start and deleteCount for splice
+      if (method === 'splice' && index < 2) return;
+
+      const argInfo: ArrayMutationArgument = {
+        argIndex: method === 'splice' ? index - 2 : index,
+        isSpread: arg.type === 'SpreadElement',
+        valueType: 'EXPRESSION'  // Default
+      };
+
+      let actualArg = arg;
+      if (arg.type === 'SpreadElement') {
+        actualArg = arg.argument;
+      }
+
+      // Determine value type
+      const literalValue = ExpressionEvaluator.extractLiteralValue(actualArg);
+      if (literalValue !== null) {
+        argInfo.valueType = 'LITERAL';
+        argInfo.literalValue = literalValue;
+      } else if (actualArg.type === 'Identifier') {
+        argInfo.valueType = 'VARIABLE';
+        argInfo.valueName = actualArg.name;
+      } else if (actualArg.type === 'ObjectExpression') {
+        argInfo.valueType = 'OBJECT_LITERAL';
+      } else if (actualArg.type === 'ArrayExpression') {
+        argInfo.valueType = 'ARRAY_LITERAL';
+      } else if (actualArg.type === 'CallExpression') {
+        argInfo.valueType = 'CALL';
+        argInfo.callLine = actualArg.loc?.start.line;
+        argInfo.callColumn = actualArg.loc?.start.column;
+      }
+
+      mutationArgs.push(argInfo);
+    });
+
+    // Only record if there are actual insertions
+    if (mutationArgs.length > 0) {
+      const line = callNode.loc?.start.line ?? 0;
+      const column = callNode.loc?.start.column ?? 0;
+
+      // Generate semantic ID for array mutation if scopeTracker available
+      const scopeTracker = this.scopeTracker;
+      let mutationId: string | undefined;
+      if (scopeTracker) {
+        const discriminator = scopeTracker.getItemCounter(`ARRAY_MUTATION:${arrayName}.${method}`);
+        mutationId = computeSemanticId('ARRAY_MUTATION', `${arrayName}.${method}`, scopeTracker.getContext(), { discriminator });
+      }
+
+      arrayMutations.push({
+        id: mutationId,
+        arrayName,
+        mutationMethod: method,
+        file: module.file,
+        line,
+        column,
+        insertedValues: mutationArgs,
+        // REG-117: Nested mutation fields
+        isNested,
+        baseObjectName,
+        propertyName
+      });
+    }
+  }
+
+  /**
+   * Detect Object.assign(target, source1, source2, ...) calls
+   * Creates ObjectMutationInfo for FLOWS_INTO edge generation in GraphBuilder
+   *
+   * @param callNode - The call expression node
+   * @param module - Current module being analyzed
+   */
+  private detectObjectAssign(
+    callNode: CallExpression,
+    module: VisitorModule
+  ): void {
+    // Need at least 2 arguments: target and at least one source
+    if (callNode.arguments.length < 2) return;
+
+    // Initialize object mutations collection if not exists
+    if (!this.collections.objectMutations) {
+      this.collections.objectMutations = [];
+    }
+    const objectMutations = this.collections.objectMutations as ObjectMutationInfo[];
+
+    // First argument is target
+    const targetArg = callNode.arguments[0];
+    let targetName: string;
+
+    if (targetArg.type === 'Identifier') {
+      targetName = targetArg.name;
+    } else if (targetArg.type === 'ObjectExpression') {
+      targetName = '<anonymous>';
+    } else {
+      return;
+    }
+
+    const line = callNode.loc?.start.line ?? 0;
+    const column = callNode.loc?.start.column ?? 0;
+
+    for (let i = 1; i < callNode.arguments.length; i++) {
+      let arg = callNode.arguments[i];
+      let isSpread = false;
+
+      if (arg.type === 'SpreadElement') {
+        isSpread = true;
+        arg = arg.argument;
+      }
+
+      const valueInfo: ObjectMutationValue = {
+        valueType: 'EXPRESSION',
+        argIndex: i - 1,
+        isSpread
+      };
+
+      const literalValue = ExpressionEvaluator.extractLiteralValue(arg);
+      if (literalValue !== null) {
+        valueInfo.valueType = 'LITERAL';
+        valueInfo.literalValue = literalValue;
+      } else if (arg.type === 'Identifier') {
+        valueInfo.valueType = 'VARIABLE';
+        valueInfo.valueName = arg.name;
+      } else if (arg.type === 'ObjectExpression') {
+        valueInfo.valueType = 'OBJECT_LITERAL';
+      } else if (arg.type === 'ArrayExpression') {
+        valueInfo.valueType = 'ARRAY_LITERAL';
+      } else if (arg.type === 'CallExpression') {
+        valueInfo.valueType = 'CALL';
+        valueInfo.callLine = arg.loc?.start.line;
+        valueInfo.callColumn = arg.loc?.start.column;
+      }
+
+      let mutationId: string | undefined;
+      if (this.scopeTracker) {
+        const discriminator = this.scopeTracker.getItemCounter(`OBJECT_MUTATION:Object.assign:${targetName}`);
+        mutationId = computeSemanticId('OBJECT_MUTATION', `Object.assign:${targetName}`, this.scopeTracker.getContext(), { discriminator });
+      }
+
+      objectMutations.push({
+        id: mutationId,
+        objectName: targetName,
+        propertyName: '<assign>',
+        mutationType: 'assign',
+        file: module.file,
+        line,
+        column,
+        value: valueInfo
+      });
+    }
+  }
+
+  /**
+   * Get a stable scope ID for a function parent.
+   *
+   * Format must match what FunctionVisitor/ClassVisitor creates (semantic ID):
+   * - Module-level function: {file}->global->FUNCTION->{name}
+   * - Class method: {file}->{className}->FUNCTION->{methodName}
    *
-   * NOTE: We don't have access to the counter here, so for arrow functions
-   * we try to match by name+file+line:col. This may not always work for
-   * multiple arrow functions on the same line.
+   * Reconstructs scope path by walking up the AST.
    */
   getFunctionScopeId(functionParent: NodePath, module: VisitorModule): string {
     const funcNode = functionParent.node as Node & {
       id?: { name: string } | null;
+      key?: { name?: string; type: string };
       loc?: { start: { line: number; column: number } };
       type: string;
     };
-    const line = funcNode.loc?.start.line || 0;
-    const col = funcNode.loc?.start.column || 0;
 
-    // FunctionDeclaration with name
+    // Get function name
+    let funcName: string | undefined;
     if (funcNode.type === 'FunctionDeclaration' && funcNode.id?.name) {
-      return `FUNCTION#${funcNode.id.name}#${module.file}#${line}`;
+      funcName = funcNode.id.name;
+    } else if (funcNode.type === 'ClassMethod' && funcNode.key?.type === 'Identifier') {
+      funcName = funcNode.key.name;
+    }
+
+    if (!funcName) {
+      // Anonymous function - fall back to module scope
+      return module.id;
+    }
+
+    // Build scope path by walking up the AST
+    const scopePath: string[] = [];
+    let current: NodePath | null = functionParent.parentPath;
+
+    while (current) {
+      const node = current.node as Node & {
+        id?: { name: string } | null;
+        type: string;
+      };
+
+      if (node.type === 'ClassDeclaration' && node.id?.name) {
+        scopePath.unshift(node.id.name);
+        break; // Class is the outermost scope we need
+      } else if (node.type === 'ClassBody') {
+        // Continue up to ClassDeclaration
+      } else if (node.type === 'Program') {
+        break;
+      }
+
+      current = current.parentPath;
+    }
+
+    // If no class found, it's at module level (global scope)
+    if (scopePath.length === 0) {
+      scopePath.push('global');
     }
 
-    // For arrow functions and other cases, we can't perfectly match the ID
-    // because FunctionVisitor uses a counter. For now, use module.id as fallback
-    // to avoid creating invalid edges. The CALL node will be connected to MODULE
-    // instead of the specific function.
-    return module.id;
+    // Compute semantic ID: {file}->{scopePath}->FUNCTION->{name}
+    return `${module.file}->${scopePath.join('->')}->FUNCTION->${funcName}`;
   }
 
   getHandlers(): VisitorHandlers {
@@ -339,26 +1055,43 @@ export class CallExpressionVisitor extends ASTVisitor {
     const callSiteCounterRef = (this.collections.callSiteCounterRef ?? { value: 0 }) as CounterRef;
     const literalCounterRef = (this.collections.literalCounterRef ?? { value: 0 }) as CounterRef;
     const processedNodes = this.collections.processedNodes ?? { callSites: new Set(), methodCalls: new Set(), eventListeners: new Set() };
+    const scopeTracker = this.scopeTracker;
 
     return {
       CallExpression: (path: NodePath) => {
         const callNode = path.node as CallExpression;
         const functionParent = path.getFunctionParent();
+
         // Determine parent scope - if inside a function, use function's scope, otherwise module
         const parentScopeId = functionParent ? this.getFunctionScopeId(functionParent, module) : module.id;
 
         // Identifier calls (direct function calls)
+        // Skip if inside function - they will be processed by analyzeFunctionBody with proper scope tracking
           if (callNode.callee.type === 'Identifier') {
+            if (functionParent) {
+              return;
+            }
             const callee = callNode.callee as Identifier;
-            const callId = `CALL#${callee.name}#${module.file}#${callNode.loc!.start.line}:${callNode.loc!.start.column}:${callSiteCounterRef.value++}`;
+
+            const line = getLine(callNode);
+            const column = getColumn(callNode);
+
+            // Generate ID using centralized IdGenerator
+            const idGenerator = new IdGenerator(scopeTracker);
+            const callId = idGenerator.generate(
+              'CALL', callee.name, module.file,
+              line, column,
+              callSiteCounterRef,
+              { useDiscriminator: true, discriminatorKey: `CALL:${callee.name}` }
+            );
 
             (callSites as CallSiteInfo[]).push({
               id: callId,
               type: 'CALL',
               name: callee.name,
               file: module.file,
-              line: callNode.loc!.start.line,
-              column: callNode.loc!.start.column,
+              line,
+              column,
               parentScopeId,
               targetFunctionName: callee.name
             });
@@ -375,8 +1108,12 @@ export class CallExpressionVisitor extends ASTVisitor {
               );
             }
           }
-          // MemberExpression calls (method calls at module level)
+          // MemberExpression calls (method calls)
+          // Skip if inside function - they will be processed by analyzeFunctionBody with proper scope tracking
           else if (callNode.callee.type === 'MemberExpression') {
+            if (functionParent) {
+              return;
+            }
             const memberCallee = callNode.callee as MemberExpression;
             const object = memberCallee.object;
             const property = memberCallee.property;
@@ -403,13 +1140,16 @@ export class CallExpressionVisitor extends ASTVisitor {
                   }
                   processedNodes.eventListeners.add(nodeKey);
 
+                  const eventLine = getLine(callNode);
+                  const eventColumn = getColumn(callNode);
+
                   (eventListeners as EventListenerInfo[]).push({
-                    id: `event:listener#${eventName}#${module.file}#${callNode.loc!.start.line}:${callNode.loc!.start.column}:${callSiteCounterRef.value++}`,
+                    id: `event:listener#${eventName}#${module.file}#${eventLine}:${eventColumn}:${callSiteCounterRef.value++}`,
                     type: 'event:listener',
                     name: eventName,
                     object: objectName,
                     file: module.file,
-                    line: callNode.loc!.start.line,
+                    line: eventLine,
                     parentScopeId,
                     callbackArg: secondArg
                   });
@@ -423,7 +1163,17 @@ export class CallExpressionVisitor extends ASTVisitor {
                 processedNodes.methodCalls.add(nodeKey);
 
                 const fullName = `${objectName}.${methodName}`;
-                const methodCallId = `CALL#${fullName}#${module.file}#${callNode.loc!.start.line}:${callNode.loc!.start.column}:${callSiteCounterRef.value++}`;
+                const methodLine = getLine(callNode);
+                const methodColumn = getColumn(callNode);
+
+                // Generate ID using centralized IdGenerator
+                const idGenerator = new IdGenerator(scopeTracker);
+                const methodCallId = idGenerator.generate(
+                  'CALL', fullName, module.file,
+                  methodLine, methodColumn,
+                  callSiteCounterRef,
+                  { useDiscriminator: true, discriminatorKey: `CALL:${fullName}` }
+                );
 
                 (methodCalls as MethodCallInfo[]).push({
                   id: methodCallId,
@@ -434,11 +1184,27 @@ export class CallExpressionVisitor extends ASTVisitor {
                   computed: isComputed,
                   computedPropertyVar,  // Variable name used in obj[x]() calls
                   file: module.file,
-                  line: callNode.loc!.start.line,
-                  column: callNode.loc!.start.column,
+                  line: methodLine,
+                  column: methodColumn,
                   parentScopeId
                 });
 
+                // Check for array mutation methods (push, unshift, splice)
+                const ARRAY_MUTATION_METHODS = ['push', 'unshift', 'splice'];
+                if (ARRAY_MUTATION_METHODS.includes(methodName)) {
+                  this.detectArrayMutation(
+                    callNode,
+                    objectName,
+                    methodName as 'push' | 'unshift' | 'splice',
+                    module
+                  );
+                }
+
+                // Check for Object.assign() calls
+                if (objectName === 'Object' && methodName === 'assign') {
+                  this.detectObjectAssign(callNode, module);
+                }
+
                 // Extract arguments for PASSES_ARGUMENT edges
                 if (callNode.arguments.length > 0) {
                   this.extractArguments(
@@ -455,8 +1221,8 @@ export class CallExpressionVisitor extends ASTVisitor {
                     if (arg.type === 'ArrowFunctionExpression' || arg.type === 'FunctionExpression') {
                       (methodCallbacks as MethodCallbackInfo[]).push({
                         methodCallId,
-                        callbackLine: arg.loc!.start.line,
-                        callbackColumn: arg.loc!.start.column,
+                        callbackLine: getLine(arg),
+                        callbackColumn: getColumn(arg),
                         callbackType: arg.type
                       });
                     }
@@ -464,14 +1230,52 @@ export class CallExpressionVisitor extends ASTVisitor {
                 }
               }
             }
+            // REG-117: Nested array mutations like obj.arr.push(item)
+            // object is MemberExpression, property is the method name
+            else if (object.type === 'MemberExpression' && property.type === 'Identifier') {
+              const nestedMember = object as MemberExpression;
+              const methodName = (property as Identifier).name;
+              const ARRAY_MUTATION_METHODS = ['push', 'unshift', 'splice'];
+
+              if (ARRAY_MUTATION_METHODS.includes(methodName)) {
+                // Extract base object and property from nested MemberExpression
+                const base = nestedMember.object;
+                const prop = nestedMember.property;
+
+                // Only handle single-level nesting: obj.arr.push() or this.items.push()
+                if ((base.type === 'Identifier' || base.type === 'ThisExpression') &&
+                    !nestedMember.computed &&
+                    prop.type === 'Identifier') {
+                  const baseObjectName = base.type === 'Identifier' ? (base as Identifier).name : 'this';
+                  const propertyName = (prop as Identifier).name;
+
+                  this.detectArrayMutation(
+                    callNode,
+                    `${baseObjectName}.${propertyName}`,  // arrayName for ID purposes
+                    methodName as 'push' | 'unshift' | 'splice',
+                    module,
+                    true,          // isNested
+                    baseObjectName,
+                    propertyName
+                  );
+                }
+              }
+            }
           }
       },
 
       // NewExpression: new Foo(), new Function(), new Map(), etc.
+      // Skip if inside function - they will be processed by analyzeFunctionBody with proper scope tracking
       NewExpression: (path: NodePath) => {
         const newNode = path.node as NewExpression;
         const functionParent = path.getFunctionParent();
-        const parentScopeId = functionParent ? this.getFunctionScopeId(functionParent, module) : module.id;
+
+        // Skip if inside function - handled by analyzeFunctionBody
+        if (functionParent) {
+          return;
+        }
+
+        const parentScopeId = module.id;
 
         // Dedup check
         const nodeKey = `new:${newNode.start}:${newNode.end}`;
@@ -484,14 +1288,25 @@ export class CallExpressionVisitor extends ASTVisitor {
         if (newNode.callee.type === 'Identifier') {
           const callee = newNode.callee as Identifier;
           const constructorName = callee.name;
+          const newLine = getLine(newNode);
+          const newColumn = getColumn(newNode);
+
+          // Generate ID using centralized IdGenerator
+          const idGenerator = new IdGenerator(scopeTracker);
+          const newCallId = idGenerator.generate(
+            'CALL', `new:${constructorName}`, module.file,
+            newLine, newColumn,
+            callSiteCounterRef,
+            { useDiscriminator: true, discriminatorKey: `CALL:new:${constructorName}` }
+          );
 
           (callSites as CallSiteInfo[]).push({
-            id: `CALL#new:${constructorName}#${module.file}#${newNode.loc!.start.line}:${newNode.loc!.start.column}:${callSiteCounterRef.value++}`,
+            id: newCallId,
             type: 'CALL',
             name: constructorName,
             file: module.file,
-            line: newNode.loc!.start.line,
-            column: newNode.loc!.start.column,
+            line: newLine,
+            column: newColumn,
             parentScopeId,
             targetFunctionName: constructorName,
             isNew: true  // Mark as constructor call
@@ -507,16 +1322,27 @@ export class CallExpressionVisitor extends ASTVisitor {
             const objectName = (object as Identifier).name;
             const constructorName = (property as Identifier).name;
             const fullName = `${objectName}.${constructorName}`;
+            const memberNewLine = getLine(newNode);
+            const memberNewColumn = getColumn(newNode);
+
+            // Generate ID using centralized IdGenerator
+            const idGenerator = new IdGenerator(scopeTracker);
+            const newMethodCallId = idGenerator.generate(
+              'CALL', `new:${fullName}`, module.file,
+              memberNewLine, memberNewColumn,
+              callSiteCounterRef,
+              { useDiscriminator: true, discriminatorKey: `CALL:new:${fullName}` }
+            );
 
             (methodCalls as MethodCallInfo[]).push({
-              id: `CALL#new:${fullName}#${module.file}#${newNode.loc!.start.line}:${newNode.loc!.start.column}:${callSiteCounterRef.value++}`,
+              id: newMethodCallId,
               type: 'CALL',
               name: fullName,
               object: objectName,
               method: constructorName,
               file: module.file,
-              line: newNode.loc!.start.line,
-              column: newNode.loc!.start.column,
+              line: memberNewLine,
+              column: memberNewColumn,
               parentScopeId,
               isNew: true  // Mark as constructor call
             });