@suss/packs 0.31.2 → 0.32.0

package/dist/node.js

@@ -162,22 +162,38 @@ function envReadsAt(node, resolution) {
   return isProcessEnv(node) ? readsThroughEnvObject(node, resolution) : dottedRead(node);
 }
 function readsThroughHelperCall(call, resolution) {
-  const reads = [];
   const callee = functionBehindCallee(call.getExpression());
   if (callee === null) {
-    return reads;
+    return [];
   }
+  const sitesNaming = namesReadAtSites(callee, resolution);
+  const parameters = callee.getParameters();
+  const defaultedByName = /* @__PURE__ */ new Map();
   call.getArguments().forEach((passed, at) => {
-    const read = parameterReachesEnvRead(callee, at, resolution);
-    if (read === null) {
+    const parameter = parameters[at];
+    if (parameter === void 0) {
+      return;
+    }
+    const sites = sitesNaming(parameter) ?? directEnvReads(callee, parameter);
+    if (sites.length === 0) {
       return;
     }
     const literal = stringValueOf(passed, resolution);
-    if (literal !== null && literal.length > 0) {
-      reads.push({ name: literal, defaulted: read.defaulted, node: call });
+    if (!namesSomething(literal)) {
+      return;
     }
+    const everywhere = sites.every(isDefaultedAt);
+    defaultedByName.set(
+      literal,
+      (defaultedByName.get(literal) ?? true) && everywhere
+    );
   });
-  return reads;
+  const wrapped = isDefaultedAt(call);
+  return [...defaultedByName].map(([name, atSites]) => ({
+    name,
+    defaulted: atSites || wrapped,
+    node: call
+  }));
 }
 function functionBehindCallee(callee) {
   const nameNode = N.isPropertyAccessExpression(callee) ? callee.getNameNode() : callee;
@@ -186,53 +202,19 @@ function functionBehindCallee(callee) {
   }
   return functionTargetOf(nameNode)?.func ?? null;
 }
-var PARAM_ENV_READS = /* @__PURE__ */ new WeakMap();
-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;
-  }
-  const found = reachesEnvRead(fn, at, resolution);
-  byParameter.set(at, found);
-  return found;
+function namesSomething(value) {
+  return value !== null && value.length > 0;
 }
-function reachesEnvRead(fn, at, resolution) {
-  const pending = [{ fn, at }];
-  const taken = /* @__PURE__ */ new Set();
-  while (pending.length > 0) {
-    const wanted = pending.pop();
-    const key = `${wanted.fn.getPos()}:${wanted.at}`;
-    if (taken.has(key)) {
-      continue;
-    }
-    taken.add(key);
-    const parameter = wanted.fn.getParameters()[wanted.at];
-    if (parameter === void 0) {
-      continue;
-    }
-    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;
-      }
-      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 });
-      }
-    }
+function namesReadAtSites(fn, resolution) {
+  if (resolution === void 0) {
+    return () => null;
   }
-  return null;
+  const namers = resolution.envNamers(fn.getSourceFile());
+  return (parameter) => namers.sitesNaming(parameter);
+}
+function directEnvReads(fn, parameter) {
+  const direct = directEnvRead(fn, parameter);
+  return direct === null ? [] : [direct];
 }
 function directEnvRead(fn, parameter) {
   for (const access of fn.getDescendantsOfKind(
@@ -243,17 +225,11 @@ function directEnvRead(fn, parameter) {
     }
     const argument = access.getArgumentExpression();
     if (argument !== void 0 && N.isIdentifier(argument) && symbolBehind(argument)?.getValueDeclaration() === parameter) {
-      return { defaulted: isDefaultedAt(access) };
+      return access;
     }
   }
   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 {
     type: "interaction",
@@ -611,6 +587,7 @@ function nodeRuntimePack(options = {}) {
     terminals: [],
     inputMapping: { type: "positionalParams", params: [] },
     invocationRecognizers: [schedulingRecognizer],
+    environmentObjects: ["process.env"],
     accessRecognizers: [
       // `envRecognizer` owns `process.env.X`; `processRecognizer`
       // owns the rest of the process surface and skips env reads,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/packs",
-  "version": "0.31.2",
+  "version": "0.32.0",
   "type": "module",
   "description": "Every pack suss ships in one install, so it can read Express, Hono, NestJS, FastAPI, Rails, Prisma, OpenAPI and the rest.",
   "keywords": [
@@ -218,15 +218,15 @@
     "ts-morph": "^23.0.0"
   },
   "dependencies": {
-    "@suss/adapter-python": "0.31.2",
-    "@suss/adapter-ruby": "0.31.2",
-    "@suss/adapter-typescript": "0.31.2",
-    "@suss/behavioral-ir": "0.31.2",
-    "@suss/contract-graphql": "0.31.2",
-    "@suss/extractor": "0.31.2",
-    "@suss/manifest-aws": "0.31.2",
-    "@suss/recognize": "0.31.2",
-    "@suss/sql": "0.31.2",
+    "@suss/adapter-python": "0.32.0",
+    "@suss/adapter-ruby": "0.32.0",
+    "@suss/adapter-typescript": "0.32.0",
+    "@suss/behavioral-ir": "0.32.0",
+    "@suss/contract-graphql": "0.32.0",
+    "@suss/extractor": "0.32.0",
+    "@suss/manifest-aws": "0.32.0",
+    "@suss/recognize": "0.32.0",
+    "@suss/sql": "0.32.0",
     "zod": "^4.0.0"
   },
   "devDependencies": {