@lzehrung/codegraph 2.3.29 → 2.3.31

package/dist/languages/definitions/c-family.js

@@ -14,12 +14,7 @@ export const cFamilyControlSplitPoints = [
     "switch_statement",
     "case_statement",
 ];
-export const cFamilyIncludeImportsQuery = `
-      (preproc_include path: (string_literal) @mod) @stmt
-      (preproc_include path: (system_lib_string) @mod) @stmt
-      (preproc_include path: (identifier) @mod) @stmt
-    `;
-export const cFamilyIncludeBindingsQuery = `
+export const cFamilyIncludeQuery = `
       (preproc_include path: (string_literal) @from) @stmt
       (preproc_include path: (system_lib_string) @from) @stmt
       (preproc_include path: (identifier) @from) @stmt
@@ -111,16 +106,16 @@ export function createCFamilyLanguageDefinition(options) {
             comments: ["comment"],
         },
         graph: {
-            imports: cFamilyIncludeImportsQuery,
+            imports: cFamilyIncludeQuery,
             exports: joinQueryPatterns([
                 ...cFamilyCoreExportQueries(graphFunctionNameQuery),
-                ...(options.extraExportQueries ?? []),
+                ...(options.extraSymbolQueries ?? []),
             ]),
             locals: joinQueryPatterns([
                 ...cFamilyCoreLocalQueries(graphFunctionNameQuery),
-                ...(options.extraLocalQueries ?? []),
+                ...(options.extraSymbolQueries ?? []),
             ]),
-            importBindings: cFamilyIncludeBindingsQuery,
+            importBindings: cFamilyIncludeQuery,
         },
         nodeTypes: options.nodeTypes,
         classifyDefinition: options.classifyDefinition,
@@ -129,10 +124,15 @@ export function createCFamilyLanguageDefinition(options) {
         createsFunctionScope: options.createsFunctionScope,
         createsBlockScope: (node) => node.type === "compound_statement",
         supportsCrossModuleSymbols: true,
-        // A name declared inside a function body is not a module export. The exports query cannot
-        // anchor on `translation_unit` because include guards nest every header declaration.
-        exportScopeBlockers: ["compound_statement"],
+        // A name declared inside a function body or a class/struct/union body is not a module
+        // export. C and C++ spell that type body `field_declaration_list`, not `class_body`.
+        // The exports query cannot anchor on `translation_unit` because include guards nest
+        // every header declaration.
+        exportScopeBlockers: ["compound_statement", "field_declaration_list"],
         usesQueryDrivenLocals: options.usesQueryDrivenLocals || false,
+        ...(options.membersAreImplicitlyInScope !== undefined
+            ? { membersAreImplicitlyInScope: options.membersAreImplicitlyInScope }
+            : {}),
     };
 }
 export function isWithin(node, ancestor) {
@@ -159,6 +159,44 @@ export function findAncestor(node, types) {
 export function isInParameterList(node) {
     return !!findAncestor(node, cFamilyParameterListTypes);
 }
+/** True when `node` sits inside the `name` field of a parent of one of the listed types. */
+export function isSpecifierNameField(node, specifierTypes) {
+    const parent = node.parent;
+    return !!parent && specifierTypes.includes(parent.type) && isInField(node, parent, "name");
+}
+/**
+ * Declarator-chain and preprocessor declaration checks shared by C and C++: parameter, field,
+ * initializer, typedef, function, and plain declarations name their declarator, and enumerator
+ * and preprocessor definitions carry a `name` field.
+ */
+export function cFamilyIsDeclarationName(node) {
+    if (isInAncestorDeclarator(node, new Set(["parameter_declaration"])) ||
+        isInAncestorDeclarator(node, new Set(["field_declaration"])) ||
+        isInAncestorDeclarator(node, new Set(["init_declarator"])) ||
+        isInAncestorDeclarator(node, new Set(["type_definition"])))
+        return true;
+    if (isInAncestorDeclarator(node, new Set(["function_definition"])) && !isInParameterList(node))
+        return true;
+    if (isInAncestorDeclarator(node, new Set(["declaration"])) && !isInParameterList(node))
+        return true;
+    return isSpecifierNameField(node, ["enumerator", "preproc_def", "preproc_function_def"]);
+}
+/**
+ * Container-walk classification shared by C and C++: a name inside a function body is a
+ * function, one inside a declaration with a function declarator is a function, and
+ * `typedef int (*Comparator)(int, int);` wraps the typedef name in a declarator chain, so the
+ * direct-parent checks above cannot see it.
+ */
+export function cFamilyContainerClassifyDefinition(node) {
+    const container = findAncestor(node, cFamilyContainerTypes);
+    if (container?.type === "function_definition")
+        return "function";
+    if (container?.type === "declaration" && isFunctionDeclarator(node))
+        return "function";
+    if (container?.type === "type_definition")
+        return "type";
+    return "variable";
+}
 function resolveDeclaratorRoot(ancestor) {
     let declaratorNode = ancestor.childForFieldName("declarator");
     if (!declaratorNode)

package/dist/languages/definitions/c-family.js.map

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

package/dist/languages/definitions/c.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"c.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/c.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,KAAK,0CAoEhB,CAAC"}
+{"version":3,"file":"c.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/c.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,KAAK,0CAqChB,CAAC"}

package/dist/languages/definitions/c.js

@@ -1,5 +1,6 @@
 import { registerLanguage } from "../registry.js";
-import { cFamilyBlock, cFamilyContainerTypes, cFamilyFunctionBlock, cFamilyTypeIdentifierBlock, createCFamilyLanguageDefinition, findAncestor, isFunctionDeclarator, isInAncestorDeclarator, isInField, isInParameterList, } from "./c-family.js";
+import { nodeTypeIn } from "./shared.js";
+import { cFamilyBlock, cFamilyContainerClassifyDefinition, cFamilyFunctionBlock, cFamilyTypeIdentifierBlock, cFamilyIsDeclarationName, createCFamilyLanguageDefinition, isInField, isSpecifierNameField, } from "./c-family.js";
 export const C_DEF = createCFamilyLanguageDefinition({
     id: "c",
     extensions: [".c", ".h", ".i"],
@@ -14,13 +15,7 @@ export const C_DEF = createCFamilyLanguageDefinition({
         cFamilyBlock("preproc_def", "name: (identifier) @chunk.name", "macro"),
         cFamilyBlock("preproc_function_def", "name: (identifier) @chunk.name", "macro"),
     ],
-    extraExportQueries: [
-        `(union_specifier name: (type_identifier) @name)`,
-        `(enumerator name: (identifier) @name)`,
-        `(preproc_def name: (identifier) @name)`,
-        `(preproc_function_def name: (identifier) @name)`,
-    ],
-    extraLocalQueries: [
+    extraSymbolQueries: [
         `(union_specifier name: (type_identifier) @name)`,
         `(enumerator name: (identifier) @name)`,
         `(preproc_def name: (identifier) @name)`,
@@ -41,42 +36,11 @@ export const C_DEF = createCFamilyLanguageDefinition({
             return "class";
         if (parent.type === "type_definition" && isInField(node, parent, "declarator"))
             return "type";
-        const container = findAncestor(node, cFamilyContainerTypes);
-        if (container?.type === "function_definition")
-            return "function";
-        if (container?.type === "declaration" && isFunctionDeclarator(node))
-            return "function";
-        // `typedef int (*Comparator)(int, int);` and `typedef int *IntPtr;` wrap the typedef name in a
-        // declarator chain, so the direct-parent check above cannot see it.
-        if (container?.type === "type_definition")
-            return "type";
-        return "variable";
-    },
-    isDeclarationName: (node) => {
-        const parent = node.parent;
-        if (!parent)
-            return false;
-        if ((parent.type === "struct_specifier" || parent.type === "union_specifier" || parent.type === "enum_specifier") &&
-            isInField(node, parent, "name"))
-            return true;
-        if (isInAncestorDeclarator(node, new Set(["parameter_declaration"])) ||
-            isInAncestorDeclarator(node, new Set(["field_declaration"])) ||
-            isInAncestorDeclarator(node, new Set(["init_declarator"])) ||
-            isInAncestorDeclarator(node, new Set(["type_definition"])))
-            return true;
-        if (isInAncestorDeclarator(node, new Set(["function_definition"])) && !isInParameterList(node))
-            return true;
-        if (isInAncestorDeclarator(node, new Set(["declaration"])) && !isInParameterList(node))
-            return true;
-        if (parent.type === "enumerator" && isInField(node, parent, "name"))
-            return true;
-        if (parent.type === "preproc_def" && isInField(node, parent, "name"))
-            return true;
-        if (parent.type === "preproc_function_def" && isInField(node, parent, "name"))
-            return true;
-        return false;
+        return cFamilyContainerClassifyDefinition(node);
     },
-    createsFunctionScope: (node) => node.type === "function_definition",
+    isDeclarationName: (node) => isSpecifierNameField(node, ["struct_specifier", "union_specifier", "enum_specifier"]) ||
+        cFamilyIsDeclarationName(node),
+    createsFunctionScope: nodeTypeIn(["function_definition"]),
 });
 registerLanguage(C_DEF);
 //# sourceMappingURL=c.js.map

package/dist/languages/definitions/c.js.map

@@ -1 +1 @@
-{"version":3,"file":"c.js","sourceRoot":"","sources":["../../../src/languages/definitions/c.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"c.js","sourceRoot":"","sources":["../../../src/languages/definitions/c.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,YAAY,EACZ,kCAAkC,EAClC,oBAAoB,EACpB,0BAA0B,EAC1B,wBAAwB,EACxB,+BAA+B,EAC/B,SAAS,EACT,oBAAoB,GACrB,MAAM,eAAe,CAAC;AAEvB,MAAM,CAAC,MAAM,KAAK,GAAG,+BAA+B,CAAC;IACnD,EAAE,EAAE,GAAG;IACP,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;IAC9B,sBAAsB,EAAE,KAAK;IAC7B,qBAAqB,EAAE,IAAI;IAC3B,MAAM,EAAE,CAAC,iBAAiB,EAAE,EAAE,CAAC;QAC7B,oBAAoB,CAAC,iBAAiB,CAAC;QACvC,0BAA0B,CAAC,kBAAkB,EAAE,QAAQ,CAAC;QACxD,0BAA0B,CAAC,iBAAiB,EAAE,OAAO,CAAC;QACtD,0BAA0B,CAAC,gBAAgB,EAAE,MAAM,CAAC;QACpD,YAAY,CAAC,iBAAiB,EAAE,2CAA2C,EAAE,MAAM,CAAC;QACpF,YAAY,CAAC,aAAa,EAAE,gCAAgC,EAAE,OAAO,CAAC;QACtE,YAAY,CAAC,sBAAsB,EAAE,gCAAgC,EAAE,OAAO,CAAC;KAChF;IACD,kBAAkB,EAAE;QAClB,iDAAiD;QACjD,uCAAuC;QACvC,wCAAwC;QACxC,iDAAiD;KAClD;IACD,SAAS,EAAE;QACT,UAAU,EAAE,CAAC,YAAY,EAAE,kBAAkB,EAAE,iBAAiB,CAAC;QACjE,kBAAkB,EAAE,CAAC,kBAAkB,CAAC;QACxC,gBAAgB,EAAE,kBAAkB;KACrC;IACD,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,MAAM;YAAE,OAAO,UAAU,CAAC;QAC/B,IAAI,MAAM,CAAC,IAAI,KAAK,gBAAgB;YAAE,OAAO,MAAM,CAAC;QACpD,IAAI,MAAM,CAAC,IAAI,KAAK,kBAAkB,IAAI,MAAM,CAAC,IAAI,KAAK,iBAAiB;YAAE,OAAO,OAAO,CAAC;QAC5F,IAAI,MAAM,CAAC,IAAI,KAAK,iBAAiB,IAAI,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC;YAAE,OAAO,MAAM,CAAC;QAC9F,OAAO,kCAAkC,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IACD,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAC1B,oBAAoB,CAAC,IAAI,EAAE,CAAC,kBAAkB,EAAE,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;QACrF,wBAAwB,CAAC,IAAI,CAAC;IAChC,oBAAoB,EAAE,UAAU,CAAC,CAAC,qBAAqB,CAAC,CAAC;CAC1D,CAAC,CAAC;AAEH,gBAAgB,CAAC,KAAK,CAAC,CAAC"}

package/dist/languages/definitions/cpp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cpp.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/cpp.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,OAAO,0CA+HlB,CAAC"}
+{"version":3,"file":"cpp.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/cpp.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,OAAO,0CAyFlB,CAAC"}

package/dist/languages/definitions/cpp.js

@@ -1,10 +1,14 @@
 import { registerLanguage } from "../registry.js";
-import { cFamilyBlock, cFamilyContainerTypes, cFamilyControlSplitPoints, cFamilyFunctionBlock, cFamilyTypeIdentifierBlock, createCFamilyLanguageDefinition, findAncestor, isFunctionDeclarator, isInAncestorDeclarator, isInField, isInParameterList, } from "./c-family.js";
+import { nodeTypeIn } from "./shared.js";
+import { cFamilyBlock, cFamilyContainerClassifyDefinition, cFamilyControlSplitPoints, cFamilyFunctionBlock, cFamilyIsDeclarationName, cFamilyTypeIdentifierBlock, createCFamilyLanguageDefinition, findAncestor, isInField, isSpecifierNameField, } from "./c-family.js";
 export const CPP_DEF = createCFamilyLanguageDefinition({
     id: "cpp",
-    extensions: [".cc", ".cpp", ".cxx", ".c++", ".hpp", ".hh", ".hxx", ".ipp", ".tpp", ".inl"],
+    // Module-interface units use `.cppm`/`.ixx`/`.mxx` by convention; without them a declared
+    // `export module foo;` is never discovered, so a first-party `import foo;` stays external.
+    extensions: [".cc", ".cpp", ".cxx", ".c++", ".hpp", ".hh", ".hxx", ".ipp", ".tpp", ".inl", ".cppm", ".ixx", ".mxx"],
     includeFieldIdentifier: true,
     usesQueryDrivenLocals: true,
+    membersAreImplicitlyInScope: true,
     blocks: (functionNameQuery) => [
         cFamilyFunctionBlock(functionNameQuery),
         cFamilyTypeIdentifierBlock("class_specifier", "class"),
@@ -15,7 +19,7 @@ export const CPP_DEF = createCFamilyLanguageDefinition({
         cFamilyBlock("type_definition", "declarator: (type_identifier) @chunk.name", "type"),
     ],
     splitPoints: [...cFamilyControlSplitPoints, "try_statement", "catch_clause"],
-    extraExportQueries: [
+    extraSymbolQueries: [
         `(class_specifier name: (type_identifier) @name)`,
         `(class_specifier name: (template_type name: (type_identifier) @name))`,
         `(union_specifier name: (type_identifier) @name)`,
@@ -31,23 +35,6 @@ export const CPP_DEF = createCFamilyLanguageDefinition({
         `(class_specifier body: (field_declaration_list (declaration declarator: (function_declarator declarator: (destructor_name) @name))))`,
         `(module_declaration name: (module_name) @name)`,
     ],
-    extraLocalQueries: [
-        `(class_specifier name: (type_identifier) @name)`,
-        `(class_specifier name: (template_type name: (type_identifier) @name))`,
-        `(enum_specifier name: (type_identifier) @name)`,
-        `(union_specifier name: (type_identifier) @name)`,
-        `(enumerator name: (identifier) @name)`,
-        `(namespace_definition name: (namespace_identifier) @name)`,
-        `(namespace_definition name: (nested_namespace_specifier (namespace_identifier) @name))`,
-        `(alias_declaration name: (type_identifier) @name)`,
-        `(concept_definition name: (identifier) @name)`,
-        `(preproc_def name: (identifier) @name)`,
-        `(preproc_function_def name: (identifier) @name)`,
-        `(class_specifier body: (field_declaration_list (field_declaration declarator: (function_declarator declarator: (field_identifier) @name))))`,
-        `(class_specifier body: (field_declaration_list (field_declaration declarator: (reference_declarator (function_declarator declarator: (operator_name) @name)))))`,
-        `(class_specifier body: (field_declaration_list (declaration declarator: (function_declarator declarator: (destructor_name) @name))))`,
-        `(module_declaration name: (module_name) @name)`,
-    ],
     nodeTypes: {
         identifier: ["identifier", "field_identifier", "type_identifier", "namespace_identifier"],
         propertyIdentifier: ["field_identifier", "identifier"],
@@ -74,27 +61,14 @@ export const CPP_DEF = createCFamilyLanguageDefinition({
         if (parent.type === "alias_declaration" ||
             (parent.type === "type_definition" && isInField(node, parent, "declarator")))
             return "type";
-        const container = findAncestor(node, cFamilyContainerTypes);
-        if (container?.type === "function_definition")
-            return "function";
-        if (container?.type === "declaration" && isFunctionDeclarator(node))
-            return "function";
-        // `typedef int (*Comparator)(int, int);` wraps the typedef name in a declarator chain, so the
-        // direct-parent check above cannot see it.
-        if (container?.type === "type_definition")
-            return "type";
-        return "variable";
+        return cFamilyContainerClassifyDefinition(node);
     },
     isDeclarationName: (node) => {
+        if (isSpecifierNameField(node, ["class_specifier", "struct_specifier", "union_specifier", "enum_specifier"]))
+            return true;
         const parent = node.parent;
         if (!parent)
             return false;
-        if ((parent.type === "class_specifier" ||
-            parent.type === "struct_specifier" ||
-            parent.type === "union_specifier" ||
-            parent.type === "enum_specifier") &&
-            isInField(node, parent, "name"))
-            return true;
         if (parent.type === "namespace_definition" && isInField(node, parent, "name"))
             return true;
         if (parent.type === "module_declaration" && isInField(node, parent, "name"))
@@ -113,40 +87,20 @@ export const CPP_DEF = createCFamilyLanguageDefinition({
             return true;
         if (parent.type === "concept_definition" && isInField(node, parent, "name"))
             return true;
-        if (isInAncestorDeclarator(node, new Set(["parameter_declaration"])) ||
-            isInAncestorDeclarator(node, new Set(["field_declaration"])) ||
-            isInAncestorDeclarator(node, new Set(["init_declarator"])) ||
-            isInAncestorDeclarator(node, new Set(["type_definition"])))
-            return true;
-        if (isInAncestorDeclarator(node, new Set(["function_definition"])) && !isInParameterList(node))
-            return true;
-        if (isInAncestorDeclarator(node, new Set(["declaration"])) && !isInParameterList(node))
-            return true;
         if (parent.type === "qualified_identifier" &&
             parent.parent?.type === "using_declaration" &&
             isInField(node, parent, "name"))
             return true;
-        if (parent.type === "enumerator" && isInField(node, parent, "name"))
-            return true;
-        if (parent.type === "preproc_def" && isInField(node, parent, "name"))
-            return true;
-        if (parent.type === "preproc_function_def" && isInField(node, parent, "name"))
-            return true;
-        return false;
+        return cFamilyIsDeclarationName(node);
     },
-    createsFunctionScope: (node) => node.type === "function_definition" || node.type === "lambda_expression",
+    createsFunctionScope: nodeTypeIn(["function_definition", "lambda_expression"]),
 });
-const cppModuleImportQuery = `
-      (import_declaration name: (module_name) @mod) @stmt
-      (import_declaration header: (string_literal) @mod) @stmt
-      (import_declaration header: (system_lib_string) @mod) @stmt
-    `;
-const cppModuleBindingQuery = `
+const cppModuleQuery = `
       (import_declaration name: (module_name) @from) @stmt
       (import_declaration header: (string_literal) @from) @stmt
       (import_declaration header: (system_lib_string) @from) @stmt
     `;
-CPP_DEF.graph.imports += cppModuleImportQuery;
-CPP_DEF.graph.importBindings += cppModuleBindingQuery;
+CPP_DEF.graph.imports += cppModuleQuery;
+CPP_DEF.graph.importBindings += cppModuleQuery;
 registerLanguage(CPP_DEF);
 //# sourceMappingURL=cpp.js.map

package/dist/languages/definitions/cpp.js.map

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

package/dist/languages/definitions/csharp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"csharp.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/csharp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAMtD,eAAO,MAAM,UAAU,EAAE,kBA6JxB,CAAC"}
+{"version":3,"file":"csharp.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/csharp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAOtD,eAAO,MAAM,UAAU,EAAE,kBAuJxB,CAAC"}

package/dist/languages/definitions/csharp.js

@@ -1,4 +1,5 @@
 import { registerLanguage } from "../registry.js";
+import { classifyByParentType, isNameFieldOnParent, nodeTypeIn } from "./shared.js";
 import { CSHARP_IDENTIFIER_FORMAT_SOURCE, hasNonAsciiCodePoint } from "../../util/identifiers.js";
 const CSHARP_IDENTIFIER_FORMAT_PATTERN = new RegExp(`[${CSHARP_IDENTIFIER_FORMAT_SOURCE}]`, "gu");
 export const CSHARP_DEF = {
@@ -59,9 +60,11 @@ export const CSHARP_DEF = {
         comments: ["comment"],
     },
     graph: {
+        // Path node is `identifier` | `qualified_name` | `alias_qualified_name` (`global::System`).
+        // An identifier/qualified_name alternation misses `alias_qualified_name`, so keep `(_)`.
         imports: `
-      (using_directive !name (_) @mod) @stmt
-      (using_directive name: (identifier) (_) @mod) @stmt
+      (using_directive !name (_) @from) @stmt
+      (using_directive name: (identifier) (_) @from) @stmt
     `,
         exports: `
       (class_declaration name: (identifier) @name)
@@ -80,6 +83,8 @@ export const CSHARP_DEF = {
       (class_declaration name: (identifier) @name)
       (record_declaration name: (identifier) @name)
       (record_declaration (parameter_list (parameter name: (identifier) @name)))
+      (method_declaration (parameter_list (parameter name: (identifier) @name)))
+      (constructor_declaration (parameter_list (parameter name: (identifier) @name)))
       (struct_declaration name: (identifier) @name)
       (interface_declaration name: (identifier) @name)
       (enum_declaration name: (identifier) @name)
@@ -91,6 +96,8 @@ export const CSHARP_DEF = {
       (variable_declarator name: (identifier) @name)
       (declaration_pattern name: (identifier) @name)
     `,
+        // extern alias has no path node in the grammar, so there is no @from.
+        // using path node: identifier | qualified_name | alias_qualified_name — keep `(_)`.
         importBindings: `
       (using_directive name: (identifier) @alias (_) @from) @stmt
       (using_directive !name (_) @from) @stmt
@@ -102,56 +109,43 @@ export const CSHARP_DEF = {
         memberExpression: "member_access_expression",
     },
     supportsCrossModuleSymbols: true,
-    classifyDefinition: (node) => {
-        const parent = node.parent;
-        if (!parent)
-            return "variable";
-        if (parent.type === "method_declaration" ||
-            parent.type === "constructor_declaration" ||
-            parent.type === "destructor_declaration" ||
-            parent.type === "local_function_statement")
-            return "method";
-        if (parent.type === "class_declaration" ||
-            parent.type === "record_declaration" ||
-            parent.type === "struct_declaration")
-            return "class";
-        if (parent.type === "interface_declaration")
-            return "interface";
-        if (parent.type === "enum_declaration" || parent.type === "delegate_declaration")
-            return "type";
-        return "variable";
-    },
-    createsFunctionScope: (node) => node.type === "method_declaration" ||
-        node.type === "constructor_declaration" ||
-        node.type === "destructor_declaration" ||
-        node.type === "local_function_statement",
-    createsBlockScope: (node) => node.type === "block" || node.type === "declaration_list",
-    isDeclarationName: (node) => {
-        const p = node.parent;
-        if (!p)
-            return false;
-        if ((p.type === "class_declaration" ||
-            p.type === "record_declaration" ||
-            p.type === "struct_declaration" ||
-            p.type === "interface_declaration" ||
-            p.type === "enum_declaration" ||
-            p.type === "delegate_declaration" ||
-            p.type === "enum_member_declaration" ||
-            p.type === "method_declaration" ||
-            p.type === "constructor_declaration" ||
-            p.type === "destructor_declaration" ||
-            p.type === "local_function_statement" ||
-            p.type === "property_declaration") &&
-            p.childForFieldName("name")?.id === node.id)
-            return true;
-        if (p.type === "variable_declarator" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        if (p.type === "parameter" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        if (p.type === "declaration_pattern" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        return false;
-    },
+    membersAreImplicitlyInScope: true,
+    classifyDefinition: classifyByParentType({
+        method_declaration: "method",
+        constructor_declaration: "method",
+        destructor_declaration: "method",
+        local_function_statement: "method",
+        class_declaration: "class",
+        record_declaration: "class",
+        struct_declaration: "class",
+        interface_declaration: "interface",
+        enum_declaration: "type",
+        delegate_declaration: "type",
+    }),
+    createsFunctionScope: nodeTypeIn([
+        "method_declaration",
+        "constructor_declaration",
+        "destructor_declaration",
+        "local_function_statement",
+    ]),
+    createsBlockScope: nodeTypeIn(["block", "declaration_list"]),
+    isDeclarationName: (node) => isNameFieldOnParent(node, [
+        "class_declaration",
+        "record_declaration",
+        "struct_declaration",
+        "interface_declaration",
+        "enum_declaration",
+        "delegate_declaration",
+        "enum_member_declaration",
+        "method_declaration",
+        "constructor_declaration",
+        "destructor_declaration",
+        "local_function_statement",
+        "property_declaration",
+        "variable_declarator",
+        "parameter",
+        "declaration_pattern",
+    ]),
     normalizeIdentifier: (name) => {
         const withoutVerbatimPrefix = name.startsWith("@") ? name.slice(1) : name;
         return hasNonAsciiCodePoint(withoutVerbatimPrefix)

package/dist/languages/definitions/csharp.js.map

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

package/dist/languages/definitions/css-like.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"css-like.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/css-like.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD,wBAAgB,gBAAgB,IAAI,kBAAkB,CAAC,WAAW,CAAC,CAUlE;AAED,wBAAgB,YAAY,IAAI,kBAAkB,CAAC,OAAO,CAAC,CAc1D;AAED,wBAAgB,gBAAgB,IAAI,WAAW,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAI/E"}
+{"version":3,"file":"css-like.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/css-like.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAetD,wBAAgB,gBAAgB,IAAI,kBAAkB,CAAC,WAAW,CAAC,CAUlE;AAED,wBAAgB,YAAY,IAAI,kBAAkB,CAAC,OAAO,CAAC,CAO1D;AAED,wBAAgB,gBAAgB,IAAI,WAAW,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAI/E"}

package/dist/languages/definitions/css-like.js

@@ -1,3 +1,13 @@
+import { graphCapture } from "../graph-captures.js";
+const from = graphCapture("from");
+const stmt = graphCapture("stmt");
+const cssLikeImportQuery = `
+      (import_statement (string_value) ${from}) ${stmt}
+    `;
+const cssLikeLocalsQuery = `
+      (class_selector (class_name) @name)
+      (id_selector (id_name) @name)
+    `;
 export function cssLikeStructure() {
     return {
         blocks: [
@@ -11,17 +21,10 @@ export function cssLikeStructure() {
 }
 export function cssLikeGraph() {
     return {
-        imports: `
-      (import_statement (string_value) @mod) @stmt
-    `,
+        imports: cssLikeImportQuery,
         exports: "",
-        locals: `
-      (class_selector (class_name) @name)
-      (id_selector (id_name) @name)
-    `,
-        importBindings: `
-      (import_statement (string_value) @from) @stmt
-    `,
+        locals: cssLikeLocalsQuery,
+        importBindings: cssLikeImportQuery,
     };
 }
 export function cssLikeNodeTypes() {

package/dist/languages/definitions/css-like.js.map

@@ -1 +1 @@
-{"version":3,"file":"css-like.js","sourceRoot":"","sources":["../../../src/languages/definitions/css-like.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,gBAAgB;IAC9B,OAAO;QACL,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE;YACvC,EAAE,IAAI,EAAE,iBAAiB,EAAE,SAAS,EAAE,OAAO,EAAE;YAC/C,EAAE,IAAI,EAAE,qBAAqB,EAAE,SAAS,EAAE,WAAW,EAAE;SACxD;QACD,WAAW,EAAE,CAAC,UAAU,CAAC;QACzB,QAAQ,EAAE,CAAC,SAAS,EAAE,YAAY,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO;QACL,OAAO,EAAE;;KAER;QACD,OAAO,EAAE,EAAE;QACX,MAAM,EAAE;;;KAGP;QACD,cAAc,EAAE;;KAEf;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,OAAO;QACL,UAAU,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC;KACtC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"css-like.js","sourceRoot":"","sources":["../../../src/languages/definitions/css-like.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;AAClC,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;AAElC,MAAM,kBAAkB,GAAG;yCACc,IAAI,KAAK,IAAI;KACjD,CAAC;AAEN,MAAM,kBAAkB,GAAG;;;KAGtB,CAAC;AAEN,MAAM,UAAU,gBAAgB;IAC9B,OAAO;QACL,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE;YACvC,EAAE,IAAI,EAAE,iBAAiB,EAAE,SAAS,EAAE,OAAO,EAAE;YAC/C,EAAE,IAAI,EAAE,qBAAqB,EAAE,SAAS,EAAE,WAAW,EAAE;SACxD;QACD,WAAW,EAAE,CAAC,UAAU,CAAC;QACzB,QAAQ,EAAE,CAAC,SAAS,EAAE,YAAY,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO;QACL,OAAO,EAAE,kBAAkB;QAC3B,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,kBAAkB;QAC1B,cAAc,EAAE,kBAAkB;KACnC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,OAAO;QACL,UAAU,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC;KACtC,CAAC;AACJ,CAAC"}

package/dist/languages/definitions/go.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"go.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/go.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGtD,eAAO,MAAM,MAAM,EAAE,kBAoGpB,CAAC"}
+{"version":3,"file":"go.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/go.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAItD,eAAO,MAAM,MAAM,EAAE,kBAkGpB,CAAC"}