ucn 5.3.3 → 5.3.5

package/languages/go.js

@@ -5,6 +5,9 @@
  * struct/interface types, and const/var declarations.
  */
 
+const { ReceiverTypeMap, typeOrigin } = require('./type-evidence');
+
+
 const {
     traverseTree,
     traverseTreeCached,
@@ -761,7 +764,7 @@ function findCallsInCode(code, parser, options = {}) {
     // unless a lexical declaration shadows the name (`var v *Viper`;
     // `func Set(...) { v.Set(...) }`). They are stored separately so local
     // scope restoration cannot erase them.
-    const packageTypes = new Map();
+    const packageTypes = new ReceiverTypeMap();
     const packageTypeQualifiers = new Map();
     // Names whose scope type is a New*-prefix GUESS (fix #266) — per scope
     const scopeGuesses = new Map();
@@ -835,7 +838,7 @@ function findCallsInCode(code, parser, options = {}) {
     // Also returns funcParamNames: parameter names with function types (func(...) ...)
     // so calls to them can be skipped (they're local parameter calls, not global function calls).
     const buildScopeTypeMap = (node) => {
-        const typeMap = new Map();
+        const typeMap = new ReceiverTypeMap();
         const typeQualifierMap = new Map();
         const funcParamNames = new Set();
         const containerMap = new Map();
@@ -851,7 +854,7 @@ function findCallsInCode(code, parser, options = {}) {
                         const typeNode = param.childForFieldName('type');
                         const typeName = extractTypeName(typeNode);
                         if (nameNode && typeName) {
-                            typeMap.set(nameNode.text, typeName);
+                            typeMap.set(nameNode.text, typeName, 'annotation', param);
                             const qualifier = extractTypeQualifier(typeNode);
                             if (qualifier) typeQualifierMap.set(nameNode.text, qualifier);
                         }
@@ -888,7 +891,7 @@ function findCallsInCode(code, parser, options = {}) {
                         if (typeName) {
                             const qualifier = extractTypeQualifier(typeNode);
                             for (const nn of nameNodes) {
-                                typeMap.set(nn.text, typeName);
+                                typeMap.set(nn.text, typeName, 'annotation', node);
                                 if (qualifier) typeQualifierMap.set(nn.text, qualifier);
                             }
                         }
@@ -956,17 +959,17 @@ function findCallsInCode(code, parser, options = {}) {
     };
 
     // Look up variable type from scope chain
-    const getReceiverType = (varName, refNode) => {
+    const getReceiverType = (varName, refNode, evidence = false) => {
         const bindingScope = refNode
             ? lexicalBindingScopeStart(refNode, varName) : null;
         for (let i = functionStack.length - 1; i >= 0; i--) {
             const scopeStart = functionStack[i].startLine;
             const typeMap = scopeTypes.get(scopeStart);
-            if (typeMap?.has(varName)) return typeMap.get(varName);
+            if (typeMap?.has(varName)) return evidence ? typeMap.fields(varName) : typeMap.get(varName);
             if (bindingScope === scopeStart) return undefined;
         }
         return refNode && isShadowedByLocal(refNode, varName)
-            ? undefined : packageTypes.get(varName);
+            ? undefined : (evidence ? packageTypes.fields(varName) : packageTypes.get(varName));
     };
     const getReceiverTypeQualifier = (varName, refNode) => {
         const bindingScope = refNode
@@ -1239,6 +1242,82 @@ function findCallsInCode(code, parser, options = {}) {
     const isShadowedByLocal = (refNode, name) =>
         lexicalBindingScopeStart(refNode, name) != null;
 
+    // Go package declarations are in scope throughout the file, including
+    // function bodies preceding the declaration. Locals still enter in order.
+    const recordVarDeclaration = (node, scopeKey) => {
+        const varTypeMap = scopeKey == null ? packageTypes : scopeTypes.get(scopeKey);
+        const varQualifierMap = scopeKey == null
+            ? packageTypeQualifiers : scopeTypeQualifiers.get(scopeKey);
+        if (varTypeMap) {
+            const varContainerMap = scopeKey == null
+                ? packageContainerTypes : scopeContainerTypes.get(scopeKey);
+            const recordSpec = (spec) => {
+                if (spec.type !== 'var_spec') return;
+                const declaredType = spec.childForFieldName('type');
+                // Container-typed declaration (fix #300): `var routes
+                // []*Route` feeds range-element typing.
+                if (declaredType && CONTAINER_TYPE_NODES.has(declaredType.type) &&
+                    varContainerMap) {
+                    for (let j = 0; j < spec.namedChildCount; j++) {
+                        const id = spec.namedChild(j);
+                        if (id.type === 'identifier') {
+                            varContainerMap.set(id.text, declaredType.text);
+                        }
+                    }
+                    return;
+                }
+                let typeName = extractTypeName(spec.childForFieldName('type'));
+                let qualifier = typeName
+                    ? extractTypeQualifier(spec.childForFieldName('type')) : null;
+                let origin = declaredType;
+                let source = 'annotation';
+                if (!typeName) {
+                    // var cstDialer = Dialer{...} — the initializer's
+                    // composite-literal type IS the variable's type
+                    // (fix #298, websocket-measured: `d := cstDialer`
+                    // copies then call DialContext). Single-value specs
+                    // only; multi-value pairing stays untyped.
+                    const valueNode = spec.childForFieldName('value');
+                    let init = valueNode?.type === 'expression_list' &&
+                        valueNode.namedChildCount === 1
+                        ? valueNode.namedChild(0) : null;
+                    if (init?.type === 'unary_expression') {
+                        init = init.namedChildCount > 0 ? init.namedChild(0) : null;
+                    }
+                    if (init?.type === 'composite_literal') {
+                        const tn = init.childForFieldName('type');
+                        typeName = extractTypeName(tn);
+                        qualifier = extractTypeQualifier(tn);
+                        origin = init;
+                        source = 'constructor';
+                    }
+                    if (!typeName) return;
+                }
+                for (let j = 0; j < spec.namedChildCount; j++) {
+                    const id = spec.namedChild(j);
+                    if (id.type === 'identifier') {
+                        varTypeMap.set(id.text, typeName, source, origin);
+                        if (qualifier) varQualifierMap?.set(id.text, qualifier);
+                        else varQualifierMap?.delete(id.text);
+                        if (scopeKey != null) {
+                            scopeGuesses.get(scopeKey)?.delete(id.text);
+                        }
+                    }
+                }
+            };
+            for (let i = 0; i < node.namedChildCount; i++) {
+                const c = node.namedChild(i);
+                if (c.type === 'var_spec') recordSpec(c);
+                else if (c.type === 'var_spec_list') {
+                    for (let j = 0; j < c.namedChildCount; j++) recordSpec(c.namedChild(j));
+                }
+            }
+        }
+    };
+    for (const declaration of tree.rootNode.namedChildren) {
+        if (declaration.type === 'var_declaration') recordVarDeclaration(declaration, null);
+    }
+
     traverseTree(tree.rootNode, (node) => {
         // Track function entry
         if (isFunctionNode(node)) {
@@ -1280,7 +1359,7 @@ function findCallsInCode(code, parser, options = {}) {
                     const scopeKey = functionStack[functionStack.length - 1].startLine;
                     const typeMap = scopeTypes.get(scopeKey);
                     if (typeMap) {
-                        typeMap.set(valueVar, el.type);
+                        typeMap.set(valueVar, el.type, 'flow', node);
                         const qualifiers = scopeTypeQualifiers.get(scopeKey);
                         if (el.qualifier) qualifiers?.set(valueVar, el.qualifier);
                         else qualifiers?.delete(valueVar);
@@ -1425,7 +1504,7 @@ function findCallsInCode(code, parser, options = {}) {
                             }
                         }
                         if (typeName) {
-                            typeMap.set(names[vi], typeName);
+                            typeMap.set(names[vi], typeName, typeGuessed ? 'guess' : val.type === 'type_assertion_expression' ? 'type-assertion' : ['composite_literal', 'unary_expression'].includes(val.type) ? 'constructor' : ['identifier', 'index_expression'].includes(val.type) ? 'flow' : 'unknown', val);
                             const qualifiers = scopeTypeQualifiers.get(scopeKey);
                             if (typeQualifier) qualifiers?.set(names[vi], typeQualifier);
                             else qualifiers?.delete(names[vi]);
@@ -1445,78 +1524,8 @@ function findCallsInCode(code, parser, options = {}) {
             }
         }
 
-        // Explicitly typed var declarations: `var buf bytes.Buffer`,
-        // `var sb strings.Builder` (fix #220, cobra-measured — sb.String()
-        // on an untyped receiver fell to single-owner confirmation). Same
-        // semantics as parameter annotations: the declared type is the
-        // receiver's compile-time type.
-        if (node.type === 'var_declaration') {
-            const scopeKey = functionStack.length > 0
-                ? functionStack[functionStack.length - 1].startLine : null;
-            const varTypeMap = scopeKey == null ? packageTypes : scopeTypes.get(scopeKey);
-            const varQualifierMap = scopeKey == null
-                ? packageTypeQualifiers : scopeTypeQualifiers.get(scopeKey);
-            if (varTypeMap) {
-                const varContainerMap = scopeKey == null
-                    ? packageContainerTypes : scopeContainerTypes.get(scopeKey);
-                const recordSpec = (spec) => {
-                    if (spec.type !== 'var_spec') return;
-                    const declaredType = spec.childForFieldName('type');
-                    // Container-typed declaration (fix #300): `var routes
-                    // []*Route` feeds range-element typing.
-                    if (declaredType && CONTAINER_TYPE_NODES.has(declaredType.type) &&
-                        varContainerMap) {
-                        for (let j = 0; j < spec.namedChildCount; j++) {
-                            const id = spec.namedChild(j);
-                            if (id.type === 'identifier') {
-                                varContainerMap.set(id.text, declaredType.text);
-                            }
-                        }
-                        return;
-                    }
-                    let typeName = extractTypeName(spec.childForFieldName('type'));
-                    let qualifier = typeName
-                        ? extractTypeQualifier(spec.childForFieldName('type')) : null;
-                    if (!typeName) {
-                        // var cstDialer = Dialer{...} — the initializer's
-                        // composite-literal type IS the variable's type
-                        // (fix #298, websocket-measured: `d := cstDialer`
-                        // copies then call DialContext). Single-value specs
-                        // only; multi-value pairing stays untyped.
-                        const valueNode = spec.childForFieldName('value');
-                        let init = valueNode?.type === 'expression_list' &&
-                            valueNode.namedChildCount === 1
-                            ? valueNode.namedChild(0) : null;
-                        if (init?.type === 'unary_expression') {
-                            init = init.namedChildCount > 0 ? init.namedChild(0) : null;
-                        }
-                        if (init?.type === 'composite_literal') {
-                            const tn = init.childForFieldName('type');
-                            typeName = extractTypeName(tn);
-                            qualifier = extractTypeQualifier(tn);
-                        }
-                        if (!typeName) return;
-                    }
-                    for (let j = 0; j < spec.namedChildCount; j++) {
-                        const id = spec.namedChild(j);
-                        if (id.type === 'identifier') {
-                            varTypeMap.set(id.text, typeName);
-                            if (qualifier) varQualifierMap?.set(id.text, qualifier);
-                            else varQualifierMap?.delete(id.text);
-                            if (scopeKey != null) {
-                                scopeGuesses.get(scopeKey)?.delete(id.text);
-                            }
-                        }
-                    }
-                };
-                for (let i = 0; i < node.namedChildCount; i++) {
-                    const c = node.namedChild(i);
-                    if (c.type === 'var_spec') recordSpec(c);
-                    else if (c.type === 'var_spec_list') {
-                        for (let j = 0; j < c.namedChildCount; j++) recordSpec(c.namedChild(j));
-                    }
-                }
-            }
+        if (node.type === 'var_declaration' && functionStack.length > 0) {
+            recordVarDeclaration(node, functionStack.at(-1).startLine);
         }
 
         // Track local closures: atoi := func(...) { ... } or
@@ -1688,6 +1697,7 @@ function findCallsInCode(code, parser, options = {}) {
                     // Distinguish pkg.Func() (package-qualified) from obj.Method()
                     // If receiver is a known import alias, this is a package call, not a method call
                     const isPkgCall = receiver && importAliases.has(receiver);
+                    let receiverTypeEvidence;
                     let receiverType = (!isPkgCall && receiver)
                         ? getReceiverType(receiver, operandNode) : undefined;
                     let receiverTypeQualifier = receiverType
@@ -1700,6 +1710,7 @@ function findCallsInCode(code, parser, options = {}) {
                         const lit = literalReceiverInfo(operandNode);
                         if (lit) {
                             receiverType = lit.receiverType;
+                            receiverTypeEvidence = typeOrigin('constructor', operandNode);
                             receiverTypeQualifier = lit.receiverTypeQualifier;
                         }
                     }
@@ -1804,7 +1815,7 @@ function findCallsInCode(code, parser, options = {}) {
                         callEnd: node.endIndex,
                         isMethod: !isPkgCall,
                         receiver,
-                        ...(receiverType && { receiverType }),
+                        ...(receiverType && { receiverType, ...(receiverTypeEvidence ? { receiverTypeSource: 'constructor', receiverTypeEvidence } : getReceiverType(receiver, node, true) || { receiverTypeSource: 'unknown' }) }),
                         ...(receiverTypeQualifier && { receiverTypeQualifier }),
                         ...(receiverType && isGuessedType(receiver) && { receiverTypeGuessed: true }),
                         ...(receiverIndexedSource && {
@@ -1908,6 +1919,7 @@ function findCallsInCode(code, parser, options = {}) {
                 const operandNode = node.childForFieldName('operand');
                 if (fieldNode && operandNode) {
                     const receiver = operandNode.type === 'identifier' ? operandNode.text : undefined;
+                    let receiverTypeEvidence;
                     let receiverType = receiver
                         ? getReceiverType(receiver, operandNode) : undefined;
                     let receiverTypeQualifier = receiverType
@@ -1918,6 +1930,7 @@ function findCallsInCode(code, parser, options = {}) {
                         const lit = literalReceiverInfo(operandNode);
                         if (lit) {
                             receiverType = lit.receiverType;
+                            receiverTypeEvidence = typeOrigin('constructor', operandNode);
                             receiverTypeQualifier = lit.receiverTypeQualifier;
                         }
                     }
@@ -1930,7 +1943,7 @@ function findCallsInCode(code, parser, options = {}) {
                         column: fieldNode.startPosition.column,
                         isMethod: true,
                         receiver,
-                        ...(receiverType && { receiverType }),
+                        ...(receiverType && { receiverType, ...(receiverTypeEvidence ? { receiverTypeSource: 'constructor', receiverTypeEvidence } : getReceiverType(receiver, node, true) || { receiverTypeSource: 'unknown' }) }),
                         ...(receiverTypeQualifier && { receiverTypeQualifier }),
                         ...(receiverType && receiver && isGuessedType(receiver) && { receiverTypeGuessed: true }),
                         enclosingFunction,
@@ -1981,6 +1994,7 @@ function findCallsInCode(code, parser, options = {}) {
                         const operandNode = rhs.childForFieldName('operand');
                         if (fieldNode && operandNode) {
                             const receiver = operandNode.type === 'identifier' ? operandNode.text : undefined;
+                            let receiverTypeEvidence;
                             let receiverType = receiver
                                 ? getReceiverType(receiver, operandNode) : undefined;
                             let receiverTypeQualifier = receiverType
@@ -1990,6 +2004,7 @@ function findCallsInCode(code, parser, options = {}) {
                                 const lit = literalReceiverInfo(operandNode);
                                 if (lit) {
                                     receiverType = lit.receiverType;
+                                    receiverTypeEvidence = typeOrigin('constructor', operandNode);
                                     receiverTypeQualifier = lit.receiverTypeQualifier;
                                 }
                             }
@@ -2000,7 +2015,7 @@ function findCallsInCode(code, parser, options = {}) {
                                 column: fieldNode.startPosition.column,
                                 isMethod: true,
                                 receiver,
-                                ...(receiverType && { receiverType }),
+                                ...(receiverType && { receiverType, ...(receiverTypeEvidence ? { receiverTypeSource: 'constructor', receiverTypeEvidence } : getReceiverType(receiver, node, true) || { receiverTypeSource: 'unknown' }) }),
                                 ...(receiverTypeQualifier && { receiverTypeQualifier }),
                                 ...(receiverType && receiver && isGuessedType(receiver) && { receiverTypeGuessed: true }),
                                 enclosingFunction,
@@ -2048,6 +2063,7 @@ function findCallsInCode(code, parser, options = {}) {
                 const operandNode = val.childForFieldName('operand');
                 if (!fieldNode || !operandNode) continue;
                 const receiver = operandNode.type === 'identifier' ? operandNode.text : undefined;
+                let receiverTypeEvidence;
                 let receiverType = receiver
                     ? getReceiverType(receiver, operandNode) : undefined;
                 let receiverTypeQualifier = receiverType
@@ -2056,6 +2072,7 @@ function findCallsInCode(code, parser, options = {}) {
                     const lit = literalReceiverInfo(operandNode);
                     if (lit) {
                         receiverType = lit.receiverType;
+                        receiverTypeEvidence = typeOrigin('constructor', operandNode);
                         receiverTypeQualifier = lit.receiverTypeQualifier;
                     }
                 }
@@ -2066,7 +2083,7 @@ function findCallsInCode(code, parser, options = {}) {
                     column: fieldNode.startPosition.column,
                     isMethod: true,
                     receiver,
-                    ...(receiverType && { receiverType }),
+                    ...(receiverType && { receiverType, ...(receiverTypeEvidence ? { receiverTypeSource: 'constructor', receiverTypeEvidence } : getReceiverType(receiver, node, true) || { receiverTypeSource: 'unknown' }) }),
                     ...(receiverTypeQualifier && { receiverTypeQualifier }),
                     ...(receiverType && receiver && isGuessedType(receiver) && { receiverTypeGuessed: true }),
                     enclosingFunction: getCurrentEnclosingFunction(),
@@ -2136,6 +2153,7 @@ function findCallsInCode(code, parser, options = {}) {
                     const operandNode = valueNode.childForFieldName('operand');
                     if (fieldNode && operandNode) {
                         const receiver = operandNode.type === 'identifier' ? operandNode.text : undefined;
+                        let receiverTypeEvidence;
                         let receiverType = receiver
                             ? getReceiverType(receiver, operandNode) : undefined;
                         let receiverTypeQualifier = receiverType
@@ -2145,6 +2163,7 @@ function findCallsInCode(code, parser, options = {}) {
                             const lit = literalReceiverInfo(operandNode);
                             if (lit) {
                                 receiverType = lit.receiverType;
+                                receiverTypeEvidence = typeOrigin('constructor', operandNode);
                                 receiverTypeQualifier = lit.receiverTypeQualifier;
                             }
                         }
@@ -2155,7 +2174,7 @@ function findCallsInCode(code, parser, options = {}) {
                             column: fieldNode.startPosition.column,
                             isMethod: true,
                             receiver,
-                            ...(receiverType && { receiverType }),
+                            ...(receiverType && { receiverType, ...(receiverTypeEvidence ? { receiverTypeSource: 'constructor', receiverTypeEvidence } : getReceiverType(receiver, node, true) || { receiverTypeSource: 'unknown' }) }),
                             ...(receiverTypeQualifier && { receiverTypeQualifier }),
                             ...(receiverType && receiver && isGuessedType(receiver) && { receiverTypeGuessed: true }),
                             enclosingFunction,

package/languages/java.js

@@ -5,6 +5,9 @@
  * declarations, and static final constants.
  */
 
+const { ReceiverTypeMap, typeOrigin } = require('./type-evidence');
+
+
 const {
     traverseTree,
     traverseTreeCached,
@@ -1029,7 +1032,7 @@ function findCallsInCode(code, parser) {
 
     // Build type map from method/constructor parameters
     const buildScopeTypeMap = (node) => {
-        const typeMap = new Map();
+        const typeMap = new ReceiverTypeMap();
         const rawTypeMap = new Map();
         const qualifierMap = new Map();
         const paramsNode = node.childForFieldName('parameters');
@@ -1041,7 +1044,7 @@ function findCallsInCode(code, parser) {
                     const typeNode = param.childForFieldName('type');
                     const typeName = extractTypeName(typeNode);
                     if (nameNode && typeName) {
-                        typeMap.set(nameNode.text, typeName);
+                        typeMap.set(nameNode.text, typeName, 'annotation', typeNode);
                         rawTypeMap.set(nameNode.text, typeNode.text);
                         const qualifier = extractTypeQualifier(typeNode);
                         if (qualifier) qualifierMap.set(nameNode.text, qualifier);
@@ -1076,10 +1079,10 @@ function findCallsInCode(code, parser) {
     };
 
     // Look up variable type from scope chain
-    const getReceiverType = (varName) => {
+    const getReceiverType = (varName, evidence = false) => {
         for (let i = functionStack.length - 1; i >= 0; i--) {
             const typeMap = scopeTypes.get(functionStack[i].startLine);
-            if (typeMap?.has(varName)) return typeMap.get(varName);
+            if (typeMap?.has(varName)) return evidence ? typeMap.fields(varName) : typeMap.get(varName);
         }
         return undefined;
     };
@@ -1476,7 +1479,7 @@ function findCallsInCode(code, parser) {
                     rawHad: rawTypeMap?.has(nameNode.text),
                     rawPrevious: rawTypeMap?.get(nameNode.text),
                 });
-                typeMap.set(nameNode.text, typeName);
+                typeMap.set(nameNode.text, typeName, 'annotation', typeNode);
                 rawTypeMap?.set(nameNode.text, typeNode.text);
                 const qualifierMap = scopeTypeQualifiers.get(scopeKey);
                 if (typeQualifier) qualifierMap?.set(nameNode.text, typeQualifier);
@@ -1525,7 +1528,9 @@ function findCallsInCode(code, parser) {
                         packageQualifier = rootText;
                     }
                 }
-                const receiverType = castReceiverType ||
+                const inlineConstructorType = receiverNode?.type === 'object_creation_expression'
+                    ? extractTypeName(receiverNode.childForFieldName('type')) : undefined;
+                const receiverType = castReceiverType || inlineConstructorType ||
                     ((receiver && receiver !== 'this') ? getReceiverType(receiver) : undefined);
                 const receiverTypeQualifier = packageQualifier ||
                     (!castReceiverType && receiver ? getReceiverTypeQualifier(receiver) : undefined);
@@ -1597,6 +1602,7 @@ function findCallsInCode(code, parser) {
                         : `chain:${receiverPath.owner}#${receiverPath.methods.join('#')}`)
                     : null;
                 calls.push({
+                    callSite: typeOrigin('call', nameNode),
                     name: nameNode.text,
                     // Multi-line chains (builder.x()\n.y()) must report each
                     // method's OWN name line, not the chain-start line — the
@@ -1604,7 +1610,10 @@ function findCallsInCode(code, parser) {
                     line: nameNode.startPosition.row + 1,
                     isMethod: !!objNode,
                     receiver,
-                    ...(receiverType && { receiverType }),
+                    ...(receiverType && { receiverType, ...(getReceiverType(receiver, true) ||
+                        (castReceiverType ? { receiverTypeSource: 'cast', receiverTypeEvidence: typeOrigin('cast', objNode) } :
+                            inlineConstructorType ? { receiverTypeSource: 'constructor', receiverTypeEvidence: typeOrigin('constructor', receiverNode) } :
+                            { receiverTypeSource: 'unknown' })) }),
                     ...(receiverTypeQualifier && { receiverTypeQualifier }),
                     ...(receiverIsTypeQualified && { receiverIsTypeQualified: true }),
                     ...(castReceiverType && { receiverTypeCast: true }),
@@ -1656,6 +1665,7 @@ function findCallsInCode(code, parser) {
                 const enclosingFunction = getCurrentEnclosingFunction();
                 const ctorArgs = getCallArgs(node);
                 calls.push({
+                    callSite: typeOrigin('call', node),
                     name: targetClass,
                     line: node.startPosition.row + 1,
                     isMethod: false,
@@ -1686,6 +1696,7 @@ function findCallsInCode(code, parser) {
             if (enumName) {
                 const ctorArgs = getCallArgs(node);
                 calls.push({
+                    callSite: typeOrigin('call', node),
                     name: enumName,
                     line: node.startPosition.row + 1,
                     isMethod: false,
@@ -1725,6 +1736,7 @@ function findCallsInCode(code, parser) {
                 const enclosingFunction = getCurrentEnclosingFunction();
                 const ctorArgs = getCallArgs(node);
                 calls.push({
+                    callSite: typeOrigin('call', typeNode),
                     name: typeName,
                     line: node.startPosition.row + 1,
                     isMethod: false,
@@ -1747,11 +1759,12 @@ function findCallsInCode(code, parser) {
                 const receiverType = (receiver && receiver !== 'this') ? getReceiverType(receiver) : undefined;
                 const enclosingFunction = getCurrentEnclosingFunction();
                 calls.push({
+                    callSite: typeOrigin('call', nameNode),
                     name: nameNode.text,
                     line: node.startPosition.row + 1,
                     isMethod: !!receiver,
                     receiver,
-                    ...(receiverType && { receiverType }),
+                    ...(receiverType && { receiverType, ...(getReceiverType(receiver, true) || { receiverTypeSource: 'unknown' }) }),
                     isFunctionReference: true,
                     isPotentialCallback: true,
                     enclosingFunction
@@ -1788,7 +1801,7 @@ function findCallsInCode(code, parser) {
                     if (nameNode && typeName) {
                         const scopeKey = functionStack[functionStack.length - 1].startLine;
                         const typeMap = scopeTypes.get(scopeKey);
-                        if (typeMap) typeMap.set(nameNode.text, typeName);
+                        if (typeMap) typeMap.set(nameNode.text, typeName, valueNode?.type === 'object_creation_expression' ? 'constructor' : 'annotation', valueNode || declTypeNode);
                         const rawTypeMap = scopeRawTypes.get(scopeKey);
                         const rawType = valueNode?.type === 'object_creation_expression'
                             ? valueNode.childForFieldName('type')?.text
@@ -1822,7 +1835,7 @@ function findCallsInCode(code, parser) {
             if (resNameNode && typeName) {
                 const scopeKey = functionStack[functionStack.length - 1].startLine;
                 const typeMap = scopeTypes.get(scopeKey);
-                if (typeMap) typeMap.set(resNameNode.text, typeName);
+                if (typeMap) typeMap.set(resNameNode.text, typeName, 'with-binding', node);
                 const rawTypeMap = scopeRawTypes.get(scopeKey);
                 const rawType = resValueNode?.type === 'object_creation_expression'
                     ? resValueNode.childForFieldName('type')?.text