@lzehrung/codegraph 2.3.24 → 2.3.25

package/dist/languages/definitions/scss.js

@@ -1,14 +1,8 @@
 import { registerLanguage } from "../registry.js";
-const SCSS_SYMBOL_QUERY_PATTERNS = [
-    "(mixin_statement (name) @name)",
-    "(function_statement (name) @name)",
-    "(variable_declaration (variable) @name)",
-    "(class_selector (class_name) @name)",
-    "(id_selector (id_name) @name)",
-];
 export const SCSS_DEF = {
     id: "scss",
     extensions: [".scss"],
+    usesQueryDrivenLocals: true,
     structure: {
         blocks: [
             { type: "rule_set", captureId: "rule" },
@@ -23,33 +17,43 @@ export const SCSS_DEF = {
     graph: {
         imports: `
       (import_statement (string_value) @mod) @stmt
+      (import_statement (_ (string_value) @mod)) @stmt
       (use_statement (string_value) @mod) @stmt
+      (use_statement (_ (string_value) @mod)) @stmt
       (forward_statement (string_value) @mod) @stmt
+      (forward_statement (_ (string_value) @mod)) @stmt
     `,
         exports: `
-      (mixin_statement (name) @name)
-      (function_statement (name) @name)
-      (variable_declaration (variable) @name)
+      (stylesheet (mixin_statement name: (identifier) @name))
+      (stylesheet (function_statement name: (identifier) @name))
+      ((stylesheet (declaration (property_name) @name)) (#match? @name "^[$]"))
+      (stylesheet (rule_set (selectors (placeholder (identifier) @name))))
     `,
         locals: `
-      (mixin_statement (name) @name)
-      (function_statement (name) @name)
-      (variable_declaration (variable) @name)
+      (mixin_statement name: (identifier) @name)
+      (function_statement name: (identifier) @name)
+      ((declaration (property_name) @name) (#match? @name "^[$]"))
+      (placeholder (identifier) @name)
       (class_selector (class_name) @name)
       (id_selector (id_name) @name)
     `,
         importBindings: `
       (import_statement (string_value) @from) @stmt
+      (import_statement (_ (string_value) @from)) @stmt
       (use_statement (string_value) @from) @stmt
+      (use_statement (_ (string_value) @from)) @stmt
       (forward_statement (string_value) @from) @stmt
+      (forward_statement (_ (string_value) @from)) @stmt
     `,
     },
     nodeTypes: {
-        identifier: ["name", "variable", "class_name", "id_name"],
+        identifier: ["identifier", "variable", "class_name", "id_name", "property_name"],
     },
-    native: {
-        normalizeQuery: (_kind, query) => SCSS_SYMBOL_QUERY_PATTERNS.some((pattern) => query.includes(pattern)) ? "" : query,
-        notes: ["skips unsupported SCSS symbol queries in the native runtime"],
+    classifyDefinition: (node) => {
+        const parent = node.parent?.type;
+        if (parent === "mixin_statement" || parent === "function_statement")
+            return "function";
+        return "variable";
     },
 };
 registerLanguage(SCSS_DEF);

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

@@ -1 +1 @@
-{"version":3,"file":"scss.js","sourceRoot":"","sources":["../../../src/languages/definitions/scss.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,0BAA0B,GAAG;IACjC,gCAAgC;IAChC,mCAAmC;IACnC,yCAAyC;IACzC,qCAAqC;IACrC,+BAA+B;CACvB,CAAC;AAEX,MAAM,CAAC,MAAM,QAAQ,GAAuB;IAC1C,EAAE,EAAE,MAAM;IACV,UAAU,EAAE,CAAC,OAAO,CAAC;IACrB,SAAS,EAAE;QACT,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,oBAAoB,EAAE,SAAS,EAAE,UAAU,EAAE;YACrD,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,EAAE,iBAAiB,EAAE,oBAAoB,CAAC;QAClE,QAAQ,EAAE,CAAC,SAAS,EAAE,YAAY,CAAC;KACpC;IACD,KAAK,EAAE;QACL,OAAO,EAAE;;;;KAIR;QACD,OAAO,EAAE;;;;KAIR;QACD,MAAM,EAAE;;;;;;KAMP;QACD,cAAc,EAAE;;;;KAIf;KACF;IACD,SAAS,EAAE;QACT,UAAU,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,CAAC;KAC1D;IACD,MAAM,EAAE;QACN,cAAc,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAC/B,0BAA0B,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK;QACpF,KAAK,EAAE,CAAC,6DAA6D,CAAC;KACvE;CACF,CAAC;AACF,gBAAgB,CAAC,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"scss.js","sourceRoot":"","sources":["../../../src/languages/definitions/scss.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,CAAC;IACrB,qBAAqB,EAAE,IAAI;IAC3B,SAAS,EAAE;QACT,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,oBAAoB,EAAE,SAAS,EAAE,UAAU,EAAE;YACrD,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,EAAE,iBAAiB,EAAE,oBAAoB,CAAC;QAClE,QAAQ,EAAE,CAAC,SAAS,EAAE,YAAY,CAAC;KACpC;IACD,KAAK,EAAE;QACL,OAAO,EAAE;;;;;;;KAOR;QACD,OAAO,EAAE;;;;;KAKR;QACD,MAAM,EAAE;;;;;;;KAOP;QACD,cAAc,EAAE;;;;;;;KAOf;KACF;IACD,SAAS,EAAE;QACT,UAAU,EAAE,CAAC,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,eAAe,CAAC;KACjF;IACD,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC;QACjC,IAAI,MAAM,KAAK,iBAAiB,IAAI,MAAM,KAAK,oBAAoB;YAAE,OAAO,UAAU,CAAC;QACvF,OAAO,UAAU,CAAC;IACpB,CAAC;CACF,CAAC;AACF,gBAAgB,CAAC,QAAQ,CAAC,CAAC"}

package/dist/languages/definitions/sql.js

@@ -1,7 +1,7 @@
 import { registerLanguage } from "../registry.js";
 export const SQL_DEF = {
     id: "sql",
-    extensions: [".sql"],
+    extensions: [".sql", ".ddl", ".pgsql", ".mysql"],
     structure: {
         blocks: [
             { type: "statement", nameQuery: "(create_table)", captureId: "create" },

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

@@ -1 +1 @@
-{"version":3,"file":"sql.js","sourceRoot":"","sources":["../../../src/languages/definitions/sql.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,CAAC,MAAM,OAAO,GAAuB;IACzC,EAAE,EAAE,KAAK;IACT,UAAU,EAAE,CAAC,MAAM,CAAC;IACpB,SAAS,EAAE;QACT,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,QAAQ,EAAE;YACvE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE;YACtE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,4BAA4B,EAAE,SAAS,EAAE,QAAQ,EAAE;YACnF,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,QAAQ,EAAE;YACvE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,mBAAmB,EAAE,SAAS,EAAE,SAAS,EAAE;YAC3E,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,kBAAkB,EAAE,SAAS,EAAE,SAAS,EAAE;YAC1E,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS,EAAE,OAAO,EAAE;YACrE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE;YACnE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE;YAClE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE;YACnE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;YAChE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;YAChE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;YAChE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE;SAClE;QACD,WAAW,EAAE,EAAE;QACf,QAAQ,EAAE,CAAC,SAAS,CAAC;KACtB;IACD,KAAK,EAAE;QACL,OAAO,EAAE,mBAAmB;QAC5B,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,EAAE;QACV,cAAc,EAAE,EAAE;KACnB;IACD,0BAA0B,EAAE,KAAK;CAClC,CAAC;AAEF,gBAAgB,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"sql.js","sourceRoot":"","sources":["../../../src/languages/definitions/sql.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,CAAC,MAAM,OAAO,GAAuB;IACzC,EAAE,EAAE,KAAK;IACT,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC;IAChD,SAAS,EAAE;QACT,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,QAAQ,EAAE;YACvE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE;YACtE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,4BAA4B,EAAE,SAAS,EAAE,QAAQ,EAAE;YACnF,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,QAAQ,EAAE;YACvE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,mBAAmB,EAAE,SAAS,EAAE,SAAS,EAAE;YAC3E,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,kBAAkB,EAAE,SAAS,EAAE,SAAS,EAAE;YAC1E,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS,EAAE,OAAO,EAAE;YACrE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE;YACnE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE;YAClE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE;YACnE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;YAChE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;YAChE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;YAChE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE;SAClE;QACD,WAAW,EAAE,EAAE;QACf,QAAQ,EAAE,CAAC,SAAS,CAAC;KACtB;IACD,KAAK,EAAE;QACL,OAAO,EAAE,mBAAmB;QAC5B,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,EAAE;QACV,cAAc,EAAE,EAAE;KACnB;IACD,0BAA0B,EAAE,KAAK;CAClC,CAAC;AAEF,gBAAgB,CAAC,OAAO,CAAC,CAAC"}

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

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

package/dist/languages/definitions/swift.js

@@ -80,18 +80,45 @@ export const SWIFT_DEF = {
       (import_declaration (identifier) @mod) @stmt
     `,
         exports: `
-      (class_declaration declaration_kind: "class" name: (_) @name)
-      (class_declaration declaration_kind: "struct" name: (_) @name)
-      (class_declaration declaration_kind: "enum" name: (_) @name)
-      (class_declaration declaration_kind: "extension" name: (user_type (type_identifier) @name))
-      (class_declaration declaration_kind: "actor" name: (_) @name)
-      (enum_entry name: (simple_identifier) @name)
-      (protocol_declaration name: (type_identifier) @name)
-      (function_declaration name: (simple_identifier) @name)
-      (typealias_declaration name: (type_identifier) @name)
-      (property_declaration name: (pattern bound_identifier: (simple_identifier) @name))
-      (protocol_function_declaration name: (simple_identifier) @name)
-      (protocol_property_declaration name: (pattern bound_identifier: (simple_identifier) @name))
+      (source_file (class_declaration declaration_kind: "class" name: (_) @name))
+      (class_body (class_declaration declaration_kind: "class" name: (_) @name))
+      (enum_class_body (class_declaration declaration_kind: "class" name: (_) @name))
+      (source_file (class_declaration declaration_kind: "struct" name: (_) @name))
+      (class_body (class_declaration declaration_kind: "struct" name: (_) @name))
+      (enum_class_body (class_declaration declaration_kind: "struct" name: (_) @name))
+      (source_file (class_declaration declaration_kind: "enum" name: (_) @name))
+      (class_body (class_declaration declaration_kind: "enum" name: (_) @name))
+      (enum_class_body (class_declaration declaration_kind: "enum" name: (_) @name))
+      (source_file (class_declaration declaration_kind: "extension" name: (user_type (type_identifier) @name)))
+      (class_body (class_declaration declaration_kind: "extension" name: (user_type (type_identifier) @name)))
+      (enum_class_body (class_declaration declaration_kind: "extension" name: (user_type (type_identifier) @name)))
+      (source_file (class_declaration declaration_kind: "actor" name: (_) @name))
+      (class_body (class_declaration declaration_kind: "actor" name: (_) @name))
+      (enum_class_body (class_declaration declaration_kind: "actor" name: (_) @name))
+      (enum_class_body (enum_entry name: (simple_identifier) @name))
+      (source_file (protocol_declaration name: (type_identifier) @name))
+      (class_body (protocol_declaration name: (type_identifier) @name))
+      (enum_class_body (protocol_declaration name: (type_identifier) @name))
+      (source_file (function_declaration name: (simple_identifier) @name))
+      (class_body (function_declaration name: (simple_identifier) @name))
+      (enum_class_body (function_declaration name: (simple_identifier) @name))
+      (source_file (typealias_declaration name: (type_identifier) @name))
+      (class_body (typealias_declaration name: (type_identifier) @name))
+      (enum_class_body (typealias_declaration name: (type_identifier) @name))
+      (protocol_body (typealias_declaration name: (type_identifier) @name))
+      (source_file (property_declaration name: (pattern bound_identifier: (simple_identifier) @name)))
+      (class_body (property_declaration name: (pattern bound_identifier: (simple_identifier) @name)))
+      (enum_class_body (property_declaration name: (pattern bound_identifier: (simple_identifier) @name)))
+      (protocol_body (protocol_function_declaration name: (simple_identifier) @name))
+      (protocol_body (protocol_property_declaration name: (pattern bound_identifier: (simple_identifier) @name)))
+      (source_file (associatedtype_declaration name: (type_identifier) @name))
+      (protocol_body (associatedtype_declaration name: (type_identifier) @name))
+      (class_body (associatedtype_declaration name: (type_identifier) @name))
+      (enum_class_body (associatedtype_declaration name: (type_identifier) @name))
+      (source_file (macro_declaration (simple_identifier) @name))
+      (source_file (operator_declaration [(custom_operator) (simple_identifier) (bang)] @name))
+      (class_body (operator_declaration [(custom_operator) (simple_identifier) (bang)] @name))
+      (enum_class_body (operator_declaration [(custom_operator) (simple_identifier) (bang)] @name))
     `,
         locals: `
       (class_declaration declaration_kind: "class" name: (_) @name)
@@ -107,6 +134,9 @@ export const SWIFT_DEF = {
       (parameter name: (simple_identifier) @name)
       (protocol_function_declaration name: (simple_identifier) @name)
       (protocol_property_declaration name: (pattern bound_identifier: (simple_identifier) @name))
+      (associatedtype_declaration name: (type_identifier) @name)
+      (macro_declaration (simple_identifier) @name)
+      (operator_declaration [(custom_operator) (simple_identifier) (bang)] @name)
     `,
         importBindings: `
       (import_declaration (identifier) @from) @stmt
@@ -121,9 +151,13 @@ export const SWIFT_DEF = {
         const parent = node.parent;
         if (!parent)
             return "variable";
-        if (parent.type === "function_declaration")
-            return "function";
-        if (parent.type === "protocol_function_declaration")
+        if (parent.type === "function_declaration" ||
+            parent.type === "protocol_function_declaration" ||
+            parent.type === "init_declaration" ||
+            parent.type === "deinit_declaration" ||
+            parent.type === "subscript_declaration" ||
+            parent.type === "macro_declaration" ||
+            parent.type === "operator_declaration")
             return "function";
         if (parent.type === "class_declaration") {
             const declarationKind = parent.childForFieldName("declaration_kind")?.text;
@@ -135,7 +169,9 @@ export const SWIFT_DEF = {
         // (`extension Container { ... }` -> name: (user_type (type_identifier))).
         if (parent.type === "user_type" && parent.parent?.type === "class_declaration")
             return "class";
-        if (parent.type === "protocol_declaration" || parent.type === "typealias_declaration")
+        if (parent.type === "protocol_declaration" ||
+            parent.type === "typealias_declaration" ||
+            parent.type === "associatedtype_declaration")
             return "type";
         return "variable";
     },
@@ -157,6 +193,19 @@ export const SWIFT_DEF = {
             return true;
         if (parent.type === "typealias_declaration" && parent.childForFieldName("name")?.id === node.id)
             return true;
+        if (parent.type === "associatedtype_declaration" && parent.childForFieldName("name")?.id === node.id)
+            return true;
+        if (parent.type === "macro_declaration" && node.type === "simple_identifier")
+            return true;
+        if (parent.type === "operator_declaration" &&
+            (node.type === "custom_operator" || node.type === "simple_identifier" || node.type === "bang"))
+            return true;
+        if (parent.type === "init_declaration" && node.type === "init")
+            return true;
+        if (parent.type === "deinit_declaration" && node.type === "deinit")
+            return true;
+        if (parent.type === "subscript_declaration" && node.type === "subscript")
+            return true;
         if (parent.type === "parameter" && parent.childForFieldName("name")?.id === node.id)
             return true;
         if (parent.type === "protocol_function_declaration" && parent.childForFieldName("name")?.id === node.id)
@@ -181,6 +230,7 @@ export const SWIFT_DEF = {
         node.type === "catch_block" ||
         node.type === "willset_didset_block",
     supportsCrossModuleSymbols: true,
+    exportScopeBlockers: ["function_body", "lambda_literal"],
 };
 registerLanguage(SWIFT_DEF);
 //# sourceMappingURL=swift.js.map

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/typescript.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAkB,MAAM,aAAa,CAAC;AAwLtE,eAAO,MAAM,cAAc,EAAE,kBAa5B,CAAC;AAGF,eAAO,MAAM,OAAO,EAAE,kBAoBrB,CAAC"}
+{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/typescript.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAkB,MAAM,aAAa,CAAC;AA6MtE,eAAO,MAAM,cAAc,EAAE,kBAa5B,CAAC;AAGF,eAAO,MAAM,OAAO,EAAE,kBAoBrB,CAAC"}

package/dist/languages/definitions/typescript.js

@@ -40,7 +40,7 @@ const BASE_STRUCTURE = {
         },
         {
             type: "module",
-            nameQuery: "name: (identifier) @chunk.name body: (statement_block) @chunk.block.namespace",
+            nameQuery: "name: [ (identifier) (string) ] @chunk.name body: (statement_block) @chunk.block.namespace",
             captureId: "namespace",
         },
         // Data
@@ -68,19 +68,25 @@ const BASE_GRAPH = {
     exports: `
     (export_statement) @stmt
     (export_statement declaration: (function_declaration name: (identifier) @name)) @stmt
+    (export_statement declaration: (function_signature name: (identifier) @name)) @stmt
     (export_statement declaration: (generator_function_declaration name: (identifier) @name)) @stmt
     (export_statement declaration: (class_declaration name: (type_identifier) @name)) @stmt
     (export_statement declaration: (abstract_class_declaration name: (type_identifier) @name)) @stmt
     (export_statement declaration: (enum_declaration name: [ (identifier) (type_identifier) ] @name)) @stmt
+    (export_statement declaration: (internal_module name: (identifier) @name)) @stmt
+    (export_statement declaration: (module name: (identifier) @name)) @stmt
+    (export_statement declaration: (ambient_declaration (function_signature name: (identifier) @name))) @stmt
+    (export_statement declaration: (ambient_declaration (internal_module name: (identifier) @name))) @stmt
+    (export_statement declaration: (ambient_declaration (module name: (identifier) @name))) @stmt
     (export_statement declaration: (function_declaration) @anon_default) @stmt
     (export_statement declaration: (generator_function_declaration) @anon_default) @stmt
     (export_statement declaration: (class_declaration) @anon_default) @stmt
     (export_statement declaration: (abstract_class_declaration) @anon_default) @stmt
     (export_statement declaration: (lexical_declaration (variable_declarator name: (identifier) @name))) @stmt
-    (export_statement (export_clause (export_specifier name: (identifier) @src alias: (identifier) @alias)) (string) @from) @stmt
-    (export_statement (export_clause (export_specifier name: (identifier) @src !alias)) (string) @from) @stmt
-    (export_statement (export_clause (export_specifier name: (identifier) @src alias: (identifier) @alias))) @stmt
-    (export_statement (export_clause (export_specifier name: (identifier) @src !alias))) @stmt
+    (export_statement (export_clause (export_specifier "type"? @type_kw name: (identifier) @src alias: (identifier) @alias)) (string) @from) @stmt
+    (export_statement (export_clause (export_specifier "type"? @type_kw name: (identifier) @src !alias)) (string) @from) @stmt
+    (export_statement (export_clause (export_specifier "type"? @type_kw name: (identifier) @src alias: (identifier) @alias))) @stmt
+    (export_statement (export_clause (export_specifier "type"? @type_kw name: (identifier) @src !alias))) @stmt
     (export_statement (string) @from) @stmt
     (export_assignment (identifier) @ts_export_assign)
   `,
@@ -90,20 +96,23 @@ const BASE_GRAPH = {
     (method_definition name: (property_identifier) @name)
     (method_signature name: (property_identifier) @name)
     (abstract_method_signature name: (property_identifier) @name)
+    (function_signature name: (identifier) @name)
     (class_declaration name: (type_identifier) @name)
     (abstract_class_declaration name: (type_identifier) @name)
     (variable_declarator name: (identifier) @name)
     (interface_declaration name: (type_identifier) @name)
     (type_alias_declaration name: (type_identifier) @name)
     (enum_declaration name: [ (identifier) (type_identifier) ] @name)
+    (internal_module name: (identifier) @name)
+    (module name: (identifier) @name)
   `,
     importBindings: `
     (import_statement) @stmt
     (import_statement (string) @from) @stmt
     (import_statement (import_require_clause (identifier) @def (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 "type"? @type_kw name: (identifier) @iname alias: (identifier) @alias))) (string) @from) @stmt
+    (import_statement (import_clause (named_imports (import_specifier "type"? @type_kw name: (identifier) @iname !alias))) (string) @from) @stmt
     (import_statement (import_clause (namespace_import (identifier) @ns)) (string) @from) @stmt
   `,
 };
@@ -126,6 +135,8 @@ const BASE_HELPERS = {
             return "function";
         if (t === "abstract_method_signature")
             return "function";
+        if (t === "function_signature")
+            return "function";
         if (t === "class_declaration")
             return "class";
         if (t === "abstract_class_declaration")
@@ -134,7 +145,7 @@ const BASE_HELPERS = {
             return "interface";
         if (t === "type_alias_declaration")
             return "type";
-        if (t === "enum_declaration")
+        if (t === "enum_declaration" || t === "internal_module" || t === "module")
             return "type";
         return "variable";
     },
@@ -150,6 +161,9 @@ const BASE_HELPERS = {
                 "interface_declaration",
                 "type_alias_declaration",
                 "enum_declaration",
+                "function_signature",
+                "internal_module",
+                "module",
                 "import_specifier",
                 "namespace_import",
                 "import_clause",
@@ -161,7 +175,14 @@ const BASE_HELPERS = {
                 "abstract_method_signature",
             ].includes(p));
     },
-    createsBlockScope: (n) => n.type === "program" || n.type === "block" || n.type === "class_body",
+    // Scope construction has structural handling for the ordinary declaration forms. Ambient
+    // overload signatures and `namespace X {}` are not in it, so opt their name nodes in here;
+    // `isDeclarationName` already accepts both parents.
+    scopeDeclarationNames: (node) => {
+        const parent = node.parent?.type;
+        return parent === "function_signature" || parent === "internal_module" || parent === "module";
+    },
+    createsBlockScope: (n) => n.type === "program" || n.type === "block" || n.type === "class_body" || n.type === "class_static_block",
     createsFunctionScope: (n) => n.type === "generator_function_declaration" ||
         n.type === "function_declaration" ||
         n.type === "function" ||

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"zig.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/zig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAYtD,eAAO,MAAM,OAAO,EAAE,kBAwDrB,CAAC"}
+{"version":3,"file":"zig.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/zig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAatD,eAAO,MAAM,OAAO,EAAE,kBA2ErB,CAAC"}

package/dist/languages/definitions/zig.js

@@ -6,6 +6,7 @@ const ZIG_TYPE_INITIALIZER_TYPES = new Set([
     "union_declaration",
     "opaque_declaration",
     "error_set_declaration",
+    "error_union_type",
 ]);
 export const ZIG_DEF = {
     id: "zig",
@@ -17,13 +18,16 @@ export const ZIG_DEF = {
             { type: "test_declaration", nameQuery: "(string) @chunk.name", captureId: "test" },
         ],
         splitPoints: ["if_expression", "for_expression", "while_expression", "switch_expression"],
-        comments: ["line_comment", "doc_comment"],
+        comments: ["comment"],
     },
     graph: {
-        imports: '(builtin_function (builtin_identifier) @fn (arguments (string) @mod) (#eq? @fn "@import")) @stmt',
+        imports: `
+      (builtin_function (builtin_identifier) @fn (arguments (string) @mod) (#eq? @fn "@import")) @stmt
+      (builtin_function (builtin_identifier) @mod (arguments) (#eq? @mod "@cImport")) @stmt
+    `,
         exports: `
-      (function_declaration name: (identifier) @name)
-      (variable_declaration (identifier) @name)
+      (source_file (function_declaration name: (identifier) @name))
+      (source_file (variable_declaration (identifier) @name))
     `,
         locals: `
       (function_declaration name: (identifier) @name)
@@ -35,6 +39,13 @@ export const ZIG_DEF = {
         (identifier) @alias
         (builtin_function (builtin_identifier) @fn (arguments (string) @from) (#eq? @fn "@import"))
       ) @stmt
+      (variable_declaration
+        (identifier) @alias
+        (builtin_function (builtin_identifier) @from (arguments) (#eq? @from "@cImport"))
+      ) @stmt
+      (using_namespace_declaration
+        (builtin_function (builtin_identifier) @fn (arguments (string) @from) (#eq? @fn "@import"))
+      ) @stmt @wild
     `,
     },
     nodeTypes: {
@@ -53,7 +64,17 @@ export const ZIG_DEF = {
         const declaredName = parent.namedChildren.find((child) => child.type === "identifier");
         if (declaredName?.id !== node.id)
             return "variable";
-        const initializer = parent.namedChildren.find((child) => child.id !== node.id);
+        let equalsEndIndex = -1;
+        for (let index = 0;; index++) {
+            const child = parent.child(index);
+            if (!child)
+                break;
+            if (child.type === "=") {
+                equalsEndIndex = child.endIndex;
+                break;
+            }
+        }
+        const initializer = parent.namedChildren.find((child) => child.startIndex >= equalsEndIndex);
         if (initializer && ZIG_TYPE_INITIALIZER_TYPES.has(initializer.type))
             return "type";
         return "variable";

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

@@ -1 +1 @@
-{"version":3,"file":"zig.js","sourceRoot":"","sources":["../../../src/languages/definitions/zig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC;IACzC,cAAc;IACd,oBAAoB;IACpB,kBAAkB;IAClB,mBAAmB;IACnB,oBAAoB;IACpB,uBAAuB;CACxB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,OAAO,GAAuB;IACzC,EAAE,EAAE,KAAK;IACT,UAAU,EAAE,CAAC,MAAM,CAAC;IACpB,qBAAqB,EAAE,IAAI;IAC3B,SAAS,EAAE;QACT,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,sBAAsB,EAAE,SAAS,EAAE,gCAAgC,EAAE,SAAS,EAAE,UAAU,EAAE;YACpG,EAAE,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,EAAE;SACnF;QACD,WAAW,EAAE,CAAC,eAAe,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,mBAAmB,CAAC;QACzF,QAAQ,EAAE,CAAC,cAAc,EAAE,aAAa,CAAC;KAC1C;IACD,KAAK,EAAE;QACL,OAAO,EAAE,kGAAkG;QAC3G,OAAO,EAAE;;;KAGR;QACD,MAAM,EAAE;;;;KAIP;QACD,cAAc,EAAE;;;;;KAKf;KACF;IACD,SAAS,EAAE;QACT,UAAU,EAAE,CAAC,YAAY,CAAC;QAC1B,gBAAgB,EAAE,kBAAkB;KACrC;IACD,0BAA0B,EAAE,IAAI;IAChC,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,sBAAsB;YAAE,OAAO,UAAU,CAAC;QAC9D,IAAI,MAAM,CAAC,IAAI,KAAK,sBAAsB;YAAE,OAAO,UAAU,CAAC;QAE9D,MAAM,YAAY,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;QACvF,IAAI,YAAY,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,UAAU,CAAC;QAEpD,MAAM,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/E,IAAI,WAAW,IAAI,0BAA0B,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC;YAAE,OAAO,MAAM,CAAC;QACnF,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAsB;IACpE,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO;IAClD,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAC1B,IAAI,MAAM,CAAC,IAAI,KAAK,sBAAsB,IAAI,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QAC5G,OAAO,MAAM,CAAC,IAAI,KAAK,sBAAsB,CAAC;IAChD,CAAC;CACF,CAAC;AAEF,gBAAgB,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"zig.js","sourceRoot":"","sources":["../../../src/languages/definitions/zig.ts"],"names":[],"mappings":"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"}

package/dist/languages/import-statement-parsers.d.ts

@@ -8,11 +8,24 @@ export type ParsedRustImportStatement = {
     from: string;
     local: string;
     isExternCrate: boolean;
+    pathAttribute?: string;
 } | {
     kind: "star";
     from: string;
 };
-export declare function parseRustImportStatement(stmtText: string): ParsedRustImportStatement | null;
+export declare function skipRustCommentOrLiteral(source: string, index: number): {
+    end: number;
+    kind: "comment" | "literal";
+} | null;
+export declare function skipRustBalancedDelimiters(source: string, index: number, closer: string): number;
+export declare function isRustItemStartBoundary(source: string, index: number): boolean;
+export declare function skipRustOuterAttribute(source: string, index: number): number | null;
+export declare function skipRustAttribute(source: string, index: number): number | null;
+export declare function skipRustMacroTokenTree(source: string, index: number): {
+    end: number;
+} | null;
+export declare function skipRustCommentsAndWhitespaceBackward(source: string, index: number): number;
+export declare function parseRustImportStatements(stmtText: string): ParsedRustImportStatement[];
 export type ParsedCsharpUsingDirective = {
     from: string;
     alias?: string;

package/dist/languages/import-statement-parsers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-statement-parsers.d.ts","sourceRoot":"","sources":["../../src/languages/import-statement-parsers.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,yBAAyB,GACjC;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,OAAO,CAAC;CACxB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AASN,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,yBAAyB,GAAG,IAAI,CA2D3F;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAChC;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,aAAa,CAAC;CAC3B,CAAC;AAEN,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,UAAU,GAAG,OAAO,CAAC;AA8E3D,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,wBAAwB,EAAE,CA+BvG;AAgJD,eAAO,MAAM,yBAAyB,QAA4E,CAAC;AAKnH,MAAM,MAAM,2BAA2B,GACnC;IACE,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEN,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,2BAA2B,GAAG,IAAI,CAoB/F;AAED,eAAO,MAAM,uBAAuB,QAAwE,CAAC;AAmB7G,MAAM,MAAM,yBAAyB,GACjC;IACE,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CACnB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEN,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,yBAAyB,GAAG,IAAI,CAsB3F;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,0BAA0B,GAAG,IAAI,CA0B7F"}
+{"version":3,"file":"import-statement-parsers.d.ts","sourceRoot":"","sources":["../../src/languages/import-statement-parsers.ts"],"names":[],"mappings":"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"}