@lzehrung/codegraph 2.3.30 → 2.4.0

package/dist/graphs/angularjs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"angularjs.d.ts","sourceRoot":"","sources":["../../src/graphs/angularjs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAY5D,wBAAsB,8BAA8B,CAClD,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EAAE,EACf,eAAe,EAAE,eAAe,GAAG,SAAS,EAC5C,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GACtC,OAAO,CAAC,IAAI,EAAE,CAAC,CAyFjB"}
+{"version":3,"file":"angularjs.d.ts","sourceRoot":"","sources":["../../src/graphs/angularjs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAIxC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAY5D,wBAAsB,8BAA8B,CAClD,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EAAE,EACf,eAAe,EAAE,eAAe,GAAG,SAAS,EAC5C,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GACtC,OAAO,CAAC,IAAI,EAAE,CAAC,CAyFjB"}

package/dist/graphs/angularjs.js

@@ -1,6 +1,7 @@
 import fsp from "node:fs/promises";
 import { supportForFileWithoutHeaderSample } from "../languages.js";
 import { extractAngularJsReferences, extractAngularJsRegistrations } from "../frameworks/angularjs.js";
+import { edgeKey } from "../util/graph-edges.js";
 import { fileIdentityKey } from "../util/paths.js";
 import { resolveSpecifier } from "../util/resolution.js";
 import {} from "../util/workspace.js";
@@ -44,7 +45,7 @@ export async function collectAngularJsFrameworkEdges(projectRoot, files, workspa
     const edges = [];
     const seen = new Set();
     const pushEdge = (edge) => {
-        const key = `${edge.from}::${edge.raw}::${edge.to.type === "file" ? edge.to.path : `external:${edge.to.name}`}`;
+        const key = edgeKey(edge);
         if (seen.has(key))
             return;
         seen.add(key);

package/dist/graphs/angularjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"angularjs.js","sourceRoot":"","sources":["../../src/graphs/angularjs.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,kBAAkB,CAAC;AAEnC,OAAO,EAAE,iCAAiC,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAC;AAEvG,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAO5D,8FAA8F;AAC9F,0FAA0F;AAC1F,0BAA0B;AAC1B,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;AAE7D,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,WAAmB,EACnB,KAAe,EACf,eAA4C,EAC5C,MAAuC;IAEvC,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACpC,MAAM,OAAO,GAAG,iCAAiC,CAAC,IAAI,CAAC,CAAC;QACxD,OAAO,OAAO,KAAK,SAAS,IAAI,uBAAuB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,QAAQ,GAA2B,EAAE,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,YAAY,GAAG,MAAM,EAAE,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC;QAChE,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;YAC9C,SAAS;QACX,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAChD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAClC,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IAED,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC/D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,KAAK,MAAM,YAAY,IAAI,6BAA6B,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACzE,IAAI,YAAY,GAAG,uBAAuB,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAClE,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;gBACjC,uBAAuB,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;YAC/D,CAAC;YACD,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAW,EAAE,CAAC;IACzB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,QAAQ,GAAG,CAAC,IAAU,EAAQ,EAAE;QACpC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QAChH,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAO;QAC1B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC;IAEF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACxD,MAAM,UAAU,GAAG,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9D,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,IAAI,SAAS,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gBACrC,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;gBAChH,QAAQ,CAAC;oBACP,IAAI,EAAE,cAAc;oBACpB,EAAE,EACA,OAAO,QAAQ,KAAK,QAAQ;wBAC1B,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;wBACtD,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE;oBACnD,GAAG,EAAE,SAAS,CAAC,KAAK;oBACpB,QAAQ,EAAE,WAAW;oBACrB,UAAU,EAAE,GAAG;iBAChB,CAAC,CAAC;gBACH,SAAS;YACX,CAAC;YAED,MAAM,aAAa,GAAG,uBAAuB,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACnE,IAAI,aAAa,IAAI,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBAC5C,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE,CAAC;oBACvC,IAAI,UAAU,KAAK,cAAc;wBAAE,SAAS;oBAC5C,QAAQ,CAAC;wBACP,IAAI,EAAE,cAAc;wBACpB,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE;wBACtC,GAAG,EAAE,SAAS,CAAC,KAAK;wBACpB,QAAQ,EAAE,WAAW;wBACrB,UAAU,EAAE,SAAS,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;qBACxD,CAAC,CAAC;gBACL,CAAC;gBACD,SAAS;YACX,CAAC;YAED,QAAQ,CAAC;gBACP,IAAI,EAAE,cAAc;gBACpB,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,CAAC,KAAK,EAAE;gBAC/C,GAAG,EAAE,SAAS,CAAC,KAAK;gBACpB,QAAQ,EAAE,WAAW;gBACrB,UAAU,EAAE,SAAS,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG;aACzD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"angularjs.js","sourceRoot":"","sources":["../../src/graphs/angularjs.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,kBAAkB,CAAC;AAEnC,OAAO,EAAE,iCAAiC,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAC;AAEvG,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAO5D,8FAA8F;AAC9F,0FAA0F;AAC1F,0BAA0B;AAC1B,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;AAE7D,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,WAAmB,EACnB,KAAe,EACf,eAA4C,EAC5C,MAAuC;IAEvC,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACpC,MAAM,OAAO,GAAG,iCAAiC,CAAC,IAAI,CAAC,CAAC;QACxD,OAAO,OAAO,KAAK,SAAS,IAAI,uBAAuB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,QAAQ,GAA2B,EAAE,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,YAAY,GAAG,MAAM,EAAE,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC;QAChE,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;YAC9C,SAAS;QACX,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAChD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAClC,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IAED,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC/D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,KAAK,MAAM,YAAY,IAAI,6BAA6B,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACzE,IAAI,YAAY,GAAG,uBAAuB,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAClE,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;gBACjC,uBAAuB,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;YAC/D,CAAC;YACD,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAW,EAAE,CAAC;IACzB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,QAAQ,GAAG,CAAC,IAAU,EAAQ,EAAE;QACpC,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAO;QAC1B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC;IAEF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACxD,MAAM,UAAU,GAAG,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9D,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,IAAI,SAAS,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gBACrC,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;gBAChH,QAAQ,CAAC;oBACP,IAAI,EAAE,cAAc;oBACpB,EAAE,EACA,OAAO,QAAQ,KAAK,QAAQ;wBAC1B,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;wBACtD,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE;oBACnD,GAAG,EAAE,SAAS,CAAC,KAAK;oBACpB,QAAQ,EAAE,WAAW;oBACrB,UAAU,EAAE,GAAG;iBAChB,CAAC,CAAC;gBACH,SAAS;YACX,CAAC;YAED,MAAM,aAAa,GAAG,uBAAuB,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACnE,IAAI,aAAa,IAAI,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBAC5C,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE,CAAC;oBACvC,IAAI,UAAU,KAAK,cAAc;wBAAE,SAAS;oBAC5C,QAAQ,CAAC;wBACP,IAAI,EAAE,cAAc;wBACpB,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE;wBACtC,GAAG,EAAE,SAAS,CAAC,KAAK;wBACpB,QAAQ,EAAE,WAAW;wBACrB,UAAU,EAAE,SAAS,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;qBACxD,CAAC,CAAC;gBACL,CAAC;gBACD,SAAS;YACX,CAAC;YAED,QAAQ,CAAC;gBACP,IAAI,EAAE,cAAc;gBACpB,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,CAAC,KAAK,EAAE;gBAC/C,GAAG,EAAE,SAAS,CAAC,KAAK;gBACpB,QAAQ,EAAE,WAAW;gBACrB,UAAU,EAAE,SAAS,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG;aACzD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/graphs/edge-resolution.d.ts

@@ -1,4 +1,4 @@
-import type { LanguageSupport } from "../languages.js";
+import { type LanguageExtensionMap, type LanguageSupport } from "../languages.js";
 import type { EdgeTo } from "../types.js";
 import { type MatchPathFn } from "../util/resolution.js";
 import { type ModuleSpecifier } from "../util/specifiers.js";
@@ -10,6 +10,7 @@ type ResolvedSpecifierEdge = {
     typeOnly?: boolean;
     resolved?: ModuleSpecifier["resolved"];
     confidence?: number;
+    includeForm?: ModuleSpecifier["includeForm"];
 };
 export type ModuleSpecifierResolutionContext = {
     support: LanguageSupport;
@@ -19,6 +20,8 @@ export type ModuleSpecifierResolutionContext = {
     matchPath: MatchPathFn | undefined;
     resolveNodeModules?: boolean;
     resolutionHints?: string[];
+    /** Active extension-to-language mapping, so a file is classified as the language that parses it. */
+    languageExtensions?: LanguageExtensionMap;
 };
 export declare function resolveModuleSpecifierEdges(entry: ModuleSpecifier, context: ModuleSpecifierResolutionContext): Promise<ResolvedSpecifierEdge[] | null>;
 export {};

package/dist/graphs/edge-resolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edge-resolution.d.ts","sourceRoot":"","sources":["../../src/graphs/edge-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAML,KAAK,WAAW,EACjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAK5D,KAAK,qBAAqB,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,OAAO,EAAE,eAAe,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;IAC7C,SAAS,EAAE,WAAW,GAAG,SAAS,CAAC;IACnC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AA4EF,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,gCAAgC,GACxC,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CAqDzC"}
+{"version":3,"file":"edge-resolution.d.ts","sourceRoot":"","sources":["../../src/graphs/edge-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,KAAK,oBAAoB,EAAE,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACrH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAML,KAAK,WAAW,EACjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAK5D,KAAK,qBAAqB,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,eAAe,CAAC,aAAa,CAAC,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,OAAO,EAAE,eAAe,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;IAC7C,SAAS,EAAE,WAAW,GAAG,SAAS,CAAC;IACnC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,oGAAoG;IACpG,kBAAkB,CAAC,EAAE,oBAAoB,CAAC;CAC3C,CAAC;AA8EF,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,gCAAgC,GACxC,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CAsFzC"}

package/dist/graphs/edge-resolution.js

@@ -1,9 +1,10 @@
+import { supportForFileWithoutHeaderSample } from "../languages.js";
 import { getGraphOnlyResolutionExtensions, resolveImportSpecifier, resolveJvmPackageImportPaths, resolvePythonModule, resolveSpecifier, } from "../util/resolution.js";
 import {} from "../util/specifiers.js";
 import {} from "../util/workspace.js";
 import { isGraphOnlyLanguage } from "../document-links.js";
 import { STYLESHEET_RESOLUTION_EXTENSIONS } from "../util/resolution-candidates.js";
-import { resolveCsharpNamespaceImportPaths } from "../util/resolution/csharp.js";
+import { resolveCsharpDottedTypeImportPath, resolveCsharpNamespaceImportPaths } from "../util/resolution/csharp.js";
 function edgeToResolvedFile(resolved) {
     return { type: "file", path: resolved.replace(/\\/g, "/") };
 }
@@ -18,6 +19,7 @@ function withSpecifierMetadata(entry, to) {
         ...(entry.typeOnly !== undefined ? { typeOnly: entry.typeOnly } : {}),
         ...(entry.resolved !== undefined ? { resolved: entry.resolved } : {}),
         ...(entry.confidence !== undefined ? { confidence: entry.confidence } : {}),
+        ...(entry.includeForm ? { includeForm: entry.includeForm } : {}),
     };
 }
 async function resolveGenericSpecifier(entry, context, resolutionExtensions) {
@@ -55,6 +57,7 @@ async function resolveImportSpecifierEdge(entry, context) {
         ...(entry.exportCondition ? { exportCondition: entry.exportCondition } : {}),
         ...(entry.pathAttribute ? { pathAttribute: entry.pathAttribute } : {}),
         ...(entry.statementStartIndex !== undefined ? { statementStartIndex: entry.statementStartIndex } : {}),
+        ...(entry.includeForm ? { includeForm: entry.includeForm } : {}),
     });
     return typeof res === "string" ? edgeToResolvedFile(res) : edgeToExternal(entry.raw ?? res.external);
 }
@@ -85,19 +88,40 @@ export async function resolveModuleSpecifierEdges(entry, context) {
     else if (context.support.id === "go" ||
         context.support.id === "php" ||
         context.support.id === "rust" ||
+        // C and C++ share the quoted-include rule, so both must reach the language resolver or a
+        // bare `#include "lib.h"` stays external in the graph while navigation resolves it.
+        context.support.id === "c" ||
         context.support.id === "cpp") {
         to = await resolveImportSpecifierEdge(entry, context);
     }
     else if (["csharp", "ruby"].includes(context.support.id)) {
         const namespaceTargets = context.support.id === "csharp"
-            ? await resolveCsharpNamespaceImportPaths(context.projectRoot, entry.spec, context.file)
+            ? await resolveCsharpNamespaceImportPaths(context.projectRoot, entry.spec, context.file, context.languageExtensions)
             : [];
         if (namespaceTargets.length) {
             return namespaceTargets.map((targetPath) => withSpecifierMetadata(entry, edgeToResolvedFile(targetPath)));
         }
+        if (context.support.id === "csharp") {
+            // `using PT = N.Point` is not a namespace. The same helper the import binding uses
+            // picks the one declaring file, or refuses an ambiguous set instead of a path guess.
+            const typeMatch = await resolveCsharpDottedTypeImportPath(context.projectRoot, entry.spec, context.file, context.languageExtensions);
+            if (typeMatch.status === "found") {
+                return [withSpecifierMetadata(entry, edgeToResolvedFile(typeMatch.file))];
+            }
+            if (typeMatch.status === "ambiguous" || typeMatch.status === "partial") {
+                return [withSpecifierMetadata(entry, edgeToExternal(entry.raw ?? entry.spec))];
+            }
+        }
         const { resolvePathLikeModule } = await import("../util/resolution.js");
         const pathLike = await resolvePathLikeModule(context.projectRoot, entry.spec);
         to = pathLike ? edgeToResolvedFile(pathLike) : await resolveGenericSpecifier(entry, context, resolutionExtensions);
+        // A C# directive names a namespace or type, never another language's file (`using System;`
+        // beside a root `system.ts`), whether path-like, hint, workspace, or package resolution found it.
+        if (context.support.id === "csharp" &&
+            to.type === "file" &&
+            supportForFileWithoutHeaderSample(to.path, context.languageExtensions)?.id !== "csharp") {
+            to = edgeToExternal(entry.raw ?? entry.spec);
+        }
     }
     else {
         to = await resolveGenericSpecifier(entry, context, resolutionExtensions);

package/dist/graphs/edge-resolution.js.map

@@ -1 +1 @@
-{"version":3,"file":"edge-resolution.js","sourceRoot":"","sources":["../../src/graphs/edge-resolution.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"edge-resolution.js","sourceRoot":"","sources":["../../src/graphs/edge-resolution.ts"],"names":[],"mappings":"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"}

package/dist/graphs/specifiers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"specifiers.d.ts","sourceRoot":"","sources":["../../src/graphs/specifiers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAOvD,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE5D,OAAO,EAML,KAAK,mBAAmB,EAExB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACvB,MAAM,iCAAiC,CAAC;AAezC,OAAO,EAA2D,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAEtH,MAAM,MAAM,8BAA8B,GACtC,MAAM,GACN,cAAc,GACd,aAAa,GACb,qBAAqB,GACrB,aAAa,GACb,aAAa,CAAC;AAElB,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,8BAA8B,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,aAAa,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC1C,oBAAoB,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAClD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0BAA0B,CAAC,EAAE,MAAM,EAAE,CAAC;IACtC,0BAA0B,CAAC,EAAE,CAAC,KAAK,EAAE,6BAA6B,KAAK,IAAI,CAAC;IAC5E,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAkLF,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,MAAM,EAClB,oBAAoB,EAAE,oBAAoB,GAAG,SAAS,EACtD,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,OAAO,GAChB,8BAA8B,CAgBhC;AAqBD,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,8BAA8B,GACpC,eAAe,EAAE,CAwPnB"}
+{"version":3,"file":"specifiers.d.ts","sourceRoot":"","sources":["../../src/graphs/specifiers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAOvD,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE5D,OAAO,EAML,KAAK,mBAAmB,EAExB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACvB,MAAM,iCAAiC,CAAC;AAezC,OAAO,EAIL,KAAK,eAAe,EACrB,MAAM,uBAAuB,CAAC;AAE/B,MAAM,MAAM,8BAA8B,GACtC,MAAM,GACN,cAAc,GACd,aAAa,GACb,qBAAqB,GACrB,aAAa,GACb,aAAa,CAAC;AAElB,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,8BAA8B,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,aAAa,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC1C,oBAAoB,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAClD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0BAA0B,CAAC,EAAE,MAAM,EAAE,CAAC;IACtC,0BAA0B,CAAC,EAAE,CAAC,KAAK,EAAE,6BAA6B,KAAK,IAAI,CAAC;IAC5E,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAqLF,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,MAAM,EAClB,oBAAoB,EAAE,oBAAoB,GAAG,SAAS,EACtD,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,OAAO,GAChB,8BAA8B,CAgBhC;AAqBD,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,8BAA8B,GACpC,eAAe,EAAE,CA2PnB"}

package/dist/graphs/specifiers.js

@@ -8,7 +8,7 @@ import { sliceText, unquote } from "../util/ast.js";
 import { isRustCfgTestStatement, utf8ByteOffsetToStringIndex } from "../util/rust-test-modules.js";
 import { rustStatementStartIndex } from "../util/resolution/rust.js";
 import { collectTextImportSpecifiers, rustSpecifierForParsedImport, } from "../indexer/imports/text-import-extractors.js";
-import { extractJsTsSpecifiers, isJsTsTypeOnlySpecifierStatement } from "../util/specifiers.js";
+import { cFamilyImportFormFromText, extractJsTsSpecifiers, isJsTsTypeOnlySpecifierStatement, } from "../util/specifiers.js";
 const HTML_LIKE_LANGUAGE_IDS = new Set(["html", "vue", "svelte"]);
 function isHtmlLikeLanguage(languageId, filePath) {
     if (HTML_LIKE_LANGUAGE_IDS.has(languageId))
@@ -76,10 +76,11 @@ function normalizeModuleSpecifiers(specifiers) {
             ...(entry.confidence !== undefined ? { confidence: entry.confidence } : {}),
             ...(entry.pathAttribute ? { pathAttribute: entry.pathAttribute } : {}),
             ...(entry.statementStartIndex !== undefined ? { statementStartIndex: entry.statementStartIndex } : {}),
+            ...(entry.includeForm ? { includeForm: entry.includeForm } : {}),
         });
 }
 function moduleSpecifierKey(entry) {
-    return `${entry.spec}::${entry.typeOnly ? 1 : 0}::${entry.exportCondition ?? ""}::${entry.pathAttribute ?? ""}`;
+    return `${entry.spec}::${entry.typeOnly ? 1 : 0}::${entry.phpImportType ?? ""}::${entry.exportCondition ?? ""}::${entry.pathAttribute ?? ""}::${entry.includeForm ?? ""}`;
 }
 function appendUniqueSpecifiers(target, incoming, seen) {
     for (const entry of incoming) {
@@ -321,16 +322,19 @@ export function collectModuleSpecifiersFromSource(support, source, opts) {
                 }
                 const stylesheetImport = support.id === "css" || support.id === "scss" || support.id === "less";
                 const isJsFamily = support.id === "js" || support.id === "ts" || support.id === "tsx";
+                const isCFamily = support.id === "c" || support.id === "cpp";
                 // CommonJS require() and TS `import x = require(...)` both use the require condition.
                 const exportCondition = isJsFamily && /\brequire\s*\(/.test(stmtText) ? "require" : undefined;
                 for (const capture of match.captures) {
                     if (capture.name !== "from")
                         continue;
+                    const includeForm = isCFamily ? cFamilyImportFormFromText(stmtText, capture.text) : undefined;
                     out.push({
                         spec: unquote(capture.text),
                         typeOnly,
                         ...(stylesheetImport ? { resolutionKind: "stylesheet" } : {}),
                         ...(exportCondition ? { exportCondition } : {}),
+                        ...(includeForm ? { includeForm } : {}),
                     });
                 }
             }

package/dist/graphs/specifiers.js.map

@@ -1 +1 @@
-{"version":3,"file":"specifiers.js","sourceRoot":"","sources":["../../src/graphs/specifiers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"specifiers.js","sourceRoot":"","sources":["../../src/graphs/specifiers.ts"],"names":[],"mappings":"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"}

package/dist/graphs/symbol-graph-detailed/ast.d.ts

@@ -19,6 +19,26 @@ export type DetailedDeclarationPassResult = {
 export declare const isIdentifierType: (sup: LanguageSupport, type: string) => boolean;
 export declare function collectDetailedDeclarations(rootNode: SyntaxNodeLike, sup: LanguageSupport, source: string, locals: SymbolDef[]): DetailedDeclarationPassResult;
 export declare function findFirstNodeByType(node: SyntaxNodeLike, type: string): SyntaxNodeLike | null;
+/**
+ * Parameter-list nodes shared by receiver classification and declaration arity. The union keeps
+ * Kotlin `function_value_parameters` and Ruby `block_parameters` recognized; declaration arity
+ * excludes the block and lambda forms because they belong to nested scopes.
+ */
+export declare const PARAMETER_LIST_NODE_TYPES: Record<string, true>;
+/** Whether a parameter node is a C/C++ variadic marker rather than a fixed positional parameter. */
+export declare function isVariadicParameterMarker(node: SyntaxNodeLike): boolean;
+/**
+ * Positional parameter count of a member/function declaration node, or undefined when the node
+ * declares no parameter list. Swift exposes parameters as direct declaration children, so its
+ * language id is required to distinguish a zero-parameter declaration from an unknown shape.
+ * Used for public declaration metadata and C++ declaration correspondence, never to establish
+ * accepted call ranges. Receiver call selection uses the shared callable ranges instead.
+ *
+ * The count is the number of *required-or-defaulted* fixed parameters; C/C++ variadic markers are
+ * excluded because they accept zero arguments, while each language's own maximum-arity handling
+ * keeps their upper bound unbounded.
+ */
+export declare function declarationMemberArity(declarationNode: SyntaxNodeLike, languageId?: string): number | undefined;
 export declare function collectNodesByType(node: SyntaxNodeLike, type: string, out: SyntaxNodeLike[]): void;
 export declare function scanForAliasUse(node: SyntaxNodeLike, sup: LanguageSupport, source: string, cb: (name: string, atNode: SyntaxNodeLike) => void): void;
 //# sourceMappingURL=ast.d.ts.map

package/dist/graphs/symbol-graph-detailed/ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/graphs/symbol-graph-detailed/ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAQxD,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,SAAS,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,SAAS,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,KAAK,eAAe,EAAE,MAAM,MAAM,KAAG,OACe,CAAC;AAqBtF,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,cAAc,EACxB,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EAAE,GAClB,6BAA6B,CAuI/B;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAO7F;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,IAAI,CAKlG;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,KAAK,IAAI,GACjD,IAAI,CAMN"}
+{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/graphs/symbol-graph-detailed/ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AASxD,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,SAAS,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,SAAS,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,KAAK,eAAe,EAAE,MAAM,MAAM,KAAG,OACe,CAAC;AA0CtF,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,cAAc,EACxB,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EAAE,GAClB,6BAA6B,CAgL/B;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAO7F;AACD;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAS1D,CAAC;AAeF,oGAAoG;AACpG,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAEvE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,eAAe,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAsC/G;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,IAAI,CAKlG;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,KAAK,IAAI,GACjD,IAAI,CAMN"}

package/dist/graphs/symbol-graph-detailed/ast.js

@@ -1,21 +1,45 @@
 import { sliceText, unquote } from "../../util/ast.js";
+import { isJsTsLanguage } from "../../languages/js-family.js";
 import { getMemberAccessParts, memberExpressionTypeFor, memberPropertyIdentifierTypes, } from "../../util/member-access.js";
 export const isIdentifierType = (sup, type) => Array.isArray(sup.nodeTypes?.identifier) && sup.nodeTypes.identifier.includes(type);
+const FUNCTION_NAME_NODE_TYPES = new Set(["identifier", "field_identifier", "operator_name", "destructor_name"]);
 /** C and C++ put the function name in a nested declarator, not a `name` field. */
+const FUNCTION_EXPRESSION_TYPES = new Set(["function_expression", "function", "generator_function"]);
+/**
+ * A named JavaScript/TypeScript function expression that no binding names: an object property
+ * value (`{ value: function render() {} }`), a callback, or an IIFE. It is a caller in its own
+ * right. A function expression that a declarator or assignment binds is recorded under that name.
+ */
+function isStandaloneNamedFunctionExpression(sup, node) {
+    if (!isJsTsLanguage(sup.id) || !FUNCTION_EXPRESSION_TYPES.has(node.type) || !node.childForFieldName("name")) {
+        return false;
+    }
+    const parent = node.parent;
+    if (parent?.type === "variable_declarator" && parent.childForFieldName("value")?.id === node.id)
+        return false;
+    return !(parent?.type === "assignment_expression" && parent.childForFieldName("right")?.id === node.id);
+}
 function functionNameNode(node) {
     const named = node.childForFieldName("name");
     if (named)
         return named;
     let current = node.childForFieldName("declarator");
     while (current) {
-        if (current.type === "identifier" || current.type === "field_identifier")
+        if (FUNCTION_NAME_NODE_TYPES.has(current.type))
             return current;
-        const nested = current.childForFieldName("declarator");
-        if (nested) {
+        let name = current.childForFieldName("name");
+        while (name?.childForFieldName("name"))
+            name = name.childForFieldName("name");
+        if (name && FUNCTION_NAME_NODE_TYPES.has(name.type))
+            return name;
+        const nested = current.childForFieldName("declarator") ??
+            current.namedChildren.find((child) => child.type.includes("declarator")) ??
+            null;
+        if (nested && nested.id !== current.id) {
             current = nested;
             continue;
         }
-        return (current.namedChildren.find((child) => child.type === "identifier" || child.type === "field_identifier") ?? null);
+        return current.namedChildren.find((child) => FUNCTION_NAME_NODE_TYPES.has(child.type)) ?? null;
     }
     return node.childForFieldName("type");
 }
@@ -27,23 +51,29 @@ export function collectDetailedDeclarations(rootNode, sup, source, locals) {
     const propertyIdentifierTypes = memberPropertyIdentifierTypes(sup);
     const functionNodeTypes = new Set([
         "function_declaration",
+        "generator_function_declaration",
         "function_definition",
         "method_declaration",
         "method_definition",
         "method_signature",
         "abstract_method_signature",
+        "function_signature",
         "constructor_declaration",
         "function_item",
         "function_signature_item",
         "method",
         "protocol_function_declaration",
         "singleton_method",
+        // C# local functions are callable in their own right; ownership stays with the
+        // enclosing method, not the containing class.
+        "local_function_statement",
     ]);
     const typeNodeTypes = new Set([
         "class_declaration",
         "record_declaration",
         "abstract_class_declaration",
         "class_definition",
+        "object_declaration",
         "class",
         "interface_declaration",
         "module",
@@ -54,6 +84,9 @@ export function collectDetailedDeclarations(rootNode, sup, source, locals) {
         "struct_declaration",
         "class_specifier",
         "struct_specifier",
+        // C/C++ unions declare members like structs (cpp.ts captures and classifies
+        // union names as classes).
+        "union_specifier",
         // Go methods sit beside the type, not inside it. Collect the type_spec so
         // member_of can name the receiver type the same way class bodies do.
         "type_spec",
@@ -75,27 +108,38 @@ export function collectDetailedDeclarations(rootNode, sup, source, locals) {
             ((right.range.end.index ?? 0) - (right.range.start.index ?? 0)));
         return containing[0] ?? candidates[0];
     };
+    /** A definition whose name starts inside `nameNode`, without falling back to a same-named one. */
+    const findDefinitionAt = (name, nameNode) => locals.find((local) => local.localName === name &&
+        (local.range.start.index ?? Number.NEGATIVE_INFINITY) >= nameNode.startIndex &&
+        (local.range.start.index ?? Number.POSITIVE_INFINITY) < nameNode.endIndex);
     const walk = (node) => {
-        if (functionNodeTypes.has(node.type)) {
+        if (functionNodeTypes.has(node.type) || isStandaloneNamedFunctionExpression(sup, node)) {
             const nameNode = functionNameNode(node);
             const name = nameNode ? sliceText(nameNode, source) : undefined;
             if (name) {
-                const def = findDefinition(name, nameNode);
+                // A declaration is modeled only through the symbol at its own name. Falling back to a
+                // same-named symbol elsewhere would give this body another declaration's identity.
+                const def = findDefinitionAt(name, nameNode);
                 if (def)
                     functionNodes.push({ name, node, def });
             }
         }
-        else if (typeNodeTypes.has(node.type)) {
+        else if (typeNodeTypes.has(node.type) ||
+            ((sup.id === "ts" || sup.id === "tsx") &&
+                node.type === "type_alias_declaration" &&
+                node.childForFieldName("value")?.type === "object_type")) {
             const nameNode = node.childForFieldName("name");
             const name = nameNode ? sliceText(nameNode, source) : undefined;
             if (name) {
-                const def = findDefinition(name, nameNode);
+                const def = findDefinitionAt(name, nameNode);
                 if (def)
                     classNodes.push({ name, node, def });
             }
         }
-        else if (node.type === "variable_declarator") {
-            const nameNode = node.childForFieldName("name");
+        else if (node.type === "variable_declarator" ||
+            node.type === "public_field_definition" ||
+            node.type === "field_definition") {
+            const nameNode = node.childForFieldName("name") ?? node.childForFieldName("property");
             const valueNode = node.childForFieldName("value");
             if (nameNode && valueNode) {
                 if (valueNode.type === "string") {
@@ -106,7 +150,7 @@ export function collectDetailedDeclarations(rootNode, sup, source, locals) {
                 const valueType = String(valueNode.type || "");
                 if (/arrow_function|function/.test(valueType)) {
                     const name = sliceText(nameNode, source);
-                    const def = findDefinition(name, nameNode);
+                    const def = findDefinitionAt(name, nameNode);
                     if (def)
                         functionNodes.push({ name, node: valueNode, def });
                 }
@@ -127,10 +171,23 @@ export function collectDetailedDeclarations(rootNode, sup, source, locals) {
                     else if (left.type === "identifier") {
                         name = sliceText(left, source);
                     }
-                    if (name) {
-                        const def = findDefinition(name, left);
-                        if (def)
-                            functionNodes.push({ name, node: right, def });
+                    // A member target (`exports.handler = function () {}`) binds only a definition declared at
+                    // that assignment; a same-named declaration elsewhere in the file is a different symbol.
+                    let def;
+                    if (name)
+                        def =
+                            left.type === memberExpressionType
+                                ? (findDefinitionAt(name, left) ?? findDefinitionAt(name, right))
+                                : findDefinition(name, left);
+                    if (name && def) {
+                        functionNodes.push({ name, node: right, def });
+                    }
+                    else {
+                        // Otherwise a named function expression is the caller under its own name.
+                        const ownName = FUNCTION_EXPRESSION_TYPES.has(right.type) ? right.childForFieldName("name") : null;
+                        const ownDef = ownName ? findDefinitionAt(sliceText(ownName, source), ownName) : undefined;
+                        if (ownName && ownDef)
+                            functionNodes.push({ name: sliceText(ownName, source), node: right, def: ownDef });
                     }
                 }
             }
@@ -166,6 +223,88 @@ export function findFirstNodeByType(node, type) {
     }
     return null;
 }
+/**
+ * Parameter-list nodes shared by receiver classification and declaration arity. The union keeps
+ * Kotlin `function_value_parameters` and Ruby `block_parameters` recognized; declaration arity
+ * excludes the block and lambda forms because they belong to nested scopes.
+ */
+export const PARAMETER_LIST_NODE_TYPES = {
+    block_parameters: true,
+    formal_parameters: true,
+    function_parameter_clause: true,
+    function_value_parameters: true,
+    lambda_parameters: true,
+    method_parameters: true,
+    parameter_list: true,
+    parameters: true,
+};
+/**
+ * C/C++ trailing parameter-list markers that accept zero or more arguments and so are not fixed
+ * positional parameters. tree-sitter-c spells a bare `...` as a named `variadic_parameter`;
+ * tree-sitter-cpp spells a parameter pack `T... name` as `variadic_parameter_declaration` (its
+ * bare `...` is an unnamed token the parser already omits from the named children). Go's
+ * `variadic_parameter_declaration` shares the C++ name but is a different language's rest form,
+ * so callers gate on the C/C++ language ids.
+ */
+const VARIADIC_PARAMETER_MARKER_TYPES = {
+    variadic_parameter: true,
+    variadic_parameter_declaration: true,
+};
+/** Whether a parameter node is a C/C++ variadic marker rather than a fixed positional parameter. */
+export function isVariadicParameterMarker(node) {
+    return !!VARIADIC_PARAMETER_MARKER_TYPES[node.type];
+}
+/**
+ * Positional parameter count of a member/function declaration node, or undefined when the node
+ * declares no parameter list. Swift exposes parameters as direct declaration children, so its
+ * language id is required to distinguish a zero-parameter declaration from an unknown shape.
+ * Used for public declaration metadata and C++ declaration correspondence, never to establish
+ * accepted call ranges. Receiver call selection uses the shared callable ranges instead.
+ *
+ * The count is the number of *required-or-defaulted* fixed parameters; C/C++ variadic markers are
+ * excluded because they accept zero arguments, while each language's own maximum-arity handling
+ * keeps their upper bound unbounded.
+ */
+export function declarationMemberArity(declarationNode, languageId) {
+    let parameters = declarationNode.childForFieldName("parameters");
+    if (!parameters) {
+        for (const type of Object.keys(PARAMETER_LIST_NODE_TYPES)) {
+            if (type === "block_parameters" || type === "lambda_parameters")
+                continue;
+            parameters = findFirstNodeByType(declarationNode, type);
+            if (parameters)
+                break;
+        }
+    }
+    if (!parameters) {
+        if (languageId !== "swift")
+            return undefined;
+        return (declarationNode.namedChildren ?? []).filter((child) => child.type === "parameter").length;
+    }
+    let positionalParameters = (parameters.namedChildren ?? []).filter((child) => child.type !== "comment");
+    if (languageId === "c" || languageId === "cpp") {
+        positionalParameters = positionalParameters.filter((child) => !isVariadicParameterMarker(child));
+    }
+    if (languageId === "kotlin") {
+        // kotlin-ng keeps default values as bare `expression` siblings and `vararg` as
+        // `parameter_modifiers` beside the parameter they modify; only `parameter`
+        // nodes occupy positional argument slots.
+        positionalParameters = positionalParameters.filter((child) => child.type === "parameter");
+    }
+    if (languageId === "java") {
+        // An explicit receiver parameter (`Box this`) is not a call argument.
+        positionalParameters = positionalParameters.filter((child) => child.type !== "receiver_parameter");
+    }
+    if ((languageId === "c" || languageId === "cpp") && positionalParameters.length === 1) {
+        const parameterParts = positionalParameters[0].namedChildren.filter((child) => child.type !== "comment");
+        if (parameterParts.length === 1 &&
+            parameterParts[0]?.type === "primitive_type" &&
+            parameterParts[0].text === "void") {
+            return 0;
+        }
+    }
+    return positionalParameters.length;
+}
 export function collectNodesByType(node, type, out) {
     for (const child of node.namedChildren ?? []) {
         if (child.type === type)