@lzehrung/codegraph 2.3.24 → 2.3.25

package/dist/languages/definitions/csharp.js

@@ -3,7 +3,7 @@ import { CSHARP_IDENTIFIER_FORMAT_SOURCE, hasNonAsciiCodePoint } from "../../uti
 const CSHARP_IDENTIFIER_FORMAT_PATTERN = new RegExp(`[${CSHARP_IDENTIFIER_FORMAT_SOURCE}]`, "gu");
 export const CSHARP_DEF = {
     id: "csharp",
-    extensions: [".cs"],
+    extensions: [".cs", ".csx"],
     usesQueryDrivenLocals: true,
     structure: {
         blocks: [
@@ -12,6 +12,11 @@ export const CSHARP_DEF = {
                 nameQuery: "name: (identifier) @chunk.name",
                 captureId: "class",
             },
+            {
+                type: "struct_declaration",
+                nameQuery: "name: (identifier) @chunk.name",
+                captureId: "struct",
+            },
             {
                 type: "record_declaration",
                 nameQuery: "name: (identifier) @chunk.name",
@@ -37,6 +42,11 @@ export const CSHARP_DEF = {
                 nameQuery: "name: (identifier) @chunk.name",
                 captureId: "namespace",
             },
+            {
+                type: "file_scoped_namespace_declaration",
+                nameQuery: "name: (identifier) @chunk.name",
+                captureId: "namespace",
+            },
         ],
         splitPoints: [
             "if_statement",
@@ -50,30 +60,41 @@ export const CSHARP_DEF = {
     },
     graph: {
         imports: `
-      (using_directive . (_) @mod) @stmt
+      (using_directive !name (_) @mod) @stmt
+      (using_directive name: (identifier) (_) @mod) @stmt
+      (extern_alias_directive name: (identifier) @mod) @stmt
     `,
         exports: `
       (class_declaration name: (identifier) @name)
       (record_declaration name: (identifier) @name)
+      (struct_declaration name: (identifier) @name)
       (interface_declaration name: (identifier) @name)
       (enum_declaration name: (identifier) @name)
       (enum_member_declaration name: (identifier) @name)
       (method_declaration name: (identifier) @name)
+      (delegate_declaration name: (identifier) @name)
       (property_declaration name: (identifier) @name)
+      (field_declaration (variable_declaration (variable_declarator name: (identifier) @name)))
+      (event_field_declaration (variable_declaration (variable_declarator name: (identifier) @name)))
     `,
         locals: `
       (class_declaration name: (identifier) @name)
       (record_declaration name: (identifier) @name)
+      (struct_declaration name: (identifier) @name)
       (interface_declaration name: (identifier) @name)
       (enum_declaration name: (identifier) @name)
       (enum_member_declaration name: (identifier) @name)
       (method_declaration name: (identifier) @name)
-      (variable_declarator (identifier) @name)
+      (delegate_declaration name: (identifier) @name)
+      (local_function_statement name: (identifier) @name)
+      (property_declaration name: (identifier) @name)
+      (variable_declarator name: (identifier) @name)
       (declaration_pattern name: (identifier) @name)
     `,
         importBindings: `
-      (using_directive name: (identifier) @alias . (_) @from) @stmt
-      (using_directive . (_) @from) @stmt
+      (using_directive name: (identifier) @alias (_) @from) @stmt
+      (using_directive !name (_) @from) @stmt
+      (extern_alias_directive name: (identifier) @alias) @stmt
     `,
     },
     nodeTypes: {
@@ -85,35 +106,45 @@ export const CSHARP_DEF = {
         const parent = node.parent;
         if (!parent)
             return "variable";
-        if (parent.type === "method_declaration" || parent.type === "constructor_declaration")
+        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")
+        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")
+        if (parent.type === "enum_declaration" || parent.type === "delegate_declaration")
             return "type";
         return "variable";
     },
-    createsFunctionScope: (node) => node.type === "method_declaration" || node.type === "constructor_declaration",
+    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.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 === "enum_declaration" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        if (p.type === "enum_member_declaration" && p.childForFieldName("name")?.id === node.id)
-            return true;
-        if (p.type === "method_declaration" && p.childForFieldName("name")?.id === node.id)
+        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.child(0)?.id === node.id)
+        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;

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/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,kBAkGpB,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;AAGtD,eAAO,MAAM,MAAM,EAAE,kBAoGpB,CAAC"}

package/dist/languages/definitions/go.js

@@ -37,9 +37,9 @@ export const GO_DEF = {
         exports: `
       (function_declaration name: (identifier) @name)
       (method_declaration name: (field_identifier) @name)
-      (type_spec name: (type_identifier) @name)
-      (const_spec name: (identifier) @name)
-      (var_spec name: (identifier) @name)
+      (source_file (type_declaration (type_spec name: (type_identifier) @name)))
+      (source_file (const_declaration (const_spec (identifier) @name)))
+      (source_file (var_declaration (var_spec (identifier) @name)))
     `,
         locals: `
       (function_declaration name: (identifier) @name)
@@ -47,9 +47,10 @@ export const GO_DEF = {
       (type_spec name: (type_identifier) @name)
       (parameter_declaration name: (identifier) @name)
       (variadic_parameter_declaration name: (identifier) @name)
+      (type_parameter_declaration name: (identifier) @name)
       (short_var_declaration left: (expression_list (identifier) @name))
-      (var_spec name: (identifier) @name)
-      (const_spec name: (identifier) @name)
+      (var_spec (identifier) @name)
+      (const_spec (identifier) @name)
       (type_spec type: (struct_type (field_declaration_list (field_declaration name: (field_identifier) @name))))
       (range_clause left: (expression_list (identifier) @name) (#not-eq? @name "_"))
     `,
@@ -71,6 +72,8 @@ export const GO_DEF = {
             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",
@@ -86,9 +89,9 @@ export const GO_DEF = {
             return true;
         if (p.type === "type_spec" && p.childForFieldName("name")?.id === node.id)
             return true;
-        if (p.type === "var_spec" && p.childForFieldName("name")?.id === node.id)
+        if ((p.type === "var_spec" || p.type === "const_spec") && node.type === "identifier")
             return true;
-        if (p.type === "const_spec" && p.childForFieldName("name")?.id === node.id)
+        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";

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-stub.d.ts

@@ -1,15 +1,14 @@
 import type { LanguageDefinition } from "../types.js";
 /**
- * Builds a graph-first markup language definition backed by an HTML parser stub.
+ * Builds a registry placeholder for graph-only markup languages.
  *
  * Languages like AsciiDoc, Astro, Handlebars, reStructuredText, MDX, and
- * Markdown have no dedicated tree-sitter grammar wired up yet, so they borrow
- * `tree-sitter-html` purely as a permissive parser and expose empty
- * structure/graph/nodeTypes (no structural or graph extraction).
+ * Markdown register here so they have a language id and extensions. Native
+ * extraction is skipped entirely: the addon has no grammar mapping for these
+ * ids. Dependency extraction lives in `src/document-links.ts`.
  *
- * Use this for any new markup language that should register and parse without
- * (yet) participating in symbol or dependency extraction. Once a language gains
- * real queries, give it its own definition instead of this factory.
+ * Once a language gains real native queries, give it its own definition
+ * instead of this factory.
  *
  * @param id Stable language id, also used as the registry key.
  * @param extensions File extensions to associate, e.g. `[".md"]`.

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

@@ -1 +1 @@
-{"version":3,"file":"html-stub.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/html-stub.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAmBrF"}
+{"version":3,"file":"html-stub.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/html-stub.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAmBrF"}

package/dist/languages/definitions/html-stub.js

@@ -1,14 +1,13 @@
 /**
- * Builds a graph-first markup language definition backed by an HTML parser stub.
+ * Builds a registry placeholder for graph-only markup languages.
  *
  * Languages like AsciiDoc, Astro, Handlebars, reStructuredText, MDX, and
- * Markdown have no dedicated tree-sitter grammar wired up yet, so they borrow
- * `tree-sitter-html` purely as a permissive parser and expose empty
- * structure/graph/nodeTypes (no structural or graph extraction).
+ * Markdown register here so they have a language id and extensions. Native
+ * extraction is skipped entirely: the addon has no grammar mapping for these
+ * ids. Dependency extraction lives in `src/document-links.ts`.
  *
- * Use this for any new markup language that should register and parse without
- * (yet) participating in symbol or dependency extraction. Once a language gains
- * real queries, give it its own definition instead of this factory.
+ * Once a language gains real native queries, give it its own definition
+ * instead of this factory.
  *
  * @param id Stable language id, also used as the registry key.
  * @param extensions File extensions to associate, e.g. `[".md"]`.

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

@@ -1 +1 @@
-{"version":3,"file":"html-stub.js","sourceRoot":"","sources":["../../../src/languages/definitions/html-stub.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,gBAAgB,CAAC,EAAU,EAAE,UAAoB;IAC/D,OAAO;QACL,EAAE;QACF,UAAU;QACV,SAAS,EAAE;YACT,MAAM,EAAE,EAAE;YACV,WAAW,EAAE,EAAE;YACf,QAAQ,EAAE,EAAE;SACb;QACD,KAAK,EAAE;YACL,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,EAAE;YACV,cAAc,EAAE,EAAE;SACnB;QACD,SAAS,EAAE;YACT,UAAU,EAAE,EAAE;SACf;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"html-stub.js","sourceRoot":"","sources":["../../../src/languages/definitions/html-stub.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,gBAAgB,CAAC,EAAU,EAAE,UAAoB;IAC/D,OAAO;QACL,EAAE;QACF,UAAU;QACV,SAAS,EAAE;YACT,MAAM,EAAE,EAAE;YACV,WAAW,EAAE,EAAE;YACf,QAAQ,EAAE,EAAE;SACb;QACD,KAAK,EAAE;YACL,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,EAAE;YACV,cAAc,EAAE,EAAE;SACnB;QACD,SAAS,EAAE;YACT,UAAU,EAAE,EAAE;SACf;KACF,CAAC;AACJ,CAAC"}

package/dist/languages/definitions/html.js

@@ -1,12 +1,12 @@
 import { registerLanguage } from "../registry.js";
 export const HTML_DEF = {
     id: "html",
-    extensions: [".html", ".htm"],
+    extensions: [".html", ".htm", ".xhtml"],
     structure: {
         blocks: [
             {
                 type: "element",
-                nameQuery: `(start_tag (attribute (attribute_name) @attr (#eq? @attr "id") (quoted_attribute_value (attribute_value) @chunk.name)))`,
+                nameQuery: `(start_tag (attribute (attribute_name) @attr (#match? @attr "^(?i)id$") (quoted_attribute_value (attribute_value) @chunk.name)))`,
                 captureId: "element",
             },
             { type: "script_element", captureId: "script" },
@@ -17,22 +17,22 @@ export const HTML_DEF = {
     },
     graph: {
         imports: `
-      (script_element (start_tag (attribute (attribute_name) @attr (#eq? @attr "src") (quoted_attribute_value (attribute_value) @mod)))) @stmt
-      (element (start_tag (tag_name) @tag (attribute (attribute_name) @attr (#eq? @attr "href") (quoted_attribute_value (attribute_value) @mod)))) @stmt (#match? @tag "^(link|a)$")
-      (element (self_closing_tag (tag_name) @tag (attribute (attribute_name) @attr (#eq? @attr "href") (quoted_attribute_value (attribute_value) @mod)))) @stmt (#match? @tag "^(link|a)$")
-      (element (start_tag (tag_name) @tag (attribute (attribute_name) @attr (#eq? @attr "src") (quoted_attribute_value (attribute_value) @mod)))) @stmt (#eq? @tag "img")
-      (element (self_closing_tag (tag_name) @tag (attribute (attribute_name) @attr (#eq? @attr "src") (quoted_attribute_value (attribute_value) @mod)))) @stmt (#eq? @tag "img")
+      (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$"))
     `,
         exports: "",
         locals: `
-      (attribute (attribute_name) @attr (#eq? @attr "id") (quoted_attribute_value (attribute_value) @name))
+      (attribute (attribute_name) @attr (#match? @attr "^(?i)id$") (quoted_attribute_value (attribute_value) @name))
     `,
         importBindings: `
-      (script_element (start_tag (attribute (attribute_name) @attr (#eq? @attr "src") (quoted_attribute_value (attribute_value) @from)))) @stmt
-      (element (start_tag (tag_name) @tag (attribute (attribute_name) @attr (#eq? @attr "href") (quoted_attribute_value (attribute_value) @from)))) @stmt (#match? @tag "^(link|a)$")
-      (element (self_closing_tag (tag_name) @tag (attribute (attribute_name) @attr (#eq? @attr "href") (quoted_attribute_value (attribute_value) @from)))) @stmt (#match? @tag "^(link|a)$")
-      (element (start_tag (tag_name) @tag (attribute (attribute_name) @attr (#eq? @attr "src") (quoted_attribute_value (attribute_value) @from)))) @stmt (#eq? @tag "img")
-      (element (self_closing_tag (tag_name) @tag (attribute (attribute_name) @attr (#eq? @attr "src") (quoted_attribute_value (attribute_value) @from)))) @stmt (#eq? @tag "img")
+      (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$"))
     `,
     },
     nodeTypes: {

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,CAAC;IAC7B,SAAS,EAAE;QACT,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,SAAS,EAAE,yHAAyH;gBACpI,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,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"}

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,kBAyGtB,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;AAMtD,eAAO,MAAM,QAAQ,EAAE,kBA8GtB,CAAC"}

package/dist/languages/definitions/java.js

@@ -69,6 +69,9 @@ export const JAVA_DEF = {
       (enum_constant name: (identifier) @name)
       (method_declaration name: (identifier) @name)
       (variable_declarator name: (identifier) @name)
+      (formal_parameter name: (identifier) @name)
+      (spread_parameter (variable_declarator name: (identifier) @name))
+      (receiver_parameter (identifier) @name)
     `,
         importBindings: `
       (import_declaration . (_) @from) @stmt
@@ -79,6 +82,7 @@ export const JAVA_DEF = {
         memberExpression: "field_access",
     },
     supportsCrossModuleSymbols: true,
+    exportScopeBlockers: ["block", "constructor_body"],
     classifyDefinition: (node) => {
         const parent = node.parent;
         if (!parent)
@@ -117,6 +121,8 @@ export const JAVA_DEF = {
             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;
     },
     normalizeIdentifier: (name) => hasNonAsciiCodePoint(name, true) ? name.replace(JAVA_IDENTIFIER_IGNORABLE_PATTERN, "") : name,

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,kBAwJ5B,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;AAwBtD,eAAO,MAAM,cAAc,EAAE,kBA0K5B,CAAC"}

package/dist/languages/definitions/javascript.js

@@ -2,17 +2,17 @@ import { registerLanguage } from "../registry.js";
 import { ECMASCRIPT_CONTROL_SPLIT_POINTS, ECMASCRIPT_CORE_FUNCTION_BLOCKS, ECMASCRIPT_MODULE_VAR_BLOCKS, } from "./js-family.js";
 const JS_OBJECT_METHOD_EXPORT_PATTERN = `
       ;; CJS: module.exports = { helper () {} }
-      (expression_statement (assignment_expression
+      ((expression_statement (assignment_expression
         left: (member_expression object: (identifier) @mod property: (property_identifier) @prop)
         right: (object (pair key: (property_identifier) @cjs_export_name value: (function_declaration) @cjs_fn))))
-        (#eq? @mod "module") (#eq? @prop "exports")
+        (#eq? @mod "module") (#eq? @prop "exports"))
 `;
 const JS_OBJECT_METHOD_EXPORT_NATIVE_PATTERN = `
       ;; CJS: module.exports = { helper () {} }
-      (expression_statement (assignment_expression
+      ((expression_statement (assignment_expression
         left: (member_expression object: (identifier) @mod property: (property_identifier) @prop)
         right: (object (method_definition name: (property_identifier) @cjs_export_name) @cjs_fn)))
-        (#eq? @mod "module") (#eq? @prop "exports")
+        (#eq? @mod "module") (#eq? @prop "exports"))
 `;
 export const JAVASCRIPT_DEF = {
     id: "js",
@@ -45,58 +45,63 @@ export const JAVASCRIPT_DEF = {
       (export_statement (export_clause (export_specifier name: (identifier) @src alias: (identifier) @alias)))
       (export_statement (export_clause (export_specifier name: (identifier) @src !alias)))
       (export_statement (string) @from)
-      (expression_statement (assignment_expression
+      ;; CJS whole-module export: module.exports = function () {} / = () => {}
+      ((expression_statement (assignment_expression
+        left: (member_expression object: (identifier) @mod property: (property_identifier) @cjs_export_name)
+        right: [ (function) (arrow_function) ] @cjs_fn))
+        (#eq? @mod "module") (#eq? @cjs_export_name "exports"))
+      ((expression_statement (assignment_expression
         left: (member_expression object: (identifier) @mod property: (property_identifier) @prop)
         right: (object (shorthand_property_identifier) @cjs_shorthand)))
-        (#eq? @mod "module") (#eq? @prop "exports")
+        (#eq? @mod "module") (#eq? @prop "exports"))
       ;; CJS spread export: module.exports = { ...base }
       ((expression_statement (assignment_expression
         left: (member_expression object: (identifier) @mod property: (property_identifier) @prop)
         right: (object (spread_element (identifier) @cjs_spread))) @stmt)
         (#eq? @mod "module") (#eq? @prop "exports"))
-      (expression_statement (assignment_expression
+      ((expression_statement (assignment_expression
         left: (member_expression object: (identifier) @mod property: (property_identifier) @prop)
         right: (object (pair key: (property_identifier) @cjs_export_name value: (identifier) @cjs_local))))
-        (#eq? @mod "module") (#eq? @prop "exports")
-      (expression_statement (assignment_expression
+        (#eq? @mod "module") (#eq? @prop "exports"))
+      ((expression_statement (assignment_expression
         left: (member_expression object: (member_expression object: (identifier) @mod property: (property_identifier) @prop) property: (property_identifier) @cjs_export_name)
         right: (identifier) @cjs_local))
-        (#eq? @mod "module") (#eq? @prop "exports")
-      (expression_statement (assignment_expression
+        (#eq? @mod "module") (#eq? @prop "exports"))
+      ((expression_statement (assignment_expression
         left: (member_expression object: (identifier) @exp property: (property_identifier) @cjs_export_name)
         right: (identifier) @cjs_local))
-        (#eq? @exp "exports")
+        (#eq? @exp "exports"))
       ;; CJS function/arrow direct exports
-      (expression_statement (assignment_expression
+      ((expression_statement (assignment_expression
         left: (member_expression object: (member_expression object: (identifier) @mod property: (property_identifier) @prop) property: (property_identifier) @cjs_export_name)
         right: (function) @cjs_fn))
-        (#eq? @mod "module") (#eq? @prop "exports")
-      (expression_statement (assignment_expression
+        (#eq? @mod "module") (#eq? @prop "exports"))
+      ((expression_statement (assignment_expression
         left: (member_expression object: (member_expression object: (identifier) @mod property: (property_identifier) @prop) property: (property_identifier) @cjs_export_name)
         right: (arrow_function) @cjs_fn))
-        (#eq? @mod "module") (#eq? @prop "exports")
-      (expression_statement (assignment_expression
+        (#eq? @mod "module") (#eq? @prop "exports"))
+      ((expression_statement (assignment_expression
         left: (member_expression object: (identifier) @exp property: (property_identifier) @cjs_export_name)
         right: (function) @cjs_fn))
-        (#eq? @exp "exports")
-      (expression_statement (assignment_expression
+        (#eq? @exp "exports"))
+      ((expression_statement (assignment_expression
         left: (member_expression object: (identifier) @exp property: (property_identifier) @cjs_export_name)
         right: (arrow_function) @cjs_fn))
-        (#eq? @exp "exports")
+        (#eq? @exp "exports"))
       ;; CJS object export with function value
-      (expression_statement (assignment_expression
+      ((expression_statement (assignment_expression
         left: (member_expression object: (identifier) @mod property: (property_identifier) @prop)
         right: (object (pair key: (property_identifier) @cjs_export_name value: (function) @cjs_fn))))
-        (#eq? @mod "module") (#eq? @prop "exports")
-      (expression_statement (assignment_expression
+        (#eq? @mod "module") (#eq? @prop "exports"))
+      ((expression_statement (assignment_expression
         left: (member_expression object: (identifier) @mod property: (property_identifier) @prop)
         right: (object (pair key: (property_identifier) @cjs_export_name value: (arrow_function) @cjs_fn))))
-        (#eq? @mod "module") (#eq? @prop "exports")
+        (#eq? @mod "module") (#eq? @prop "exports"))
       ;; CJS: module.exports = { helper () {} }
-      (expression_statement (assignment_expression
+      ((expression_statement (assignment_expression
         left: (member_expression object: (identifier) @mod property: (property_identifier) @prop)
         right: (object (pair key: (property_identifier) @cjs_export_name value: (function_declaration) @cjs_fn))))
-        (#eq? @mod "module") (#eq? @prop "exports")
+        (#eq? @mod "module") (#eq? @prop "exports"))
     `,
         locals: `
       (function_declaration name: (identifier) @name)
@@ -110,10 +115,12 @@ export const JAVASCRIPT_DEF = {
       (import_statement (string) @from) @stmt
       (import_statement (import_clause (identifier) @def) (string) @from) @stmt
       (import_statement (import_clause (named_imports (import_specifier name: (identifier) @iname alias: (identifier) @alias))) (string) @from) @stmt
-      (import_statement (import_clause (named_imports (import_specifier name: (identifier) @iname))) (string) @from) @stmt
+      (import_statement (import_clause (named_imports (import_specifier name: (identifier) @iname !alias))) (string) @from) @stmt
       (import_statement (import_clause (namespace_import (identifier) @ns)) (string) @from) @stmt
-      (lexical_declaration (variable_declarator name:(identifier) @def value: (call_expression (identifier) @req arguments: (arguments (string) @from)))) (#eq? @req "require")
-      (lexical_declaration (variable_declarator (object_pattern) @pattern value: (call_expression (identifier) @req arguments: (arguments (string) @from)))) (#eq? @req "require")
+      ((lexical_declaration (variable_declarator name:(identifier) @def value: (call_expression (identifier) @req arguments: (arguments (string) @from))))
+        (#eq? @req "require"))
+      ((lexical_declaration (variable_declarator (object_pattern) @pattern value: (call_expression (identifier) @req arguments: (arguments (string) @from))))
+        (#eq? @req "require"))
     `,
     },
     nodeTypes: {
@@ -130,6 +137,8 @@ export const JAVASCRIPT_DEF = {
             return "function";
         if (t === "method_definition")
             return "function";
+        if (t === "function" || t === "function_expression")
+            return "function";
         if (t === "class_declaration")
             return "class";
         return "variable";
@@ -148,9 +157,18 @@ export const JAVASCRIPT_DEF = {
                 // 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));
     },
-    createsBlockScope: (n) => n.type === "program" || n.type === "block" || n.type === "class_body",
+    // 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" ||

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":"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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;AAuBtD,eAAO,MAAM,UAAU,EAAE,kBAqHxB,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;AAEtD,eAAO,MAAM,UAAU,EAAE,kBA0HxB,CAAC"}