@lzehrung/codegraph 2.3.23 → 2.3.25

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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"}

package/dist/languages/import-statement-parsers.js

@@ -1,66 +1,494 @@
 import path from "node:path";
 import { CSHARP_IDENTIFIER_SOURCE, JAVA_IDENTIFIER_SOURCE, KOTLIN_IDENTIFIER_SOURCE, PHP_IDENTIFIER_SOURCE, XID_IDENTIFIER_SOURCE, } from "../util/identifiers.js";
 import { isAbsoluteFilePath, normalizePath } from "../util/paths.js";
-const RUST_MODULE_PATTERN = new RegExp(String.raw `^mod\s+(${XID_IDENTIFIER_SOURCE})\s*;?$`, "u");
+const RUST_MODULE_PATTERN = new RegExp(String.raw `^(?:pub(?:\s*\([^)]*\))?\s+)?mod\s+(${XID_IDENTIFIER_SOURCE})\s*;?$`, "u");
 const RUST_EXTERN_CRATE_PATTERN = new RegExp(String.raw `^extern\s+crate\s+(${XID_IDENTIFIER_SOURCE})(?:\s+as\s+(${XID_IDENTIFIER_SOURCE}))?\s*;?$`, "u");
-const RUST_USE_ALIAS_PATTERN = new RegExp(String.raw `^(.*?)\s+as\s+(${XID_IDENTIFIER_SOURCE})$`, "u");
-export function parseRustImportStatement(stmtText) {
-    const trimmed = stmtText.trim();
-    // Rust identifiers permit Unicode XID_Start/XID_Continue, not just ASCII.
-    const modMatch = trimmed.match(RUST_MODULE_PATTERN);
+const RUST_IDENTIFIER_PATTERN = new RegExp(String.raw `^${XID_IDENTIFIER_SOURCE}$`, "u");
+const RUST_IDENTIFIER_PREFIX_PATTERN = new RegExp(String.raw `^${XID_IDENTIFIER_SOURCE}`, "u");
+const RUST_PATH_ATTRIBUTE_PATTERN = /#\s*\[\s*path\s*=\s*(?:r(#*)"([\s\S]*?)"\1|"([^"]*)")\s*\]/gu;
+const RUST_USE_PATTERN = /^(?:pub(?:\s*\([^)]*\))?\s+)?use\s+([\s\S]+?)\s*;?$/;
+export function skipRustCommentOrLiteral(source, index) {
+    const ch = source[index];
+    const next = source[index + 1];
+    if (ch === "/" && next === "/") {
+        let end = index + 2;
+        while (end < source.length && source[end] !== "\n" && source[end] !== "\r")
+            end += 1;
+        return { end, kind: "comment" };
+    }
+    if (ch === "/" && next === "*") {
+        let end = index + 2;
+        let depth = 1;
+        while (end < source.length && depth > 0) {
+            const current = source[end];
+            const following = source[end + 1];
+            if (current === "/" && following === "*") {
+                depth += 1;
+                end += 2;
+                continue;
+            }
+            if (current === "*" && following === "/") {
+                depth -= 1;
+                end += 2;
+                continue;
+            }
+            end += 1;
+        }
+        return { end, kind: "comment" };
+    }
+    let rawIndex = index;
+    if (ch === "b" || ch === "c")
+        rawIndex += 1;
+    if (source[rawIndex] === "r") {
+        let hashes = 0;
+        let cursor = rawIndex + 1;
+        while (source[cursor] === "#") {
+            hashes += 1;
+            cursor += 1;
+        }
+        if (source[cursor] === '"') {
+            return { end: skipRustRawString(source, cursor, hashes), kind: "literal" };
+        }
+    }
+    if (ch === "b" && next === '"') {
+        return { end: skipRustQuotedString(source, index + 1), kind: "literal" };
+    }
+    if (ch === '"') {
+        return { end: skipRustQuotedString(source, index), kind: "literal" };
+    }
+    if (ch === "'") {
+        const charEnd = skipRustCharLiteral(source, index);
+        if (charEnd !== null)
+            return { end: charEnd, kind: "literal" };
+    }
+    return null;
+}
+function takeRustIdentifierEnd(source, index) {
+    const match = source.slice(index).match(RUST_IDENTIFIER_PREFIX_PATTERN);
+    if (!match)
+        return null;
+    return index + match[0].length;
+}
+function takeRustMacroPathEnd(source, index) {
+    let cursor = takeRustIdentifierEnd(source, index);
+    if (cursor === null)
+        return null;
+    while (source.startsWith("::", cursor)) {
+        const next = takeRustIdentifierEnd(source, cursor + 2);
+        if (next === null)
+            return cursor;
+        cursor = next;
+    }
+    return cursor;
+}
+const RUST_DELIMITER_PAIRS = { "(": ")", "{": "}", "[": "]" };
+export function skipRustBalancedDelimiters(source, index, closer) {
+    const stack = [closer];
+    let cursor = index;
+    while (cursor < source.length && stack.length) {
+        const skipped = skipRustCommentOrLiteral(source, cursor);
+        if (skipped) {
+            cursor = skipped.end;
+            continue;
+        }
+        const ch = source[cursor];
+        if (ch === "(") {
+            stack.push(")");
+            cursor += 1;
+            continue;
+        }
+        if (ch === "{") {
+            stack.push("}");
+            cursor += 1;
+            continue;
+        }
+        if (ch === "[") {
+            stack.push("]");
+            cursor += 1;
+            continue;
+        }
+        if (ch === ")" || ch === "}" || ch === "]") {
+            if (ch === stack[stack.length - 1])
+                stack.pop();
+            cursor += 1;
+            continue;
+        }
+        cursor += 1;
+    }
+    return cursor;
+}
+export function isRustItemStartBoundary(source, index) {
+    if (index <= 0)
+        return true;
+    return !/[_\p{XID_Continue}]/u.test(source[index - 1]);
+}
+export function skipRustOuterAttribute(source, index) {
+    return skipRustHashAttribute(source, index, false);
+}
+export function skipRustAttribute(source, index) {
+    return skipRustHashAttribute(source, index, true);
+}
+function skipRustHashAttribute(source, index, allowInner) {
+    if (source[index] !== "#")
+        return null;
+    let cursor = index + 1;
+    while (cursor < source.length && /\s/.test(source[cursor]))
+        cursor += 1;
+    if (source[cursor] === "!") {
+        if (!allowInner)
+            return null;
+        cursor += 1;
+        while (cursor < source.length && /\s/.test(source[cursor]))
+            cursor += 1;
+    }
+    if (source[cursor] !== "[")
+        return null;
+    cursor += 1;
+    let depth = 1;
+    while (cursor < source.length && depth > 0) {
+        const skipped = skipRustCommentOrLiteral(source, cursor);
+        if (skipped) {
+            cursor = skipped.end;
+            continue;
+        }
+        const ch = source[cursor];
+        if (ch === "[")
+            depth += 1;
+        else if (ch === "]")
+            depth -= 1;
+        cursor += 1;
+    }
+    return cursor;
+}
+export function skipRustMacroTokenTree(source, index) {
+    const pathEnd = takeRustMacroPathEnd(source, index);
+    if (pathEnd === null)
+        return null;
+    let cursor = pathEnd;
+    while (cursor < source.length && /\s/.test(source[cursor]))
+        cursor += 1;
+    if (source[cursor] !== "!")
+        return null;
+    cursor += 1;
+    while (cursor < source.length && /\s/.test(source[cursor]))
+        cursor += 1;
+    const nameEnd = takeRustIdentifierEnd(source, cursor);
+    if (nameEnd !== null) {
+        let afterName = nameEnd;
+        while (afterName < source.length && /\s/.test(source[afterName]))
+            afterName += 1;
+        const openAfterName = source[afterName];
+        if (openAfterName === "(" || openAfterName === "{" || openAfterName === "[") {
+            cursor = afterName;
+        }
+    }
+    const open = source[cursor];
+    if (open === undefined)
+        return null;
+    const closer = RUST_DELIMITER_PAIRS[open];
+    if (!closer)
+        return null;
+    return { end: skipRustBalancedDelimiters(source, cursor + 1, closer) };
+}
+function rustCommentStartEndingAt(source, end) {
+    if (end >= 2 && source[end - 2] === "*" && source[end - 1] === "/") {
+        for (let start = end - 2; start >= 0; start -= 1) {
+            if (source[start] !== "/" || source[start + 1] !== "*")
+                continue;
+            const skipped = skipRustCommentOrLiteral(source, start);
+            if (skipped?.kind === "comment" && skipped.end === end)
+                return start;
+        }
+        return null;
+    }
+    let lineStart = end;
+    while (lineStart > 0 && source[lineStart - 1] !== "\n" && source[lineStart - 1] !== "\r") {
+        lineStart -= 1;
+    }
+    let scan = lineStart;
+    while (scan < end) {
+        const skipped = skipRustCommentOrLiteral(source, scan);
+        if (!skipped) {
+            scan += 1;
+            continue;
+        }
+        if (skipped.kind === "comment" && source[scan] === "/" && source[scan + 1] === "/" && skipped.end === end) {
+            return scan;
+        }
+        if (skipped.end > scan) {
+            scan = skipped.end;
+            continue;
+        }
+        scan += 1;
+    }
+    return null;
+}
+export function skipRustCommentsAndWhitespaceBackward(source, index) {
+    let cursor = index;
+    while (cursor > 0) {
+        const previous = source[cursor - 1];
+        if (previous && /\s/.test(previous)) {
+            cursor -= 1;
+            continue;
+        }
+        const commentStart = rustCommentStartEndingAt(source, cursor);
+        if (commentStart === null || commentStart >= cursor)
+            break;
+        cursor = commentStart;
+    }
+    return cursor;
+}
+function skipRustQuotedString(source, quoteIndex) {
+    let index = quoteIndex + 1;
+    while (index < source.length) {
+        const ch = source[index];
+        if (ch === "\\") {
+            index += 2;
+            continue;
+        }
+        if (ch === '"')
+            return index + 1;
+        index += 1;
+    }
+    return source.length;
+}
+function skipRustRawString(source, quoteIndex, hashes) {
+    let index = quoteIndex + 1;
+    while (index < source.length) {
+        if (source[index] !== '"') {
+            index += 1;
+            continue;
+        }
+        let count = 0;
+        while (count < hashes && source[index + 1 + count] === "#")
+            count += 1;
+        if (count === hashes)
+            return index + 1 + hashes;
+        index += 1;
+    }
+    return source.length;
+}
+function skipRustCharLiteral(source, index) {
+    if (source[index] !== "'")
+        return null;
+    let cursor = index + 1;
+    if (cursor >= source.length)
+        return null;
+    if (source[cursor] === "\\") {
+        cursor += 1;
+        while (cursor < source.length && source[cursor] !== "'") {
+            if (source[cursor] === "\\")
+                cursor += 2;
+            else
+                cursor += 1;
+        }
+        if (cursor < source.length)
+            return cursor + 1;
+        return cursor;
+    }
+    if (source[cursor + 1] === "'")
+        return cursor + 2;
+    return null;
+}
+function stripRustComments(source) {
+    let out = "";
+    let index = 0;
+    while (index < source.length) {
+        const skipped = skipRustCommentOrLiteral(source, index);
+        if (skipped) {
+            if (skipped.kind === "comment") {
+                out += source.slice(index, skipped.end).replace(/[^\n\r]/g, " ");
+            }
+            else {
+                out += source.slice(index, skipped.end);
+            }
+            index = skipped.end;
+            continue;
+        }
+        out += source[index];
+        index += 1;
+    }
+    return out;
+}
+function takeLeadingRustOuterAttributes(text) {
+    let index = 0;
+    while (index < text.length) {
+        if (/\s/.test(text[index])) {
+            index += 1;
+            continue;
+        }
+        const skipped = skipRustCommentOrLiteral(text, index);
+        if (skipped) {
+            index = skipped.end;
+            continue;
+        }
+        const attrEnd = skipRustOuterAttribute(text, index);
+        if (attrEnd === null)
+            break;
+        index = attrEnd;
+    }
+    return { attributes: text.slice(0, index), rest: text.slice(index).trim() };
+}
+export function parseRustImportStatements(stmtText) {
+    const trimmed = stripRustComments(stmtText).trim();
+    if (!trimmed)
+        return [];
+    const { attributes, rest: statement } = takeLeadingRustOuterAttributes(trimmed);
+    const pathAttribute = rustPathAttributeFromText(attributes);
+    const modMatch = statement.match(RUST_MODULE_PATTERN);
     if (modMatch?.[1]) {
-        return {
-            kind: "module",
-            from: modMatch[1],
-            local: modMatch[1],
-            isExternCrate: false,
-        };
+        return [
+            {
+                kind: "module",
+                from: modMatch[1],
+                local: modMatch[1],
+                isExternCrate: false,
+                ...(pathAttribute ? { pathAttribute } : {}),
+            },
+        ];
     }
-    const externMatch = trimmed.match(RUST_EXTERN_CRATE_PATTERN);
+    const externMatch = statement.match(RUST_EXTERN_CRATE_PATTERN);
     if (externMatch?.[1]) {
-        return {
-            kind: "module",
-            from: externMatch[1],
-            local: externMatch[2] ?? externMatch[1],
-            isExternCrate: true,
-        };
+        return [
+            {
+                kind: "module",
+                from: externMatch[1],
+                local: externMatch[2] ?? externMatch[1],
+                isExternCrate: true,
+            },
+        ];
     }
-    const useMatch = trimmed.match(/^(?:pub(?:\s*\([^)]*\))?\s+)?use\s+(.+?)\s*;?$/);
+    const useMatch = statement.match(RUST_USE_PATTERN);
     const useBody = useMatch?.[1]?.trim();
     if (!useBody)
-        return null;
-    if (useBody.includes("{") || useBody.includes(","))
-        return null;
-    const aliasMatch = useBody.match(RUST_USE_ALIAS_PATTERN);
-    const rawPath = aliasMatch?.[1]?.trim() ?? useBody;
-    const alias = aliasMatch?.[2];
-    if (rawPath.endsWith("::*")) {
-        return { kind: "star", from: rawPath };
+        return [];
+    return flattenRustUseTree([], useBody);
+}
+function rustPathAttributeFromText(text) {
+    let last;
+    RUST_PATH_ATTRIBUTE_PATTERN.lastIndex = 0;
+    for (const match of text.matchAll(RUST_PATH_ATTRIBUTE_PATTERN)) {
+        last = match[2] ?? match[3];
     }
-    const parts = rawPath.split("::").filter(Boolean);
+    return last;
+}
+function rustPathSegments(spec) {
+    return spec
+        .split("::")
+        .map((part) => part.trim())
+        .filter(Boolean);
+}
+function splitTopLevelRustAlias(input) {
+    let depth = 0;
+    let asIndex = -1;
+    for (let index = 0; index < input.length; index += 1) {
+        const character = input[index];
+        if (character === "{")
+            depth += 1;
+        else if (character === "}")
+            depth = Math.max(0, depth - 1);
+        if (depth === 0 &&
+            input.startsWith("as", index) &&
+            /\s/.test(input[index - 1] ?? "") &&
+            /\s/.test(input[index + 2] ?? "")) {
+            asIndex = index;
+        }
+    }
+    if (asIndex < 0)
+        return { path: input.trim() };
+    const path = input.slice(0, asIndex).trim();
+    const alias = input.slice(asIndex + 2).trim();
+    if (!path || !RUST_IDENTIFIER_PATTERN.test(alias))
+        return { path: input.trim() };
+    return { path, alias };
+}
+function splitRustUseGroup(item) {
+    let depth = 0;
+    let open = -1;
+    for (let index = 0; index < item.length; index += 1) {
+        const character = item[index];
+        if (character === "{") {
+            if (depth === 0)
+                open = index;
+            depth += 1;
+            continue;
+        }
+        if (character !== "}")
+            continue;
+        depth -= 1;
+        if (depth !== 0 || open < 0)
+            continue;
+        if (item.slice(index + 1).trim())
+            return null;
+        return {
+            prefix: item.slice(0, open).replace(/::$/, "").trim(),
+            inner: item.slice(open + 1, index),
+        };
+    }
+    return null;
+}
+function flattenRustUseTree(prefix, item) {
+    const trimmed = item.trim();
+    if (!trimmed)
+        return [];
+    const group = splitRustUseGroup(trimmed);
+    if (group) {
+        const nextPrefix = group.prefix ? [...prefix, ...rustPathSegments(group.prefix)] : [...prefix];
+        const nested = [];
+        for (const piece of splitTopLevelCommaList(group.inner)) {
+            nested.push(...flattenRustUseTree(nextPrefix, piece));
+        }
+        return nested;
+    }
+    const { path: rawPath, alias } = splitTopLevelRustAlias(trimmed);
+    if (!rawPath)
+        return [];
+    if (rawPath === "*" || rawPath.endsWith("::*")) {
+        const base = rawPath === "*"
+            ? prefix.join("::")
+            : [...prefix, ...rustPathSegments(rawPath.slice(0, -"::*".length))].join("::");
+        if (!base)
+            return [];
+        return [{ kind: "star", from: `${base}::*` }];
+    }
+    if (rawPath === "self") {
+        const from = prefix.join("::");
+        if (!from)
+            return [];
+        const segments = rustPathSegments(from);
+        const local = alias ?? segments[segments.length - 1];
+        if (!local)
+            return [];
+        return [{ kind: "module", from, local, isExternCrate: false }];
+    }
+    const parts = [...prefix, ...rustPathSegments(rawPath)];
     if (!parts.length)
-        return null;
+        return [];
     if (parts.length === 1) {
         const moduleName = parts[0];
         if (!moduleName)
-            return null;
-        return {
-            kind: "module",
-            from: moduleName,
-            local: alias ?? moduleName,
-            isExternCrate: false,
-        };
+            return [];
+        return [
+            {
+                kind: "module",
+                from: moduleName,
+                local: alias ?? moduleName,
+                isExternCrate: false,
+            },
+        ];
     }
     const imported = parts[parts.length - 1];
     const from = parts.slice(0, -1).join("::");
     if (!imported || !from)
-        return null;
-    return {
-        kind: "member",
-        from,
-        imported,
-        local: alias ?? imported,
-    };
+        return [];
+    return [
+        {
+            kind: "member",
+            from,
+            imported,
+            local: alias ?? imported,
+        },
+    ];
 }
 const PHP_USE_ALIAS_PATTERN = new RegExp(String.raw `^(.*?)\s+as\s+(${PHP_IDENTIFIER_SOURCE})$`, "iu");
 function splitTopLevelCommaList(input) {
@@ -302,7 +730,7 @@ function resolvePhpIncludePath(expr, fromFile) {
     return `./${relativePath}`;
 }
 export const KOTLIN_DOTTED_NAME_SOURCE = String.raw `${KOTLIN_IDENTIFIER_SOURCE}(?:\.${KOTLIN_IDENTIFIER_SOURCE})*`;
-const KOTLIN_IMPORT_PATTERN = new RegExp(String.raw `^\s*import\s+(${KOTLIN_DOTTED_NAME_SOURCE}(?:\.\*)?)(?:\s+as\s+(${KOTLIN_IDENTIFIER_SOURCE}))?\s*$`, "mu");
+const KOTLIN_IMPORT_PATTERN = new RegExp(String.raw `^\s*import\s+(${KOTLIN_DOTTED_NAME_SOURCE}(?:\.\*)?)(?:\s+as\s+(${KOTLIN_IDENTIFIER_SOURCE}))?\s*;?\s*$`, "mu");
 export function parseKotlinImportStatement(stmtText) {
     const match = stmtText.trim().match(KOTLIN_IMPORT_PATTERN);
     const rawSpec = match?.[1];