@suss/adapter-python 0.5.2 → 0.5.4

package/dist/index.cjs

@@ -564,6 +564,18 @@ function readArg(node) {
   if (node.type === "identifier") {
     return { kind: "identifier", name: node.text };
   }
+  if (node.type === "attribute") {
+    const object2 = field(node, "object");
+    const attribute = field(node, "attribute");
+    if (object2?.type === "identifier" && attribute?.type === "identifier") {
+      return {
+        kind: "attribute",
+        objectName: object2.text,
+        attributeName: attribute.text
+      };
+    }
+    return { kind: "other" };
+  }
   if (node.type === "list") {
     return {
       kind: "list",
@@ -17248,45 +17260,64 @@ function directStorageEffects(calls, options) {
 function discoverUnits(root, module2, options) {
   const units = [];
   for (const stmt of bodyStatements(root)) {
-    if (stmt.type !== "decorated_definition") {
+    if (stmt.type === "decorated_definition") {
+      units.push(...decoratedUnits(stmt, module2.moduleScope, module2, options));
       continue;
     }
-    const { definition, decorators } = stripDecorators(stmt);
-    for (const decoratorNode of decorators) {
-      const direct = classifyDecorator(decoratorNode, module2.moduleScope);
-      const classifications = direct.module !== null && acceptedByAnyPattern(direct.module, options) ? [direct] : [
-        unwrapDecorator(
-          decoratorNode,
-          module2.moduleScope,
-          module2,
-          (spec, name) => options.routerIndex?.moduleDef(
-            options.absoluteFile ?? options.filePath,
-            spec,
-            name
-          ) ?? null
-        )
-      ].filter(
-        (candidate) => candidate !== null
-      );
-      for (const classification of classifications) {
-        if (classification.module === null) {
-          continue;
-        }
-        const decoratorModule = classification.module;
-        for (const pack of options.packs) {
-          for (const pattern of pack.discovery) {
-            units.push(
-              ...unitsFor(
-                pattern,
-                pack,
-                decoratorModule,
-                classification,
-                definition,
-                module2,
-                options
-              )
-            );
-          }
+    const { definition } = stripDecorators(stmt);
+    if (definition.type !== "function_definition") {
+      continue;
+    }
+    const body = field(definition, "body");
+    const scope = module2.scopeFor.get(definition.id);
+    if (body === null || scope === void 0) {
+      continue;
+    }
+    for (const inner of bodyStatements(body)) {
+      if (inner.type === "decorated_definition") {
+        units.push(...decoratedUnits(inner, scope, module2, options));
+      }
+    }
+  }
+  return units;
+}
+function decoratedUnits(stmt, scope, module2, options) {
+  const units = [];
+  const { definition, decorators } = stripDecorators(stmt);
+  for (const decoratorNode of decorators) {
+    const direct = classifyDecorator(decoratorNode, scope);
+    const classifications = direct.module !== null && acceptedByAnyPattern(direct.module, options) ? [direct] : [
+      unwrapDecorator(
+        decoratorNode,
+        scope,
+        module2,
+        (spec, name) => options.routerIndex?.moduleDef(
+          options.absoluteFile ?? options.filePath,
+          spec,
+          name
+        ) ?? null
+      )
+    ].filter(
+      (candidate) => candidate !== null
+    );
+    for (const classification of classifications) {
+      if (classification.module === null) {
+        continue;
+      }
+      const decoratorModule = classification.module;
+      for (const pack of options.packs) {
+        for (const pattern of pack.discovery) {
+          units.push(
+            ...unitsFor(
+              pattern,
+              pack,
+              decoratorModule,
+              classification,
+              definition,
+              module2,
+              options
+            )
+          );
         }
       }
     }
@@ -18221,8 +18252,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 +18295,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 +18337,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;
@@ -18772,6 +18814,10 @@ function resolvedValueKey(facts, value) {
   return row === void 0 ? value : String(row[1]);
 }
 function mountedConstructions(arg, position, scan) {
+  if (arg?.kind === "attribute") {
+    const construction = constructionThroughModule(arg, position.scope, scan);
+    return construction === null ? [] : [construction];
+  }
   if (arg?.kind !== "identifier") {
     return [];
   }
@@ -18793,6 +18839,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,10 +18847,42 @@ function mountedConstructions(arg, position, scan) {
   }
   scan.index.unenumerableLoops.set(target.location, {
     site: position.site,
+    file: scan.bound.displayPath,
     location: target.location
   });
   return [];
 }
+function constructionThroughModule(arg, scope, scan) {
+  const binding = resolveName(scope, arg.objectName);
+  if (binding === null) {
+    return null;
+  }
+  const spec = importedModuleSpec(binding);
+  if (spec === null) {
+    return null;
+  }
+  const resolution = resolveModule(scan.bound.file, spec, scan.resolverOptions);
+  if (resolution.status !== "resolved") {
+    return null;
+  }
+  const target = scan.byFile.get(resolution.file);
+  if (target === void 0) {
+    return null;
+  }
+  return scan.index.constructions.get(target.module)?.get(arg.attributeName) ?? null;
+}
+function importedModuleSpec(binding) {
+  if (binding.kind === "import") {
+    return { module: binding.module, relativeLevel: binding.relativeLevel };
+  }
+  if (binding.kind === "importFrom") {
+    return {
+      module: binding.module === "" ? binding.importedName : `${binding.module}.${binding.importedName}`,
+      relativeLevel: binding.relativeLevel
+    };
+  }
+  return null;
+}
 function recordMountStatement(stmt, position, scan) {
   const mountCall = mountCallOf(stmt, position.scope, scan);
   if (mountCall === null) {

package/dist/index.d.cts

@@ -128,6 +128,12 @@ type DecoratorArg = {
  | {
     kind: "identifier";
     name: string;
+}
+/** One dotted hop, `routers.orders`. The caller decides what the object is. */
+ | {
+    kind: "attribute";
+    objectName: string;
+    attributeName: string;
 } | {
     kind: "list";
     items: DecoratorArg[];

package/dist/index.d.ts

@@ -128,6 +128,12 @@ type DecoratorArg = {
  | {
     kind: "identifier";
     name: string;
+}
+/** One dotted hop, `routers.orders`. The caller decides what the object is. */
+ | {
+    kind: "attribute";
+    objectName: string;
+    attributeName: string;
 } | {
     kind: "list";
     items: DecoratorArg[];

package/dist/index.js

@@ -510,6 +510,18 @@ function readArg(node) {
   if (node.type === "identifier") {
     return { kind: "identifier", name: node.text };
   }
+  if (node.type === "attribute") {
+    const object2 = field(node, "object");
+    const attribute = field(node, "attribute");
+    if (object2?.type === "identifier" && attribute?.type === "identifier") {
+      return {
+        kind: "attribute",
+        objectName: object2.text,
+        attributeName: attribute.text
+      };
+    }
+    return { kind: "other" };
+  }
   if (node.type === "list") {
     return {
       kind: "list",
@@ -17204,45 +17216,64 @@ function directStorageEffects(calls, options) {
 function discoverUnits(root, module, options) {
   const units = [];
   for (const stmt of bodyStatements(root)) {
-    if (stmt.type !== "decorated_definition") {
+    if (stmt.type === "decorated_definition") {
+      units.push(...decoratedUnits(stmt, module.moduleScope, module, options));
       continue;
     }
-    const { definition, decorators } = stripDecorators(stmt);
-    for (const decoratorNode of decorators) {
-      const direct = classifyDecorator(decoratorNode, module.moduleScope);
-      const classifications = direct.module !== null && acceptedByAnyPattern(direct.module, options) ? [direct] : [
-        unwrapDecorator(
-          decoratorNode,
-          module.moduleScope,
-          module,
-          (spec, name) => options.routerIndex?.moduleDef(
-            options.absoluteFile ?? options.filePath,
-            spec,
-            name
-          ) ?? null
-        )
-      ].filter(
-        (candidate) => candidate !== null
-      );
-      for (const classification of classifications) {
-        if (classification.module === null) {
-          continue;
-        }
-        const decoratorModule = classification.module;
-        for (const pack of options.packs) {
-          for (const pattern of pack.discovery) {
-            units.push(
-              ...unitsFor(
-                pattern,
-                pack,
-                decoratorModule,
-                classification,
-                definition,
-                module,
-                options
-              )
-            );
-          }
+    const { definition } = stripDecorators(stmt);
+    if (definition.type !== "function_definition") {
+      continue;
+    }
+    const body = field(definition, "body");
+    const scope = module.scopeFor.get(definition.id);
+    if (body === null || scope === void 0) {
+      continue;
+    }
+    for (const inner of bodyStatements(body)) {
+      if (inner.type === "decorated_definition") {
+        units.push(...decoratedUnits(inner, scope, module, options));
+      }
+    }
+  }
+  return units;
+}
+function decoratedUnits(stmt, scope, module, options) {
+  const units = [];
+  const { definition, decorators } = stripDecorators(stmt);
+  for (const decoratorNode of decorators) {
+    const direct = classifyDecorator(decoratorNode, scope);
+    const classifications = direct.module !== null && acceptedByAnyPattern(direct.module, options) ? [direct] : [
+      unwrapDecorator(
+        decoratorNode,
+        scope,
+        module,
+        (spec, name) => options.routerIndex?.moduleDef(
+          options.absoluteFile ?? options.filePath,
+          spec,
+          name
+        ) ?? null
+      )
+    ].filter(
+      (candidate) => candidate !== null
+    );
+    for (const classification of classifications) {
+      if (classification.module === null) {
+        continue;
+      }
+      const decoratorModule = classification.module;
+      for (const pack of options.packs) {
+        for (const pattern of pack.discovery) {
+          units.push(
+            ...unitsFor(
+              pattern,
+              pack,
+              decoratorModule,
+              classification,
+              definition,
+              module,
+              options
+            )
+          );
         }
       }
     }
@@ -18177,8 +18208,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 +18251,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 +18293,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;
@@ -18728,6 +18770,10 @@ function resolvedValueKey(facts, value) {
   return row === void 0 ? value : String(row[1]);
 }
 function mountedConstructions(arg, position, scan) {
+  if (arg?.kind === "attribute") {
+    const construction = constructionThroughModule(arg, position.scope, scan);
+    return construction === null ? [] : [construction];
+  }
   if (arg?.kind !== "identifier") {
     return [];
   }
@@ -18749,6 +18795,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,10 +18803,42 @@ function mountedConstructions(arg, position, scan) {
   }
   scan.index.unenumerableLoops.set(target.location, {
     site: position.site,
+    file: scan.bound.displayPath,
     location: target.location
   });
   return [];
 }
+function constructionThroughModule(arg, scope, scan) {
+  const binding = resolveName(scope, arg.objectName);
+  if (binding === null) {
+    return null;
+  }
+  const spec = importedModuleSpec(binding);
+  if (spec === null) {
+    return null;
+  }
+  const resolution = resolveModule(scan.bound.file, spec, scan.resolverOptions);
+  if (resolution.status !== "resolved") {
+    return null;
+  }
+  const target = scan.byFile.get(resolution.file);
+  if (target === void 0) {
+    return null;
+  }
+  return scan.index.constructions.get(target.module)?.get(arg.attributeName) ?? null;
+}
+function importedModuleSpec(binding) {
+  if (binding.kind === "import") {
+    return { module: binding.module, relativeLevel: binding.relativeLevel };
+  }
+  if (binding.kind === "importFrom") {
+    return {
+      module: binding.module === "" ? binding.importedName : `${binding.module}.${binding.importedName}`,
+      relativeLevel: binding.relativeLevel
+    };
+  }
+  return null;
+}
 function recordMountStatement(stmt, position, scan) {
   const mountCall = mountCallOf(stmt, position.scope, scan);
   if (mountCall === null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-python",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "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.4",
+    "@suss/datalog": "0.5.4",
+    "@suss/extractor": "0.5.4",
     "web-tree-sitter": "^0.26.11"
   },
   "devDependencies": {