@suss/adapter-python 0.5.2 → 0.5.3

package/dist/index.cjs

@@ -18221,8 +18221,10 @@ function buildRouterIndex(files, packs, resolverOptions) {
     }
   }
   const byFile = /* @__PURE__ */ new Map();
+  const displayPaths = /* @__PURE__ */ new Map();
   for (const file2 of files) {
     byFile.set(file2.file, file2);
+    displayPaths.set(file2.module, file2.displayPath);
   }
   return {
     moduleDef(fromFile, spec, name) {
@@ -18262,14 +18264,15 @@ function buildRouterIndex(files, packs, resolverOptions) {
       if (ownPrefix.kind === "abstain") {
         return ownPrefix;
       }
+      const routerPath = displayPaths.get(module2);
       const mount = index.mounts.get(construction);
       if (mount === void 0) {
-        return { kind: "abstain", reason: unmountedReason(index) };
+        return { kind: "abstain", reason: unmountedReason(index, routerPath) };
       }
       if (mount.kind === "abstain") {
         return { kind: "abstain", reason: mount.reason };
       }
-      const rivalled = rivalRegistration(index, mount.site);
+      const rivalled = rivalRegistration(index, mount.site, routerPath);
       if (rivalled !== null) {
         return { kind: "abstain", reason: rivalled };
       }
@@ -18303,24 +18306,32 @@ function loopsClause(loops, verb) {
   }
   return `loops at ${locations.join(", ")} ${verb}`;
 }
-function unmountedReason(index) {
-  const loops = [...index.unenumerableLoops.values()];
-  if (loops.length === 0) {
-    return "is never mounted through a single variable binding in the files read";
+function couldReach(loop, routerPath) {
+  if (routerPath === void 0) {
+    return true;
   }
+  const directory = loop.file.slice(0, loop.file.lastIndexOf("/") + 1);
+  return routerPath.startsWith(directory);
+}
+function unmountedReason(index, routerPath) {
+  const loops = [...index.unenumerableLoops.values()];
   const stopped = loops.find((loop) => loop.unmatched !== void 0);
   if (stopped?.unmatched !== void 0) {
     const { name, resolvedTo, matched, of } = stopped.unmatched;
     return `is not mounted by name in the files read, and a loop at ${stopped.location} mounts a list this reading resolved, where ${matched} of ${of} entries matched a router and ${name} did not (it resolved to ${resolvedTo}), so the whole list is declined rather than most of it mounted`;
   }
-  return `is not mounted by name in the files read, and ${loopsClause(loops, "mount")} routers read out of a call this reading does not follow`;
+  const reachable = loops.filter((loop) => couldReach(loop, routerPath));
+  if (reachable.length === 0) {
+    return "is never mounted through a single variable binding in the files read";
+  }
+  return `is not mounted by name in the files read, and ${loopsClause(reachable, "mount")} routers read out of a call this reading does not follow`;
 }
-function rivalRegistration(index, site) {
+function rivalRegistration(index, site, routerPath) {
   if (site.kind === "module") {
     return null;
   }
   const rivals = [...index.unenumerableLoops.values()].filter(
-    (loop) => !sameSite(loop.site, site)
+    (loop) => !sameSite(loop.site, site) && couldReach(loop, routerPath)
   );
   if (rivals.length === 0) {
     return null;
@@ -18793,6 +18804,7 @@ function mountedConstructions(arg, position, scan) {
     }
     scan.index.unenumerableLoops.set(target.location, {
       site: position.site,
+      file: scan.bound.displayPath,
       location: target.location,
       ...returned.kind === "unmatched" ? { unmatched: returned } : {}
     });
@@ -18800,6 +18812,7 @@ function mountedConstructions(arg, position, scan) {
   }
   scan.index.unenumerableLoops.set(target.location, {
     site: position.site,
+    file: scan.bound.displayPath,
     location: target.location
   });
   return [];

package/dist/index.js

@@ -18177,8 +18177,10 @@ function buildRouterIndex(files, packs, resolverOptions) {
     }
   }
   const byFile = /* @__PURE__ */ new Map();
+  const displayPaths = /* @__PURE__ */ new Map();
   for (const file2 of files) {
     byFile.set(file2.file, file2);
+    displayPaths.set(file2.module, file2.displayPath);
   }
   return {
     moduleDef(fromFile, spec, name) {
@@ -18218,14 +18220,15 @@ function buildRouterIndex(files, packs, resolverOptions) {
       if (ownPrefix.kind === "abstain") {
         return ownPrefix;
       }
+      const routerPath = displayPaths.get(module);
       const mount = index.mounts.get(construction);
       if (mount === void 0) {
-        return { kind: "abstain", reason: unmountedReason(index) };
+        return { kind: "abstain", reason: unmountedReason(index, routerPath) };
       }
       if (mount.kind === "abstain") {
         return { kind: "abstain", reason: mount.reason };
       }
-      const rivalled = rivalRegistration(index, mount.site);
+      const rivalled = rivalRegistration(index, mount.site, routerPath);
       if (rivalled !== null) {
         return { kind: "abstain", reason: rivalled };
       }
@@ -18259,24 +18262,32 @@ function loopsClause(loops, verb) {
   }
   return `loops at ${locations.join(", ")} ${verb}`;
 }
-function unmountedReason(index) {
-  const loops = [...index.unenumerableLoops.values()];
-  if (loops.length === 0) {
-    return "is never mounted through a single variable binding in the files read";
+function couldReach(loop, routerPath) {
+  if (routerPath === void 0) {
+    return true;
   }
+  const directory = loop.file.slice(0, loop.file.lastIndexOf("/") + 1);
+  return routerPath.startsWith(directory);
+}
+function unmountedReason(index, routerPath) {
+  const loops = [...index.unenumerableLoops.values()];
   const stopped = loops.find((loop) => loop.unmatched !== void 0);
   if (stopped?.unmatched !== void 0) {
     const { name, resolvedTo, matched, of } = stopped.unmatched;
     return `is not mounted by name in the files read, and a loop at ${stopped.location} mounts a list this reading resolved, where ${matched} of ${of} entries matched a router and ${name} did not (it resolved to ${resolvedTo}), so the whole list is declined rather than most of it mounted`;
   }
-  return `is not mounted by name in the files read, and ${loopsClause(loops, "mount")} routers read out of a call this reading does not follow`;
+  const reachable = loops.filter((loop) => couldReach(loop, routerPath));
+  if (reachable.length === 0) {
+    return "is never mounted through a single variable binding in the files read";
+  }
+  return `is not mounted by name in the files read, and ${loopsClause(reachable, "mount")} routers read out of a call this reading does not follow`;
 }
-function rivalRegistration(index, site) {
+function rivalRegistration(index, site, routerPath) {
   if (site.kind === "module") {
     return null;
   }
   const rivals = [...index.unenumerableLoops.values()].filter(
-    (loop) => !sameSite(loop.site, site)
+    (loop) => !sameSite(loop.site, site) && couldReach(loop, routerPath)
   );
   if (rivals.length === 0) {
     return null;
@@ -18749,6 +18760,7 @@ function mountedConstructions(arg, position, scan) {
     }
     scan.index.unenumerableLoops.set(target.location, {
       site: position.site,
+      file: scan.bound.displayPath,
       location: target.location,
       ...returned.kind === "unmatched" ? { unmatched: returned } : {}
     });
@@ -18756,6 +18768,7 @@ function mountedConstructions(arg, position, scan) {
   }
   scan.index.unenumerableLoops.set(target.location, {
     site: position.site,
+    file: scan.bound.displayPath,
     location: target.location
   });
   return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-python",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "type": "module",
   "description": "Python language adapter for suss — parses source with tree-sitter (WASM), resolves names with a lexical binder, and emits raw extractions for the suss pipeline.",
   "keywords": [
@@ -47,9 +47,9 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.5.2",
-    "@suss/datalog": "0.5.2",
-    "@suss/extractor": "0.5.2",
+    "@suss/behavioral-ir": "0.5.3",
+    "@suss/datalog": "0.5.3",
+    "@suss/extractor": "0.5.3",
     "web-tree-sitter": "^0.26.11"
   },
   "devDependencies": {