@lzehrung/codegraph 2.3.23 → 2.3.25

package/dist/indexer/imports/python.js

@@ -3,6 +3,7 @@ import path from "node:path";
 import { resolvePythonModule } from "../../util/resolution.js";
 import { stripPythonCommentsAndStrings } from "../../util/comments.js";
 import { PYTHON_IDENTIFIER_SOURCE } from "../../util/identifiers.js";
+import { utf8ByteOffsetToStringIndex } from "../../util/rust-test-modules.js";
 function splitRelativeModuleSpec(moduleSpec) {
     const match = moduleSpec.match(/^(\.+)(.*)$/);
     if (!match)
@@ -93,14 +94,116 @@ async function pushDefaultImport(context, dotted, local, moduleLevel) {
     });
 }
 const PYTHON_NAMED_IMPORT_PATTERN = new RegExp(String.raw `^(${PYTHON_IDENTIFIER_SOURCE})(?:\s+as\s+(${PYTHON_IDENTIFIER_SOURCE}))?$`, "u");
-const PYTHON_MODULE_IMPORT_PATTERN = new RegExp(String.raw `^[\t ]*import\s+(${PYTHON_IDENTIFIER_SOURCE}(?:\.${PYTHON_IDENTIFIER_SOURCE})*)\s*(?:as\s+(${PYTHON_IDENTIFIER_SOURCE}))?`, "gmu");
+// Matches at a physical line start (capturing its indentation) or immediately after a `;`
+// that ends a preceding simple statement on the same line, so `x = 1; import os` and a
+// multi-line parenthesized statement's trailing `; import os` are both recognized. A
+// compound-suite header's `:` is deliberately excluded, so `if x: import os` still is not.
+const PYTHON_MODULE_IMPORT_PATTERN = new RegExp(String.raw `(^[\t ]*|;[\t ]*)import\s+(${PYTHON_IDENTIFIER_SOURCE}(?:\.${PYTHON_IDENTIFIER_SOURCE})*)\s*(?:as\s+(${PYTHON_IDENTIFIER_SOURCE}))?`, "gmu");
+const PYTHON_MODULE_LIST_ITEM_PATTERN = new RegExp(String.raw `^(${PYTHON_IDENTIFIER_SOURCE}(?:\.${PYTHON_IDENTIFIER_SOURCE})*)(?:\s+as\s+(${PYTHON_IDENTIFIER_SOURCE}))?$`, "u");
+function isPythonModuleLevelImportPrefix(prefix) {
+    if (/^[\t ]/.test(prefix))
+        return false;
+    const cleaned = stripPythonCommentsAndStrings(prefix).trim();
+    if (!cleaned)
+        return true;
+    // A same-line suite belongs to its compound statement, not the module.
+    if (/^(?:async\s+)?(?:if|elif|else|for|while|try|except|finally|with|def|class)\b/.test(cleaned)) {
+        return false;
+    }
+    const delimiters = [];
+    for (const char of cleaned) {
+        if (char === "(")
+            delimiters.push(")");
+        else if (char === "[")
+            delimiters.push("]");
+        else if (char === "{")
+            delimiters.push("}");
+        else if (char === ")" || char === "]" || char === "}") {
+            // A closing delimiter with no matching open on this physical line belongs to a
+            // bracket opened on a preceding physical line (e.g. a multi-line parenthesized
+            // statement or suite header); it does not by itself make this a nested suite.
+            if (delimiters[delimiters.length - 1] === char)
+                delimiters.pop();
+        }
+    }
+    if (delimiters.length || !cleaned.endsWith(";"))
+        return false;
+    return true;
+}
+// `strippedSrc` has already had comments/strings deleted (not offset-preserving), so
+// `keywordStart` and every position derived from it are only meaningful within that same
+// string. `isPythonModuleLevelImportPrefix` re-strips its input, which is a harmless no-op
+// here since `strippedSrc` is already clean.
+function isModuleLevelKeywordInStrippedSource(strippedSrc, keywordStart) {
+    const lineStart = strippedSrc.lastIndexOf("\n", keywordStart - 1) + 1;
+    return isPythonModuleLevelImportPrefix(strippedSrc.slice(lineStart, keywordStart));
+}
+function normalizePythonImportStatement(statement) {
+    return stripPythonCommentsAndStrings(statement)
+        .replace(/\\\r?\n[\t ]*/g, " ")
+        .trim();
+}
+async function collectPythonImportStatement(context, statement, moduleLevel) {
+    const normalized = normalizePythonImportStatement(statement);
+    const fromMatch = normalized.match(/^from\s+([^\s]+)\s+import\s+([\s\S]+)$/u);
+    if (fromMatch) {
+        const moduleSpec = fromMatch[1];
+        const importedList = fromMatch[2].trim().replace(/^\(\s*|\s*\)$/g, "");
+        for (const item of importedList
+            .split(",")
+            .map((entry) => entry.trim())
+            .filter(Boolean)) {
+            if (item === "*") {
+                await pushStarImport(context, moduleSpec, moduleLevel);
+                continue;
+            }
+            const aliasMatch = item.match(PYTHON_NAMED_IMPORT_PATTERN);
+            if (!aliasMatch)
+                continue;
+            const imported = aliasMatch[1];
+            await pushNamedImport(context, moduleSpec, imported, aliasMatch[2] ?? imported, moduleLevel);
+        }
+        return true;
+    }
+    const importMatch = normalized.match(/^import\s+([\s\S]+)$/u);
+    if (!importMatch)
+        return false;
+    for (const item of importMatch[1]
+        .split(",")
+        .map((entry) => entry.trim())
+        .filter(Boolean)) {
+        const aliasMatch = item.match(PYTHON_MODULE_LIST_ITEM_PATTERN);
+        if (!aliasMatch)
+            continue;
+        const dotted = aliasMatch[1];
+        await pushDefaultImport(context, dotted, aliasMatch[2] ?? dotted.split(".")[0], moduleLevel);
+    }
+    return true;
+}
+export async function collectPythonImportsFromNativeMatches(context, matches) {
+    for (const match of matches) {
+        const statementCapture = match.captures.find((capture) => capture.name === "stmt");
+        if (!statementCapture)
+            continue;
+        const startIndex = utf8ByteOffsetToStringIndex(context.source, statementCapture.start.index);
+        const lineStart = context.source.lastIndexOf("\n", startIndex - 1) + 1;
+        const prefix = context.source.slice(lineStart, startIndex);
+        const moduleLevel = isPythonModuleLevelImportPrefix(prefix);
+        await collectPythonImportStatement(context, statementCapture.text, moduleLevel);
+    }
+}
 export async function collectPythonImportsFromSource(context) {
     const pySrc = stripPythonCommentsAndStrings(context.source);
-    const fromLinePattern = /^[\t ]*from\s+([^\s]+)\s+import\s+([^\n#]+)/gm;
+    // Boundary group 1 captures either the line's leading indentation or the `;` (plus any
+    // following tabs/spaces) that separates this import from a completed simple statement on
+    // the same physical line; a compound-suite header's `:` is not part of this alternation, so
+    // `if x: import os` still is not recognized as a statement start here.
+    const fromLinePattern = /(^[\t ]*|;[\t ]*)from\s+([^\s]+)\s+import\s+([^\n;#]+)/gm;
     for (const match of pySrc.matchAll(fromLinePattern)) {
-        const mod = match[1].trim();
-        const moduleLevel = !/^[\t ]/.test(match[0]);
-        const items = match[2].split(",").map((item) => item.trim());
+        const keywordStart = match.index + match[1].length;
+        const mod = match[2].trim();
+        const moduleLevel = isModuleLevelKeywordInStrippedSource(pySrc, keywordStart);
+        const items = match[3].split(",").map((item) => item.trim());
         for (const item of items) {
             if (item === "*") {
                 await pushStarImport(context, mod, moduleLevel);
@@ -118,9 +221,11 @@ export async function collectPythonImportsFromSource(context) {
     }
     const importPattern = PYTHON_MODULE_IMPORT_PATTERN;
     for (const match of pySrc.matchAll(importPattern)) {
-        const dotted = match[1];
-        const local = match[2] ?? dotted.split(".")[0];
-        await pushDefaultImport(context, dotted, local, !/^[\t ]/.test(match[0]));
+        const keywordStart = match.index + match[1].length;
+        const dotted = match[2];
+        const local = match[3] ?? dotted.split(".")[0];
+        const moduleLevel = isModuleLevelKeywordInStrippedSource(pySrc, keywordStart);
+        await pushDefaultImport(context, dotted, local, moduleLevel);
     }
 }
 //# sourceMappingURL=python.js.map

package/dist/indexer/imports/python.js.map

@@ -1 +1 @@
-{"version":3,"file":"python.js","sourceRoot":"","sources":["../../../src/indexer/imports/python.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AASrE,SAAS,uBAAuB,CAAC,UAAkB;IACjD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAC9C,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC;IACnD,OAAO;QACL,OAAO,EAAE,KAAK,CAAC,CAAC,CAAE,CAAC,MAAM;QACzB,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI;KACtB,CAAC;AACJ,CAAC;AAED,SAAS,4BAA4B,CAAC,QAA8B,EAAE,QAAgB;IACpF,IAAI,OAAO,QAAQ,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IACnD,IAAI,OAAO,GAAG,QAAQ,CAAC;IACvB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAClC,IACE,CAAC,IAAI,CAAC,WAAW,EAAE;YACnB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,EACjG,CAAC;YACD,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,UAAU,GAAG;QACjB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,QAAQ,KAAK,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,QAAQ,MAAM,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,CAAC;QAC3C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,cAAc,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC;KAC7B,CAAC;IACF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC;YACH,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC7B,OAAO,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,8EAA8E;QAChF,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,OAAsC,EACtC,UAAkB,EAClB,WAAoB;IAEpB,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAC7D,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAC5F,OAAO,CAAC,WAAW,CAAC;QAClB,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,UAAU;QAChB,QAAQ;QACR,SAAS,EAAE,QAAQ;QACnB,WAAW;KACZ,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,OAAsC,EACtC,UAAkB,EAClB,QAAgB,EAChB,KAAa,EACb,WAAoB;IAEpB,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAC7D,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAC5F,MAAM,iBAAiB,GAAG,4BAA4B,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC3E,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO,CAAC,WAAW,CAAC;YAClB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE,iBAAiB;YAC3B,SAAS,EAAE,QAAQ;YACnB,WAAW;SACZ,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,OAAO,CAAC,WAAW,CAAC;QAClB,IAAI,EAAE,OAAO;QACb,KAAK;QACL,QAAQ;QACR,IAAI,EAAE,UAAU;QAChB,QAAQ;QACR,SAAS,EAAE,QAAQ;QACnB,WAAW;KACZ,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,OAAsC,EACtC,MAAc,EACd,KAAa,EACb,WAAoB;IAEpB,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACzF,OAAO,CAAC,WAAW,CAAC;QAClB,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,MAAM;QACZ,QAAQ;QACR,SAAS,EAAE,QAAQ;QACnB,WAAW;KACZ,CAAC,CAAC;AACL,CAAC;AAED,MAAM,2BAA2B,GAAG,IAAI,MAAM,CAC5C,MAAM,CAAC,GAAG,CAAA,KAAK,wBAAwB,gBAAgB,wBAAwB,MAAM,EACrF,GAAG,CACJ,CAAC;AACF,MAAM,4BAA4B,GAAG,IAAI,MAAM,CAC7C,MAAM,CAAC,GAAG,CAAA,oBAAoB,wBAAwB,QAAQ,wBAAwB,kBAAkB,wBAAwB,KAAK,EACrI,KAAK,CACN,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,OAAsC;IACzF,MAAM,KAAK,GAAG,6BAA6B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,eAAe,GAAG,+CAA+C,CAAC;IACxE,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;QACpD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACjB,MAAM,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;gBAChD,SAAS;YACX,CAAC;YACD,+EAA+E;YAC/E,+EAA+E;YAC/E,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC3D,IAAI,CAAC,UAAU;gBAAE,SAAS;YAC1B,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAE,CAAC;YAChC,MAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;YACxC,MAAM,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED,MAAM,aAAa,GAAG,4BAA4B,CAAC;IACnD,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QAClD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;QACzB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC;QAChD,MAAM,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC;AACH,CAAC"}
+{"version":3,"file":"python.js","sourceRoot":"","sources":["../../../src/indexer/imports/python.ts"],"names":[],"mappings":"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"}

package/dist/indexer/imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/indexer/imports.ts"],"names":[],"mappings":"AACA,OAAO,EAAkD,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzG,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAEL,KAAK,6BAA6B,EAEnC,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAU5D,OAAO,KAAK,EAAwB,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAWnH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IACL,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,eAAe,CAAC;IACtB,aAAa,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC1C,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,0BAA0B,CAAC,EAAE,CAAC,KAAK,EAAE,6BAA6B,KAAK,IAAI,CAAC;IAC5E,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,kBAAkB,CAAC,EAAE,oBAAoB,CAAC;IAC1C,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,SAAS,CAAC,EAAE,WAAW,CAAC;CACzB,GACA,OAAO,CAAC,aAAa,EAAE,CAAC,CAoN1B"}
+{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/indexer/imports.ts"],"names":[],"mappings":"AACA,OAAO,EAAkD,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzG,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAGL,KAAK,6BAA6B,EAEnC,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAU5D,OAAO,KAAK,EAAwB,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAYnH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IACL,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,eAAe,CAAC;IACtB,aAAa,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC1C,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,0BAA0B,CAAC,EAAE,CAAC,KAAK,EAAE,6BAA6B,KAAK,IAAI,CAAC;IAC5E,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,kBAAkB,CAAC,EAAE,oBAAoB,CAAC;IAC1C,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,SAAS,CAAC,EAAE,WAAW,CAAC;CACzB,GACA,OAAO,CAAC,aAAa,EAAE,CAAC,CAsO1B"}

package/dist/indexer/imports.js

@@ -1,7 +1,7 @@
 import { prepareSourceInput } from "../languages/file-prep.js";
 import { loadNearestTsconfigFor, resolveImportSpecifier } from "../util/resolution.js";
 import { loadWorkspaceConfig } from "../util/workspace.js";
-import { collectModuleSpecifiersFromSource, } from "../graphs/specifiers.js";
+import { collectModuleSpecifiersFromSource, mapNativeExecutionFallbackReason, } from "../graphs/specifiers.js";
 import { isGraphOnlyLanguage } from "../document-links.js";
 import { stripJsLikeComments } from "../util/comments.js";
 import { assertNativeRequiredAvailable, getNativeQueryExecution, isNativeBindingLoadedForLanguage, isNativeRequiredUnavailableError, isNativeQueryAuthoritative, } from "../native/tree-sitter-native.js";
@@ -9,7 +9,7 @@ import { collectGraphOnlyImports } from "./imports/graph-only.js";
 import { collectJsTextImports, collectJsTextValueRequireImports } from "./imports/js-text-imports.js";
 import { applyStatementImportOverride, createStatementImportOverrideState, finalizeLanguageSpecificImports, } from "./imports/language-specific.js";
 import { collectNativeCaptureImportBindings } from "./imports/native-captures.js";
-import { collectPythonImportsFromSource } from "./imports/python.js";
+import { collectPythonImportsFromNativeMatches, collectPythonImportsFromSource } from "./imports/python.js";
 export async function collectImportsForFile(file, projectRoot, opts) {
     let source = opts?.source;
     let sup = opts?.sup;
@@ -48,13 +48,26 @@ export async function collectImportsForFile(file, projectRoot, opts) {
         nativeExecution = getNativeQueryExecution(resolvedSource, resolvedSup, nativeMode);
         resolvedNativeQueries = nativeExecution.results;
     }
+    // The graph and binding consumers must agree on why extraction fell back, so both map the
+    // native execution reason with the same rule instead of labelling it per call site.
+    const nativeExecutionFallbackReason = nativeExecution?.fallbackReason
+        ? mapNativeExecutionFallbackReason(resolvedSup.id, nativeExecution.fallbackReason, false, resolvedNativeQueries !== null)
+        : null;
     if (resolvedSup.id === "python") {
-        await collectPythonImportsFromSource({
+        const context = {
             file,
             projectRoot,
             source: resolvedSource,
             pushBinding: (binding) => imports.push(binding),
-        });
+        };
+        if (resolvedNativeQueries) {
+            await collectPythonImportsFromNativeMatches(context, resolvedNativeQueries.importBindings);
+        }
+        else {
+            await collectPythonImportsFromSource(context);
+            if (nativeExecutionFallbackReason)
+                reportFallback(nativeExecutionFallbackReason);
+        }
         return imports;
     }
     let matchPath = opts?.matchPath;
@@ -63,8 +76,9 @@ export async function collectImportsForFile(file, projectRoot, opts) {
     }
     const workspaceConfig = opts?.workspaceConfig ?? (await loadWorkspaceConfig(projectRoot));
     const resolvedImportCache = new Map();
-    const resolveFrom = async (from, phpImportType) => {
-        const cacheKey = `${from}\0${phpImportType ?? ""}`;
+    const stylesheetLanguage = ["css", "scss", "less"].includes(resolvedSup.id);
+    const resolveFrom = async (from, phpImportType, resolutionKind) => {
+        const cacheKey = `${from}\0${phpImportType ?? ""}\0${resolutionKind ?? ""}`;
         const cached = resolvedImportCache.get(cacheKey);
         if (cached)
             return await cached;
@@ -76,6 +90,8 @@ export async function collectImportsForFile(file, projectRoot, opts) {
                 resolveNodeModules: !!opts?.graphOptions?.resolveNodeModules,
                 ...(resolutionHints ? { resolutionHints } : {}),
                 ...(phpImportType ? { phpImportType } : {}),
+                ...(resolutionKind ? { resolutionKind } : {}),
+                ...(resolvedSup.id === "scss" && resolutionKind === "stylesheet" ? { allowScssPartialResolution: true } : {}),
             });
             return typeof result === "string" ? result.replace(/\\/g, "/") : result;
         })();
@@ -87,7 +103,7 @@ export async function collectImportsForFile(file, projectRoot, opts) {
         projectRoot,
         source: resolvedSource,
         languageId: resolvedSup.id,
-        resolveFrom,
+        resolveFrom: (from, phpImportType) => resolveFrom(from, phpImportType, stylesheetLanguage ? "stylesheet" : undefined),
         pushBinding: (binding) => imports.push(binding),
         getBindings: () => imports,
         replaceBindings: (bindings) => imports.splice(0, imports.length, ...bindings),
@@ -116,10 +132,7 @@ export async function collectImportsForFile(file, projectRoot, opts) {
         });
     };
     const nativeLanguageAvailable = isNativeBindingLoadedForLanguage(resolvedSup.id, nativeMode);
-    let nativeFallbackReason = null;
-    if (nativeExecution?.fallbackReason === "queryFailure") {
-        nativeFallbackReason = "query-error";
-    }
+    let nativeFallbackReason = nativeExecutionFallbackReason;
     if (resolvedNativeQueries) {
         try {
             await collectNativeCaptureImportBindings({
@@ -176,7 +189,7 @@ export async function collectImportsForFile(file, projectRoot, opts) {
             imports.push({
                 kind: "star",
                 from: specifier.spec,
-                resolved: await resolveFrom(specifier.spec),
+                resolved: await resolveFrom(specifier.spec, undefined, specifier.resolutionKind),
                 ...(specifier.typeOnly ? { typeOnly: true } : {}),
             });
         }

package/dist/indexer/imports.js.map

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

package/dist/indexer/locals-and-exports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"locals-and-exports.d.ts","sourceRoot":"","sources":["../../src/indexer/locals-and-exports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAK9C,OAAO,EAKL,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACvB,MAAM,iCAAiC,CAAC;AAMzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,KAAK,EAAe,aAAa,EAAE,WAAW,EAAa,MAAM,YAAY,CAAC;AA0QrF,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,OAAO,GAAE,aAAa,EAAO,EAC7B,IAAI,CAAC,EAAE;IACL,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,aAAa,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC1C,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,GACA,WAAW,CA0uBb"}
+{"version":3,"file":"locals-and-exports.d.ts","sourceRoot":"","sources":["../../src/indexer/locals-and-exports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAK9C,OAAO,EAKL,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACvB,MAAM,iCAAiC,CAAC;AAMzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,KAAK,EAAe,aAAa,EAAE,WAAW,EAAa,MAAM,YAAY,CAAC;AA+VrF,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,OAAO,GAAE,aAAa,EAAO,EAC7B,IAAI,CAAC,EAAE;IACL,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,aAAa,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC1C,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,GACA,WAAW,CAqwBb"}

package/dist/indexer/locals-and-exports.js

@@ -8,11 +8,23 @@ import { sliceText, toRange, unquote } from "../util/ast.js";
 import { bindingKindToSymbolKind } from "./declarations.js";
 import { buildScopeIndexFromSource } from "./scope.js";
 import { SymbolKind } from "./types.js";
-import { ECMASCRIPT_IDENTIFIER_SOURCE } from "../util/identifiers.js";
+import { ECMASCRIPT_IDENTIFIER_SOURCE, XID_IDENTIFIER_SOURCE } from "../util/identifiers.js";
+/**
+ * Matches one `exportScopeBlockers` entry against an ancestor node. A plain entry compares the
+ * node type; a `parent>node` entry also requires that parent type, which is how Python separates a
+ * function body from a class body when the grammar spells both `block`.
+ */
+function matchesExportScopeBlocker(node, blocker) {
+    const separator = blocker.indexOf(">");
+    if (separator < 0)
+        return node.type === blocker;
+    return node.type === blocker.slice(separator + 1) && node.parent?.type === blocker.slice(0, separator);
+}
 const JS_FALLBACK_DECLARATION_PATTERN = new RegExp(String.raw `\bexport\s+(?:const|let|var|function|class)\s+(${ECMASCRIPT_IDENTIFIER_SOURCE})`, "gu");
 const JS_FALLBACK_DEFAULT_PATTERN = new RegExp(String.raw `\bexport\s+default\s+(${ECMASCRIPT_IDENTIFIER_SOURCE})`, "gu");
 const JS_FALLBACK_EXPORT_ASSIGN_PATTERN = new RegExp(String.raw `\bexport\s*=\s*(${ECMASCRIPT_IDENTIFIER_SOURCE})`, "gu");
-const JS_FALLBACK_REEXPORT_SPECIFIER_PATTERN = new RegExp(String.raw `^(${ECMASCRIPT_IDENTIFIER_SOURCE})(?:\s+as\s+(${ECMASCRIPT_IDENTIFIER_SOURCE}))?$`, "u");
+const JS_FALLBACK_REEXPORT_SPECIFIER_PATTERN = new RegExp(String.raw `^(?:type\s+)?(${ECMASCRIPT_IDENTIFIER_SOURCE})(?:\s+as\s+(${ECMASCRIPT_IDENTIFIER_SOURCE}))?$`, "u");
+const JS_FALLBACK_REEXPORT_TYPE_SPECIFIER_PATTERN = new RegExp(String.raw `^type\s+(${ECMASCRIPT_IDENTIFIER_SOURCE})(?:\s+as\s+(${ECMASCRIPT_IDENTIFIER_SOURCE}))?$`, "u");
 const JS_FALLBACK_REEXPORT_NAMESPACE_PATTERN = new RegExp(String.raw `\bexport\s*\*\s+as\s+(${ECMASCRIPT_IDENTIFIER_SOURCE})\s+from\s*("|')([^"']*)\2`, "gu");
 const JS_FALLBACK_CJS_FUNCTION_PATTERN = new RegExp(String.raw `(?:^|[;\n\r])\s*(?:exports|module\.exports)\.(${ECMASCRIPT_IDENTIFIER_SOURCE})\s*=\s*(function\b|\([^)]*\)\s*=>)`, "gu");
 const JS_FALLBACK_CJS_OBJECT_FUNCTION_PATTERN = new RegExp(String.raw `(${ECMASCRIPT_IDENTIFIER_SOURCE})\s*:\s*(function\b|\([^)]*\)\s*=>)`, "gu");
@@ -71,6 +83,74 @@ function isTypeMemberDeclaration(node) {
     }
     return false;
 }
+const C_DECLARATOR_IDENTIFIER_PATTERN = new RegExp(`^${XID_IDENTIFIER_SOURCE}`, "u");
+const C_DECLARATOR_QUALIFIER_PATTERN = /^(?:const|volatile|restrict|_Atomic)\b/;
+function cDeclaratorDeclaredName(text) {
+    const masked = maskJsLikeCommentsAndStrings(text);
+    let index = 0;
+    while (index < masked.length) {
+        if (/[\s(*&]/.test(masked[index])) {
+            index += 1;
+            continue;
+        }
+        const rest = masked.slice(index);
+        const qualifier = C_DECLARATOR_QUALIFIER_PATTERN.exec(rest);
+        if (qualifier) {
+            index += qualifier[0].length;
+            continue;
+        }
+        const ident = C_DECLARATOR_IDENTIFIER_PATTERN.exec(rest);
+        if (!ident || rest.slice(ident[0].length).trimStart().startsWith("::"))
+            return undefined;
+        return { name: ident[0], start: index, end: index + ident[0].length };
+    }
+    return undefined;
+}
+function declaratorNameNode(node) {
+    let current = node;
+    while (current) {
+        if (current.type === "identifier" || current.type === "type_identifier")
+            return current;
+        const next = current.childForFieldName("declarator");
+        if (next) {
+            current = next;
+        }
+        else if (current.type === "parenthesized_declarator") {
+            current = current.namedChildren.find((child) => child.type !== "comment");
+        }
+        else {
+            return undefined;
+        }
+    }
+    return undefined;
+}
+function declaratorCaptureName(capture, node) {
+    const fromNode = declaratorNameNode(node)?.text;
+    if (fromNode)
+        return fromNode;
+    if (capture.nodeType === "identifier" || capture.nodeType === "type_identifier")
+        return capture.text;
+    return cDeclaratorDeclaredName(capture.text)?.name;
+}
+function localExportDedupeKey(entry) {
+    return `${entry.exportedAs}\0${entry.target.localName}\0${entry.target.range.start.index ?? 0}\0${entry.target.range.end.index ?? 0}`;
+}
+function dedupeExportEntries(entries) {
+    const seen = new Set();
+    const out = [];
+    for (const entry of entries) {
+        if (entry.type !== "local") {
+            out.push(entry);
+            continue;
+        }
+        const key = localExportDedupeKey(entry);
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        out.push(entry);
+    }
+    return out;
+}
 function appendJsLikeRegexFallbackExports(file, source, locals, exports) {
     const maskedSource = maskJsLikeCommentsAndStrings(source);
     JS_FALLBACK_DECLARATION_PATTERN.lastIndex = 0;
@@ -82,7 +162,7 @@ function appendJsLikeRegexFallbackExports(file, source, locals, exports) {
     const reDecl = JS_FALLBACK_DECLARATION_PATTERN;
     const reDefault = JS_FALLBACK_DEFAULT_PATTERN;
     const reExportAssign = JS_FALLBACK_EXPORT_ASSIGN_PATTERN;
-    const reReexport = new RegExp(String.raw `\bexport\s*\{\s*([^}]+)\}\s*from\s*("|')([^"']*)\2`, "gu");
+    const reReexport = new RegExp(String.raw `\bexport\b\s*(type\s+)?\{\s*([^}]*)\}\s*from\s*("|')([^"']*)\3`, "gu");
     const reReexportNs = JS_FALLBACK_REEXPORT_NAMESPACE_PATTERN;
     const reStar = /\bexport\s*\*\s*from\s*("|')([^"']*)\1/gu;
     const reCjsFn = JS_FALLBACK_CJS_FUNCTION_PATTERN;
@@ -124,7 +204,8 @@ function appendJsLikeRegexFallbackExports(file, source, locals, exports) {
         }
     }
     while ((match = reReexport.exec(maskedSource))) {
-        const list = match[1]
+        const statementTypeOnly = Boolean(match[1]);
+        const list = match[2]
             .split(",")
             .map((item) => item.trim())
             .filter(Boolean);
@@ -137,12 +218,14 @@ function appendJsLikeRegexFallbackExports(file, source, locals, exports) {
                 continue;
             const srcName = entryMatch[1];
             const alias = entryMatch[2] ?? srcName;
+            const typeOnly = statementTypeOnly || JS_FALLBACK_REEXPORT_TYPE_SPECIFIER_PATTERN.test(spec);
             if (!exports.some((entry) => entry.type === "reexport" && entry.exportedAs === alias && entry.fromModule === from)) {
                 exports.push({
                     type: "reexport",
                     exportedAs: alias,
                     fromModule: from,
                     sourceSpecifier: srcName,
+                    typeOnly,
                 });
             }
         }
@@ -394,14 +477,12 @@ export function collectLocalsAndExportsFromSource(file, source, support, imports
             return SymbolKind.Class;
         return SymbolKind.Variable;
     };
-    const classifyLocalCapture = (capture, range, node) => {
+    const classifyLocalCapture = (node) => {
         if (node)
             return toKind(support.classifyDefinition(node));
-        if ("name" in capture && capture.name === "tname") {
-            return SymbolKind.TypeAlias;
-        }
         return SymbolKind.Variable;
     };
+    // Declarator captures name the declared entity, never parameter or array-bound types.
     const extractLocalsFromNativeQueries = () => {
         if (!nativeQueries)
             return false;
@@ -415,12 +496,31 @@ export function collectLocalsAndExportsFromSource(file, source, support, imports
             const enrichmentTree = ensureTree();
             for (const match of nativeQueries.locals) {
                 for (const capture of match.captures) {
-                    if (capture.name !== "name" && capture.name !== "tname")
+                    if (capture.name !== "name" && capture.name !== "declarator")
                         continue;
                     const nativeRange = rangeFromNativeCapture(capture, ensureByteIndexMap());
                     const node = enrichmentTree?.rootNode.descendantForIndex(nativeRange.start.index ?? 0, nativeRange.end.index ?? 0) ??
                         undefined;
-                    pushLocal(capture.text, classifyLocalCapture(capture, nativeRange, node), nativeRange, node);
+                    if (capture.name === "declarator") {
+                        const namedNode = declaratorNameNode(node);
+                        if (namedNode) {
+                            pushLocal(namedNode.text, classifyLocalCapture(namedNode), toRange(namedNode), namedNode);
+                        }
+                        else {
+                            const extracted = cDeclaratorDeclaredName(capture.text);
+                            if (!extracted)
+                                continue;
+                            if (capture.nodeType === "identifier" || capture.nodeType === "type_identifier") {
+                                pushLocal(capture.text, SymbolKind.TypeAlias, nativeRange);
+                            }
+                            else {
+                                pushLocal(extracted.name, SymbolKind.TypeAlias, rangeFromOffsets((nativeRange.start.index ?? 0) + extracted.start, (nativeRange.start.index ?? 0) + extracted.end));
+                            }
+                        }
+                    }
+                    else {
+                        pushLocal(capture.text, classifyLocalCapture(node), nativeRange, node);
+                    }
                     capturedLocals = true;
                 }
             }
@@ -432,9 +532,7 @@ export function collectLocalsAndExportsFromSource(file, source, support, imports
             return false;
         }
     };
-    const extractLocalsFromJsQueries = () => false;
-    const usedNativeLocals = extractLocalsFromNativeQueries();
-    const usedQueryLocals = usedNativeLocals || extractLocalsFromJsQueries();
+    const usedQueryLocals = extractLocalsFromNativeQueries();
     if (!usedQueryLocals) {
         const scopeTree = ensureTree();
         if (scopeTree) {
@@ -526,14 +624,44 @@ export function collectLocalsAndExportsFromSource(file, source, support, imports
             return (node.childForFieldName("name") ?? node.childForFieldName("declaration")?.childForFieldName("name") ?? undefined);
         };
         const hasDefaultExport = () => exports.some((entry) => entry.type === "local" && entry.exportedAs === "default");
+        const excludedCaptures = [];
+        if (!treeForEnrichment) {
+            for (const match of matches) {
+                for (const capture of match.captures) {
+                    if (capture.name === "export_scope" || capture.name === "private_declaration")
+                        excludedCaptures.push(capture);
+                }
+            }
+        }
+        // Native scope captures preserve C/C++ exclusions without an enrichment tree.
+        const isOutsideModuleScope = (capture) => {
+            if (!capture || !support.exportScopeBlockers.length)
+                return false;
+            let current = nodeForCapture(capture)?.parent ?? undefined;
+            while (current) {
+                const ancestor = current;
+                if (support.exportScopeBlockers.some((blocker) => matchesExportScopeBlocker(ancestor, blocker)))
+                    return true;
+                current = ancestor.parent ?? undefined;
+            }
+            return excludedCaptures.some((scope) => capture.start.index >= scope.start.index && capture.end.index <= scope.end.index);
+        };
         for (const match of matches) {
             const map = capturesByName(match);
             const stmtText = map["stmt"]?.text ?? "";
+            if (support.id === "c" || support.id === "cpp") {
+                const declarationNode = nodeForCapture(map["declaration"]);
+                const hasStaticStorageClass = declarationNode?.namedChildren.some((child) => child.type === "storage_class_specifier" && child.text === "static");
+                if (hasStaticStorageClass)
+                    continue;
+            }
+            if (isOutsideModuleScope(map["name"] ?? map["src"]))
+                continue;
             const isTypeOnly = support.isTypeOnly(stmtText);
             if (support.id === "python") {
                 const leftText = map["left"]?.text ?? "";
                 const methodText = map["method"]?.text ?? "";
-                const isAllAssignment = leftText === "__all__";
+                const isAllAssignment = leftText === "__all__" && !methodText;
                 const isAllMethod = leftText === "__all__" && (methodText === "extend" || methodText === "append");
                 if (isAllAssignment || isAllMethod) {
                     hasPythonAll = true;
@@ -551,26 +679,6 @@ export function collectLocalsAndExportsFromSource(file, source, support, imports
                             });
                         }
                     }
-                    if (isAllAssignment && map["stmt"]) {
-                        const assignmentText = map["stmt"].text;
-                        const hasTuple = /=\s*\(/.test(assignmentText);
-                        if (!items.length || hasTuple) {
-                            const strRe = /["']([^"']+)["']/g;
-                            for (let submatch; (submatch = strRe.exec(assignmentText));) {
-                                const name = submatch[1];
-                                pythonAllExports.add(name);
-                                const local = mergedLocals.find((def) => def.localName === name);
-                                if (local &&
-                                    !exports.some((entry) => entry.type !== "exportStar" && "exportedAs" in entry && entry.exportedAs === name)) {
-                                    exports.push({
-                                        type: "local",
-                                        exportedAs: name,
-                                        target: local,
-                                    });
-                                }
-                            }
-                        }
-                    }
                     continue;
                 }
                 if (map["name"]) {
@@ -597,7 +705,7 @@ export function collectLocalsAndExportsFromSource(file, source, support, imports
                         fromModule: from,
                         moduleSpecifier: from,
                         sourceSpecifier: srcName,
-                        typeOnly: isTypeOnly,
+                        typeOnly: Boolean(map["type_kw"]) || isTypeOnly,
                     });
                 }
                 else if (/^\s*export\s*\*/.test(stmtText)) {
@@ -785,8 +893,15 @@ export function collectLocalsAndExportsFromSource(file, source, support, imports
                 }
                 continue;
             }
-            if (map["name"]) {
-                const nameText = map["name"].text;
+            const nameCapture = map["name"] ?? map["declarator"];
+            if (nameCapture) {
+                if (isOutsideModuleScope(nameCapture))
+                    continue;
+                const nameText = map["declarator"]
+                    ? declaratorCaptureName(nameCapture, nodeForCapture(nameCapture))
+                    : nameCapture.text;
+                if (!nameText)
+                    continue;
                 const local = locals.find((def) => def.localName === nameText);
                 if (local) {
                     const isDefaultExport = /^\s*export\s+default\b/.test(stmtText);
@@ -926,6 +1041,6 @@ export function collectLocalsAndExportsFromSource(file, source, support, imports
             }
         }
     }
-    return { file, exports, imports, locals };
+    return { file, exports: dedupeExportEntries(exports), imports, locals };
 }
 //# sourceMappingURL=locals-and-exports.js.map