@suss/packs 0.29.0 → 0.31.0

package/dist/drizzle.js

@@ -1,7 +1,15 @@
 // ../framework/drizzle/dist/index.js
 import { Node as N } from "ts-morph";
 import { z } from "zod";
-import { resolveAliasedSymbol } from "@suss/adapter-typescript";
+import {
+  arrayLiteralOf,
+  objectLiteralOf,
+  propertiesOf,
+  propertyNameOf,
+  propertyOf,
+  stringValueOf,
+  writtenNodeOf
+} from "@suss/adapter-typescript";
 import { storageBinding } from "@suss/behavioral-ir";
 import { scopeOption, storageSystemOption } from "@suss/extractor";
 import {
@@ -13,6 +21,7 @@ import {
 } from "@suss/recognize";
 var QUERY_API_METHODS = /* @__PURE__ */ new Set(["findMany", "findFirst"]);
 var TABLE_FACTORIES = /* @__PURE__ */ new Set(["pgTable", "mysqlTable", "sqliteTable"]);
+var DRIZZLE_PACKAGE = "drizzle-orm";
 var CHAIN_WALK_LIMIT = 12;
 var optionsSchema = z.object({
   /**
@@ -36,8 +45,9 @@ function rawStatements(opts) {
 function makeRecognizer(opts) {
   const storageSystem = opts.storageSystem ?? "postgresql";
   const scope = opts.scope ?? "default";
-  return (call) => {
-    const query = recognizeAnchor(call);
+  return (call, ctx) => {
+    const { resolution } = ctx;
+    const query = recognizeAnchor(call, resolution);
     if (query === null) {
       return null;
     }
@@ -62,24 +72,24 @@ function makeRecognizer(opts) {
     ];
   };
 }
-function recognizeAnchor(call) {
+function recognizeAnchor(call, resolution) {
   const callee = call.getExpression();
   if (!N.isPropertyAccessExpression(callee)) {
     return null;
   }
   const method = callee.getName();
   if (method === "from") {
-    return recognizeSelect(call, callee.getExpression());
+    return recognizeSelect(call, callee.getExpression(), resolution);
   }
   if (method === "insert" || method === "update" || method === "delete") {
-    return recognizeMutation(call, callee.getExpression(), method);
+    return recognizeMutation(call, callee.getExpression(), method, resolution);
   }
   if (QUERY_API_METHODS.has(method)) {
-    return recognizeQueryApi(call, callee.getExpression(), method);
+    return recognizeQueryApi(call, callee.getExpression(), method, resolution);
   }
   return null;
 }
-function recognizeSelect(fromCall, receiver) {
+function recognizeSelect(fromCall, receiver, resolution) {
   if (!N.isCallExpression(receiver)) {
     return null;
   }
@@ -98,10 +108,11 @@ function recognizeSelect(fromCall, receiver) {
   if (tableArg === void 0) {
     return null;
   }
-  const table = resolveTableName(tableArg);
+  const table = resolveTableName(tableArg, resolution);
   const tableExprText = tableArg.getText();
   const selectArg = receiver.getArguments()[0];
-  const fields = selectArg !== void 0 && N.isObjectLiteralExpression(selectArg) ? objectKeys(selectArg) : ["*"];
+  const projected = selectArg === void 0 ? [] : objectKeys(selectArg, resolution);
+  const fields = projected.length > 0 ? projected : ["*"];
   const chain = collectChainCalls(fromCall);
   const selector = selectorFromWhere(chain.get("where"), tableExprText);
   return {
@@ -114,7 +125,7 @@ function recognizeSelect(fromCall, receiver) {
     calleeText: fromCall.getExpression().getText()
   };
 }
-function recognizeMutation(call, receiver, operation) {
+function recognizeMutation(call, receiver, operation, resolution) {
   if (!isDrizzleReceiver(receiver)) {
     return null;
   }
@@ -122,10 +133,10 @@ function recognizeMutation(call, receiver, operation) {
   if (tableArg === void 0) {
     return null;
   }
-  const table = resolveTableName(tableArg);
+  const table = resolveTableName(tableArg, resolution);
   const tableExprText = tableArg.getText();
   const chain = collectChainCalls(call);
-  const fields = operation === "insert" ? valuesKeys(chain.get("values")) : operation === "update" ? setKeys(chain.get("set")) : ["*"];
+  const fields = operation === "insert" ? valuesKeys(chain.get("values"), resolution) : operation === "update" ? setKeys(chain.get("set"), resolution) : ["*"];
   const selector = selectorFromWhere(chain.get("where"), tableExprText);
   return {
     kind: "write",
@@ -137,7 +148,7 @@ function recognizeMutation(call, receiver, operation) {
     calleeText: call.getExpression().getText()
   };
 }
-function recognizeQueryApi(call, receiver, operation) {
+function recognizeQueryApi(call, receiver, operation, resolution) {
   if (!N.isPropertyAccessExpression(receiver)) {
     return null;
   }
@@ -148,17 +159,14 @@ function recognizeQueryApi(call, receiver, operation) {
   if (!isDrizzleReceiver(queryAccess.getExpression())) {
     return null;
   }
-  const table = resolveTableName(receiver) ?? receiver.getName();
+  const table = resolveTableName(receiver, resolution) ?? receiver.getName();
   const optionsArg = call.getArguments()[0];
+  const options = optionsArg === void 0 ? null : objectLiteralOf(optionsArg, resolution);
   const fields = [];
-  if (optionsArg !== void 0 && N.isObjectLiteralExpression(optionsArg)) {
-    const columns = objectProperty(optionsArg, "columns");
-    if (columns !== null && N.isObjectLiteralExpression(columns)) {
-      fields.push(...objectKeys(columns));
-    }
-    const withProp = objectProperty(optionsArg, "with");
-    if (withProp !== null && N.isObjectLiteralExpression(withProp)) {
-      fields.push(...objectKeys(withProp));
+  for (const key of ["columns", "with"]) {
+    const written = options === null ? null : propertyOf(options, key, resolution);
+    if (written !== null) {
+      fields.push(...objectKeys(written, resolution));
     }
   }
   return {
@@ -204,98 +212,58 @@ function isDrizzleReceiver(node) {
   }
   return false;
 }
-function resolveTableName(tableExpr) {
-  const symbol = N.isPropertyAccessExpression(tableExpr) ? tableExpr.getNameNode().getSymbol() : tableExpr.getSymbol();
-  if (symbol === void 0) {
+function resolveTableName(tableExpr, resolution) {
+  const written = writtenNodeOf(tableExpr, resolution);
+  if (written === null || !N.isCallExpression(written) || !isTableFactory(written.getExpression(), resolution)) {
     return null;
   }
-  for (const decl of symbol.getDeclarations()) {
-    const declared = tableNameFromDeclaration(decl);
-    if (declared !== null) {
-      return declared;
-    }
-  }
-  return null;
+  const first = written.getArguments()[0];
+  return first === void 0 ? null : stringValueOf(first, resolution);
 }
-function tableNameFromDeclaration(decl) {
-  if (N.isImportSpecifier(decl)) {
-    const symbol = decl.getNameNode().getSymbol();
-    const aliased = symbol === void 0 ? void 0 : resolveAliasedSymbol(symbol);
-    for (const target of aliased?.getDeclarations() ?? []) {
-      const name = tableNameFromDeclaration(target);
-      if (name !== null) {
-        return name;
-      }
-    }
-    return null;
-  }
-  if (!N.isVariableDeclaration(decl)) {
-    return null;
-  }
-  const init = decl.getInitializer();
-  if (init === void 0 || !N.isCallExpression(init)) {
-    return null;
-  }
-  const calleeText = init.getExpression().getText();
-  const calleeName = calleeText.split(".").pop() ?? calleeText;
-  if (!TABLE_FACTORIES.has(calleeName)) {
-    return null;
-  }
-  const first = init.getArguments()[0];
-  if (first !== void 0 && N.isStringLiteral(first)) {
-    return first.getLiteralValue();
+function isTableFactory(callee, resolution) {
+  if (resolution === void 0) {
+    return false;
   }
-  return null;
+  return resolution.importedNamesOf(callee, [DRIZZLE_PACKAGE]).some((name) => TABLE_FACTORIES.has(name));
 }
-function objectKeys(obj) {
-  if (!N.isObjectLiteralExpression(obj)) {
+function objectKeys(value, resolution) {
+  const object = objectLiteralOf(value, resolution);
+  if (object === null) {
     return [];
   }
   const keys = [];
-  for (const prop of obj.getProperties()) {
-    if (N.isPropertyAssignment(prop) || N.isShorthandPropertyAssignment(prop)) {
-      keys.push(prop.getName());
+  for (const property of propertiesOf(object, resolution)) {
+    const name = propertyNameOf(property);
+    if (name !== null) {
+      keys.push(name);
     }
   }
   return keys;
 }
-function objectProperty(obj, name) {
-  if (!N.isObjectLiteralExpression(obj)) {
-    return null;
-  }
-  for (const prop of obj.getProperties()) {
-    if (N.isPropertyAssignment(prop) && prop.getName() === name) {
-      return prop.getInitializer() ?? null;
-    }
-  }
-  return null;
-}
-function valuesKeys(valuesCall) {
+function valuesKeys(valuesCall, resolution) {
   const arg = valuesCall?.getArguments()[0];
   if (arg === void 0) {
     return ["*"];
   }
-  if (N.isObjectLiteralExpression(arg)) {
-    const keys = objectKeys(arg);
-    return keys.length > 0 ? keys : ["*"];
-  }
-  if (N.isArrayLiteralExpression(arg)) {
+  const rows = arrayLiteralOf(arg, resolution);
+  if (rows !== null) {
     const union = /* @__PURE__ */ new Set();
-    for (const element of arg.getElements()) {
-      for (const key of objectKeys(element)) {
+    for (const element of rows.getElements()) {
+      for (const key of objectKeys(element, resolution)) {
         union.add(key);
       }
     }
     return union.size > 0 ? [...union] : ["*"];
   }
-  return ["*"];
+  const keys = objectKeys(arg, resolution);
+  return keys.length > 0 ? keys : ["*"];
 }
-function setKeys(setCall) {
+function setKeys(setCall, resolution) {
   const arg = setCall?.getArguments()[0];
   if (arg === void 0) {
     return ["*"];
   }
-  const keys = objectKeys(arg);
+  const keys = objectKeys(arg, resolution);
   return keys.length > 0 ? keys : ["*"];
 }
 function selectorFromWhere(whereCall, tableExprText) {

package/dist/httpx.js

@@ -37,6 +37,11 @@ function httpxClient() {
           failureDelivery: "response"
         }
       }
+    ],
+    // Both classes document `__enter__` as giving back the client, so
+    // `with httpx.Client() as c` puts the constructed client in c.
+    contextManagers: [
+      { module: "httpx", returnsSelf: ["Client", "AsyncClient"] }
     ]
   };
 }

package/dist/node.js

@@ -2,8 +2,15 @@
 import { z } from "zod";
 import {
   Node as N,
-  VariableDeclarationKind
+  SyntaxKind
 } from "ts-morph";
+import {
+  findEnclosingFunction,
+  functionTargetOf,
+  isDefaultedAt,
+  stringValueOf,
+  symbolBehind
+} from "@suss/adapter-typescript";
 import { runtimeConfigBinding } from "@suss/behavioral-ir";
 import { Node } from "ts-morph";
 import { runtimeConfigBinding as runtimeConfigBinding2 } from "@suss/behavioral-ir";
@@ -29,7 +36,7 @@ function dottedRead(node) {
   }
   return [{ name: node.getName(), defaulted: isDefaultedAt(node), node }];
 }
-function bracketRead(access) {
+function bracketRead(access, resolution) {
   const argument = access.getArgumentExpression();
   if (argument === void 0) {
     return [];
@@ -42,51 +49,49 @@ function bracketRead(access) {
     return [{ name, defaulted: isDefaultedAt(access), node: access }];
   }
   if (N.isIdentifier(argument)) {
-    return readsThroughParameter(access, argument);
+    return readsThroughParameter(access, argument, resolution);
   }
   return [];
 }
 var CALLER_LOOKUPS = /* @__PURE__ */ new WeakMap();
-function readsThroughParameter(access, index) {
+function readsThroughParameter(access, index, resolution) {
   const remembered = CALLER_LOOKUPS.get(access);
   if (remembered !== void 0) {
     return remembered;
   }
-  const found = callerLiteralReads(access, index);
+  const found = callerLiteralReads(access, index, resolution);
   CALLER_LOOKUPS.set(access, found);
   return found;
 }
-function callerLiteralReads(access, index) {
-  const enclosing = enclosingFunction(access);
-  if (enclosing === void 0) {
+function callerLiteralReads(access, index, resolution) {
+  if (resolution === void 0) {
+    return [];
+  }
+  const enclosing = findEnclosingFunction(access);
+  if (enclosing === null) {
     return [];
   }
-  const at = enclosing.getParameters().findIndex((parameter) => parameter.getName() === index.getText());
-  if (at === -1) {
+  const start = enclosing.getParameters().find((parameter) => parameter.getName() === index.getText());
+  if (start === void 0) {
     return [];
   }
   const defaulted = isDefaultedAt(access);
   const reads = [];
-  const pending = [{ fn: enclosing, at }];
+  const pending = [start];
   const taken = /* @__PURE__ */ new Set();
   while (pending.length > 0) {
     const wanted = pending.pop();
-    const key = `${wanted.fn.getPos()}:${wanted.at}`;
-    if (taken.has(key)) {
+    if (taken.has(wanted)) {
       continue;
     }
-    taken.add(key);
-    for (const call of callSitesOf(wanted.fn)) {
-      const passed = call.getArguments()[wanted.at];
-      if (passed === void 0) {
-        continue;
-      }
-      const literal = literalBehind(passed);
+    taken.add(wanted);
+    for (const passed of resolution.argumentsPassedTo(wanted)) {
+      const literal = stringValueOf(passed.argument, resolution);
       if (literal !== null && literal.length > 0) {
-        reads.push({ name: literal, defaulted, node: call });
+        reads.push({ name: literal, defaulted, node: passed.call });
         continue;
       }
-      const forwarded = forwardedParameter(passed, call);
+      const forwarded = forwardedParameter(passed.argument, passed.call);
       if (forwarded !== null) {
         pending.push(forwarded);
       }
@@ -94,63 +99,19 @@ function callerLiteralReads(access, index) {
   }
   return reads;
 }
-function enclosingFunction(node) {
-  return node.getFirstAncestor(
-    (candidate) => N.isFunctionDeclaration(candidate) || N.isArrowFunction(candidate) || N.isFunctionExpression(candidate) || N.isMethodDeclaration(candidate)
-  );
-}
-function literalBehind(passed) {
-  if (N.isStringLiteral(passed) || N.isNoSubstitutionTemplateLiteral(passed)) {
-    return passed.getLiteralValue();
-  }
-  if (!N.isIdentifier(passed)) {
-    return null;
-  }
-  for (const definition of passed.getDefinitionNodes()) {
-    if (!N.isVariableDeclaration(definition)) {
-      continue;
-    }
-    const initializer = definition.getInitializer();
-    if (initializer !== void 0 && definition.getVariableStatement()?.getDeclarationKind() === VariableDeclarationKind.Const && (N.isStringLiteral(initializer) || N.isNoSubstitutionTemplateLiteral(initializer))) {
-      return initializer.getLiteralValue();
-    }
-  }
-  return null;
-}
 function forwardedParameter(passed, call) {
   if (!N.isIdentifier(passed)) {
     return null;
   }
-  const caller = enclosingFunction(call);
-  if (caller === void 0) {
+  const caller = findEnclosingFunction(call);
+  if (caller === null) {
     return null;
   }
-  const at = caller.getParameters().findIndex((parameter) => parameter.getName() === passed.getText());
-  return at === -1 ? null : { fn: caller, at };
-}
-function callSitesOf(fn) {
-  const named = N.isVariableDeclaration(fn.getParent()) ? fn.getParent().getNameNode() : fn.getNameNode?.();
-  if (named === void 0 || !N.isIdentifier(named)) {
-    return [];
-  }
-  const calls = [];
-  for (const reference of named.findReferencesAsNodes()) {
-    const parent = reference.getParent();
-    if (parent === void 0) {
-      continue;
-    }
-    if (N.isCallExpression(parent) && parent.getExpression() === reference) {
-      calls.push(parent);
-      continue;
-    }
-    if (N.isPropertyAccessExpression(parent) && parent.getNameNode() === reference) {
-      const grandparent = parent.getParent();
-      if (grandparent !== void 0 && N.isCallExpression(grandparent) && grandparent.getExpression() === parent) {
-        calls.push(grandparent);
-      }
-    }
+  const behind = symbolBehind(passed)?.getValueDeclaration();
+  if (behind === void 0 || !N.isParameterDeclaration(behind)) {
+    return null;
   }
-  return calls;
+  return behind.getParent() === caller ? behind : null;
 }
 function bindingRead(element) {
   if (element.getDotDotDotToken() !== void 0) {
@@ -181,37 +142,37 @@ function destructuredReads(declaration) {
   }
   return pattern.getElements().flatMap(bindingRead);
 }
-function readsThroughEnvObject(envNode) {
+function readsThroughEnvObject(envNode, resolution) {
   const parent = envNode.getParent();
   if (N.isElementAccessExpression(parent)) {
-    return bracketRead(parent);
+    return bracketRead(parent, resolution);
   }
   if (N.isVariableDeclaration(parent)) {
     return destructuredReads(parent);
   }
   return [];
 }
-function envReadsAt(node) {
+function envReadsAt(node, resolution) {
   if (N.isCallExpression(node)) {
-    return readsThroughHelperCall(node);
+    return readsThroughHelperCall(node, resolution);
   }
   if (!N.isPropertyAccessExpression(node)) {
     return [];
   }
-  return isProcessEnv(node) ? readsThroughEnvObject(node) : dottedRead(node);
+  return isProcessEnv(node) ? readsThroughEnvObject(node, resolution) : dottedRead(node);
 }
-function readsThroughHelperCall(call) {
+function readsThroughHelperCall(call, resolution) {
   const reads = [];
   const callee = functionBehindCallee(call.getExpression());
   if (callee === null) {
     return reads;
   }
   call.getArguments().forEach((passed, at) => {
-    const literal = literalBehind(passed);
+    const literal = stringValueOf(passed, resolution);
     if (literal === null || literal.length === 0) {
       return;
     }
-    const read = parameterReachesEnvRead(callee, at);
+    const read = parameterReachesEnvRead(callee, at, resolution);
     if (read !== null) {
       reads.push({ name: literal, defaulted: read.defaulted, node: call });
     }
@@ -223,31 +184,24 @@ function functionBehindCallee(callee) {
   if (!N.isIdentifier(nameNode)) {
     return null;
   }
-  for (const definition of nameNode.getDefinitionNodes()) {
-    if (N.isFunctionDeclaration(definition) || N.isMethodDeclaration(definition)) {
-      return definition;
-    }
-    if (N.isVariableDeclaration(definition)) {
-      const initializer = definition.getInitializer();
-      if (initializer !== void 0 && (N.isArrowFunction(initializer) || N.isFunctionExpression(initializer))) {
-        return initializer;
-      }
-    }
-  }
-  return null;
+  return functionTargetOf(nameNode)?.func ?? null;
 }
 var PARAM_ENV_READS = /* @__PURE__ */ new WeakMap();
-function parameterReachesEnvRead(fn, at) {
+function parameterReachesEnvRead(fn, at, resolution) {
   const byParameter = PARAM_ENV_READS.get(fn.compilerNode) ?? /* @__PURE__ */ new Map();
   PARAM_ENV_READS.set(fn.compilerNode, byParameter);
   const remembered = byParameter.get(at);
   if (remembered !== void 0) {
     return remembered;
   }
-  let found = null;
+  const found = reachesEnvRead(fn, at, resolution);
+  byParameter.set(at, found);
+  return found;
+}
+function reachesEnvRead(fn, at, resolution) {
   const pending = [{ fn, at }];
   const taken = /* @__PURE__ */ new Set();
-  while (pending.length > 0 && found === null) {
+  while (pending.length > 0) {
     const wanted = pending.pop();
     const key = `${wanted.fn.getPos()}:${wanted.at}`;
     if (taken.has(key)) {
@@ -258,57 +212,47 @@ function parameterReachesEnvRead(fn, at) {
     if (parameter === void 0) {
       continue;
     }
-    const name = parameter.getName();
-    wanted.fn.forEachDescendant((node) => {
-      if (found !== null) {
-        return;
-      }
-      if (N.isElementAccessExpression(node) && isProcessEnv(node.getExpression())) {
-        const argument = node.getArgumentExpression();
-        if (argument !== void 0 && argument.getText() === name) {
-          found = { defaulted: isDefaultedAt(node) };
-        }
-        return;
+    const direct = directEnvRead(wanted.fn, parameter);
+    if (direct !== null) {
+      return direct;
+    }
+    if (resolution === void 0) {
+      continue;
+    }
+    for (const passed of resolution.callsPassing(parameter)) {
+      if (!N.isCallExpression(passed.call)) {
+        continue;
       }
-      if (N.isCallExpression(node)) {
-        node.getArguments().forEach((argument, position) => {
-          if (!N.isIdentifier(argument) || argument.getText() !== name) {
-            return;
-          }
-          const next = functionBehindCallee(node.getExpression());
-          if (next !== null && next !== wanted.fn) {
-            pending.push({ fn: next, at: position });
-          }
-        });
+      const position = passed.call.getArguments().indexOf(passed.argument);
+      const next = functionLikeOf(
+        resolution.resolveCallable(passed.call.getExpression())
+      );
+      if (position >= 0 && next !== null && next !== wanted.fn) {
+        pending.push({ fn: next, at: position });
       }
-    });
+    }
   }
-  byParameter.set(at, found);
-  return found;
+  return null;
 }
-function isDefaultedAt(node) {
-  let child = node;
-  let parent = child.getParent();
-  while (parent !== void 0) {
-    if (N.isParenthesizedExpression(parent)) {
-      child = parent;
-      parent = parent.getParent();
+function directEnvRead(fn, parameter) {
+  for (const access of fn.getDescendantsOfKind(
+    SyntaxKind.ElementAccessExpression
+  )) {
+    if (!isProcessEnv(access.getExpression())) {
       continue;
     }
-    if (!N.isBinaryExpression(parent)) {
-      return false;
+    const argument = access.getArgumentExpression();
+    if (argument !== void 0 && N.isIdentifier(argument) && symbolBehind(argument)?.getValueDeclaration() === parameter) {
+      return { defaulted: isDefaultedAt(access) };
     }
-    const op = parent.getOperatorToken().getText();
-    if (op !== "??" && op !== "||") {
-      return false;
-    }
-    if (parent.getLeft() === child) {
-      return true;
-    }
-    child = parent;
-    parent = parent.getParent();
   }
-  return false;
+  return null;
+}
+function functionLikeOf(node) {
+  if (node === null) {
+    return null;
+  }
+  return N.isFunctionDeclaration(node) || N.isArrowFunction(node) || N.isFunctionExpression(node) || N.isMethodDeclaration(node) ? node : null;
 }
 function configReadEffect(read, deploymentTarget, instanceName) {
   return {
@@ -326,8 +270,8 @@ function configReadEffect(read, deploymentTarget, instanceName) {
     }
   };
 }
-function recognizeProcessEnvRead(access, deploymentTarget, instanceName) {
-  const reads = envReadsAt(access);
+function recognizeProcessEnvRead(access, deploymentTarget, instanceName, resolution) {
+  const reads = envReadsAt(access, resolution);
   if (reads.length === 0) {
     return null;
   }
@@ -338,7 +282,12 @@ function recognizeProcessEnvRead(access, deploymentTarget, instanceName) {
 function envVarRecognizer(opts = {}) {
   const deploymentTarget = opts.deploymentTarget ?? "lambda";
   const instanceName = opts.instanceName ?? "<unknown>";
-  return (access, _ctx) => recognizeProcessEnvRead(access, deploymentTarget, instanceName);
+  return (access, ctx) => recognizeProcessEnvRead(
+    access,
+    deploymentTarget,
+    instanceName,
+    ctx.resolution
+  );
 }
 var FILE_LOCATION_GLOBALS = /* @__PURE__ */ new Set(["__dirname", "__filename"]);
 function moduleMetaRead(callee) {