@suss/adapter-python 0.5.3 → 0.5.5

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
+            )
+          );
         }
       }
     }
@@ -18783,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 [];
   }
@@ -18817,6 +18852,37 @@ function mountedConstructions(arg, position, scan) {
   });
   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
+            )
+          );
         }
       }
     }
@@ -18739,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 [];
   }
@@ -18773,6 +18808,37 @@ function mountedConstructions(arg, position, scan) {
   });
   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.3",
+  "version": "0.5.5",
   "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.3",
-    "@suss/datalog": "0.5.3",
-    "@suss/extractor": "0.5.3",
+    "@suss/behavioral-ir": "0.5.5",
+    "@suss/datalog": "0.5.5",
+    "@suss/extractor": "0.5.5",
     "web-tree-sitter": "^0.26.11"
   },
   "devDependencies": {