@suss/adapter-python 0.13.0 → 0.13.1

package/dist/index.cjs

@@ -642,18 +642,25 @@ function resolveObjectModule(name, scope) {
   }
   if (binding?.kind === "assignment" && binding.value?.type === "call") {
     const callee = field(binding.value, "function");
-    if (callee?.type === "identifier") {
-      const calleeBinding = resolveName(scope, callee.text);
-      if (calleeBinding?.kind === "importFrom") {
-        return {
-          module: calleeBinding.module,
-          relativeLevel: calleeBinding.relativeLevel
-        };
-      }
-    }
+    return callee === null ? null : calleeModule(callee, scope);
   }
   return null;
 }
+function calleeModule(callee, scope) {
+  if (callee.type === "identifier") {
+    const binding2 = resolveName(scope, callee.text);
+    return binding2?.kind === "importFrom" ? { module: binding2.module, relativeLevel: binding2.relativeLevel } : null;
+  }
+  if (callee.type !== "attribute") {
+    return null;
+  }
+  const object2 = field(callee, "object");
+  if (object2?.type !== "identifier") {
+    return null;
+  }
+  const binding = resolveName(scope, object2.text);
+  return binding?.kind === "import" ? { module: binding.module, relativeLevel: binding.relativeLevel } : null;
+}
 function resolveCallee(expr, scope) {
   if (expr.type === "identifier") {
     const binding = resolveName(scope, expr.text);
@@ -18796,14 +18803,11 @@ function constructionOf(name, scope, importModule) {
     return null;
   }
   const callee = field(binding.value, "function");
-  if (callee?.type !== "identifier") {
-    return null;
-  }
-  const calleeBinding = resolveName(scope, callee.text);
-  if (calleeBinding?.kind !== "importFrom" || !importModule.includes(calleeBinding.module)) {
+  if (callee === null) {
     return null;
   }
-  return { constructorName: calleeBinding.importedName, call: binding.value };
+  const constructorName = importedConstructorName(callee, scope, importModule);
+  return constructorName === null ? null : { constructorName, call: binding.value };
 }
 var PREFIX_TRAILING_SLASH_READERS = {
   kept: (prefix) => prefix,
@@ -18815,7 +18819,20 @@ var NO_VALUE_LITERALS = {
   boolean: (arg) => arg.kind === "boolean" && !arg.value,
   none: () => true
 };
-function readPrefixKeyword(keywordArgs, keyword, composition) {
+function prefixStringOf(arg, scope) {
+  if (arg.kind === "string") {
+    return arg.value;
+  }
+  if (arg.kind !== "identifier" || scope === void 0) {
+    return null;
+  }
+  const binding = resolveName(scope, arg.name);
+  if (binding === null || binding.kind !== "assignment" || binding.value === null) {
+    return null;
+  }
+  return stringLiteralValue(binding.value);
+}
+function readPrefixKeyword(keywordArgs, keyword, composition, scope) {
   const arg = keywordArgs[keyword];
   if (arg === void 0) {
     return UNSTATED_PREFIX;
@@ -18823,16 +18840,15 @@ function readPrefixKeyword(keywordArgs, keyword, composition) {
   if ((composition.noValuePrefix ?? "unreadable") === "unstated" && NO_VALUE_LITERALS[arg.kind]?.(arg) === true) {
     return UNSTATED_PREFIX;
   }
-  if (arg.kind === "string") {
-    return { kind: "stated", value: arg.value };
-  }
-  return UNREADABLE_PREFIX;
+  const value = prefixStringOf(arg, scope);
+  return value === null ? UNREADABLE_PREFIX : { kind: "stated", value };
 }
-function constructorPrefix(keywordArgs, composition) {
+function constructorPrefix(keywordArgs, composition, scope) {
   const reading = readPrefixKeyword(
     keywordArgs,
     composition.prefixKeyword,
-    composition
+    composition,
+    scope
   );
   if (reading.kind !== "stated") {
     return reading;
@@ -18859,18 +18875,36 @@ function constructionStatement(stmt, scope, importModule) {
     return null;
   }
   const callee = field(right, "function");
-  if (callee?.type !== "identifier") {
+  if (callee === null) {
     return null;
   }
-  const calleeBinding = resolveName(scope, callee.text);
-  if (calleeBinding?.kind !== "importFrom" || !importModule.includes(calleeBinding.module)) {
+  const constructorName = importedConstructorName(callee, scope, importModule);
+  if (constructorName === null) {
     return null;
   }
-  return {
-    name: left.text,
-    constructorName: calleeBinding.importedName,
-    call: right
-  };
+  return { name: left.text, constructorName, call: right };
+}
+function importedConstructorName(callee, scope, importModule) {
+  if (callee.type === "identifier") {
+    const binding2 = resolveName(scope, callee.text);
+    if (binding2?.kind !== "importFrom" || !importModule.includes(binding2.module)) {
+      return null;
+    }
+    return binding2.importedName;
+  }
+  if (callee.type !== "attribute") {
+    return null;
+  }
+  const object2 = field(callee, "object");
+  const attribute = field(callee, "attribute");
+  if (object2?.type !== "identifier" || attribute?.type !== "identifier") {
+    return null;
+  }
+  const binding = resolveName(scope, object2.text);
+  if (binding?.kind !== "import" || !importModule.includes(binding.module)) {
+    return null;
+  }
+  return attribute.text;
 }
 function recordConstruction(construction, module2, file2, prefixOf, into, byValueKey) {
   const perModule = into.get(module2) ?? /* @__PURE__ */ new Map();
@@ -18906,7 +18940,7 @@ function collectConstructions(bound, importModule, composition, index) {
       construction,
       bound.module,
       bound.file,
-      (keywordArgs) => constructorPrefix(keywordArgs, composition),
+      (keywordArgs) => constructorPrefix(keywordArgs, composition, bound.module.moduleScope),
       index.constructions,
       index.byValueKey
     );
@@ -18930,7 +18964,12 @@ function collectCarrierConstructions(carrier, composition, scan) {
         construction,
         scan.bound.module,
         scan.bound.file,
-        (keywordArgs) => readPrefixKeyword(keywordArgs, carrier.prefixKeyword, composition),
+        (keywordArgs) => readPrefixKeyword(
+          keywordArgs,
+          carrier.prefixKeyword,
+          composition,
+          scan.bound.module.moduleScope
+        ),
         scan.index.carriers,
         scan.index.byValueKey
       );
@@ -19249,14 +19288,15 @@ function recordMountStatement(stmt, position, scan) {
     keywordArgs,
     objectPrefix,
     scan.composition,
-    position.site
+    position.site,
+    position.scope
   );
   const mounted = args[0] ?? (scan.composition.routerKeyword === void 0 ? void 0 : keywordArgs[scan.composition.routerKeyword]);
   for (const target of mountedConstructions(mounted, position, scan)) {
     recordMount(scan.index, target, state);
   }
 }
-function mountStateOf(includerConstructorName, keywordArgs, objectPrefix, composition, site) {
+function mountStateOf(includerConstructorName, keywordArgs, objectPrefix, composition, site, scope) {
   if (includerConstructorName === composition.routerConstructorName) {
     return {
       kind: "abstain",
@@ -19272,7 +19312,8 @@ function mountStateOf(includerConstructorName, keywordArgs, objectPrefix, compos
   const mountPrefix = readPrefixKeyword(
     keywordArgs,
     composition.prefixKeyword,
-    composition
+    composition,
+    scope
   );
   if (mountPrefix.kind === "unreadable") {
     return {
@@ -19428,7 +19469,12 @@ function readMountObjectPrefix(spec, objectName, constructionCall, scope, scan)
   const { args, keywordArgs } = readCallArguments(
     field(constructionCall, "arguments")
   );
-  const own = spec.prefixKeyword === void 0 ? UNSTATED_PREFIX : readPrefixKeyword(keywordArgs, spec.prefixKeyword, scan.composition);
+  const own = spec.prefixKeyword === void 0 ? UNSTATED_PREFIX : readPrefixKeyword(
+    keywordArgs,
+    spec.prefixKeyword,
+    scan.composition,
+    scan.bound.module.moduleScope
+  );
   if (own.kind === "unreadable") {
     return {
       kind: "abstain",

package/dist/index.js

@@ -588,18 +588,25 @@ function resolveObjectModule(name, scope) {
   }
   if (binding?.kind === "assignment" && binding.value?.type === "call") {
     const callee = field(binding.value, "function");
-    if (callee?.type === "identifier") {
-      const calleeBinding = resolveName(scope, callee.text);
-      if (calleeBinding?.kind === "importFrom") {
-        return {
-          module: calleeBinding.module,
-          relativeLevel: calleeBinding.relativeLevel
-        };
-      }
-    }
+    return callee === null ? null : calleeModule(callee, scope);
   }
   return null;
 }
+function calleeModule(callee, scope) {
+  if (callee.type === "identifier") {
+    const binding2 = resolveName(scope, callee.text);
+    return binding2?.kind === "importFrom" ? { module: binding2.module, relativeLevel: binding2.relativeLevel } : null;
+  }
+  if (callee.type !== "attribute") {
+    return null;
+  }
+  const object2 = field(callee, "object");
+  if (object2?.type !== "identifier") {
+    return null;
+  }
+  const binding = resolveName(scope, object2.text);
+  return binding?.kind === "import" ? { module: binding.module, relativeLevel: binding.relativeLevel } : null;
+}
 function resolveCallee(expr, scope) {
   if (expr.type === "identifier") {
     const binding = resolveName(scope, expr.text);
@@ -18752,14 +18759,11 @@ function constructionOf(name, scope, importModule) {
     return null;
   }
   const callee = field(binding.value, "function");
-  if (callee?.type !== "identifier") {
-    return null;
-  }
-  const calleeBinding = resolveName(scope, callee.text);
-  if (calleeBinding?.kind !== "importFrom" || !importModule.includes(calleeBinding.module)) {
+  if (callee === null) {
     return null;
   }
-  return { constructorName: calleeBinding.importedName, call: binding.value };
+  const constructorName = importedConstructorName(callee, scope, importModule);
+  return constructorName === null ? null : { constructorName, call: binding.value };
 }
 var PREFIX_TRAILING_SLASH_READERS = {
   kept: (prefix) => prefix,
@@ -18771,7 +18775,20 @@ var NO_VALUE_LITERALS = {
   boolean: (arg) => arg.kind === "boolean" && !arg.value,
   none: () => true
 };
-function readPrefixKeyword(keywordArgs, keyword, composition) {
+function prefixStringOf(arg, scope) {
+  if (arg.kind === "string") {
+    return arg.value;
+  }
+  if (arg.kind !== "identifier" || scope === void 0) {
+    return null;
+  }
+  const binding = resolveName(scope, arg.name);
+  if (binding === null || binding.kind !== "assignment" || binding.value === null) {
+    return null;
+  }
+  return stringLiteralValue(binding.value);
+}
+function readPrefixKeyword(keywordArgs, keyword, composition, scope) {
   const arg = keywordArgs[keyword];
   if (arg === void 0) {
     return UNSTATED_PREFIX;
@@ -18779,16 +18796,15 @@ function readPrefixKeyword(keywordArgs, keyword, composition) {
   if ((composition.noValuePrefix ?? "unreadable") === "unstated" && NO_VALUE_LITERALS[arg.kind]?.(arg) === true) {
     return UNSTATED_PREFIX;
   }
-  if (arg.kind === "string") {
-    return { kind: "stated", value: arg.value };
-  }
-  return UNREADABLE_PREFIX;
+  const value = prefixStringOf(arg, scope);
+  return value === null ? UNREADABLE_PREFIX : { kind: "stated", value };
 }
-function constructorPrefix(keywordArgs, composition) {
+function constructorPrefix(keywordArgs, composition, scope) {
   const reading = readPrefixKeyword(
     keywordArgs,
     composition.prefixKeyword,
-    composition
+    composition,
+    scope
   );
   if (reading.kind !== "stated") {
     return reading;
@@ -18815,18 +18831,36 @@ function constructionStatement(stmt, scope, importModule) {
     return null;
   }
   const callee = field(right, "function");
-  if (callee?.type !== "identifier") {
+  if (callee === null) {
     return null;
   }
-  const calleeBinding = resolveName(scope, callee.text);
-  if (calleeBinding?.kind !== "importFrom" || !importModule.includes(calleeBinding.module)) {
+  const constructorName = importedConstructorName(callee, scope, importModule);
+  if (constructorName === null) {
     return null;
   }
-  return {
-    name: left.text,
-    constructorName: calleeBinding.importedName,
-    call: right
-  };
+  return { name: left.text, constructorName, call: right };
+}
+function importedConstructorName(callee, scope, importModule) {
+  if (callee.type === "identifier") {
+    const binding2 = resolveName(scope, callee.text);
+    if (binding2?.kind !== "importFrom" || !importModule.includes(binding2.module)) {
+      return null;
+    }
+    return binding2.importedName;
+  }
+  if (callee.type !== "attribute") {
+    return null;
+  }
+  const object2 = field(callee, "object");
+  const attribute = field(callee, "attribute");
+  if (object2?.type !== "identifier" || attribute?.type !== "identifier") {
+    return null;
+  }
+  const binding = resolveName(scope, object2.text);
+  if (binding?.kind !== "import" || !importModule.includes(binding.module)) {
+    return null;
+  }
+  return attribute.text;
 }
 function recordConstruction(construction, module, file2, prefixOf, into, byValueKey) {
   const perModule = into.get(module) ?? /* @__PURE__ */ new Map();
@@ -18862,7 +18896,7 @@ function collectConstructions(bound, importModule, composition, index) {
       construction,
       bound.module,
       bound.file,
-      (keywordArgs) => constructorPrefix(keywordArgs, composition),
+      (keywordArgs) => constructorPrefix(keywordArgs, composition, bound.module.moduleScope),
       index.constructions,
       index.byValueKey
     );
@@ -18886,7 +18920,12 @@ function collectCarrierConstructions(carrier, composition, scan) {
         construction,
         scan.bound.module,
         scan.bound.file,
-        (keywordArgs) => readPrefixKeyword(keywordArgs, carrier.prefixKeyword, composition),
+        (keywordArgs) => readPrefixKeyword(
+          keywordArgs,
+          carrier.prefixKeyword,
+          composition,
+          scan.bound.module.moduleScope
+        ),
         scan.index.carriers,
         scan.index.byValueKey
       );
@@ -19205,14 +19244,15 @@ function recordMountStatement(stmt, position, scan) {
     keywordArgs,
     objectPrefix,
     scan.composition,
-    position.site
+    position.site,
+    position.scope
   );
   const mounted = args[0] ?? (scan.composition.routerKeyword === void 0 ? void 0 : keywordArgs[scan.composition.routerKeyword]);
   for (const target of mountedConstructions(mounted, position, scan)) {
     recordMount(scan.index, target, state);
   }
 }
-function mountStateOf(includerConstructorName, keywordArgs, objectPrefix, composition, site) {
+function mountStateOf(includerConstructorName, keywordArgs, objectPrefix, composition, site, scope) {
   if (includerConstructorName === composition.routerConstructorName) {
     return {
       kind: "abstain",
@@ -19228,7 +19268,8 @@ function mountStateOf(includerConstructorName, keywordArgs, objectPrefix, compos
   const mountPrefix = readPrefixKeyword(
     keywordArgs,
     composition.prefixKeyword,
-    composition
+    composition,
+    scope
   );
   if (mountPrefix.kind === "unreadable") {
     return {
@@ -19384,7 +19425,12 @@ function readMountObjectPrefix(spec, objectName, constructionCall, scope, scan)
   const { args, keywordArgs } = readCallArguments(
     field(constructionCall, "arguments")
   );
-  const own = spec.prefixKeyword === void 0 ? UNSTATED_PREFIX : readPrefixKeyword(keywordArgs, spec.prefixKeyword, scan.composition);
+  const own = spec.prefixKeyword === void 0 ? UNSTATED_PREFIX : readPrefixKeyword(
+    keywordArgs,
+    spec.prefixKeyword,
+    scan.composition,
+    scan.bound.module.moduleScope
+  );
   if (own.kind === "unreadable") {
     return {
       kind: "abstain",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-python",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "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,10 +47,10 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.13.0",
-    "@suss/datalog": "0.13.0",
-    "@suss/extractor": "0.13.0",
-    "@suss/sql": "0.13.0",
+    "@suss/behavioral-ir": "0.13.1",
+    "@suss/datalog": "0.13.1",
+    "@suss/extractor": "0.13.1",
+    "@suss/sql": "0.13.1",
     "web-tree-sitter": "^0.26.11"
   },
   "devDependencies": {