@optave/codegraph 3.11.2 → 3.12.0

package/src/domain/wasm-worker-entry.ts

@@ -109,8 +109,10 @@ function grammarPath(name: string): string {
 
 const COMMON_QUERY_PATTERNS: string[] = [
   '(function_declaration name: (identifier) @fn_name) @fn_node',
+  '(generator_function_declaration name: (identifier) @fn_name) @fn_node',
   '(variable_declarator name: (identifier) @varfn_name value: (arrow_function) @varfn_value)',
   '(variable_declarator name: (identifier) @varfn_name value: (function_expression) @varfn_value)',
+  '(variable_declarator name: (identifier) @varfn_name value: (generator_function) @varfn_value)',
   '(method_definition name: (property_identifier) @meth_name) @meth_node',
   '(method_definition name: (private_property_identifier) @meth_name) @meth_node',
   '(import_statement source: (string) @imp_source) @imp_node',
@@ -127,6 +129,7 @@ const JS_CLASS_PATTERN: string = '(class_declaration name: (identifier) @cls_nam
 
 const TS_EXTRA_PATTERNS: string[] = [
   '(class_declaration name: (type_identifier) @cls_name) @cls_node',
+  '(abstract_class_declaration name: (type_identifier) @cls_name) @cls_node',
   '(interface_declaration name: (type_identifier) @iface_name) @iface_node',
   '(type_alias_declaration name: (type_identifier) @type_name) @type_node',
 ];
@@ -801,6 +804,28 @@ function serializeExtractorOutput(
     _lineCount: code.split('\n').length,
     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()) }
+      : {}),
+    ...(symbols.returnTypeMap?.size
+      ? { returnTypeMap: Array.from(symbols.returnTypeMap.entries()) }
+      : {}),
+    ...(symbols.callAssignments?.length ? { callAssignments: symbols.callAssignments } : {}),
   };
 }
 

package/src/domain/wasm-worker-pool.ts

@@ -106,6 +106,27 @@ function deserializeResult(ser: SerializedExtractorOutput | null): ExtractorOutp
   // {line, kind, name, text?, receiver?} shape — see engine.ts:822 where the
   // 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>();
+    for (const [k, v] of ser.definePropertyReceivers) m.set(k, v);
+    out.definePropertyReceivers = m;
+  }
+  if (ser.returnTypeMap?.length) {
+    const returnTypeMap = new Map<string, TypeMapEntry>();
+    for (const [k, v] of ser.returnTypeMap) returnTypeMap.set(k, v);
+    out.returnTypeMap = returnTypeMap;
+  }
+  if (ser.callAssignments?.length) out.callAssignments = ser.callAssignments;
   return out;
 }
 

package/src/domain/wasm-worker-protocol.ts

@@ -12,6 +12,7 @@
 
 import type {
   Call,
+  CallAssignment,
   ClassRelation,
   DataflowResult,
   Definition,
@@ -62,6 +63,19 @@ export interface SerializedExtractorOutput {
     text?: string;
     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[];
 }
 
 export interface WorkerParseResponseOk {

package/src/extractors/c.ts

@@ -189,7 +189,7 @@ function extractCParameters(paramListNode: TreeSitterNode | null): SubDeclaratio
   if (!paramListNode) return params;
   for (let i = 0; i < paramListNode.childCount; i++) {
     const param = paramListNode.child(i);
-    if (!param || param.type !== 'parameter_declaration') continue;
+    if (param?.type !== 'parameter_declaration') continue;
     const nameNode = param.childForFieldName('declarator');
     if (nameNode) {
       const name = unwrapCDeclaratorName(nameNode);
@@ -205,7 +205,7 @@ function extractStructFields(structNode: TreeSitterNode): SubDeclaration[] {
   if (!body) return fields;
   for (let i = 0; i < body.childCount; i++) {
     const member = body.child(i);
-    if (!member || member.type !== 'field_declaration') continue;
+    if (member?.type !== 'field_declaration') continue;
     const nameNode = member.childForFieldName('declarator');
     if (nameNode) {
       const name = unwrapCDeclaratorName(nameNode);
@@ -221,7 +221,7 @@ function extractEnumEntries(enumNode: TreeSitterNode): SubDeclaration[] {
   if (!body) return entries;
   for (let i = 0; i < body.childCount; i++) {
     const member = body.child(i);
-    if (!member || member.type !== 'enumerator') continue;
+    if (member?.type !== 'enumerator') continue;
     const nameNode = member.childForFieldName('name');
     if (nameNode) {
       entries.push({ name: nameNode.text, kind: 'constant', line: member.startPosition.row + 1 });

package/src/extractors/clojure.ts

@@ -224,7 +224,7 @@ function extractClojureParams(defnNode: TreeSitterNode): SubDeclaration[] {
   // Find the parameter vector [x y z]
   for (let i = 0; i < defnNode.childCount; i++) {
     const child = defnNode.child(i);
-    if (!child || child.type !== 'vec_lit') continue;
+    if (child?.type !== 'vec_lit') continue;
     for (let j = 0; j < child.childCount; j++) {
       const param = child.child(j);
       if (!param) continue;

package/src/extractors/cpp.ts

@@ -292,7 +292,7 @@ function extractCppParameters(paramListNode: TreeSitterNode | null): SubDeclarat
   if (!paramListNode) return params;
   for (let i = 0; i < paramListNode.childCount; i++) {
     const param = paramListNode.child(i);
-    if (!param || param.type !== 'parameter_declaration') continue;
+    if (param?.type !== 'parameter_declaration') continue;
     const nameNode = param.childForFieldName('declarator');
     if (nameNode) {
       const name = unwrapCppDeclaratorName(nameNode);
@@ -309,7 +309,7 @@ function extractCppClassFields(classNode: TreeSitterNode): SubDeclaration[] {
   if (!body) return fields;
   for (let i = 0; i < body.childCount; i++) {
     const member = body.child(i);
-    if (!member || member.type !== 'field_declaration') continue;
+    if (member?.type !== 'field_declaration') continue;
     const nameNode = member.childForFieldName('declarator');
     if (nameNode) {
       const name = unwrapCppDeclaratorName(nameNode);
@@ -330,7 +330,7 @@ function extractCppEnumEntries(enumNode: TreeSitterNode): SubDeclaration[] {
   if (!body) return entries;
   for (let i = 0; i < body.childCount; i++) {
     const member = body.child(i);
-    if (!member || member.type !== 'enumerator') continue;
+    if (member?.type !== 'enumerator') continue;
     const nameNode = member.childForFieldName('name');
     if (nameNode) {
       entries.push({ name: nameNode.text, kind: 'constant', line: member.startPosition.row + 1 });

package/src/extractors/csharp.ts

@@ -28,6 +28,7 @@ export function extractCSharpSymbols(tree: TreeSitterTree, _filePath: string): E
     classes: [],
     exports: [],
     typeMap: new Map(),
+    newExpressions: [],
   };
 
   walkCSharpNode(tree.rootNode, ctx);
@@ -252,7 +253,12 @@ function handleCsObjectCreation(node: TreeSitterNode, ctx: ExtractorOutput): voi
     typeNode.type === 'generic_name'
       ? typeNode.childForFieldName('name')?.text || typeNode.child(0)?.text
       : typeNode.text;
-  if (typeName) ctx.calls.push({ name: typeName, line: node.startPosition.row + 1 });
+  if (typeName) {
+    ctx.calls.push({ name: typeName, line: node.startPosition.row + 1 });
+    // Phase 8.5 (RTA): record instantiated type for CHA filtering, matching
+    // the JS extractor's newExpressions extraction for cross-engine parity.
+    (ctx.newExpressions as string[]).push(typeName);
+  }
 }
 
 const CS_PARENT_TYPES = [
@@ -273,7 +279,7 @@ function extractCSharpParameters(paramListNode: TreeSitterNode | null): SubDecla
   if (!paramListNode) return params;
   for (let i = 0; i < paramListNode.childCount; i++) {
     const param = paramListNode.child(i);
-    if (!param || param.type !== 'parameter') continue;
+    if (param?.type !== 'parameter') continue;
     const nameNode = param.childForFieldName('name');
     if (nameNode) {
       params.push({ name: nameNode.text, kind: 'parameter', line: param.startPosition.row + 1 });
@@ -288,12 +294,12 @@ function extractCSharpClassFields(classNode: TreeSitterNode): SubDeclaration[] {
   if (!body) return fields;
   for (let i = 0; i < body.childCount; i++) {
     const member = body.child(i);
-    if (!member || member.type !== 'field_declaration') continue;
+    if (member?.type !== 'field_declaration') continue;
     const varDecl = findChild(member, 'variable_declaration');
     if (!varDecl) continue;
     for (let j = 0; j < varDecl.childCount; j++) {
       const child = varDecl.child(j);
-      if (!child || child.type !== 'variable_declarator') continue;
+      if (child?.type !== 'variable_declarator') continue;
       const nameNode = child.childForFieldName('name');
       if (nameNode) {
         fields.push({
@@ -326,16 +332,34 @@ function extractCSharpTypeMap(node: TreeSitterNode, ctx: ExtractorOutput): void
 /** Extract type info from a variable_declaration node (local vars with explicit types). */
 function handleCSharpVarDecl(node: TreeSitterNode, ctx: ExtractorOutput): void {
   const typeNode = node.childForFieldName('type') || node.child(0);
-  if (!typeNode || typeNode.type === 'var_keyword') return;
+  if (!typeNode) return;
+
+  if (typeNode.type === 'implicit_type') {
+    // var x = new Foo() — infer type from object_creation_expression initializer
+    if (!ctx.typeMap) return;
+    for (let i = 0; i < node.childCount; i++) {
+      const child = node.child(i);
+      if (child?.type !== 'variable_declarator') continue;
+      const nameNode = child.childForFieldName('name') || child.child(0);
+      if (nameNode?.type !== 'identifier') continue;
+      const objCreation = findChild(child, 'object_creation_expression');
+      if (!objCreation) continue;
+      const ctorTypeNode = objCreation.childForFieldName('type');
+      if (!ctorTypeNode) continue;
+      const ctorType = extractCSharpTypeName(ctorTypeNode);
+      if (ctorType) setTypeMapEntry(ctx.typeMap, nameNode.text, ctorType, 1.0);
+    }
+    return;
+  }
+
   const typeName = extractCSharpTypeName(typeNode);
   if (!typeName) return;
   for (let i = 0; i < node.childCount; i++) {
     const child = node.child(i);
-    if (!child || child.type !== 'variable_declarator') continue;
+    if (child?.type !== 'variable_declarator') continue;
     const nameNode = child.childForFieldName('name') || child.child(0);
-    if (nameNode && nameNode.type === 'identifier' && ctx.typeMap) {
-      setTypeMapEntry(ctx.typeMap, nameNode.text, typeName, 0.9);
-    }
+    if (nameNode?.type !== 'identifier' || !ctx.typeMap) continue;
+    if (typeName) setTypeMapEntry(ctx.typeMap, nameNode.text, typeName, 0.9);
   }
 }
 

package/src/extractors/cuda.ts

@@ -262,7 +262,7 @@ function extractCudaParameters(paramListNode: TreeSitterNode | null): SubDeclara
   if (!paramListNode) return params;
   for (let i = 0; i < paramListNode.childCount; i++) {
     const param = paramListNode.child(i);
-    if (!param || param.type !== 'parameter_declaration') continue;
+    if (param?.type !== 'parameter_declaration') continue;
     const nameNode = param.childForFieldName('declarator');
     if (nameNode) {
       // Reuse the field-name drill helper so function-type parameters like
@@ -282,7 +282,7 @@ function extractCudaClassFields(classNode: TreeSitterNode): SubDeclaration[] {
   if (!body) return fields;
   for (let i = 0; i < body.childCount; i++) {
     const member = body.child(i);
-    if (!member || member.type !== 'field_declaration') continue;
+    if (member?.type !== 'field_declaration') continue;
     const nameNode = member.childForFieldName('declarator');
     if (!nameNode) continue;
     // Skip method declarations — a `field_declaration` whose declarator
@@ -380,7 +380,7 @@ function extractCudaEnumEntries(enumNode: TreeSitterNode): SubDeclaration[] {
   if (!body) return entries;
   for (let i = 0; i < body.childCount; i++) {
     const member = body.child(i);
-    if (!member || member.type !== 'enumerator') continue;
+    if (member?.type !== 'enumerator') continue;
     const nameNode = member.childForFieldName('name');
     if (nameNode) {
       entries.push({ name: nameNode.text, kind: 'constant', line: member.startPosition.row + 1 });

package/src/extractors/elixir.ts

@@ -122,9 +122,9 @@ function collectModuleMembers(
 ): void {
   for (let i = 0; i < doBlock.childCount; i++) {
     const child = doBlock.child(i);
-    if (!child || child.type !== 'call') continue;
+    if (child?.type !== 'call') continue;
     const target = child.childForFieldName('target');
-    if (!target || target.type !== 'identifier') continue;
+    if (target?.type !== 'identifier') continue;
 
     if (target.text === 'def' || target.text === 'defp') {
       const fnName = extractFunctionName(child);
@@ -184,7 +184,7 @@ function extractElixirParams(defCallNode: TreeSitterNode): SubDeclaration[] {
 
   for (let i = 0; i < args.childCount; i++) {
     const child = args.child(i);
-    if (!child || child.type !== 'call') continue;
+    if (child?.type !== 'call') continue;
     const innerArgs = findChild(child, 'arguments');
     if (!innerArgs) continue;
     for (let j = 0; j < innerArgs.childCount; j++) {
@@ -277,13 +277,13 @@ function pushElixirMapValues(node: TreeSitterNode, stack: TreeSitterNode[]): voi
   const parts: TreeSitterNode[] = [];
   for (let i = 0; i < node.childCount; i++) {
     const content = node.child(i);
-    if (!content || content.type !== 'map_content') continue;
+    if (content?.type !== 'map_content') continue;
     for (let j = 0; j < content.childCount; j++) {
       const kws = content.child(j);
-      if (!kws || kws.type !== 'keywords') continue;
+      if (kws?.type !== 'keywords') continue;
       for (let k = 0; k < kws.childCount; k++) {
         const pair = kws.child(k);
-        if (!pair || pair.type !== 'pair') continue;
+        if (pair?.type !== 'pair') continue;
         for (let p = 0; p < pair.childCount; p++) {
           const part = pair.child(p);
           if (!part || part.type === 'keyword') continue;

package/src/extractors/fsharp.ts

@@ -303,7 +303,7 @@ function handleValueDefinition(
   currentModule: string | null,
 ): void {
   const first = node.child(0);
-  if (!first || first.type !== 'val') return;
+  if (first?.type !== 'val') return;
 
   const declLeft = findChild(node, 'value_declaration_left');
   if (!declLeft) return;

package/src/extractors/go.ts

@@ -111,7 +111,7 @@ function extractGoReceiverType(receiver: TreeSitterNode): string | null {
 function handleGoTypeDecl(node: TreeSitterNode, ctx: ExtractorOutput): void {
   for (let i = 0; i < node.childCount; i++) {
     const spec = node.child(i);
-    if (!spec || spec.type !== 'type_spec') continue;
+    if (spec?.type !== 'type_spec') continue;
     const nameNode = spec.childForFieldName('name');
     const typeNode = spec.childForFieldName('type');
     if (!nameNode || !typeNode) continue;
@@ -213,7 +213,7 @@ function extractGoImportSpec(spec: TreeSitterNode, ctx: ExtractorOutput): void {
 function handleGoConstDecl(node: TreeSitterNode, ctx: ExtractorOutput): void {
   for (let i = 0; i < node.childCount; i++) {
     const spec = node.child(i);
-    if (!spec || spec.type !== 'const_spec') continue;
+    if (spec?.type !== 'const_spec') continue;
     const constName = spec.childForFieldName('name');
     if (constName) {
       ctx.definitions.push({
@@ -288,7 +288,7 @@ function inferAddressOfComposite(
 ): boolean {
   if (rhs.type !== 'unary_expression') return false;
   const operand = rhs.childForFieldName('operand');
-  if (!operand || operand.type !== 'composite_literal') return false;
+  if (operand?.type !== 'composite_literal') return false;
   const typeNode = operand.childForFieldName('type');
   if (!typeNode) return false;
   const typeName = extractGoTypeName(typeNode);
@@ -409,7 +409,7 @@ function extractGoParameters(paramListNode: TreeSitterNode | null): SubDeclarati
   if (!paramListNode) return params;
   for (let i = 0; i < paramListNode.childCount; i++) {
     const param = paramListNode.child(i);
-    if (!param || param.type !== 'parameter_declaration') continue;
+    if (param?.type !== 'parameter_declaration') continue;
     // A parameter_declaration may have multiple identifiers (e.g., `a, b int`)
     for (let j = 0; j < param.childCount; j++) {
       const child = param.child(j);
@@ -494,7 +494,7 @@ function extractStructFields(structTypeNode: TreeSitterNode): SubDeclaration[] {
   if (!fieldList) return fields;
   for (let i = 0; i < fieldList.childCount; i++) {
     const field = fieldList.child(i);
-    if (!field || field.type !== 'field_declaration') continue;
+    if (field?.type !== 'field_declaration') continue;
     const nameNode = field.childForFieldName('name');
     if (nameNode) {
       fields.push({ name: nameNode.text, kind: 'property', line: field.startPosition.row + 1 });

package/src/extractors/haskell.ts

@@ -123,7 +123,7 @@ function collectHaskellPatternBindings(node: TreeSitterNode, out: SubDeclaration
     case 'record':
       for (let i = 0; i < node.childCount; i++) {
         const fp = node.child(i);
-        if (!fp || fp.type !== 'field_pattern') continue;
+        if (fp?.type !== 'field_pattern') continue;
         for (let j = 0; j < fp.childCount; j++) {
           const g = fp.child(j);
           if (g && g.type !== 'field_name') collectHaskellPatternBindings(g, out);

package/src/extractors/java.ts

@@ -330,7 +330,7 @@ function extractClassFields(classNode: TreeSitterNode): SubDeclaration[] {
   if (!body) return fields;
   for (let i = 0; i < body.childCount; i++) {
     const member = body.child(i);
-    if (!member || member.type !== 'field_declaration') continue;
+    if (member?.type !== 'field_declaration') continue;
     extractFieldDeclarators(member, fields);
   }
   return fields;
@@ -341,7 +341,7 @@ function extractFieldDeclarators(member: TreeSitterNode, fields: SubDeclaration[
   const vis = extractModifierVisibility(member);
   for (let j = 0; j < member.childCount; j++) {
     const child = member.child(j);
-    if (!child || child.type !== 'variable_declarator') continue;
+    if (child?.type !== 'variable_declarator') continue;
     const nameNode = child.childForFieldName('name');
     if (nameNode) {
       fields.push({