@lzehrung/codegraph 2.3.29 → 2.3.31

package/dist/languages/definitions/go.js

@@ -1,4 +1,5 @@
 import { registerLanguage } from "../registry.js";
+import { classifyByParentType, isNameFieldOnParent, matchesParentTypePairs, nodeTypeIn } from "./shared.js";
 export const GO_DEF = {
     id: "go",
     extensions: [".go"],
@@ -32,7 +33,7 @@ export const GO_DEF = {
     },
     graph: {
         imports: `
-      (import_spec path: (interpreted_string_literal) @mod) @stmt
+      (import_spec path: (interpreted_string_literal) @from) @stmt
     `,
         exports: `
       (function_declaration name: (identifier) @name)
@@ -55,7 +56,9 @@ export const GO_DEF = {
       (range_clause left: (expression_list (identifier) @name) (#not-eq? @name "_"))
     `,
         importBindings: `
+      (import_spec name: (dot) @wild path: (interpreted_string_literal) @from) @stmt
       (import_spec name: (package_identifier) @alias path: (interpreted_string_literal) @from) @stmt
+      (import_spec name: (blank_identifier) @alias path: (interpreted_string_literal) @from) @stmt
       (import_spec path: (interpreted_string_literal) @from) @stmt
     `,
     },
@@ -64,47 +67,31 @@ export const GO_DEF = {
         memberExpression: "selector_expression",
     },
     supportsCrossModuleSymbols: true,
-    classifyDefinition: (node) => {
-        const parent = node.parent;
-        if (!parent)
-            return "variable";
-        if (parent.type === "function_declaration" || parent.type === "method_declaration")
-            return "function";
-        if (parent.type === "type_spec" && parent.childForFieldName("name")?.id === node.id)
-            return "type";
-        if (parent.type === "type_parameter_declaration")
-            return "type";
-        return "variable";
-    },
-    createsFunctionScope: (node) => node.type === "function_declaration" || node.type === "method_declaration" || node.type === "func_literal",
-    createsBlockScope: (node) => node.type === "block" || node.type === "for_statement",
-    membersAreImplicitlyInScope: false,
-    isDeclarationName: (node) => {
-        const p = node.parent;
-        if (!p)
-            return false;
-        if (p.type === "function_declaration" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        if (p.type === "method_declaration" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        if (p.type === "type_spec" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        if ((p.type === "var_spec" || p.type === "const_spec") && node.type === "identifier")
-            return true;
-        if (p.type === "type_parameter_declaration" && node.type === "identifier")
-            return true;
-        if (p.type === "expression_list" && p.parent?.type === "short_var_declaration")
-            return node.type === "identifier";
-        if (p.type === "expression_list" && p.parent?.type === "range_clause")
-            return node.type === "identifier" && node.text !== "_";
-        // Only parameter *names* — never type-position identifiers (e.g. builtin `int` or type param `T`).
-        if (p.type === "parameter_declaration" || p.type === "variadic_parameter_declaration") {
-            return node.type === "identifier";
-        }
-        if (p.type === "field_declaration" && node.type === "field_identifier")
-            return true;
-        return false;
-    },
+    classifyDefinition: classifyByParentType({
+        function_declaration: "function",
+        method_declaration: "function",
+        type_spec: { kind: "type", nameField: "name" },
+        type_parameter_declaration: "type",
+    }),
+    createsFunctionScope: nodeTypeIn(["function_declaration", "method_declaration", "func_literal"]),
+    createsBlockScope: nodeTypeIn(["block", "for_statement"]),
+    isDeclarationName: (node) => isNameFieldOnParent(node, ["function_declaration", "method_declaration", "type_spec"]) ||
+        matchesParentTypePairs(node, [
+            ["var_spec", "identifier"],
+            ["const_spec", "identifier"],
+            ["type_parameter_declaration", "identifier"],
+            // Only parameter *names* — never type-position identifiers (e.g. builtin `int` or type param `T`).
+            ["parameter_declaration", "identifier"],
+            ["variadic_parameter_declaration", "identifier"],
+            ["field_declaration", "field_identifier"],
+        ]) ||
+        (node.parent?.type === "expression_list" &&
+            node.parent.parent?.type === "short_var_declaration" &&
+            node.type === "identifier") ||
+        (node.parent?.type === "expression_list" &&
+            node.parent.parent?.type === "range_clause" &&
+            node.type === "identifier" &&
+            node.text !== "_"),
     scopeDeclarationNames: (node) => (node.type === "field_identifier" && node.parent?.type === "field_declaration") ||
         (node.type === "identifier" &&
             node.parent?.type === "expression_list" &&

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

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

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

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

package/dist/languages/definitions/html.js

@@ -1,4 +1,17 @@
+import { graphCapture } from "../graph-captures.js";
 import { registerLanguage } from "../registry.js";
+function htmlAssetImportQuery(valueCapture) {
+    const value = graphCapture(valueCapture);
+    const stmt = graphCapture("stmt");
+    return `
+      (script_element (start_tag (attribute (attribute_name) @attr (#match? @attr "^(?i)src$") (quoted_attribute_value (attribute_value) ${value})))) ${stmt}
+      ((element (start_tag (tag_name) @tag (attribute (attribute_name) @attr (#match? @attr "^(?i)href$") (quoted_attribute_value (attribute_value) ${value})))) ${stmt} (#match? @tag "^(?i)(link|a)$"))
+      ((element (self_closing_tag (tag_name) @tag (attribute (attribute_name) @attr (#match? @attr "^(?i)href$") (quoted_attribute_value (attribute_value) ${value})))) ${stmt} (#match? @tag "^(?i)(link|a)$"))
+      ((element (start_tag (tag_name) @tag (attribute (attribute_name) @attr (#match? @attr "^(?i)src$") (quoted_attribute_value (attribute_value) ${value})))) ${stmt} (#match? @tag "^(?i)img$"))
+      ((element (self_closing_tag (tag_name) @tag (attribute (attribute_name) @attr (#match? @attr "^(?i)src$") (quoted_attribute_value (attribute_value) ${value})))) ${stmt} (#match? @tag "^(?i)img$"))
+    `;
+}
+const htmlAssetImports = htmlAssetImportQuery("from");
 export const HTML_DEF = {
     id: "html",
     extensions: [".html", ".htm", ".xhtml"],
@@ -16,24 +29,12 @@ export const HTML_DEF = {
         comments: ["comment"],
     },
     graph: {
-        imports: `
-      (script_element (start_tag (attribute (attribute_name) @attr (#match? @attr "^(?i)src$") (quoted_attribute_value (attribute_value) @mod)))) @stmt
-      ((element (start_tag (tag_name) @tag (attribute (attribute_name) @attr (#match? @attr "^(?i)href$") (quoted_attribute_value (attribute_value) @mod)))) @stmt (#match? @tag "^(?i)(link|a)$"))
-      ((element (self_closing_tag (tag_name) @tag (attribute (attribute_name) @attr (#match? @attr "^(?i)href$") (quoted_attribute_value (attribute_value) @mod)))) @stmt (#match? @tag "^(?i)(link|a)$"))
-      ((element (start_tag (tag_name) @tag (attribute (attribute_name) @attr (#match? @attr "^(?i)src$") (quoted_attribute_value (attribute_value) @mod)))) @stmt (#match? @tag "^(?i)img$"))
-      ((element (self_closing_tag (tag_name) @tag (attribute (attribute_name) @attr (#match? @attr "^(?i)src$") (quoted_attribute_value (attribute_value) @mod)))) @stmt (#match? @tag "^(?i)img$"))
-    `,
+        imports: htmlAssetImports,
         exports: "",
         locals: `
       (attribute (attribute_name) @attr (#match? @attr "^(?i)id$") (quoted_attribute_value (attribute_value) @name))
     `,
-        importBindings: `
-      (script_element (start_tag (attribute (attribute_name) @attr (#match? @attr "^(?i)src$") (quoted_attribute_value (attribute_value) @from)))) @stmt
-      ((element (start_tag (tag_name) @tag (attribute (attribute_name) @attr (#match? @attr "^(?i)href$") (quoted_attribute_value (attribute_value) @from)))) @stmt (#match? @tag "^(?i)(link|a)$"))
-      ((element (self_closing_tag (tag_name) @tag (attribute (attribute_name) @attr (#match? @attr "^(?i)href$") (quoted_attribute_value (attribute_value) @from)))) @stmt (#match? @tag "^(?i)(link|a)$"))
-      ((element (start_tag (tag_name) @tag (attribute (attribute_name) @attr (#match? @attr "^(?i)src$") (quoted_attribute_value (attribute_value) @from)))) @stmt (#match? @tag "^(?i)img$"))
-      ((element (self_closing_tag (tag_name) @tag (attribute (attribute_name) @attr (#match? @attr "^(?i)src$") (quoted_attribute_value (attribute_value) @from)))) @stmt (#match? @tag "^(?i)img$"))
-    `,
+        importBindings: htmlAssetImports,
     },
     nodeTypes: {
         identifier: ["attribute_value", "tag_name"],

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

@@ -1 +1 @@
-{"version":3,"file":"html.js","sourceRoot":"","sources":["../../../src/languages/definitions/html.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,CAAC,MAAM,QAAQ,GAAuB;IAC1C,EAAE,EAAE,MAAM;IACV,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC;IACvC,SAAS,EAAE;QACT,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,SAAS,EAAE,kIAAkI;gBAC7I,SAAS,EAAE,SAAS;aACrB;YACD,EAAE,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,QAAQ,EAAE;YAC/C,EAAE,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,OAAO,EAAE;SAC9C;QACD,WAAW,EAAE,CAAC,SAAS,CAAC;QACxB,QAAQ,EAAE,CAAC,SAAS,CAAC;KACtB;IACD,KAAK,EAAE;QACL,OAAO,EAAE;;;;;;KAMR;QACD,OAAO,EAAE,EAAE;QACX,MAAM,EAAE;;KAEP;QACD,cAAc,EAAE;;;;;;KAMf;KACF;IACD,SAAS,EAAE;QACT,UAAU,EAAE,CAAC,iBAAiB,EAAE,UAAU,CAAC;KAC5C;CACF,CAAC;AACF,gBAAgB,CAAC,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"html.js","sourceRoot":"","sources":["../../../src/languages/definitions/html.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAA2B,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,SAAS,oBAAoB,CAAC,YAAgC;IAC5D,MAAM,KAAK,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAClC,OAAO;2IACkI,KAAK,QAAQ,IAAI;sJACN,KAAK,QAAQ,IAAI;6JACV,KAAK,QAAQ,IAAI;qJACzB,KAAK,QAAQ,IAAI;4JACV,KAAK,QAAQ,IAAI;KACxK,CAAC;AACN,CAAC;AAED,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;AAEtD,MAAM,CAAC,MAAM,QAAQ,GAAuB;IAC1C,EAAE,EAAE,MAAM;IACV,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC;IACvC,SAAS,EAAE;QACT,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,SAAS,EAAE,kIAAkI;gBAC7I,SAAS,EAAE,SAAS;aACrB;YACD,EAAE,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,QAAQ,EAAE;YAC/C,EAAE,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,OAAO,EAAE;SAC9C;QACD,WAAW,EAAE,CAAC,SAAS,CAAC;QACxB,QAAQ,EAAE,CAAC,SAAS,CAAC;KACtB;IACD,KAAK,EAAE;QACL,OAAO,EAAE,gBAAgB;QACzB,OAAO,EAAE,EAAE;QACX,MAAM,EAAE;;KAEP;QACD,cAAc,EAAE,gBAAgB;KACjC;IACD,SAAS,EAAE;QACT,UAAU,EAAE,CAAC,iBAAiB,EAAE,UAAU,CAAC;KAC5C;CACF,CAAC;AACF,gBAAgB,CAAC,QAAQ,CAAC,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"java.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/java.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAMtD,eAAO,MAAM,QAAQ,EAAE,kBA8GtB,CAAC"}
+{"version":3,"file":"java.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/java.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAmBtD,eAAO,MAAM,QAAQ,EAAE,kBA6GtB,CAAC"}

package/dist/languages/definitions/java.js

@@ -1,6 +1,18 @@
 import { registerLanguage } from "../registry.js";
+import { classifyByParentType, isNameFieldOnParent, nodeTypeIn } from "./shared.js";
 import { hasNonAsciiCodePoint, JAVA_IDENTIFIER_IGNORABLE_SOURCE } from "../../util/identifiers.js";
 const JAVA_IDENTIFIER_IGNORABLE_PATTERN = new RegExp(`[${JAVA_IDENTIFIER_IGNORABLE_SOURCE}]`, "gu");
+// Pinned tree-sitter-java `import_declaration` children:
+//   anonymous: "import", optional "static", trailing ";"
+//   named: `identifier` (bare `import Foo;`) or `scoped_identifier` (`import a.b.C;`),
+//          optional named `asterisk` (`import a.b.*;`, `import static a.B.*;`)
+// Optional `(asterisk)? @wild` yields one match per statement without a trailing `.`
+// end-anchor, which would treat `;` as a last-child miss if the engine counts anonymous
+// siblings. Java has no import alias.
+const JAVA_IMPORT_QUERY = `
+      (import_declaration (scoped_identifier) @from (asterisk)? @wild) @stmt
+      (import_declaration (identifier) @from (asterisk)? @wild) @stmt
+    `;
 export const JAVA_DEF = {
     id: "java",
     extensions: [".java"],
@@ -47,9 +59,7 @@ export const JAVA_DEF = {
         comments: ["line_comment", "block_comment"],
     },
     graph: {
-        imports: `
-      (import_declaration . (_) @mod) @stmt
-    `,
+        imports: JAVA_IMPORT_QUERY,
         exports: `
       (class_declaration name: (identifier) @name)
       (record_declaration name: (identifier) @name)
@@ -73,58 +83,42 @@ export const JAVA_DEF = {
       (spread_parameter (variable_declarator name: (identifier) @name))
       (receiver_parameter (identifier) @name)
     `,
-        importBindings: `
-      (import_declaration . (_) @from) @stmt
-    `,
+        importBindings: JAVA_IMPORT_QUERY,
     },
     nodeTypes: {
         identifier: ["identifier", "type_identifier"],
         memberExpression: "field_access",
     },
     supportsCrossModuleSymbols: true,
+    membersAreImplicitlyInScope: true,
     exportScopeBlockers: ["block", "constructor_body"],
-    classifyDefinition: (node) => {
-        const parent = node.parent;
-        if (!parent)
-            return "variable";
-        if (parent.type === "method_declaration" || parent.type === "constructor_declaration")
-            return "method";
-        if (parent.type === "class_declaration" || parent.type === "record_declaration")
-            return "class";
-        if (parent.type === "interface_declaration" || parent.type === "annotation_type_declaration")
-            return "interface";
-        if (parent.type === "enum_declaration")
-            return "type";
-        return "variable";
-    },
-    createsFunctionScope: (node) => node.type === "method_declaration" || node.type === "constructor_declaration",
-    createsBlockScope: (node) => node.type === "block" || node.type === "class_body",
-    isDeclarationName: (node) => {
-        const p = node.parent;
-        if (!p)
-            return false;
-        if (p.type === "class_declaration" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        if (p.type === "record_declaration" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        if (p.type === "interface_declaration" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        if (p.type === "annotation_type_declaration" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        if (p.type === "enum_declaration" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        if (p.type === "enum_constant" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        if (p.type === "method_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 === "formal_parameter" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        if (p.type === "receiver_parameter" && node.type === "identifier")
-            return true;
-        return false;
-    },
+    classifyDefinition: classifyByParentType({
+        method_declaration: "method",
+        constructor_declaration: "method",
+        class_declaration: "class",
+        record_declaration: "class",
+        interface_declaration: "interface",
+        annotation_type_declaration: "interface",
+        enum_declaration: "type",
+    }),
+    createsFunctionScope: nodeTypeIn(["method_declaration", "constructor_declaration"]),
+    createsBlockScope: nodeTypeIn(["block", "class_body"]),
+    isDeclarationName: (node) => isNameFieldOnParent(node, [
+        "class_declaration",
+        "record_declaration",
+        "interface_declaration",
+        "annotation_type_declaration",
+        "enum_declaration",
+        "enum_constant",
+        "method_declaration",
+        "constructor_declaration",
+        "variable_declarator",
+        "formal_parameter",
+    ]) ||
+        // `spread_parameter` (`int... rest`) has no `name` field; its declared name is the
+        // `variable_declarator` child, so that node is the declaration name.
+        (node.type === "variable_declarator" && node.parent?.type === "spread_parameter") ||
+        (node.parent?.type === "receiver_parameter" && node.type === "identifier"),
     normalizeIdentifier: (name) => hasNonAsciiCodePoint(name, true) ? name.replace(JAVA_IDENTIFIER_IGNORABLE_PATTERN, "") : name,
 };
 registerLanguage(JAVA_DEF);

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"javascript.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/javascript.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAwBtD,eAAO,MAAM,cAAc,EAAE,kBAkL5B,CAAC"}
+{"version":3,"file":"javascript.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/javascript.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AA+BtD,eAAO,MAAM,cAAc,EAAE,kBAuJ5B,CAAC"}

package/dist/languages/definitions/javascript.js

@@ -1,5 +1,6 @@
 import { registerLanguage } from "../registry.js";
-import { ECMASCRIPT_CONTROL_SPLIT_POINTS, ECMASCRIPT_CORE_FUNCTION_BLOCKS, ECMASCRIPT_MODULE_VAR_BLOCKS, } from "./js-family.js";
+import { classifyByParentType, hasParentType, nodeTypeIn } from "./shared.js";
+import { ECMASCRIPT_BLOCK_SCOPE_TYPES, ECMASCRIPT_CONTROL_SPLIT_POINTS, ECMASCRIPT_CORE_FUNCTION_BLOCKS, ECMASCRIPT_DECLARATION_NAME_PARENTS, ECMASCRIPT_FUNCTION_SCOPE_TYPES, ECMASCRIPT_MODULE_VAR_BLOCKS, isEcmaScriptFieldDefinitionName, isEcmaScriptTypeOnlyStatement, isEcmaScriptVariableDeclaratorName, } from "./js-family.js";
 const JS_OBJECT_METHOD_EXPORT_PATTERN = `
       ;; CJS: module.exports = { helper () {} }
       ((expression_statement (assignment_expression
@@ -25,10 +26,10 @@ export const JAVASCRIPT_DEF = {
     },
     graph: {
         imports: `
-      (import_statement (string) @mod) @stmt
-      (export_statement (string) @mod) @stmt
-      (call_expression function: (import) arguments: (arguments (string) @mod)) @stmt
-      ((call_expression function: (identifier) @fn arguments: (arguments (string) @mod)) @stmt
+      (import_statement (string) @from) @stmt
+      (export_statement (string) @from) @stmt
+      (call_expression function: (import) arguments: (arguments (string) @from)) @stmt
+      ((call_expression function: (identifier) @fn arguments: (arguments (string) @from)) @stmt
         (#eq? @fn "require"))
     `,
         exports: `
@@ -44,8 +45,10 @@ export const JAVASCRIPT_DEF = {
       (export_statement (export_clause (export_specifier name: (identifier) @src !alias)) (string) @from)
       (export_statement (export_clause (export_specifier name: (identifier) @src alias: (identifier) @alias)))
       (export_statement (export_clause (export_specifier name: (identifier) @src !alias)))
+      (export_statement "*" @wild (string) @from)
       (export_statement (string) @from)
       ;; CJS whole-module export: module.exports = function () {} / = () => {}
+      ;; @mod is the identifier module in module.exports, not a specifier; keep it out of GraphImportCapture.
       ((expression_statement (assignment_expression
         left: (member_expression object: (identifier) @mod property: (property_identifier) @cjs_export_name)
         right: [ (function) (arrow_function) ] @cjs_fn))
@@ -130,61 +133,30 @@ export const JAVASCRIPT_DEF = {
         shorthandPropertyIdentifier: ["shorthand_property_identifier", "shorthand_property_identifier_pattern"],
         memberExpression: "member_expression",
     },
-    classifyDefinition: (n) => {
-        const t = n.parent?.type;
-        if (t === "function_declaration")
-            return "function";
-        if (t === "generator_function_declaration")
-            return "function";
-        if (t === "method_definition")
-            return "function";
-        if (t === "function" || t === "function_expression")
-            return "function";
-        if (t === "class_declaration")
-            return "class";
-        return "variable";
-    },
-    isDeclarationName: (node) => {
-        const parent = node.parent;
-        const p = parent?.type;
-        if (parent?.type === "variable_declarator") {
-            return parent.childForFieldName("name")?.id === node.id;
-        }
-        if (parent?.type === "field_definition") {
-            const name = parent.childForFieldName("name") ?? parent.childForFieldName("property");
-            return name?.id === node.id;
-        }
-        return (!!p &&
-            [
-                "function_declaration",
-                "generator_function_declaration",
-                "class_declaration",
-                "import_specifier",
-                "namespace_import",
-                "import_clause",
-                // Method names in classes: needed so that editing a method name is
-                // classified as a definition change, not an unrecognised node.
-                "method_definition",
-                // A named function expression binds its own name; `$scope.x = function x() {}` and
-                // `const f = function inner() {}` are the common shapes.
-                "function",
-                "function_expression",
-            ].includes(p));
-    },
+    classifyDefinition: classifyByParentType({
+        function_declaration: "function",
+        generator_function_declaration: "function",
+        method_definition: "function",
+        function: "function",
+        function_expression: "function",
+        class_declaration: "class",
+    }),
+    isDeclarationName: (node) => isEcmaScriptVariableDeclaratorName(node) ||
+        isEcmaScriptFieldDefinitionName(node, "field_definition") ||
+        // `function` is the JS grammar's function-expression node; the TS grammar spells it
+        // `function_expression` instead.
+        hasParentType(node, [...ECMASCRIPT_DECLARATION_NAME_PARENTS, "function"]),
     // Scope construction has no structural handling for a function expression's own name.
     scopeDeclarationNames: (node) => {
         const parent = node.parent?.type;
         return parent === "function" || parent === "function_expression";
     },
-    createsBlockScope: (n) => n.type === "program" || n.type === "block" || n.type === "class_body" || n.type === "class_static_block",
-    createsFunctionScope: (n) => n.type === "function_declaration" ||
-        n.type === "generator_function_declaration" ||
-        n.type === "function" ||
-        n.type === "function_expression" ||
-        n.type === "arrow_function" ||
-        n.type === "method_definition",
-    membersAreImplicitlyInScope: false,
+    createsBlockScope: nodeTypeIn([...ECMASCRIPT_BLOCK_SCOPE_TYPES]),
+    createsFunctionScope: nodeTypeIn([...ECMASCRIPT_FUNCTION_SCOPE_TYPES, "function"]),
     supportsCrossModuleSymbols: true,
+    // JSDoc-typed `.js` files use `import type` / `export type`; the JS grammar has no type-only
+    // syntax, so classification matches statement text. A binding named `type` stays runtime.
+    isTypeOnly: isEcmaScriptTypeOnlyStatement,
     native: {
         normalizeQuery: (_kind, query) => query
             .replace(/\(function\)/g, "(function_expression)")

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

@@ -1 +1 @@
-{"version":3,"file":"javascript.js","sourceRoot":"","sources":["../../../src/languages/definitions/javascript.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"javascript.js","sourceRoot":"","sources":["../../../src/languages/definitions/javascript.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9E,OAAO,EACL,4BAA4B,EAC5B,+BAA+B,EAC/B,+BAA+B,EAC/B,mCAAmC,EACnC,+BAA+B,EAC/B,4BAA4B,EAC5B,+BAA+B,EAC/B,6BAA6B,EAC7B,kCAAkC,GACnC,MAAM,gBAAgB,CAAC;AAExB,MAAM,+BAA+B,GAAG;;;;;;CAMvC,CAAC;AAEF,MAAM,sCAAsC,GAAG;;;;;;CAM9C,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAuB;IAChD,EAAE,EAAE,IAAI;IACR,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;IAC3C,4BAA4B,EAAE,IAAI;IAClC,SAAS,EAAE;QACT,MAAM,EAAE,CAAC,GAAG,+BAA+B,EAAE,GAAG,4BAA4B,CAAC;QAC7E,WAAW,EAAE,CAAC,GAAG,+BAA+B,CAAC;QACjD,QAAQ,EAAE,CAAC,SAAS,CAAC;KACtB;IACD,KAAK,EAAE;QACL,OAAO,EAAE;;;;;;KAMR;QACD,OAAO,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAyER;QACD,MAAM,EAAE;;;;;;;KAOP;QACD,cAAc,EAAE;;;;;;;;;;;KAWf;KACF;IACD,SAAS,EAAE;QACT,UAAU,EAAE,CAAC,YAAY,CAAC;QAC1B,kBAAkB,EAAE,CAAC,qBAAqB,CAAC;QAC3C,2BAA2B,EAAE,CAAC,+BAA+B,EAAE,uCAAuC,CAAC;QACvG,gBAAgB,EAAE,mBAAmB;KACtC;IACD,kBAAkB,EAAE,oBAAoB,CAAC;QACvC,oBAAoB,EAAE,UAAU;QAChC,8BAA8B,EAAE,UAAU;QAC1C,iBAAiB,EAAE,UAAU;QAC7B,QAAQ,EAAE,UAAU;QACpB,mBAAmB,EAAE,UAAU;QAC/B,iBAAiB,EAAE,OAAO;KAC3B,CAAC;IACF,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAC1B,kCAAkC,CAAC,IAAI,CAAC;QACxC,+BAA+B,CAAC,IAAI,EAAE,kBAAkB,CAAC;QACzD,oFAAoF;QACpF,iCAAiC;QACjC,aAAa,CAAC,IAAI,EAAE,CAAC,GAAG,mCAAmC,EAAE,UAAU,CAAC,CAAC;IAC3E,sFAAsF;IACtF,qBAAqB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC;QACjC,OAAO,MAAM,KAAK,UAAU,IAAI,MAAM,KAAK,qBAAqB,CAAC;IACnE,CAAC;IACD,iBAAiB,EAAE,UAAU,CAAC,CAAC,GAAG,4BAA4B,CAAC,CAAC;IAChE,oBAAoB,EAAE,UAAU,CAAC,CAAC,GAAG,+BAA+B,EAAE,UAAU,CAAC,CAAC;IAClF,0BAA0B,EAAE,IAAI;IAChC,6FAA6F;IAC7F,0FAA0F;IAC1F,UAAU,EAAE,6BAA6B;IACzC,MAAM,EAAE;QACN,cAAc,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAC/B,KAAK;aACF,OAAO,CAAC,eAAe,EAAE,uBAAuB,CAAC;aACjD,OAAO,CAAC,+BAA+B,EAAE,sCAAsC,CAAC;QACrF,kBAAkB,EAAE,CAAC,SAAS,CAAC;QAC/B,KAAK,EAAE,CAAC,sEAAsE,CAAC;KAChF;CACF,CAAC;AACF,gBAAgB,CAAC,cAAc,CAAC,CAAC"}

package/dist/languages/definitions/js-family.d.ts

@@ -1,4 +1,18 @@
-import type { BlockDefinition } from "../types.js";
+import type { BlockDefinition, SyntaxNodeLike } from "../types.js";
+/**
+ * Statement-level `import type` / `export type`. The JS grammar has no type-only syntax
+ * (the keyword parses as an ERROR node), so this matches the statement text. A binding
+ * literally named `type` (`import type from "./mod"`) is a runtime import.
+ */
+export declare function isEcmaScriptTypeOnlyStatement(stmtText: string): boolean;
+/** Declaration parents whose direct name child declares a name in both the JS and TS grammars. */
+export declare const ECMASCRIPT_DECLARATION_NAME_PARENTS: readonly ["function_declaration", "generator_function_declaration", "class_declaration", "import_specifier", "namespace_import", "import_clause", "method_definition", "function_expression"];
+export declare const ECMASCRIPT_BLOCK_SCOPE_TYPES: readonly ["program", "block", "class_body", "class_static_block"];
+export declare const ECMASCRIPT_FUNCTION_SCOPE_TYPES: readonly ["function_declaration", "generator_function_declaration", "function_expression", "arrow_function", "method_definition"];
+/** A `variable_declarator`'s declared name (field identity; `const x = y` must not match `y`). */
+export declare function isEcmaScriptVariableDeclaratorName(node: SyntaxNodeLike): boolean;
+/** A class field's declared name; the grammar spells the field `name` or `property`. */
+export declare function isEcmaScriptFieldDefinitionName(node: SyntaxNodeLike, parentType: string): boolean;
 export declare const ECMASCRIPT_CONTROL_SPLIT_POINTS: readonly ["if_statement", "else_clause", "switch_statement", "for_statement", "for_in_statement", "while_statement", "do_statement", "try_statement", "catch_clause", "finally_clause"];
 export declare const ECMASCRIPT_CORE_FUNCTION_BLOCKS: BlockDefinition[];
 export declare const ECMASCRIPT_MODULE_VAR_BLOCKS: BlockDefinition[];

package/dist/languages/definitions/js-family.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"js-family.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/js-family.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,eAAO,MAAM,+BAA+B,yLAWlC,CAAC;AAEX,eAAO,MAAM,+BAA+B,EAAE,eAAe,EA8C5D,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,eAAe,EAczD,CAAC"}
+{"version":3,"file":"js-family.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/js-family.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAUnE;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAKvE;AAED,kGAAkG;AAClG,eAAO,MAAM,mCAAmC,+LAatC,CAAC;AAEX,eAAO,MAAM,4BAA4B,mEAAoE,CAAC;AAE9G,eAAO,MAAM,+BAA+B,mIAMlC,CAAC;AAEX,kGAAkG;AAClG,wBAAgB,kCAAkC,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAEhF;AAED,wFAAwF;AACxF,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAEjG;AAED,eAAO,MAAM,+BAA+B,yLAWlC,CAAC;AAEX,eAAO,MAAM,+BAA+B,EAAE,eAAe,EA8C5D,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,eAAe,EAczD,CAAC"}

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

@@ -1,3 +1,54 @@
+import { stripJsLikeComments } from "../../util/comments.js";
+import { isNameFieldOnParent, isNameOrPropertyFieldOnParent } from "./shared.js";
+function isStatementLevelTypeKeywordClause(clause) {
+    const trimmed = clause.trim();
+    if (!/^type(?:\s+|(?=\{))/.test(trimmed))
+        return false;
+    return !trimmed.slice(4).trimStart().startsWith(",");
+}
+/**
+ * Statement-level `import type` / `export type`. The JS grammar has no type-only syntax
+ * (the keyword parses as an ERROR node), so this matches the statement text. A binding
+ * literally named `type` (`import type from "./mod"`) is a runtime import.
+ */
+export function isEcmaScriptTypeOnlyStatement(stmtText) {
+    const text = stripJsLikeComments(stmtText).trim();
+    const fromMatch = /^(?:import|export)\b\s*([\s\S]*?)\bfrom\s*["']/.exec(text);
+    if (fromMatch)
+        return isStatementLevelTypeKeywordClause(fromMatch[1] ?? "");
+    return /^(?:import|export)\b\s+type(?:\s+|(?=\{|$))/.test(text);
+}
+/** Declaration parents whose direct name child declares a name in both the JS and TS grammars. */
+export const ECMASCRIPT_DECLARATION_NAME_PARENTS = [
+    "function_declaration",
+    "generator_function_declaration",
+    "class_declaration",
+    "import_specifier",
+    "namespace_import",
+    "import_clause",
+    // Method names in classes: needed so that editing a method name is
+    // classified as a definition change, not an unrecognised node.
+    "method_definition",
+    // A named function expression binds its own name; `$scope.x = function x() {}` and
+    // `const f = function inner() {}` are the common shapes.
+    "function_expression",
+];
+export const ECMASCRIPT_BLOCK_SCOPE_TYPES = ["program", "block", "class_body", "class_static_block"];
+export const ECMASCRIPT_FUNCTION_SCOPE_TYPES = [
+    "function_declaration",
+    "generator_function_declaration",
+    "function_expression",
+    "arrow_function",
+    "method_definition",
+];
+/** A `variable_declarator`'s declared name (field identity; `const x = y` must not match `y`). */
+export function isEcmaScriptVariableDeclaratorName(node) {
+    return isNameFieldOnParent(node, ["variable_declarator"]);
+}
+/** A class field's declared name; the grammar spells the field `name` or `property`. */
+export function isEcmaScriptFieldDefinitionName(node, parentType) {
+    return isNameOrPropertyFieldOnParent(node, [parentType]);
+}
 export const ECMASCRIPT_CONTROL_SPLIT_POINTS = [
     "if_statement",
     "else_clause",

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

@@ -1 +1 @@
-{"version":3,"file":"js-family.js","sourceRoot":"","sources":["../../../src/languages/definitions/js-family.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,+BAA+B,GAAG;IAC7C,cAAc;IACd,aAAa;IACb,kBAAkB;IAClB,eAAe;IACf,kBAAkB;IAClB,iBAAiB;IACjB,cAAc;IACd,eAAe;IACf,cAAc;IACd,gBAAgB;CACR,CAAC;AAEX,MAAM,CAAC,MAAM,+BAA+B,GAAsB;IAChE;QACE,IAAI,EAAE,mBAAmB;QACzB,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,OAAO;KACnB;IACD;QACE,IAAI,EAAE,sBAAsB;QAC5B,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,UAAU;KACtB;IACD;QACE,IAAI,EAAE,gCAAgC;QACtC,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,UAAU;KACtB;IACD;QACE,IAAI,EAAE,mBAAmB;QACzB,SAAS,EAAE,mEAAmE;QAC9E,SAAS,EAAE,QAAQ;KACpB;IACD;QACE,IAAI,EAAE,qBAAqB;QAC3B,SAAS,EAAE,oMAAoM;QAC/M,SAAS,EAAE,UAAU;KACtB;IACD;QACE,IAAI,EAAE,sBAAsB;QAC5B,SAAS,EAAE,oMAAoM;QAC/M,SAAS,EAAE,UAAU;KACtB;IACD;QACE,IAAI,EAAE,uBAAuB;QAC7B,SAAS,EAAE,qKAAqK;QAChL,SAAS,EAAE,UAAU;KACtB;IACD;QACE,IAAI,EAAE,gBAAgB;QACtB,SAAS,EAAE,+CAA+C;QAC1D,SAAS,EAAE,UAAU;KACtB;IACD;QACE,IAAI,EAAE,qBAAqB;QAC3B,SAAS,EAAE,+CAA+C;QAC1D,SAAS,EAAE,UAAU;KACtB;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAsB;IAC7D,EAAE,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,SAAS,EAAE;IAClD;QACE,IAAI,EAAE,qBAAqB;QAC3B,SAAS,EAAE,sDAAsD;QACjE,SAAS,EAAE,YAAY;QACvB,UAAU,EAAE,SAAS;KACtB;IACD;QACE,IAAI,EAAE,sBAAsB;QAC5B,SAAS,EAAE,sDAAsD;QACjE,SAAS,EAAE,YAAY;QACvB,UAAU,EAAE,SAAS;KACtB;CACF,CAAC"}
+{"version":3,"file":"js-family.js","sourceRoot":"","sources":["../../../src/languages/definitions/js-family.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"kotlin.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/kotlin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD,eAAO,MAAM,UAAU,EAAE,kBA0HxB,CAAC"}
+{"version":3,"file":"kotlin.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/kotlin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAiBtD,eAAO,MAAM,UAAU,EAAE,kBAwGxB,CAAC"}