@suss/adapter-python 0.29.0 → 0.30.0

package/dist/index.cjs

@@ -1887,6 +1887,79 @@ function assignedValue(right) {
   const first = fields(right, "subscript")[0];
   return outer?.text === "Annotated" && first !== void 0 ? first : right;
 }
+function sideBesidesNone(node) {
+  const left = field(node, "left");
+  const right = field(node, "right");
+  if (right?.type === "none") {
+    return left;
+  }
+  if (left?.type === "none") {
+    return right;
+  }
+  return null;
+}
+function annotatedClass(node) {
+  if (node === void 0) {
+    return null;
+  }
+  if (node.type === "identifier" || node.type === "string") {
+    return node;
+  }
+  if (node.type === "type") {
+    return annotatedClass(children(node)[0]);
+  }
+  if (node.type === "generic_type") {
+    const parameter = children(node).find(
+      (child) => child.type === "type_parameter"
+    );
+    return annotatedClass(
+      parameter === void 0 ? void 0 : children(parameter)[0]
+    );
+  }
+  if (node.type === "binary_operator") {
+    return annotatedClass(sideBesidesNone(node) ?? void 0);
+  }
+  return null;
+}
+function classReferenceKey(emitter, node) {
+  if (node.type === "identifier") {
+    return valueKey(emitter, node);
+  }
+  const written = stringLiteralValue(node);
+  if (written === null) {
+    return null;
+  }
+  return nameKey(emitter.filePath, emitter.enclosing, written);
+}
+function firstPositional(call) {
+  const args = field(call, "arguments");
+  for (const argument of args === null ? [] : children(args)) {
+    if (argument.type !== "keyword_argument") {
+      return argument;
+    }
+  }
+  return null;
+}
+function fieldClassKey(emitter, assignment2, call) {
+  const annotation = field(assignment2, "type");
+  const annotated = annotation === null ? null : annotatedClass(annotation);
+  if (annotated !== null) {
+    return classReferenceKey(emitter, annotated);
+  }
+  const first = firstPositional(call);
+  return first === null ? null : classReferenceKey(emitter, first);
+}
+function emitFieldCall(emitter, classKey, name, assignment2, value) {
+  if (value.type !== "call") {
+    return;
+  }
+  const callee = field(value, "function");
+  const target = callee === null ? null : fieldClassKey(emitter, assignment2, value);
+  if (callee === null || target === null) {
+    return;
+  }
+  add(emitter, "fieldCall", classKey, name, valueKey(emitter, callee), target);
+}
 function declaredBy(statement) {
   if (statement.type === "decorated_definition") {
     return field(statement, "definition") ?? statement;
@@ -1933,6 +2006,7 @@ function emitClassFacts(emitter, cls) {
           left.text,
           valueKey(emitter, right)
         );
+        emitFieldCall(emitter, classKey, left.text, member, right);
       }
       continue;
     }
@@ -5363,7 +5437,12 @@ function matchedChains(calls, options) {
     }
     const pattern = resolvedMethodPattern(options, callee);
     if (pattern !== void 0) {
-      matched.push({ chain, pattern, operation: chain.operation });
+      const returnedOnly = chain.last === chain.root;
+      matched.push({
+        chain,
+        pattern,
+        operation: returnedOnly ? null : chain.operation
+      });
     }
   }
   return matched;
@@ -7675,6 +7754,12 @@ function emitModelQueryFacts(db, packs) {
           String(entry.argument)
         ]);
       }
+      for (const relationship of model.relationships ?? []) {
+        db.add("associationConstructor", [
+          relationship.module,
+          relationship.name
+        ]);
+      }
     }
   }
 }

package/dist/index.d.cts

@@ -170,6 +170,20 @@ interface PyModelQueries {
     entryMethods: PyModelEntryMethod[];
     /** Functions the library exports that do the same, called on their own rather than read off a session. */
     entryFunctions: PyModelEntryFunction[];
+    /** The library's own constructors for a field that reaches another model. */
+    relationships?: PyRelationshipConstructor[];
+}
+/**
+ * `items: list[Item] = Relationship(...)`: the callable a model's field
+ * is given to say it reaches another model, and where it comes from. A
+ * project function spelled the same way is somebody else's, so the
+ * import is what settles a match.
+ */
+interface PyRelationshipConstructor {
+    /** The module it is imported from, `sqlmodel` or `sqlalchemy.orm`. */
+    module: string;
+    /** Its name, `Relationship` or `relationship`. */
+    name: string;
 }
 /** `session.get(User, id)`: the method, and where the class is written. */
 interface PyModelEntryMethod {

package/dist/index.d.ts

@@ -170,6 +170,20 @@ interface PyModelQueries {
     entryMethods: PyModelEntryMethod[];
     /** Functions the library exports that do the same, called on their own rather than read off a session. */
     entryFunctions: PyModelEntryFunction[];
+    /** The library's own constructors for a field that reaches another model. */
+    relationships?: PyRelationshipConstructor[];
+}
+/**
+ * `items: list[Item] = Relationship(...)`: the callable a model's field
+ * is given to say it reaches another model, and where it comes from. A
+ * project function spelled the same way is somebody else's, so the
+ * import is what settles a match.
+ */
+interface PyRelationshipConstructor {
+    /** The module it is imported from, `sqlmodel` or `sqlalchemy.orm`. */
+    module: string;
+    /** Its name, `Relationship` or `relationship`. */
+    name: string;
 }
 /** `session.get(User, id)`: the method, and where the class is written. */
 interface PyModelEntryMethod {

package/dist/index.js

@@ -1839,6 +1839,79 @@ function assignedValue(right) {
   const first = fields(right, "subscript")[0];
   return outer?.text === "Annotated" && first !== void 0 ? first : right;
 }
+function sideBesidesNone(node) {
+  const left = field(node, "left");
+  const right = field(node, "right");
+  if (right?.type === "none") {
+    return left;
+  }
+  if (left?.type === "none") {
+    return right;
+  }
+  return null;
+}
+function annotatedClass(node) {
+  if (node === void 0) {
+    return null;
+  }
+  if (node.type === "identifier" || node.type === "string") {
+    return node;
+  }
+  if (node.type === "type") {
+    return annotatedClass(children(node)[0]);
+  }
+  if (node.type === "generic_type") {
+    const parameter = children(node).find(
+      (child) => child.type === "type_parameter"
+    );
+    return annotatedClass(
+      parameter === void 0 ? void 0 : children(parameter)[0]
+    );
+  }
+  if (node.type === "binary_operator") {
+    return annotatedClass(sideBesidesNone(node) ?? void 0);
+  }
+  return null;
+}
+function classReferenceKey(emitter, node) {
+  if (node.type === "identifier") {
+    return valueKey(emitter, node);
+  }
+  const written = stringLiteralValue(node);
+  if (written === null) {
+    return null;
+  }
+  return nameKey(emitter.filePath, emitter.enclosing, written);
+}
+function firstPositional(call) {
+  const args = field(call, "arguments");
+  for (const argument of args === null ? [] : children(args)) {
+    if (argument.type !== "keyword_argument") {
+      return argument;
+    }
+  }
+  return null;
+}
+function fieldClassKey(emitter, assignment2, call) {
+  const annotation = field(assignment2, "type");
+  const annotated = annotation === null ? null : annotatedClass(annotation);
+  if (annotated !== null) {
+    return classReferenceKey(emitter, annotated);
+  }
+  const first = firstPositional(call);
+  return first === null ? null : classReferenceKey(emitter, first);
+}
+function emitFieldCall(emitter, classKey, name, assignment2, value) {
+  if (value.type !== "call") {
+    return;
+  }
+  const callee = field(value, "function");
+  const target = callee === null ? null : fieldClassKey(emitter, assignment2, value);
+  if (callee === null || target === null) {
+    return;
+  }
+  add(emitter, "fieldCall", classKey, name, valueKey(emitter, callee), target);
+}
 function declaredBy(statement) {
   if (statement.type === "decorated_definition") {
     return field(statement, "definition") ?? statement;
@@ -1885,6 +1958,7 @@ function emitClassFacts(emitter, cls) {
           left.text,
           valueKey(emitter, right)
         );
+        emitFieldCall(emitter, classKey, left.text, member, right);
       }
       continue;
     }
@@ -5336,7 +5410,12 @@ function matchedChains(calls, options) {
     }
     const pattern = resolvedMethodPattern(options, callee);
     if (pattern !== void 0) {
-      matched.push({ chain, pattern, operation: chain.operation });
+      const returnedOnly = chain.last === chain.root;
+      matched.push({
+        chain,
+        pattern,
+        operation: returnedOnly ? null : chain.operation
+      });
     }
   }
   return matched;
@@ -7687,6 +7766,12 @@ function emitModelQueryFacts(db, packs) {
           String(entry.argument)
         ]);
       }
+      for (const relationship of model.relationships ?? []) {
+        db.add("associationConstructor", [
+          relationship.module,
+          relationship.name
+        ]);
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-python",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "type": "module",
   "description": "Read a Python codebase with suss and check what each FastAPI or Flask route returns against the clients, specs and infrastructure that depend on it.",
   "keywords": [
@@ -49,13 +49,13 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.29.0",
-    "@suss/datalog": "0.29.0",
-    "@suss/extractor": "0.29.0",
-    "@suss/ir-core": "0.29.0",
-    "@suss/resolution": "0.29.0",
-    "@suss/sql": "0.29.0",
-    "@suss/values": "0.29.0",
+    "@suss/behavioral-ir": "0.30.0",
+    "@suss/datalog": "0.30.0",
+    "@suss/extractor": "0.30.0",
+    "@suss/ir-core": "0.30.0",
+    "@suss/resolution": "0.30.0",
+    "@suss/sql": "0.30.0",
+    "@suss/values": "0.30.0",
     "web-tree-sitter": "^0.26.11"
   },
   "devDependencies": {