@lzehrung/codegraph 2.3.31 → 2.4.0

package/dist/indexer/declaration-visibility.js

@@ -1,3 +1,4 @@
+import { fileIdentityKey } from "../util/paths.js";
 const RUST_ROW = {
     declarationTypes: new Set([
         "function_item",
@@ -44,7 +45,8 @@ const CSHARP_ROW = {
         "event_field_declaration",
     ]),
     modifierNodeTypes: new Set(["modifier"]),
-    hiddenModifierTexts: new Set(["private"]),
+    // `file` (C# 11) restricts a top-level type to its declaring file, so it is never a peer export.
+    hiddenModifierTexts: new Set(["private", "file"]),
     namespaceHiddenModifierTexts: new Set(["internal"]),
     typeContainerTypes: new Set([
         "class_declaration",
@@ -92,12 +94,30 @@ const C_FAMILY_ROW = {
     namespaceHiddenModifierTexts: new Set(["static"]),
     typeContainerTypes: new Set(["class_specifier", "struct_specifier", "union_specifier"]),
 };
+/**
+ * Zig `pub` is an anonymous keyword child of the declaration (tree-sitter-zig 1.1.2),
+ * not a named modifier node. Unmarked top-level items stay module-local, matching
+ * `@import` visibility. `export` without `pub` is C ABI only and is not a Zig export.
+ */
+const ZIG_ROW = {
+    declarationTypes: new Set([
+        "function_declaration",
+        "variable_declaration",
+        "using_namespace_declaration",
+        "test_declaration",
+        "comptime_declaration",
+    ]),
+    modifierNodeTypes: new Set(["pub"]),
+    publicModifierTexts: new Set(["pub"]),
+    hiddenModifierTexts: new Set(),
+};
 const VISIBILITY_BY_LANGUAGE = {
     rust: RUST_ROW,
     java: JAVA_ROW,
     csharp: CSHARP_ROW,
     kotlin: KOTLIN_ROW,
     swift: SWIFT_ROW,
+    zig: ZIG_ROW,
     c: C_FAMILY_ROW,
     cpp: C_FAMILY_ROW,
 };
@@ -111,7 +131,11 @@ function collectModifierTexts(declaration, row) {
         if (row.modifierNodeTypes.has(node.type) && node.text)
             texts.push(node.text.trim());
     };
-    for (const child of declaration.namedChildren) {
+    // Zig `pub` is unnamed. Named-only walks miss it; other languages still match named modifiers.
+    for (let index = 0;; index += 1) {
+        const child = declaration.child(index);
+        if (!child)
+            break;
         visit(child);
         for (const grand of child.namedChildren)
             visit(grand);
@@ -199,4 +223,114 @@ export function isExportedDeclaration(languageId, node) {
         return true;
     return isExportedByRow(declaration, row);
 }
+const CSHARP_ACCESS_MODIFIERS = new Set(["public", "protected", "internal", "private"]);
+const CSHARP_MEMBER_CONTAINERS = new Set([
+    "class_declaration",
+    "struct_declaration",
+    "record_declaration",
+    "interface_declaration",
+]);
+const CSHARP_PRIVATE_BY_DEFAULT_CONTAINERS = new Set(["class_declaration", "struct_declaration", "record_declaration"]);
+/**
+ * Whether `node`'s declaration is `private` (and not C# `private protected`). A private member is
+ * not accessible to a subclass, so it cannot be reached through the implicit `this` there.
+ */
+export function isPrivateDeclaration(languageId, node) {
+    const row = VISIBILITY_BY_LANGUAGE[languageId];
+    const declaration = row ? findVisibilityDeclaration(node, row) : null;
+    if (!row || !declaration)
+        return false;
+    const tokens = modifierTokens(collectModifierTexts(declaration, row));
+    // C# `private protected` stays accessible to derived classes in the same assembly.
+    if (tokens.includes("private"))
+        return !tokens.includes("protected");
+    // A C# class, struct, or record member without an access modifier is private; interface
+    // members are public.
+    return (languageId === "csharp" &&
+        !tokens.some((token) => CSHARP_ACCESS_MODIFIERS.has(token)) &&
+        CSHARP_PRIVATE_BY_DEFAULT_CONTAINERS.has(enclosingAncestor(declaration, CSHARP_MEMBER_CONTAINERS)?.type ?? ""));
+}
+/**
+ * Whether a C# member is accessible from an unrelated type in the same assembly: `public`,
+ * `internal`, or `protected internal`. `private`, `protected`, `private protected`, and a class,
+ * struct, or record member without an access modifier are not.
+ */
+export function isCsharpAccessibleOutsideType(node) {
+    const row = VISIBILITY_BY_LANGUAGE.csharp;
+    const declaration = row ? findVisibilityDeclaration(node, row) : null;
+    if (!row || !declaration)
+        return true;
+    const tokens = modifierTokens(collectModifierTexts(declaration, row));
+    if (tokens.includes("private"))
+        return false;
+    if (tokens.includes("protected"))
+        return tokens.includes("internal");
+    if (tokens.some((token) => CSHARP_ACCESS_MODIFIERS.has(token)))
+        return true;
+    return !CSHARP_PRIVATE_BY_DEFAULT_CONTAINERS.has(enclosingAncestor(declaration, CSHARP_MEMBER_CONTAINERS)?.type ?? "");
+}
+/**
+ * Go export visibility is spelled in the identifier itself (Go spec, "Exported identifiers"):
+ * a name is visible outside its declaring package only when its first Unicode letter is
+ * upper case. Unlike every `DeclarationVisibilityRow` above, this must never filter a Go
+ * file's module exports: Go's own compilation-unit peers (any file in the same package)
+ * legitimately see an unexported name, and that same-package lookup reads the same export
+ * list. Only a reference that crosses into a different Go package, whether by namespace
+ * selector (`pkg.hidden`) or by a proven receiver of an imported type (`v.hidden()`), must
+ * reject an unexported name. Both paths call this rule instead of adding a `GO_ROW` here.
+ */
+export function isGoExportedMemberName(languageId, name) {
+    if (languageId !== "go")
+        return true;
+    return /^\p{Lu}/u.test(name);
+}
+function swiftDeclarationKind(container) {
+    const kind = container.childForFieldName("declaration_kind");
+    if (kind) {
+        const text = kind.text.trim();
+        if (text)
+            return text;
+    }
+    for (let index = 0;; index += 1) {
+        const child = container.child(index);
+        if (!child)
+            return "";
+        const text = child.text.trim();
+        if (text === "extension" || text === "class" || text === "struct" || text === "enum" || text === "actor") {
+            return text;
+        }
+    }
+}
+function enclosingSwiftExtension(node) {
+    let current = node;
+    while (current) {
+        if (current.type === "class_declaration") {
+            return swiftDeclarationKind(current) === "extension" ? current : null;
+        }
+        current = current.parent;
+    }
+    return null;
+}
+/**
+ * Swift `private`/`fileprivate` is file-scoped, including when that modifier is on the
+ * enclosing `extension` rather than the member.
+ */
+export function isSwiftFileHiddenSharedOwnerMember(languageId, memberNode) {
+    if (languageId !== "swift")
+        return false;
+    if (!isExportedDeclaration("swift", memberNode))
+        return true;
+    const extension = enclosingSwiftExtension(memberNode);
+    return !!extension && !isExportedDeclaration("swift", extension);
+}
+/**
+ * Shared-owner navigation and detailed membership drop Swift file-hidden members when
+ * the owner lives in another file, and keep same-file matches plus ordinary cross-file
+ * internal/public members.
+ */
+export function isSwiftCrossFileHiddenSharedOwnerMember(languageId, ownerFile, memberFile, memberNode) {
+    if (fileIdentityKey(ownerFile) === fileIdentityKey(memberFile))
+        return false;
+    return isSwiftFileHiddenSharedOwnerMember(languageId, memberNode);
+}
 //# sourceMappingURL=declaration-visibility.js.map

package/dist/indexer/declaration-visibility.js.map

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

package/dist/indexer/expand-star-imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expand-star-imports.d.ts","sourceRoot":"","sources":["../../src/indexer/expand-star-imports.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAc,KAAK,YAAY,EAAE,KAAK,WAAW,EAAkB,MAAM,YAAY,CAAC;AAoC7F;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,EAAE,YAAY,GAAG,IAAI,CAuD9F"}
+{"version":3,"file":"expand-star-imports.d.ts","sourceRoot":"","sources":["../../src/indexer/expand-star-imports.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAc,KAAK,YAAY,EAAE,KAAK,WAAW,EAAkB,MAAM,YAAY,CAAC;AAoC7F;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,EAAE,YAAY,GAAG,IAAI,CA2E9F"}

package/dist/indexer/expand-star-imports.js

@@ -1,4 +1,4 @@
-import { supportForFile } from "../languages.js";
+import { supportForFileWithoutHeaderSample } from "../languages.js";
 import { fileIdentityKey } from "../util/paths.js";
 import { SymbolKind } from "./types.js";
 const STYLESHEET_LANGUAGE_IDS = new Set(["css", "scss", "less"]);
@@ -44,7 +44,15 @@ export function expandStarImports(modules, opts) {
     const expandedImportKey = (binding) => {
         const typeOnly = binding.typeOnly ?? false;
         if (binding.kind === "named") {
-            return JSON.stringify(["named", binding.from, binding.resolved, typeOnly, binding.local, binding.imported]);
+            return JSON.stringify([
+                "named",
+                binding.from,
+                binding.resolved,
+                typeOnly,
+                binding.local,
+                binding.imported,
+                binding.cNamespace,
+            ]);
         }
         if (binding.kind === "namespace") {
             return JSON.stringify(["namespace", binding.from, binding.resolved, typeOnly, binding.localNS]);
@@ -59,18 +67,29 @@ export function expandStarImports(modules, opts) {
                 expandedImportKeys.add(key);
         }
         for (const imp of [...mod.imports]) {
-            if (imp.kind !== "star" || typeof imp.resolved !== "string")
+            // A C# `using static` imports one type's static members, not the file's exports.
+            if (imp.kind !== "star" || imp.staticMembersOf || typeof imp.resolved !== "string")
                 continue;
             const target = modules.get(fileIdentityKey(imp.resolved));
             if (!target)
                 continue;
-            const targetSupport = supportForFile(imp.resolved, opts?.languageExtensions);
+            // Only stylesheet and Ruby membership is asked below, and C and C++ answer both the same,
+            // so a `.h` target must not pay for a header sample read here.
+            const targetSupport = supportForFileWithoutHeaderSample(imp.resolved, opts?.languageExtensions);
             const exportedSymbols = symbolsForStarImport(target, !!targetSupport && STYLESHEET_LANGUAGE_IDS.has(targetSupport.id));
+            // `.h` defaults to C in filename-only lookup. Only extracted C tags prove the namespace split.
+            const hasCTagExports = exportedSymbols.some(({ symbol }) => Boolean(symbol.cTag));
             const seen = new Set();
             for (const { name, symbol } of exportedSymbols) {
-                if (!name || seen.has(name))
+                let namespace;
+                if (symbol.cTag)
+                    namespace = "tag";
+                else if (hasCTagExports)
+                    namespace = "ordinary";
+                const symbolKey = namespace ? `${name}\0${namespace}` : name;
+                if (!name || seen.has(symbolKey))
                     continue;
-                seen.add(name);
+                seen.add(symbolKey);
                 const treatAsNamespace = targetSupport?.id === "ruby" && symbol.kind === SymbolKind.Class;
                 const expandedImport = treatAsNamespace
                     ? {
@@ -79,6 +98,7 @@ export function expandStarImports(modules, opts) {
                         from: imp.from,
                         resolved: imp.resolved,
                         ...(imp.typeOnly !== undefined ? { typeOnly: imp.typeOnly } : {}),
+                        ...(imp.includeForm ? { includeForm: imp.includeForm } : {}),
                     }
                     : {
                         kind: "named",
@@ -86,7 +106,9 @@ export function expandStarImports(modules, opts) {
                         imported: name,
                         from: imp.from,
                         resolved: imp.resolved,
+                        ...(namespace ? { cNamespace: namespace } : {}),
                         ...(imp.typeOnly !== undefined ? { typeOnly: imp.typeOnly } : {}),
+                        ...(imp.includeForm ? { includeForm: imp.includeForm } : {}),
                     };
                 const expandedImportKeyValue = expandedImportKey(expandedImport);
                 if (!expandedImportKeyValue || expandedImportKeys.has(expandedImportKeyValue))

package/dist/indexer/expand-star-imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"expand-star-imports.js","sourceRoot":"","sources":["../../src/indexer/expand-star-imports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,UAAU,EAAuD,MAAM,YAAY,CAAC;AAQ7F,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAEjE;;;;;;;;;GASG;AACH,SAAS,oBAAoB,CAAC,MAAmB,EAAE,YAAqB;IACtE,MAAM,YAAY,GAAuB,EAAE,CAAC;IAC5C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC3B,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IACD,IAAI,YAAY,CAAC,MAAM,IAAI,YAAY;QAAE,OAAO,YAAY,CAAC;IAC7D,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClC,IAAI,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS;QAC9C,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAiC,EAAE,IAAmB;IACtF,MAAM,iBAAiB,GAAG,CAAC,OAAsB,EAAiB,EAAE;QAClE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC;QAC3C,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9G,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAClG,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACnC,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;QAC7C,KAAK,MAAM,QAAQ,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YACnC,MAAM,GAAG,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACxC,IAAI,GAAG;gBAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvC,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACnC,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ;gBAAE,SAAS;YACtE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC1D,IAAI,CAAC,MAAM;gBAAE,SAAS;YACtB,MAAM,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;YAC7E,MAAM,eAAe,GAAG,oBAAoB,CAC1C,MAAM,EACN,CAAC,CAAC,aAAa,IAAI,uBAAuB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC,CACjE,CAAC;YACF,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;YAC/B,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,eAAe,EAAE,CAAC;gBAC/C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;oBAAE,SAAS;gBACtC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACf,MAAM,gBAAgB,GAAG,aAAa,EAAE,EAAE,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,KAAK,CAAC;gBAC1F,MAAM,cAAc,GAAkB,gBAAgB;oBACpD,CAAC,CAAC;wBACE,IAAI,EAAE,WAAW;wBACjB,OAAO,EAAE,IAAI;wBACb,IAAI,EAAE,GAAG,CAAC,IAAI;wBACd,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,GAAG,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAClE;oBACH,CAAC,CAAC;wBACE,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE,IAAI;wBACX,QAAQ,EAAE,IAAI;wBACd,IAAI,EAAE,GAAG,CAAC,IAAI;wBACd,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,GAAG,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAClE,CAAC;gBACN,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC;gBACjE,IAAI,CAAC,sBAAsB,IAAI,kBAAkB,CAAC,GAAG,CAAC,sBAAsB,CAAC;oBAAE,SAAS;gBACxF,kBAAkB,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;gBAC/C,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"expand-star-imports.js","sourceRoot":"","sources":["../../src/indexer/expand-star-imports.ts"],"names":[],"mappings":"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"}

package/dist/indexer/import-types.d.ts

@@ -1,4 +1,5 @@
 import type { FileId, Range } from "../types.js";
+import type { CFamilyIncludeForm } from "../util/specifiers.js";
 export type ImportBinding = {
     kind: "default";
     local: string;
@@ -29,6 +30,8 @@ export type ImportBinding = {
      */
     localRange?: Range;
     phpImportType?: "class" | "function" | "const";
+    /** Namespace retained when a C include expands tags and ordinary names. */
+    cNamespace?: "tag" | "ordinary";
     resolved?: FileId | {
         external: string;
     };
@@ -38,10 +41,18 @@ export type ImportBinding = {
     moduleLevel?: boolean;
     resolvedType?: "heuristic" | "precise";
     confidence?: number;
+    /** Copied from the C/C++ star include this binding was expanded from. */
+    includeForm?: CFamilyIncludeForm;
 } | {
     kind: "namespace";
     localNS: string;
     from: string;
+    /**
+     * True when the source spells an explicit `as alias` (Python `import a.b as alias`).
+     * A plain `import a.b` also binds a name here (`a`, the first dotted segment), but that
+     * name is not itself an alias for `a.b`'s own spelling.
+     */
+    explicitAlias?: boolean;
     /** UTF-16 range of the namespace binding token. */
     localRange?: Range;
     resolved?: FileId | {
@@ -53,6 +64,8 @@ export type ImportBinding = {
     moduleLevel?: boolean;
     resolvedType?: "heuristic" | "precise";
     confidence?: number;
+    /** Copied from the C/C++ star include this binding was expanded from. */
+    includeForm?: CFamilyIncludeForm;
 } | {
     kind: "star";
     from: string;
@@ -65,5 +78,29 @@ export type ImportBinding = {
     moduleLevel?: boolean;
     resolvedType?: "heuristic" | "precise";
     confidence?: number;
+    /** Present for a C/C++ include. Older cached bindings omit it. */
+    includeForm?: CFamilyIncludeForm;
+    /**
+     * C# `using static N.T;`: the normalized qualified type name `N.T`. Only static members and
+     * nested types of that type in the resolved file are imported, so generic star lookup and
+     * expansion skip this binding.
+     */
+    staticMembersOf?: string;
 };
+/**
+ * PHP resolves named imports through separate class, function, and constant namespaces, and
+ * PHP spells an untyped named import as a class alias. Non-PHP bindings carry no PHP role.
+ */
+export declare function phpNamedImportRole(binding: ImportBinding): "class" | "function" | "const" | undefined;
+/**
+ * The role segment a named binding contributes to its import node ID: a PHP import role or a
+ * C include namespace. Bindings with neither keep the plain `import` segment.
+ */
+export declare function importIdRoleSegment(binding: Extract<ImportBinding, {
+    kind: "named";
+}>): string | undefined;
+/** Use the caller's normalized file path and keep PHP import roles and C namespaces distinct. */
+export declare function importNodeId(file: string, binding: Exclude<ImportBinding, {
+    kind: "star";
+}>): string;
 //# sourceMappingURL=import-types.d.ts.map

package/dist/indexer/import-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-types.d.ts","sourceRoot":"","sources":["../../src/indexer/import-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,MAAM,aAAa,GACrB;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,qEAAqE;IACrE,UAAU,CAAC,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,IAAI,GAAG,KAAK,GAAG,QAAQ,GAAG,KAAK,CAAC;IAC5C,wEAAwE;IACxE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,uFAAuF;IACvF,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,+EAA+E;IAC/E,aAAa,CAAC,EAAE,KAAK,CAAC;IACtB;;;OAGG;IACH,UAAU,CAAC,EAAE,KAAK,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,OAAO,CAAC;IAC/C,QAAQ,CAAC,EAAE,MAAM,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,IAAI,GAAG,KAAK,GAAG,QAAQ,GAAG,KAAK,CAAC;IAC5C,wEAAwE;IACxE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACD;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,mDAAmD;IACnD,UAAU,CAAC,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,IAAI,GAAG,KAAK,GAAG,QAAQ,GAAG,KAAK,CAAC;IAC5C,wEAAwE;IACxE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,IAAI,GAAG,KAAK,GAAG,QAAQ,GAAG,KAAK,CAAC;IAC5C,wEAAwE;IACxE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC"}
+{"version":3,"file":"import-types.d.ts","sourceRoot":"","sources":["../../src/indexer/import-types.ts"],"names":[],"mappings":"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"}

package/dist/indexer/import-types.js

@@ -1,2 +1,25 @@
-export {};
+/**
+ * PHP resolves named imports through separate class, function, and constant namespaces, and
+ * PHP spells an untyped named import as a class alias. Non-PHP bindings carry no PHP role.
+ */
+export function phpNamedImportRole(binding) {
+    if (binding.kind !== "named")
+        return undefined;
+    if (binding.mechanism !== "php" && binding.phpImportType === undefined)
+        return undefined;
+    return binding.phpImportType ?? "class";
+}
+/**
+ * The role segment a named binding contributes to its import node ID: a PHP import role or a
+ * C include namespace. Bindings with neither keep the plain `import` segment.
+ */
+export function importIdRoleSegment(binding) {
+    return phpNamedImportRole(binding) ?? binding.cNamespace;
+}
+/** Use the caller's normalized file path and keep PHP import roles and C namespaces distinct. */
+export function importNodeId(file, binding) {
+    const name = binding.kind === "namespace" ? binding.localNS : binding.local;
+    const role = binding.kind === "named" ? importIdRoleSegment(binding) : undefined;
+    return `${file}::${name}::import${role ? `:${role}` : ""}`;
+}
 //# sourceMappingURL=import-types.js.map

package/dist/indexer/import-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-types.js","sourceRoot":"","sources":["../../src/indexer/import-types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"import-types.js","sourceRoot":"","sources":["../../src/indexer/import-types.ts"],"names":[],"mappings":"AAuFA;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAsB;IACvD,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO;QAAE,OAAO,SAAS,CAAC;IAC/C,IAAI,OAAO,CAAC,SAAS,KAAK,KAAK,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACzF,OAAO,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC;AAC1C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAkD;IACpF,OAAO,kBAAkB,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC;AAC3D,CAAC;AAED,iGAAiG;AACjG,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,OAAiD;IAC1F,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5E,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjF,OAAO,GAAG,IAAI,KAAK,IAAI,WAAW,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAC7D,CAAC"}

package/dist/indexer/imports/context.d.ts

@@ -1,6 +1,16 @@
 import type { ImportBinding } from "../types.js";
+import type { CFamilyIncludeForm, ModuleSpecifierResolutionKind } from "../../util/specifiers.js";
 export type ResolvedImportTarget = Exclude<ImportBinding["resolved"], undefined>;
-export type ImportResolver = (from: string, phpImportType?: "class" | "function" | "const") => Promise<ResolvedImportTarget>;
+/**
+ * Per-occurrence resolution facts the capture path can prove but the extracted specifier text
+ * cannot. A C/C++ `#include` keeps its literal/angle/macro form here so resolution never infers
+ * it from the file's other spellings.
+ */
+export type ImportResolverOptions = {
+    includeForm?: CFamilyIncludeForm;
+    resolutionKind?: ModuleSpecifierResolutionKind;
+};
+export type ImportResolver = (from: string, phpImportType?: "class" | "function" | "const", opts?: ImportResolverOptions) => Promise<ResolvedImportTarget>;
 export type ImportBindingSink = {
     pushBinding: (binding: ImportBinding) => void;
 };

package/dist/indexer/imports/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/indexer/imports/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC,CAAC;AAEjF,MAAM,MAAM,cAAc,GAAG,CAC3B,IAAI,EAAE,MAAM,EACZ,aAAa,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,OAAO,KAC3C,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAEnC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;CAC/C,CAAC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/indexer/imports/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AAElG,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC,CAAC;AAEjF;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,cAAc,CAAC,EAAE,6BAA6B,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,CAC3B,IAAI,EAAE,MAAM,EACZ,aAAa,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,OAAO,EAC9C,IAAI,CAAC,EAAE,qBAAqB,KACzB,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAEnC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;CAC/C,CAAC"}

package/dist/indexer/imports/import-binding-tables.d.ts

@@ -1,3 +1,6 @@
+import { type LanguageExtensionMap } from "../../languages.js";
+import type { Range } from "../../types.js";
+import type { CFamilyIncludeForm } from "../../util/specifiers.js";
 import type { ImportBinding } from "../types.js";
 import type { ImportBindingSink, ImportResolver, ResolvedImportTarget } from "./context.js";
 /**
@@ -19,6 +22,8 @@ export type LanguageSpecificImportContext = ImportBindingSink & {
     source: string;
     languageId: string;
     resolveFrom: ImportResolver;
+    /** Active extension-to-language mapping, so a resolved file is classified as the language that parses it. */
+    languageExtensions?: LanguageExtensionMap;
     getBindings: () => ImportBinding[];
     replaceBindings: (bindings: ImportBinding[]) => void;
 };
@@ -31,7 +36,10 @@ export type ImplicitImportBindingArgs = {
     stmtStartIndex?: number;
     source?: string;
     alias?: string;
+    /** UTF-16 range of the captured alias token, when the native alias capture proved it. */
+    localRange?: Range;
     wildcard?: boolean;
+    includeForm?: CFamilyIncludeForm;
 };
 export type ApplyStatementImportOverride = (context: LanguageSpecificImportContext, parserStmt: string, typeOnly: boolean, statementStartIndex?: number) => Promise<boolean>;
 export type AppendImplicitImportBinding = (context: LanguageSpecificImportContext, args: ImplicitImportBindingArgs) => void;
@@ -49,7 +57,10 @@ export type ImportBindingRow = {
     maskTrivia?: StatementTriviaMask;
     /** Collapse whitespace around `.` after masking (C#, Java, Kotlin). */
     normalizeDots?: true;
-    /** Include the statement start offset in the override de-dupe key (Rust). */
+    /**
+     * Include the statement start offset in the override de-dupe key (C#, Rust). Required when the
+     * same statement text can appear in several scopes and each must keep its own range.
+     */
     statementKeyUsesOffset?: true;
     /** Named-range attribution treats unaliased `local === imported` as two tokens (C#). */
     alwaysAliased?: true;

package/dist/indexer/imports/import-binding-tables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-binding-tables.d.ts","sourceRoot":"","sources":["../../../src/indexer/imports/import-binding-tables.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAE5F;;;;;;;;;;;;GAYG;AAEH,MAAM,MAAM,6BAA6B,GAAG,iBAAiB,GAAG;IAC9D,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,cAAc,CAAC;IAC5B,WAAW,EAAE,MAAM,aAAa,EAAE,CAAC;IACnC,eAAe,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,IAAI,CAAC;CACtD,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,2EAA2E;IAC3E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,CACzC,OAAO,EAAE,6BAA6B,EACtC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,OAAO,EACjB,mBAAmB,CAAC,EAAE,MAAM,KACzB,OAAO,CAAC,OAAO,CAAC,CAAC;AAEtB,MAAM,MAAM,2BAA2B,GAAG,CACxC,OAAO,EAAE,6BAA6B,EACtC,IAAI,EAAE,yBAAyB,KAC5B,IAAI,CAAC;AAEV;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,IAAI,GAAG,KAAK,GAAG,aAAa,CAAC;AAE/D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,yEAAyE;IACzE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,4BAA4B,CAAC;IAC9C,cAAc,CAAC,EAAE,2BAA2B,CAAC;IAC7C,0CAA0C;IAC1C,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,uEAAuE;IACvE,aAAa,CAAC,EAAE,IAAI,CAAC;IACrB,6EAA6E;IAC7E,sBAAsB,CAAC,EAAE,IAAI,CAAC;IAC9B,wFAAwF;IACxF,aAAa,CAAC,EAAE,IAAI,CAAC;IACrB,uFAAuF;IACvF,kBAAkB,CAAC,EAAE,IAAI,CAAC;IAC1B,uDAAuD;IACvD,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,oDAAoD;IACpD,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AA6dF,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAyFhE,CAAC"}
+{"version":3,"file":"import-binding-tables.d.ts","sourceRoot":"","sources":["../../../src/indexer/imports/import-binding-tables.ts"],"names":[],"mappings":"AASA,OAAO,EAAqC,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAOlG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAE5F;;;;;;;;;;;;GAYG;AAEH,MAAM,MAAM,6BAA6B,GAAG,iBAAiB,GAAG;IAC9D,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,cAAc,CAAC;IAC5B,6GAA6G;IAC7G,kBAAkB,CAAC,EAAE,oBAAoB,CAAC;IAC1C,WAAW,EAAE,MAAM,aAAa,EAAE,CAAC;IACnC,eAAe,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,IAAI,CAAC;CACtD,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,2EAA2E;IAC3E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yFAAyF;IACzF,UAAU,CAAC,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,kBAAkB,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,CACzC,OAAO,EAAE,6BAA6B,EACtC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,OAAO,EACjB,mBAAmB,CAAC,EAAE,MAAM,KACzB,OAAO,CAAC,OAAO,CAAC,CAAC;AAEtB,MAAM,MAAM,2BAA2B,GAAG,CACxC,OAAO,EAAE,6BAA6B,EACtC,IAAI,EAAE,yBAAyB,KAC5B,IAAI,CAAC;AAEV;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,IAAI,GAAG,KAAK,GAAG,aAAa,CAAC;AAE/D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,yEAAyE;IACzE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,4BAA4B,CAAC;IAC9C,cAAc,CAAC,EAAE,2BAA2B,CAAC;IAC7C,0CAA0C;IAC1C,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,uEAAuE;IACvE,aAAa,CAAC,EAAE,IAAI,CAAC;IACrB;;;OAGG;IACH,sBAAsB,CAAC,EAAE,IAAI,CAAC;IAC9B,wFAAwF;IACxF,aAAa,CAAC,EAAE,IAAI,CAAC;IACrB,uFAAuF;IACvF,kBAAkB,CAAC,EAAE,IAAI,CAAC;IAC1B,uDAAuD;IACvD,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,oDAAoD;IACpD,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAknBF,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CA2FhE,CAAC"}