fix: resolve merge conflicts with main

Author: carlos-alm

src/domain/wasm-worker-entry.ts

@@ -805,6 +805,19 @@ function serializeExtractorOutput(
     dataflow: symbols.dataflow,
     astNodes,
     ...(symbols.fnRefBindings?.length ? { fnRefBindings: symbols.fnRefBindings } : {}),
+    ...(symbols.paramBindings?.length ? { paramBindings: symbols.paramBindings } : {}),
+    ...(symbols.arrayElemBindings?.length ? { arrayElemBindings: symbols.arrayElemBindings } : {}),
+    ...(symbols.spreadArgBindings?.length ? { spreadArgBindings: symbols.spreadArgBindings } : {}),
+    ...(symbols.forOfBindings?.length ? { forOfBindings: symbols.forOfBindings } : {}),
+    ...(symbols.arrayCallbackBindings?.length
+      ? { arrayCallbackBindings: symbols.arrayCallbackBindings }
+      : {}),
+    ...(symbols.objectRestParamBindings?.length
+      ? { objectRestParamBindings: symbols.objectRestParamBindings }
+      : {}),
+    ...(symbols.objectPropBindings?.length
+      ? { objectPropBindings: symbols.objectPropBindings }
+      : {}),
     ...(symbols.newExpressions?.length ? { newExpressions: symbols.newExpressions } : {}),
     ...(symbols.definePropertyReceivers?.size
       ? { definePropertyReceivers: Array.from(symbols.definePropertyReceivers.entries()) }
@@ -813,10 +826,6 @@ function serializeExtractorOutput(
       ? { returnTypeMap: Array.from(symbols.returnTypeMap.entries()) }
       : {}),
     ...(symbols.callAssignments?.length ? { callAssignments: symbols.callAssignments } : {}),
-    ...(symbols.paramBindings?.length ? { paramBindings: symbols.paramBindings } : {}),
-    ...(symbols.objectRestParamBindings?.length
-      ? { objectRestParamBindings: symbols.objectRestParamBindings }
-      : {}),
   };
 }
 

src/domain/wasm-worker-pool.ts

@@ -107,6 +107,14 @@ function deserializeResult(ser: SerializedExtractorOutput | null): ExtractorOutp
   // visitor output is cast the same way.
   if (ser.astNodes !== undefined) out.astNodes = ser.astNodes as unknown as ASTNodeRow[];
   if (ser.fnRefBindings?.length) out.fnRefBindings = ser.fnRefBindings;
+  if (ser.paramBindings?.length) out.paramBindings = ser.paramBindings;
+  if (ser.arrayElemBindings?.length) out.arrayElemBindings = ser.arrayElemBindings;
+  if (ser.spreadArgBindings?.length) out.spreadArgBindings = ser.spreadArgBindings;
+  if (ser.forOfBindings?.length) out.forOfBindings = ser.forOfBindings;
+  if (ser.arrayCallbackBindings?.length) out.arrayCallbackBindings = ser.arrayCallbackBindings;
+  if (ser.objectRestParamBindings?.length)
+    out.objectRestParamBindings = ser.objectRestParamBindings;
+  if (ser.objectPropBindings?.length) out.objectPropBindings = ser.objectPropBindings;
   if (ser.newExpressions?.length) out.newExpressions = ser.newExpressions;
   if (ser.definePropertyReceivers?.length) {
     const m = new Map<string, string>();
@@ -119,9 +127,6 @@ function deserializeResult(ser: SerializedExtractorOutput | null): ExtractorOutp
     out.returnTypeMap = returnTypeMap;
   }
   if (ser.callAssignments?.length) out.callAssignments = ser.callAssignments;
-  if (ser.paramBindings?.length) out.paramBindings = ser.paramBindings;
-  if (ser.objectRestParamBindings?.length)
-    out.objectRestParamBindings = ser.objectRestParamBindings;
   return out;
 }
 

src/domain/wasm-worker-protocol.ts

@@ -19,7 +19,6 @@ import type {
   Export,
   Import,
   LanguageId,
-  ParamBinding,
   TypeMapEntry,
 } from '../types.js';
 
@@ -65,13 +64,18 @@ export interface SerializedExtractorOutput {
     receiver?: string;
   }>;
   fnRefBindings?: import('../types.js').FnRefBinding[];
+  arrayElemBindings?: import('../types.js').ArrayElemBinding[];
+  spreadArgBindings?: import('../types.js').SpreadArgBinding[];
+  forOfBindings?: import('../types.js').ForOfBinding[];
+  arrayCallbackBindings?: import('../types.js').ArrayCallbackBinding[];
+  objectRestParamBindings?: import('../types.js').ObjectRestParamBinding[];
+  objectPropBindings?: import('../types.js').ObjectPropBinding[];
+  paramBindings?: import('../types.js').ParamBinding[];
   newExpressions?: readonly string[];
   /** Serialized definePropertyReceivers map (funcName → receiverVarName) as tuple array. */
   definePropertyReceivers?: Array<[string, string]>;
   returnTypeMap?: Array<[string, TypeMapEntry]>;
   callAssignments?: CallAssignment[];
-  paramBindings?: ParamBinding[];
-  objectRestParamBindings?: import('../types.js').ObjectRestParamBinding[];
 }
 
 export interface WorkerParseResponseOk {