@suss/adapter-typescript 0.7.2 → 0.9.0

package/dist/index.js

@@ -1,8 +1,9 @@
 // src/adapter.ts
 import path9 from "path";
 import {
-  Node as Node53,
-  Project
+  Node as Node54,
+  Project,
+  SyntaxKind as SyntaxKind11
 } from "ts-morph";
 import {
   functionCallBinding as functionCallBinding2,
@@ -3953,6 +3954,7 @@ import { Node as Node18 } from "ts-morph";
 import { Node as Node17, SyntaxKind as SyntaxKind5, VariableDeclarationKind } from "ts-morph";
 var byFile = createPerFileCache();
 var byDeclaration = /* @__PURE__ */ new WeakMap();
+var byField = /* @__PURE__ */ new WeakMap();
 function writesToBinding(declaration) {
   const remembered = byDeclaration.get(declaration);
   if (remembered !== void 0) {
@@ -3985,22 +3987,19 @@ function writesToBindingUncached(declaration) {
   return { values, inOrder: writesRunInOrder(declaration, writes) };
 }
 function writesToField(declaration) {
-  const remembered = byDeclaration.get(declaration);
+  const remembered = byField.get(declaration);
   if (remembered !== void 0) {
     return remembered;
   }
   const answer = writesToFieldUncached(declaration);
-  byDeclaration.set(declaration, answer);
+  byField.set(declaration, answer);
   return answer;
 }
 function writesToFieldUncached(declaration) {
-  const initializer = declaration.getInitializer();
+  const first = startingValueOf(declaration);
   const assignments = assignmentsTo(declaration);
   if (assignments.length === 0) {
-    return {
-      values: initializer === void 0 ? [] : [initializer],
-      inOrder: true
-    };
+    return { values: first === void 0 ? [] : [first], inOrder: true };
   }
   const values = [];
   for (const write of assignments) {
@@ -4009,14 +4008,16 @@ function writesToFieldUncached(declaration) {
     }
     values.push(write.value);
   }
-  const withInitializer = initializer === void 0 ? values : [initializer, ...values];
   return {
-    values: withInitializer,
+    values: first === void 0 ? values : [first, ...values],
     inOrder: assignments.every(
       (write) => writeRunsInConstructor(declaration, write)
     )
   };
 }
+function startingValueOf(declaration) {
+  return Node17.isParameterDeclaration(declaration) ? declaration : declaration.getInitializer();
+}
 function writeRunsInConstructor(declaration, write) {
   const statement = statementOf(write.node);
   if (statement === null) {
@@ -4027,13 +4028,16 @@ function writeRunsInConstructor(declaration, write) {
     return false;
   }
   const owner = body.getParent();
-  return owner !== void 0 && Node17.isConstructorDeclaration(owner) && owner.getParent() === declaration.getParent();
+  return owner !== void 0 && Node17.isConstructorDeclaration(owner) && owner.getParent() === classHolding(declaration);
+}
+function classHolding(declaration) {
+  return Node17.isParameterDeclaration(declaration) ? declaration.getParent().getParent() : declaration.getParent();
 }
 function isWrittenAgain(declaration) {
   return assignmentsTo(declaration).length > 0;
 }
 function assignmentsTo(declaration) {
-  if (Node17.isPropertyDeclaration(declaration)) {
+  if (Node17.isPropertyDeclaration(declaration) || Node17.isParameterDeclaration(declaration)) {
     const sourceFile2 = declaration.getSourceFile();
     return sourceFile2.isDeclarationFile() ? [] : assignmentsInFile(sourceFile2).get(declaration) ?? [];
   }
@@ -4100,7 +4104,9 @@ function declarationsOf(name) {
   }
   const declarations = [];
   for (const declaration of symbol.getDeclarations()) {
-    if (Node17.isVariableDeclaration(declaration) || Node17.isPropertyDeclaration(declaration)) {
+    if (Node17.isVariableDeclaration(declaration) || Node17.isPropertyDeclaration(declaration) || // A parameter property is the field's only declaration, so
+    // `this.dao = other` in the constructor writes to it.
+    Node17.isParameterDeclaration(declaration) && declaration.isParameterProperty()) {
       declarations.push(declaration);
     }
   }
@@ -5884,7 +5890,8 @@ function createNodeTable() {
     byId: /* @__PURE__ */ new Map(),
     seenFunctions: /* @__PURE__ */ new Set(),
     seenBindings: /* @__PURE__ */ new Set(),
-    seenValues: /* @__PURE__ */ new Set()
+    seenValues: /* @__PURE__ */ new Set(),
+    seenClasses: /* @__PURE__ */ new Set()
   };
 }
 function nodeId(node) {
@@ -6105,7 +6112,7 @@ function emitValue(db, table, value) {
     }
     return id;
   }
-  if (Node26.isCallExpression(expression)) {
+  if (Node26.isCallExpression(expression) || Node26.isNewExpression(expression)) {
     emitCallFacts(db, table, expression);
     fact(db, "writtenValue", id);
     return id;
@@ -6132,11 +6139,24 @@ function emitBindingValues(db, table, declaration) {
 function emitFieldValues(db, table, declaration) {
   const { values, inOrder } = writesToField(declaration);
   const last = values[values.length - 1];
-  if (!inOrder || last === void 0) {
+  if (!inOrder || last === void 0 || !Node26.isExpression(last)) {
     return;
   }
   fact(db, "binds", nodeId(declaration), emitValue(db, table, last));
 }
+function emitParameterPropertyRead(db, table, referenceId, declaration) {
+  const { values, inOrder } = writesToField(declaration);
+  const last = values[values.length - 1];
+  if (!inOrder || last === void 0) {
+    return;
+  }
+  if (!Node26.isExpression(last)) {
+    table.byId.set(nodeId(last), last);
+    fact(db, "binds", referenceId, nodeId(last));
+    return;
+  }
+  fact(db, "binds", referenceId, emitValue(db, table, last));
+}
 function emitBindingElementFacts(db, table, element) {
   const id = nodeId(element);
   table.byId.set(id, element);
@@ -6218,7 +6238,16 @@ function emitReferenceFacts(db, table, reference) {
       continue;
     }
     if (Node26.isParameterDeclaration(declaration)) {
+      if (declaration.isParameterProperty() && Node26.isPropertyAccessExpression(reference)) {
+        emitParameterPropertyRead(db, table, referenceId, declaration);
+      } else {
+        fact(db, "binds", referenceId, declarationId);
+      }
+      continue;
+    }
+    if (Node26.isClassDeclaration(declaration)) {
       fact(db, "binds", referenceId, declarationId);
+      emitClassFacts(db, table, declaration);
       continue;
     }
     if (Node26.isBindingElement(declaration)) {
@@ -6263,9 +6292,14 @@ function emitCallFacts(db, table, call) {
   }
 }
 function emitClassFacts(db, table, declaration) {
+  if (table.seenClasses.has(declaration)) {
+    return;
+  }
+  table.seenClasses.add(declaration);
   const id = nodeId(declaration);
   table.byId.set(id, declaration);
   fact(db, "objectValue", id);
+  emitConstructorParameters(db, table, declaration, id);
   for (const method of declaration.getMethods()) {
     const methodId = nodeId(method);
     table.byId.set(methodId, method);
@@ -6286,6 +6320,25 @@ function emitClassFacts(db, table, declaration) {
     }
   }
 }
+function emitConstructorParameters(db, table, declaration, classId) {
+  const implementation = declaration.getConstructors().find((candidate) => candidate.getBody() !== void 0);
+  if (implementation === void 0) {
+    return;
+  }
+  emitParameters(db, table, classId, implementation.getParameters());
+}
+function emitParameters(db, table, ownerId, parameters) {
+  for (let position = 0; position < parameters.length; position++) {
+    const parameter = parameters[position];
+    if (parameter === void 0) {
+      continue;
+    }
+    const parameterId = nodeId(parameter);
+    table.byId.set(parameterId, parameter);
+    fact(db, "paramOf", ownerId, String(position), parameterId);
+    fact(db, "paramNamed", ownerId, parameter.getName(), parameterId);
+  }
+}
 function emitFunctionFacts(db, table, fn) {
   if (table.seenFunctions.has(fn)) {
     return;
@@ -6294,17 +6347,7 @@ function emitFunctionFacts(db, table, fn) {
   const fnId = nodeId(fn);
   table.byId.set(fnId, fn);
   if (Node26.isFunctionDeclaration(fn) || Node26.isFunctionExpression(fn) || Node26.isArrowFunction(fn) || Node26.isMethodDeclaration(fn)) {
-    const parameters = fn.getParameters();
-    for (let position = 0; position < parameters.length; position++) {
-      const parameter = parameters[position];
-      if (parameter === void 0) {
-        continue;
-      }
-      const parameterId = nodeId(parameter);
-      table.byId.set(parameterId, parameter);
-      fact(db, "paramOf", fnId, String(position), parameterId);
-      fact(db, "paramNamed", fnId, parameter.getName(), parameterId);
-    }
+    emitParameters(db, table, fnId, fn.getParameters());
     const body = fn.getBody?.();
     if (body !== void 0) {
       if (Node26.isExpression(body)) {
@@ -10016,14 +10059,16 @@ import {
 import {
   ANSWER_RELATIONS,
   RESOLUTION_QUESTIONS,
-  RESOLUTION_RULES as SHARED_RULES
+  RESOLUTION_RULES as SHARED_RULES,
+  VALUE_STEP
 } from "@suss/resolution";
 var JS_RULES = [
-  // f.bind(...) resolves to whatever f resolves to.
+  // f.bind(...) leads wherever f leads. Stated as a step, so the
+  // questions other than `comesTo` follow it too.
   rule2(
-    "comesTo",
-    [v2("r"), v2("h")],
-    [lit2("bindCall", v2("r"), v2("t")), lit2("comesTo", v2("t"), v2("h"))]
+    "stepsTo",
+    [v2("r"), v2("t"), VALUE_STEP],
+    [lit2("bindCall", v2("r"), v2("t"))]
   )
 ];
 var RESOLUTION_PROGRAM = process.env.SUSS_RESOLUTION_ON_DEMAND === "0" ? {
@@ -10050,9 +10095,21 @@ var ResolutionStore = class {
       this.db.add("wrapperModule", [wrapper.callee, wrapper.module]);
     }
   }
-  resolveCallable(value) {
+  /**
+   * `alsoFrom` is a second file to walk out from, for a caller that
+   * knows where the value it is asking about was set up. The walk
+   * follows imports outward from the value's own file, so a file that
+   * imports it, and passed something to the constructor, is somewhere
+   * the walk never reaches on its own.
+   */
+  resolveCallable(value, alsoFrom) {
     const target = factKeyOf(value);
-    return this.resolveByWaves(target, "wanted", () => this.lookup(target));
+    return this.resolveByWaves(
+      target,
+      "wanted",
+      () => this.lookup(target),
+      alsoFrom
+    );
   }
   resolveObject(value) {
     const target = factKeyOf(value);
@@ -10120,18 +10177,18 @@ var ResolutionStore = class {
     }
     return origins.some((pair) => namesAPackage(pairHalves(pair).module)) ? [] : null;
   }
-  resolveByWaves(value, question, ask) {
+  resolveByWaves(value, question, ask, alsoFrom) {
     try {
-      return this.walkForAnswer(value, question, ask);
+      return this.walkForAnswer(value, question, ask, alsoFrom);
     } finally {
       this.forgetQuery();
     }
   }
-  walkForAnswer(value, question, ask) {
+  walkForAnswer(value, question, ask, alsoFrom) {
     this.wantValue(question, value);
     this.seedValue(value);
     const walked = /* @__PURE__ */ new Set();
-    let frontier = [value.getSourceFile()];
+    let frontier = alsoFrom === void 0 ? [value.getSourceFile()] : [value.getSourceFile(), alsoFrom];
     for (let hop = 0; hop <= MAX_MODULE_HOPS; hop++) {
       const next = [];
       for (const sourceFile of frontier) {
@@ -10483,7 +10540,10 @@ function bindingLabel(binding) {
   if (semantics.name === "graphql-operation") {
     return `${semantics.operationType} ${semantics.operationName ?? ""}`.trim();
   }
-  return semantics.exportName ?? semantics.module ?? binding.recognition;
+  if ("exportName" in semantics || "module" in semantics) {
+    return semantics.exportName ?? semantics.module ?? binding.recognition;
+  }
+  return binding.recognition;
 }
 function effectFact(effect) {
   if (effect.type === "invocation") {
@@ -10555,10 +10615,103 @@ function deriveBoundaryEffects(summaries, facts) {
 }
 
 // src/resolve/reachableClosure.ts
-import { Node as Node49 } from "ts-morph";
+import { Node as Node50 } from "ts-morph";
 import { functionCallBinding } from "@suss/behavioral-ir";
 import { Database as Database3, evaluate as evaluate4, lit as lit4, rule as rule4, variable as variable2 } from "@suss/datalog";
 import { assembleSummary as assembleSummary2 } from "@suss/extractor";
+
+// src/resolve/unfollowedCall.ts
+import {
+  Node as Node49,
+  SyntaxKind as SyntaxKind10
+} from "ts-morph";
+function isInExternalCode(sourceFile) {
+  if (sourceFile.isDeclarationFile()) {
+    return true;
+  }
+  return sourceFile.getFilePath().includes("/node_modules/");
+}
+function hasBody(fn) {
+  if (Node49.isFunctionDeclaration(fn) || Node49.isMethodDeclaration(fn) || Node49.isFunctionExpression(fn)) {
+    return fn.getBody?.() !== void 0;
+  }
+  return true;
+}
+function isDeclaredShape(declaration) {
+  return (Node49.isMethodSignature(declaration) || Node49.isPropertySignature(declaration)) && !isInExternalCode(declaration.getSourceFile());
+}
+function isExternalDeclaration(declaration) {
+  if (isInExternalCode(declaration.getSourceFile())) {
+    return true;
+  }
+  if (Node49.isImportSpecifier(declaration) || Node49.isImportClause(declaration) || Node49.isNamespaceImport(declaration)) {
+    const target = declaration.getFirstAncestorByKind(SyntaxKind10.ImportDeclaration)?.getModuleSpecifierSourceFile();
+    return target === void 0 || isInExternalCode(target);
+  }
+  return declaresAnotherModule(declaration);
+}
+function declaresAnotherModule(declaration) {
+  const module = declaration.getFirstAncestorByKind(
+    SyntaxKind10.ModuleDeclaration
+  );
+  return module !== void 0 && Node49.isStringLiteral(module.getNameNode());
+}
+function statesShapeOnly(declaration) {
+  if (isExternalDeclaration(declaration)) {
+    return false;
+  }
+  if (Node49.isMethodSignature(declaration) || Node49.isPropertySignature(declaration)) {
+    return true;
+  }
+  if (Node49.isFunctionDeclaration(declaration) || Node49.isMethodDeclaration(declaration)) {
+    return declaration.getBody() === void 0;
+  }
+  return false;
+}
+function declarationsBehind(symbol) {
+  if (symbol === void 0) {
+    return [];
+  }
+  const behind = symbol.getAliasedSymbol()?.getDeclarations() ?? [];
+  return behind.length > 0 ? behind : symbol.getDeclarations();
+}
+function classifyStop(declarations) {
+  if (declarations.length === 0) {
+    return "noDeclaration";
+  }
+  if (declarations.every(isExternalDeclaration)) {
+    return "outsideRun";
+  }
+  if (declarations.some(statesShapeOnly)) {
+    return "noBody";
+  }
+  return "unsettledValue";
+}
+var RECORDED = {
+  noBody: true,
+  unsettledValue: true,
+  outsideRun: false,
+  noDeclaration: false
+};
+function worthRecording(reason) {
+  return RECORDED[reason];
+}
+var STOP_SENTENCE = {
+  noBody: (callee) => `The call to ${callee} lands on a declaration with no body, so whatever runs there is missing from this summary`,
+  unsettledValue: (callee) => `The call to ${callee} goes through a value this run could not settle, so whatever runs there is missing from this summary`,
+  outsideRun: (callee) => `The call to ${callee} lands in a package whose source is not in this run, so whatever runs there is missing from this summary`,
+  noDeclaration: (callee) => `The call to ${callee} has no declaration this run could find, so whatever runs there is missing from this summary`
+};
+function unfollowedCallGap(stop) {
+  return {
+    type: "unfollowedCall",
+    conditions: [],
+    consequence: "unknown",
+    description: STOP_SENTENCE[stop.reason](stop.callee)
+  };
+}
+
+// src/resolve/reachableClosure.ts
 var reachablePack = {
   name: "reachable",
   languages: ["typescript"],
@@ -10581,23 +10734,6 @@ function nodeKey2(func) {
   const sf = func.getSourceFile();
   return `${sf.getFilePath()}:${func.getStart()}-${func.getEnd()}`;
 }
-function isInExternalCode(sourceFile) {
-  if (sourceFile.isDeclarationFile()) {
-    return true;
-  }
-  const filePath = sourceFile.getFilePath();
-  if (filePath.includes("/node_modules/")) {
-    return true;
-  }
-  return false;
-}
-function hasBody(fn) {
-  if (Node49.isFunctionDeclaration(fn) || Node49.isMethodDeclaration(fn) || Node49.isFunctionExpression(fn)) {
-    const body = fn.getBody?.();
-    return body !== void 0;
-  }
-  return true;
-}
 function resolveDecl(decl, calleeName) {
   if (isInExternalCode(decl.getSourceFile())) {
     return null;
@@ -10609,14 +10745,14 @@ function resolveDecl(decl, calleeName) {
     }
     return { func: fn, name: declName(decl) ?? calleeName };
   }
-  if (Node49.isVariableDeclaration(decl)) {
+  if (Node50.isVariableDeclaration(decl)) {
     const init = decl.getInitializer();
-    if (init !== void 0 && (Node49.isArrowFunction(init) || Node49.isFunctionExpression(init))) {
+    if (init !== void 0 && (Node50.isArrowFunction(init) || Node50.isFunctionExpression(init))) {
       return { func: init, name: decl.getName() };
     }
     return null;
   }
-  if (Node49.isImportSpecifier(decl)) {
+  if (Node50.isImportSpecifier(decl)) {
     const importDecl = decl.getImportDeclaration();
     const sf = importDecl.getModuleSpecifierSourceFile();
     if (sf === void 0 || isInExternalCode(sf)) {
@@ -10637,61 +10773,85 @@ function resolveDecl(decl, calleeName) {
   return null;
 }
 function declName(decl) {
-  if (Node49.isFunctionDeclaration(decl) || Node49.isMethodDeclaration(decl)) {
+  if (Node50.isFunctionDeclaration(decl) || Node50.isMethodDeclaration(decl)) {
     const n = decl.getName?.();
     if (typeof n === "string" && n.length > 0) {
       return n;
     }
   }
-  if (Node49.isFunctionExpression(decl)) {
+  if (Node50.isFunctionExpression(decl)) {
     const n = decl.getName();
     if (typeof n === "string" && n.length > 0) {
       return n;
     }
   }
   const parent = decl.getParent();
-  if (parent !== void 0 && Node49.isVariableDeclaration(parent)) {
+  if (parent !== void 0 && Node50.isVariableDeclaration(parent)) {
     return parent.getName();
   }
   return null;
 }
-function resolveCallee(call, calleeName) {
-  if (!Node49.isCallExpression(call)) {
+function resolveCallee(call, calleeName, scan) {
+  if (!Node50.isCallExpression(call)) {
     return null;
   }
   const callee = call.getExpression();
   const symbol = callee.getSymbol();
-  if (symbol === void 0) {
-    return null;
-  }
-  for (const decl of symbol.getDeclarations()) {
+  const declarations = symbol?.getDeclarations() ?? [];
+  for (const decl of declarations) {
     const resolved = resolveDecl(decl, calleeName);
     if (resolved !== null) {
-      return resolved;
+      return { kind: "followed", candidate: resolved };
     }
   }
-  return null;
+  const resolveCallable = scan.resolveCallable;
+  if (resolveCallable !== void 0 && Node50.isPropertyAccessExpression(callee) && declarations.some(isDeclaredShape)) {
+    const value = resolveCallable(callee, scan.reachedFrom);
+    const resolved = value === null ? null : resolveDecl(value, calleeName);
+    if (resolved !== null) {
+      return { kind: "followed", candidate: resolved };
+    }
+  }
+  return {
+    kind: "stopped",
+    stop: {
+      callee: calleeName,
+      reason: classifyStop(declarationsBehind(symbol))
+    }
+  };
 }
-function collectReachable(func) {
-  const found = [];
+function collectReachable(func, scan) {
+  const candidates = [];
+  const stops = [];
   const seen = /* @__PURE__ */ new Set();
   func.forEachDescendant((node) => {
-    if (!Node49.isCallExpression(node)) {
+    if (!Node50.isCallExpression(node)) {
       return;
     }
-    const calleeText = node.getExpression().getText();
-    const resolved = resolveCallee(node, calleeText);
-    if (resolved === null) {
+    const calleeText = normalizeCallee(node.getExpression().getText());
+    const outcome = resolveCallee(node, calleeText, scan);
+    if (outcome === null) {
       return;
     }
-    const key = nodeKey2(resolved.func);
+    if (outcome.kind === "stopped") {
+      const stopKey = `${outcome.stop.reason}:${outcome.stop.callee}`;
+      if (!seen.has(stopKey) && worthRecording(outcome.stop.reason)) {
+        seen.add(stopKey);
+        stops.push(outcome.stop);
+      }
+      return;
+    }
+    const key = nodeKey2(outcome.candidate.func);
     if (seen.has(key)) {
       return;
     }
     seen.add(key);
-    found.push(resolved);
+    candidates.push(outcome.candidate);
   });
-  return found;
+  return { candidates, stops };
+}
+function normalizeCallee(text) {
+  return text.replace(/\s+/g, " ").trim();
 }
 function extractReachableSummary(candidate, options, recognizers) {
   const unit = {
@@ -10731,6 +10891,9 @@ function expandReachableClosure(seeds, project, options, projectFileSet, facts,
   const functionByKey = /* @__PURE__ */ new Map();
   const seedKeys = /* @__PURE__ */ new Set();
   const scanned = /* @__PURE__ */ new Set();
+  const stopsByKey = /* @__PURE__ */ new Map();
+  const summariesByKey = /* @__PURE__ */ new Map();
+  const reachedFrom = /* @__PURE__ */ new Map();
   for (const seed of seeds) {
     const func = lookup.functionAt(seed.location);
     if (func !== null) {
@@ -10738,6 +10901,7 @@ function expandReachableClosure(seeds, project, options, projectFileSet, facts,
       seedKeys.add(key);
       functionByKey.set(key, { func, name: seed.identity.name });
       facts?.unitKeyBySummary.set(seed, key);
+      rememberSummary(summariesByKey, key, seed);
       db.add("entry", [key]);
     }
   }
@@ -10753,11 +10917,23 @@ function expandReachableClosure(seeds, project, options, projectFileSet, facts,
       if (source === void 0) {
         continue;
       }
-      for (const candidate of collectReachable(source.func)) {
+      const cameFrom = reachedFrom.get(key);
+      const scan = {
+        ...recognizers.resolveCallable === void 0 ? {} : { resolveCallable: recognizers.resolveCallable },
+        ...cameFrom === void 0 ? {} : { reachedFrom: cameFrom }
+      };
+      const { candidates, stops } = collectReachable(source.func, scan);
+      if (stops.length > 0) {
+        stopsByKey.set(key, stops);
+      }
+      for (const candidate of candidates) {
         const calleeKey = nodeKey2(candidate.func);
         if (!functionByKey.has(calleeKey)) {
           functionByKey.set(calleeKey, candidate);
         }
+        if (!reachedFrom.has(calleeKey)) {
+          reachedFrom.set(calleeKey, source.func.getSourceFile());
+        }
         db.add("calls", [key, calleeKey]);
       }
     }
@@ -10781,13 +10957,30 @@ function expandReachableClosure(seeds, project, options, projectFileSet, facts,
     }
     const summary = extractReachableSummary(candidate, options, recognizers);
     facts?.unitKeyBySummary.set(summary, key);
+    rememberSummary(summariesByKey, key, summary);
     reached.push(summary);
   }
+  recordStops(stopsByKey, summariesByKey, options);
   return [...seeds, ...reached];
 }
+function rememberSummary(summariesByKey, key, summary) {
+  const bucket = summariesByKey.get(key) ?? [];
+  bucket.push(summary);
+  summariesByKey.set(key, bucket);
+}
+function recordStops(stopsByKey, summariesByKey, options) {
+  if (options?.gapHandling === "silent") {
+    return;
+  }
+  for (const [key, stops] of stopsByKey) {
+    for (const summary of summariesByKey.get(key) ?? []) {
+      summary.gaps.push(...stops.map(unfollowedCallGap));
+    }
+  }
+}
 
 // src/resolve/rethrowEnrichment.ts
-import { Node as Node50 } from "ts-morph";
+import { Node as Node51 } from "ts-morph";
 import { Database as Database4, evaluate as evaluate5, lit as lit5, rule as rule5, variable as variable3 } from "@suss/datalog";
 var RETHROW_RULES = [
   rule5(
@@ -10927,7 +11120,7 @@ function findBareRethrow(func, location) {
       traversal.stop();
       return;
     }
-    if (!Node50.isThrowStatement(node)) {
+    if (!Node51.isThrowStatement(node)) {
       return;
     }
     if (startLineOf(node) !== location.start) {
@@ -10937,7 +11130,7 @@ function findBareRethrow(func, location) {
       return;
     }
     const thrown = node.getExpression();
-    if (thrown !== void 0 && Node50.isIdentifier(thrown)) {
+    if (thrown !== void 0 && Node51.isIdentifier(thrown)) {
       found = node;
     }
   });
@@ -10947,13 +11140,13 @@ function enclosingTry(throwStmt) {
   let current2 = throwStmt.getParent();
   let sawCatchClause = false;
   while (current2 !== void 0) {
-    if (Node50.isCatchClause(current2)) {
+    if (Node51.isCatchClause(current2)) {
       sawCatchClause = true;
     }
-    if (Node50.isTryStatement(current2)) {
+    if (Node51.isTryStatement(current2)) {
       return sawCatchClause ? current2 : null;
     }
-    if (Node50.isFunctionDeclaration(current2) || Node50.isFunctionExpression(current2) || Node50.isArrowFunction(current2) || Node50.isMethodDeclaration(current2)) {
+    if (Node51.isFunctionDeclaration(current2) || Node51.isFunctionExpression(current2) || Node51.isArrowFunction(current2) || Node51.isMethodDeclaration(current2)) {
       return null;
     }
     current2 = current2.getParent();
@@ -10961,14 +11154,14 @@ function enclosingTry(throwStmt) {
   return null;
 }
 function collectTryBodyCallees(tryStmt, index, keyFor) {
-  if (!Node50.isTryStatement(tryStmt)) {
+  if (!Node51.isTryStatement(tryStmt)) {
     return [];
   }
   const tryBlock = tryStmt.getTryBlock();
   const callees = [];
   const seen = /* @__PURE__ */ new Set();
   tryBlock.forEachDescendant((node) => {
-    if (!Node50.isCallExpression(node)) {
+    if (!Node51.isCallExpression(node)) {
       return;
     }
     const calleeSummary = resolveCalleeSummary(node, index);
@@ -10985,7 +11178,7 @@ function collectTryBodyCallees(tryStmt, index, keyFor) {
   return callees;
 }
 function resolveCalleeSummary(call, index) {
-  if (!Node50.isCallExpression(call)) {
+  if (!Node51.isCallExpression(call)) {
     return null;
   }
   const callee = call.getExpression();
@@ -11011,12 +11204,12 @@ function resolveCalleeSummary(call, index) {
   return null;
 }
 function functionFromDecl(decl) {
-  if (Node50.isFunctionDeclaration(decl) || Node50.isFunctionExpression(decl) || Node50.isArrowFunction(decl) || Node50.isMethodDeclaration(decl)) {
+  if (Node51.isFunctionDeclaration(decl) || Node51.isFunctionExpression(decl) || Node51.isArrowFunction(decl) || Node51.isMethodDeclaration(decl)) {
     return decl;
   }
-  if (Node50.isVariableDeclaration(decl)) {
+  if (Node51.isVariableDeclaration(decl)) {
     const init = decl.getInitializer();
-    if (init !== void 0 && (Node50.isArrowFunction(init) || Node50.isFunctionExpression(init))) {
+    if (init !== void 0 && (Node51.isArrowFunction(init) || Node51.isFunctionExpression(init))) {
       return init;
     }
   }
@@ -11025,23 +11218,23 @@ function functionFromDecl(decl) {
 
 // src/shapes/fieldAccesses.ts
 import {
-  Node as Node51
+  Node as Node52
 } from "ts-morph";
 function findResponseAccessor(callExpr) {
   let current2 = callExpr;
   const parent1 = current2.getParent();
-  if (parent1 !== void 0 && Node51.isAwaitExpression(parent1)) {
+  if (parent1 !== void 0 && Node52.isAwaitExpression(parent1)) {
     current2 = parent1;
   }
   const parent2 = current2.getParent();
-  if (parent2 === void 0 || !Node51.isVariableDeclaration(parent2)) {
+  if (parent2 === void 0 || !Node52.isVariableDeclaration(parent2)) {
     return null;
   }
   const nameNode = parent2.getNameNode();
-  if (Node51.isIdentifier(nameNode)) {
+  if (Node52.isIdentifier(nameNode)) {
     return { kind: "identifier", name: nameNode.getText() };
   }
-  if (Node51.isObjectBindingPattern(nameNode)) {
+  if (Node52.isObjectBindingPattern(nameNode)) {
     const bindings = /* @__PURE__ */ new Map();
     for (const element of nameNode.getElements()) {
       if (element.getDotDotDotToken() !== void 0) {
@@ -11062,11 +11255,11 @@ function findResponseAccessor(callExpr) {
 function buildThenChainAccessor(callExpr, func) {
   const bindings = /* @__PURE__ */ new Map();
   func.forEachDescendant((node) => {
-    if (!Node51.isParameterDeclaration(node)) {
+    if (!Node52.isParameterDeclaration(node)) {
       return;
     }
     const nameNode = node.getNameNode();
-    if (!Node51.isIdentifier(nameNode)) {
+    if (!Node52.isIdentifier(nameNode)) {
       return;
     }
     const prefix = prefixOfThenParam(node, callExpr, 0);
@@ -11098,7 +11291,7 @@ function prefixOfExpr(expr, responseCall, depth) {
   if (node === responseCall) {
     return [];
   }
-  if (Node51.isCallExpression(node)) {
+  if (Node52.isCallExpression(node)) {
     const hop = thenLikeCall(node);
     if (hop !== null) {
       if (hop.method === "catch") {
@@ -11130,14 +11323,14 @@ function prefixOfMemberExpr(expr, responseCall, depth) {
     return null;
   }
   const decl = chain.root.getSymbol()?.getDeclarations()?.[0];
-  if (decl === void 0 || !Node51.isParameterDeclaration(decl)) {
+  if (decl === void 0 || !Node52.isParameterDeclaration(decl)) {
     return null;
   }
   const base = prefixOfThenParam(decl, responseCall, depth + 1);
   return base === null ? null : [...base, ...chain.segments];
 }
 function firstCallbackParamName(callback) {
-  if (callback === void 0 || !(Node51.isArrowFunction(callback) || Node51.isFunctionExpression(callback))) {
+  if (callback === void 0 || !(Node52.isArrowFunction(callback) || Node52.isFunctionExpression(callback))) {
     return null;
   }
   const param = callback.getParameters()[0];
@@ -11145,11 +11338,11 @@ function firstCallbackParamName(callback) {
     return null;
   }
   const nameNode = param.getNameNode();
-  return Node51.isIdentifier(nameNode) ? nameNode.getText() : null;
+  return Node52.isIdentifier(nameNode) ? nameNode.getText() : null;
 }
 function unwrap2(expr) {
   let node = expr;
-  while (Node51.isAwaitExpression(node) || Node51.isParenthesizedExpression(node) || Node51.isAsExpression(node)) {
+  while (Node52.isAwaitExpression(node) || Node52.isParenthesizedExpression(node) || Node52.isAsExpression(node)) {
     node = node.getExpression();
   }
   return node;
@@ -11159,15 +11352,15 @@ function chainRootedAt(expr, rootName) {
   if (chain === null) {
     return null;
   }
-  return Node51.isIdentifier(chain.root) && chain.root.getText() === rootName ? chain.segments : null;
+  return Node52.isIdentifier(chain.root) && chain.root.getText() === rootName ? chain.segments : null;
 }
 function memberChain(expr) {
-  let node = Node51.isExpression(expr) ? unwrap2(expr) : expr;
-  if (Node51.isCallExpression(node)) {
+  let node = Node52.isExpression(expr) ? unwrap2(expr) : expr;
+  if (Node52.isCallExpression(node)) {
     node = node.getExpression();
   }
   const segments = [];
-  while (Node51.isPropertyAccessExpression(node)) {
+  while (Node52.isPropertyAccessExpression(node)) {
     segments.unshift(node.getName());
     node = node.getExpression();
   }
@@ -11186,16 +11379,16 @@ function collectPropertyAccesses(subtree, accessor) {
   if (accessor.kind === "identifier") {
     const varName = accessor.name;
     subtree.forEachDescendant((node) => {
-      if (!Node51.isPropertyAccessExpression(node)) {
+      if (!Node52.isPropertyAccessExpression(node)) {
         return;
       }
       const chain = [];
       let current2 = node;
-      while (Node51.isPropertyAccessExpression(current2)) {
+      while (Node52.isPropertyAccessExpression(current2)) {
         chain.unshift(current2.getName());
         current2 = current2.getExpression();
       }
-      if (Node51.isIdentifier(current2) && current2.getText() === varName) {
+      if (Node52.isIdentifier(current2) && current2.getText() === varName) {
         pushChain(chain);
       }
     });
@@ -11206,7 +11399,7 @@ function collectPropertyAccesses(subtree, accessor) {
     return source === void 0 ? void 0 : [source];
   } : (name) => accessor.bindings.get(name);
   subtree.forEachDescendant((node) => {
-    if (!Node51.isIdentifier(node)) {
+    if (!Node52.isIdentifier(node)) {
       return;
     }
     const prefix = prefixOf(node.getText());
@@ -11218,13 +11411,13 @@ function collectPropertyAccesses(subtree, accessor) {
     }
     let chainTop = node;
     let parent = chainTop.getParent();
-    while (parent !== void 0 && Node51.isPropertyAccessExpression(parent) && parent.getExpression() === chainTop) {
+    while (parent !== void 0 && Node52.isPropertyAccessExpression(parent) && parent.getExpression() === chainTop) {
       chainTop = parent;
       parent = chainTop.getParent();
     }
     const segments = [];
     let current2 = chainTop;
-    while (Node51.isPropertyAccessExpression(current2)) {
+    while (Node52.isPropertyAccessExpression(current2)) {
       segments.push(current2.getName());
       current2 = current2.getExpression();
     }
@@ -11238,15 +11431,15 @@ function isBindingDeclarationSite(node) {
     return true;
   }
   const parent = node.getParent();
-  return parent !== void 0 && Node51.isParameterDeclaration(parent) && parent.getNameNode() === node;
+  return parent !== void 0 && Node52.isParameterDeclaration(parent) && parent.getNameNode() === node;
 }
 function isInsideObjectBindingPattern(node) {
   let current2 = node.getParent();
   while (current2 !== void 0) {
-    if (Node51.isObjectBindingPattern(current2)) {
+    if (Node52.isObjectBindingPattern(current2)) {
       return true;
     }
-    if (Node51.isFunctionLikeDeclaration(current2) || Node51.isVariableStatement(current2)) {
+    if (Node52.isFunctionLikeDeclaration(current2) || Node52.isVariableStatement(current2)) {
       break;
     }
     current2 = current2.getParent();
@@ -11309,7 +11502,7 @@ function findBranchSubtree(func, byLineRange, terminalStartLine, terminalEndLine
     if (parent === void 0) {
       break;
     }
-    if (Node51.isIfStatement(parent)) {
+    if (Node52.isIfStatement(parent)) {
       const ifStmt = parent;
       const thenBlock = ifStmt.getThenStatement();
       const elseBlock = ifStmt.getElseStatement();
@@ -11372,7 +11565,7 @@ function buildNonBodyPropertySet(semantics) {
 
 // src/subUnitContext.ts
 import {
-  Node as Node52
+  Node as Node53
 } from "ts-morph";
 function createTsSubUnitContext() {
   return {
@@ -11386,7 +11579,7 @@ function createTsSubUnitContext() {
 }
 function skipNestedFunctions(parent) {
   return (node, traversal) => {
-    if (node !== parent && (Node52.isFunctionDeclaration(node) || Node52.isFunctionExpression(node) || Node52.isArrowFunction(node) || Node52.isMethodDeclaration(node))) {
+    if (node !== parent && (Node53.isFunctionDeclaration(node) || Node53.isFunctionExpression(node) || Node53.isArrowFunction(node) || Node53.isMethodDeclaration(node))) {
       traversal.skip();
       return true;
     }
@@ -11400,18 +11593,18 @@ function findJsxAttributes(parent) {
     if (skip(node, traversal)) {
       return;
     }
-    if (!Node52.isJsxOpeningElement(node) && !Node52.isJsxSelfClosingElement(node)) {
+    if (!Node53.isJsxOpeningElement(node) && !Node53.isJsxSelfClosingElement(node)) {
       return;
     }
     const tag = node.getTagNameNode().getText();
     for (const attr of node.getAttributes()) {
-      if (!Node52.isJsxAttribute(attr)) {
+      if (!Node53.isJsxAttribute(attr)) {
         continue;
       }
       const initializer = attr.getInitializer();
       let valueExpression = null;
       if (initializer !== void 0) {
-        if (Node52.isJsxExpression(initializer)) {
+        if (Node53.isJsxExpression(initializer)) {
           const inner = initializer.getExpression();
           valueExpression = inner ?? null;
         } else {
@@ -11434,11 +11627,11 @@ function findCallExpressionsByName(parent, name) {
     if (skip(node, traversal)) {
       return;
     }
-    if (!Node52.isCallExpression(node)) {
+    if (!Node53.isCallExpression(node)) {
       return;
     }
     const callee = node.getExpression();
-    if (Node52.isIdentifier(callee) && callee.getText() === name) {
+    if (Node53.isIdentifier(callee) && callee.getText() === name) {
       out.push(node);
     }
   });
@@ -11449,10 +11642,10 @@ function resolveAttributeValueFunction(attr, parent) {
   if (expr === null) {
     return null;
   }
-  if (Node52.isArrowFunction(expr) || Node52.isFunctionExpression(expr)) {
+  if (Node53.isArrowFunction(expr) || Node53.isFunctionExpression(expr)) {
     return { func: expr, localName: null };
   }
-  if (Node52.isIdentifier(expr)) {
+  if (Node53.isIdentifier(expr)) {
     const symbol = expr.getSymbol();
     if (symbol === void 0) {
       return null;
@@ -11471,15 +11664,15 @@ function resolveAttributeValueFunction(attr, parent) {
   return null;
 }
 function tryExtractFunction(decl) {
-  if (Node52.isFunctionDeclaration(decl)) {
+  if (Node53.isFunctionDeclaration(decl)) {
     return decl;
   }
-  if (Node52.isVariableDeclaration(decl)) {
+  if (Node53.isVariableDeclaration(decl)) {
     const init = decl.getInitializer();
     if (init === void 0) {
       return null;
     }
-    if (Node52.isArrowFunction(init) || Node52.isFunctionExpression(init)) {
+    if (Node53.isArrowFunction(init) || Node53.isFunctionExpression(init)) {
       return init;
     }
   }
@@ -11500,7 +11693,7 @@ function getCallArgumentFunction(call, position) {
   if (arg === void 0) {
     return null;
   }
-  if (Node52.isArrowFunction(arg) || Node52.isFunctionExpression(arg)) {
+  if (Node53.isArrowFunction(arg) || Node53.isFunctionExpression(arg)) {
     return arg;
   }
   return null;
@@ -11512,7 +11705,7 @@ function readArrayLiteralText(node) {
   if (node === null) {
     return null;
   }
-  if (Node52.isArrayLiteralExpression(node)) {
+  if (Node53.isArrayLiteralExpression(node)) {
     return node.getElements().map((e) => e.getText());
   }
   return [node.getText()];
@@ -11737,13 +11930,13 @@ var raise = (msg) => {
   throw new Error(msg);
 };
 function bindingPatternNames(nameNode) {
-  if (Node53.isObjectBindingPattern(nameNode)) {
+  if (Node54.isObjectBindingPattern(nameNode)) {
     return nameNode.getElements().map((e) => e.getName());
   }
-  if (Node53.isArrayBindingPattern(nameNode)) {
+  if (Node54.isArrayBindingPattern(nameNode)) {
     const names = [];
     for (const element of nameNode.getElements()) {
-      if (Node53.isOmittedExpression(element)) {
+      if (Node54.isOmittedExpression(element)) {
         continue;
       }
       names.push(element.getName());
@@ -11754,7 +11947,7 @@ function bindingPatternNames(nameNode) {
 }
 function componentPropsParameters(param, mapping) {
   const nameNode = param.getNameNode();
-  if (!Node53.isObjectBindingPattern(nameNode)) {
+  if (!Node54.isObjectBindingPattern(nameNode)) {
     const type = param.getType();
     return [
       {
@@ -11880,11 +12073,11 @@ function extractParameters(func, inputMapping) {
 function extractDependencyCalls(func) {
   const results = [];
   func.forEachDescendant((node, traversal) => {
-    if (node !== func && (Node53.isFunctionDeclaration(node) || Node53.isFunctionExpression(node) || Node53.isArrowFunction(node) || Node53.isMethodDeclaration(node))) {
+    if (node !== func && (Node54.isFunctionDeclaration(node) || Node54.isFunctionExpression(node) || Node54.isArrowFunction(node) || Node54.isMethodDeclaration(node))) {
       traversal.skip();
       return;
     }
-    if (!Node53.isVariableDeclaration(node)) {
+    if (!Node54.isVariableDeclaration(node)) {
       return;
     }
     const init = node.getInitializer();
@@ -11893,19 +12086,19 @@ function extractDependencyCalls(func) {
     }
     let isAsync = false;
     let callExpr = init;
-    if (Node53.isAwaitExpression(init)) {
+    if (Node54.isAwaitExpression(init)) {
       isAsync = true;
       callExpr = init.getExpression();
     }
-    if (!Node53.isCallExpression(callExpr)) {
+    if (!Node54.isCallExpression(callExpr)) {
       return;
     }
     const calleeName = callExpr.getExpression().getText();
     const nameNode = node.getNameNode();
-    const assignedTo = Node53.isIdentifier(nameNode) ? nameNode.getText() : null;
+    const assignedTo = Node54.isIdentifier(nameNode) ? nameNode.getText() : null;
     const declList = node.getParent();
     const varStmt = declList?.getParent();
-    const locationNode = varStmt !== void 0 && Node53.isVariableStatement(varStmt) ? varStmt : node;
+    const locationNode = varStmt !== void 0 && Node54.isVariableStatement(varStmt) ? varStmt : node;
     results.push({
       name: calleeName,
       assignedTo,
@@ -12161,9 +12354,9 @@ function extractBindingMethod(binding, callSite, pack, resolution) {
   if (m.type === "fromArgumentProperty") {
     const args = callSite.callExpression.getArguments();
     const arg = args[m.position];
-    if (arg !== void 0 && Node53.isObjectLiteralExpression(arg)) {
+    if (arg !== void 0 && Node54.isObjectLiteralExpression(arg)) {
       const prop = arg.getProperty(m.property);
-      if (prop !== void 0 && Node53.isPropertyAssignment(prop)) {
+      if (prop !== void 0 && Node54.isPropertyAssignment(prop)) {
         const init = prop.getInitializer();
         if (init !== void 0) {
           const value = stringValueOf(init, resolution);
@@ -12292,22 +12485,22 @@ function extractBindingPath(binding, callSite, pack, resolution) {
   return void 0;
 }
 function pathFromUrlNode(node) {
-  if (Node53.isStringLiteral(node)) {
+  if (Node54.isStringLiteral(node)) {
     return pathFromLiteralUrl(node.getLiteralValue());
   }
-  if (Node53.isNoSubstitutionTemplateLiteral(node)) {
+  if (Node54.isNoSubstitutionTemplateLiteral(node)) {
     return pathFromLiteralUrl(node.getLiteralValue());
   }
-  if (Node53.isTemplateExpression(node)) {
+  if (Node54.isTemplateExpression(node)) {
     return pathFromTemplateUrl(node);
   }
   return void 0;
 }
 function placeholderName(expr) {
-  if (Node53.isIdentifier(expr)) {
+  if (Node54.isIdentifier(expr)) {
     return expr.getText();
   }
-  if (Node53.isPropertyAccessExpression(expr)) {
+  if (Node54.isPropertyAccessExpression(expr)) {
     return expr.getName();
   }
   return "param";
@@ -12742,7 +12935,7 @@ function expandWrapperCallers(summaries, project, options) {
       continue;
     }
     const binding = s.identity.boundaryBinding;
-    if (binding === null || binding.semantics.name !== "rest" || binding.semantics.method === null || binding.semantics.path !== null) {
+    if (binding === null || binding.semantics.name !== "rest" || binding.semantics.method === null) {
       continue;
     }
     lookup ??= createSourceFileLookup(project);
@@ -12770,11 +12963,21 @@ function findWrapperPathParam(summary, lookup) {
   if (func === null) {
     return null;
   }
-  const params = func.getParameters();
-  if (params.length === 0) {
+  const names = func.getParameters().map((p) => p.getName());
+  if (names.length === 0) {
     return null;
   }
-  return { func, pathParamPosition: 0 };
+  for (const call of func.getDescendantsOfKind(SyntaxKind11.CallExpression)) {
+    const first = call.getArguments()[0];
+    if (first === void 0 || !Node54.isIdentifier(first)) {
+      continue;
+    }
+    const at = names.indexOf(first.getText());
+    if (at !== -1) {
+      return { func, pathParamPosition: at };
+    }
+  }
+  return null;
 }
 function synthesizeCallerSummaries(wrapper, _project, options) {
   const nameNode = wrapperNameNode(wrapper.func);
@@ -12815,16 +13018,16 @@ function synthesizeCallerSummaries(wrapper, _project, options) {
   return out;
 }
 function wrapperNameNode(func) {
-  if (Node53.isFunctionDeclaration(func) || Node53.isMethodDeclaration(func)) {
+  if (Node54.isFunctionDeclaration(func) || Node54.isMethodDeclaration(func)) {
     const name = func.getNameNode();
-    if (name !== void 0 && Node53.isIdentifier(name)) {
+    if (name !== void 0 && Node54.isIdentifier(name)) {
       return name;
     }
   }
   const parent = func.getParent();
-  if (parent !== void 0 && Node53.isVariableDeclaration(parent)) {
+  if (parent !== void 0 && Node54.isVariableDeclaration(parent)) {
     const nameNode = parent.getNameNode();
-    if (Node53.isIdentifier(nameNode)) {
+    if (Node54.isIdentifier(nameNode)) {
       return nameNode;
     }
   }
@@ -12833,10 +13036,10 @@ function wrapperNameNode(func) {
 function enclosingCall(node) {
   let current2 = node.getParent();
   while (current2 !== void 0) {
-    if (Node53.isCallExpression(current2)) {
+    if (Node54.isCallExpression(current2)) {
       return current2;
     }
-    if (Node53.isPropertyAccessExpression(current2)) {
+    if (Node54.isPropertyAccessExpression(current2)) {
       current2 = current2.getParent();
       continue;
     }
@@ -12847,7 +13050,7 @@ function enclosingCall(node) {
 function enclosingFunction(node) {
   let current2 = node.getParent();
   while (current2 !== void 0) {
-    if (Node53.isFunctionDeclaration(current2) || Node53.isFunctionExpression(current2) || Node53.isArrowFunction(current2) || Node53.isMethodDeclaration(current2)) {
+    if (Node54.isFunctionDeclaration(current2) || Node54.isFunctionExpression(current2) || Node54.isArrowFunction(current2) || Node54.isMethodDeclaration(current2)) {
       return current2;
     }
     current2 = current2.getParent();
@@ -12855,13 +13058,13 @@ function enclosingFunction(node) {
   return null;
 }
 function literalOrTemplate(arg) {
-  if (Node53.isStringLiteral(arg)) {
+  if (Node54.isStringLiteral(arg)) {
     return arg.getLiteralValue();
   }
-  if (Node53.isNoSubstitutionTemplateLiteral(arg)) {
+  if (Node54.isNoSubstitutionTemplateLiteral(arg)) {
     return arg.getLiteralValue();
   }
-  if (Node53.isTemplateExpression(arg)) {
+  if (Node54.isTemplateExpression(arg)) {
     let path11 = arg.getHead().getLiteralText();
     for (const span of arg.getTemplateSpans()) {
       path11 += `{${placeholderName(span.getExpression())}}`;
@@ -12872,13 +13075,13 @@ function literalOrTemplate(arg) {
   return void 0;
 }
 function callerName(func) {
-  if (Node53.isFunctionDeclaration(func) || Node53.isMethodDeclaration(func)) {
+  if (Node54.isFunctionDeclaration(func) || Node54.isMethodDeclaration(func)) {
     return func.getName() ?? "anonymous";
   }
   const parent = func.getParent();
-  if (parent !== void 0 && Node53.isVariableDeclaration(parent)) {
+  if (parent !== void 0 && Node54.isVariableDeclaration(parent)) {
     const nameNode = parent.getNameNode();
-    if (Node53.isIdentifier(nameNode)) {
+    if (Node54.isIdentifier(nameNode)) {
       return nameNode.getText();
     }
   }
@@ -13152,7 +13355,8 @@ function createTypeScriptAdapter(config) {
               tallies
             ),
             access: collectAccessRecognizers(config.frameworks, tallies),
-            resolveWrittenValue: (value) => resolution.resolveWrittenValue(value)
+            resolveWrittenValue: (value) => resolution.resolveWrittenValue(value),
+            resolveCallable: (value, alsoFrom) => resolution.resolveCallable(value, alsoFrom)
           }
         )
       ) : withSubUnits;
@@ -13423,10 +13627,10 @@ function findNearestTsconfig(startDir) {
 }
 
 // src/configuredCall.ts
-import { Node as Node54 } from "ts-morph";
+import { Node as Node55 } from "ts-morph";
 function readConfiguredCall(call, ctx, spec) {
   const callee = call.getExpression();
-  if (!Node54.isPropertyAccessExpression(callee)) {
+  if (!Node55.isPropertyAccessExpression(callee)) {
     return null;
   }
   if (callee.getName() !== spec.method) {
@@ -13471,10 +13675,10 @@ function readStringArg(arg) {
 }
 function rootIdentifier(node) {
   let current2 = node;
-  while (Node54.isPropertyAccessExpression(current2)) {
+  while (Node55.isPropertyAccessExpression(current2)) {
     current2 = current2.getExpression();
   }
-  return Node54.isIdentifier(current2) ? current2 : null;
+  return Node55.isIdentifier(current2) ? current2 : null;
 }
 
 // src/packHealth.ts
@@ -13590,7 +13794,7 @@ function formatPackHealth(checks, audiences) {
 }
 
 // src/resolve/readName.ts
-import { Node as Node55, SyntaxKind as SyntaxKind10 } from "ts-morph";
+import { Node as Node56, SyntaxKind as SyntaxKind12 } from "ts-morph";
 var MAX_HELPER_HOPS = 2;
 var UNNAMED_HOLE = "param";
 function readName(expr, options = {}) {
@@ -13619,25 +13823,25 @@ function read(expr, ctx) {
   }
   const seen = new Set(ctx.seen).add(expr);
   const inner = { ...ctx, seen };
-  if (Node55.isStringLiteral(expr) || Node55.isNoSubstitutionTemplateLiteral(expr)) {
+  if (Node56.isStringLiteral(expr) || Node56.isNoSubstitutionTemplateLiteral(expr)) {
     return expr.getLiteralValue();
   }
-  if (Node55.isNumericLiteral(expr)) {
+  if (Node56.isNumericLiteral(expr)) {
     return expr.getLiteralText();
   }
-  if (Node55.isTemplateExpression(expr)) {
+  if (Node56.isTemplateExpression(expr)) {
     return fromTemplate(expr, inner);
   }
-  if (Node55.isParenthesizedExpression(expr)) {
+  if (Node56.isParenthesizedExpression(expr)) {
     return read(expr.getExpression(), inner);
   }
-  if (Node55.isBinaryExpression(expr)) {
+  if (Node56.isBinaryExpression(expr)) {
     return fromBinary(expr, inner);
   }
-  if (Node55.isCallExpression(expr)) {
+  if (Node56.isCallExpression(expr)) {
     return fromCall(expr, inner);
   }
-  if (Node55.isIdentifier(expr)) {
+  if (Node56.isIdentifier(expr)) {
     const only = boundOnce(expr, ctx);
     if (only !== null) {
       return read(only.node, { ...inner, bindings: only.scope });
@@ -13647,7 +13851,7 @@ function read(expr, ctx) {
   return written === null || written === expr ? null : read(written, inner);
 }
 function fromTemplate(expr, ctx) {
-  if (!Node55.isTemplateExpression(expr)) {
+  if (!Node56.isTemplateExpression(expr)) {
     return null;
   }
   let name = expr.getHead().getLiteralText();
@@ -13658,28 +13862,28 @@ function fromTemplate(expr, ctx) {
   return name;
 }
 function fromBinary(expr, ctx) {
-  if (!Node55.isBinaryExpression(expr)) {
+  if (!Node56.isBinaryExpression(expr)) {
     return null;
   }
   const operator = expr.getOperatorToken().getKind();
-  if (operator === SyntaxKind10.BarBarToken || operator === SyntaxKind10.QuestionQuestionToken) {
+  if (operator === SyntaxKind12.BarBarToken || operator === SyntaxKind12.QuestionQuestionToken) {
     return ctx.insideHole ? null : read(expr.getRight(), ctx);
   }
-  if (operator !== SyntaxKind10.PlusToken) {
+  if (operator !== SyntaxKind12.PlusToken) {
     return null;
   }
   const parts = { ...ctx, insideHole: true };
   return readOrHole(expr.getLeft(), parts) + readOrHole(expr.getRight(), parts);
 }
 function fromCall(expr, ctx) {
-  if (!Node55.isCallExpression(expr)) {
+  if (!Node56.isCallExpression(expr)) {
     return null;
   }
   const callee = expr.getExpression();
-  if (Node55.isPropertyAccessExpression(callee) && callee.getName() === "join") {
+  if (Node56.isPropertyAccessExpression(callee) && callee.getName() === "join") {
     return fromJoin(callee.getExpression(), expr.getArguments(), ctx);
   }
-  if (Node55.isIdentifier(callee) && callee.getText() === "String") {
+  if (Node56.isIdentifier(callee) && callee.getText() === "String") {
     const only = expr.getArguments()[0];
     return only === void 0 ? null : readOrHole(only, ctx);
   }
@@ -13698,7 +13902,7 @@ function fromCall(expr, ctx) {
 }
 function fromJoin(subject, args, ctx) {
   const separator = args[0];
-  if (separator === void 0 || !Node55.isStringLiteral(separator)) {
+  if (separator === void 0 || !Node56.isStringLiteral(separator)) {
     return null;
   }
   const parts = elementsOf(subject, ctx);
@@ -13714,17 +13918,17 @@ function fromJoin(subject, args, ctx) {
   ).join(separator.getLiteralValue());
 }
 function elementsOf(subject, ctx) {
-  if (Node55.isArrayLiteralExpression(subject)) {
+  if (Node56.isArrayLiteralExpression(subject)) {
     return subject.getElements().map((element) => here(element, ctx));
   }
-  if (Node55.isCallExpression(subject)) {
+  if (Node56.isCallExpression(subject)) {
     const callee = subject.getExpression();
-    if (Node55.isPropertyAccessExpression(callee) && callee.getName() === "map") {
+    if (Node56.isPropertyAccessExpression(callee) && callee.getName() === "map") {
       return elementsOf(callee.getExpression(), ctx);
     }
     return null;
   }
-  if (!Node55.isIdentifier(subject)) {
+  if (!Node56.isIdentifier(subject)) {
     return null;
   }
   const bound = ctx.bindings.get(subject.getText());
@@ -13732,7 +13936,7 @@ function elementsOf(subject, ctx) {
     return null;
   }
   const only = bound.length === 1 ? bound[0] : void 0;
-  return only !== void 0 && Node55.isArrayLiteralExpression(only.node) ? only.node.getElements().map((element) => here(element, ctx)) : bound;
+  return only !== void 0 && Node56.isArrayLiteralExpression(only.node) ? only.node.getElements().map((element) => here(element, ctx)) : bound;
 }
 function singleReturnBody(callee, ctx) {
   const declaration = declarationOf2(callee, ctx);
@@ -13747,22 +13951,22 @@ function singleReturnBody(callee, ctx) {
   if (body === void 0) {
     return null;
   }
-  if (Node55.isExpression(body)) {
+  if (Node56.isExpression(body)) {
     return { parameters, returned: body };
   }
-  if (!Node55.isBlock(body)) {
+  if (!Node56.isBlock(body)) {
     return null;
   }
   const statements = body.getStatements();
   const only = statements[0];
-  if (statements.length !== 1 || only === void 0 || !Node55.isReturnStatement(only)) {
+  if (statements.length !== 1 || only === void 0 || !Node56.isReturnStatement(only)) {
     return null;
   }
   const returned = only.getExpression();
   return returned === void 0 ? null : { parameters, returned };
 }
 function declarationOf2(callee, ctx) {
-  const symbol = Node55.isPropertyAccessExpression(callee) ? callee.getNameNode().getSymbol() : callee.getSymbol();
+  const symbol = Node56.isPropertyAccessExpression(callee) ? callee.getNameNode().getSymbol() : callee.getSymbol();
   const declarations = symbol?.getAliasedSymbol()?.getDeclarations() ?? symbol?.getDeclarations() ?? [];
   for (const declaration of declarations) {
     const callable = asCallable(declaration);
@@ -13774,14 +13978,14 @@ function declarationOf2(callee, ctx) {
   return written === null || written === callee ? null : declarationOf2(written, { ...ctx, resolve: () => null });
 }
 function asCallable(declaration) {
-  if (Node55.isFunctionDeclaration(declaration) || Node55.isMethodDeclaration(declaration) || Node55.isArrowFunction(declaration) || Node55.isFunctionExpression(declaration)) {
+  if (Node56.isFunctionDeclaration(declaration) || Node56.isMethodDeclaration(declaration) || Node56.isArrowFunction(declaration) || Node56.isFunctionExpression(declaration)) {
     return declaration;
   }
-  if (!Node55.isVariableDeclaration(declaration)) {
+  if (!Node56.isVariableDeclaration(declaration)) {
     return null;
   }
   const initializer = declaration.getInitializer();
-  if (initializer !== void 0 && (Node55.isArrowFunction(initializer) || Node55.isFunctionExpression(initializer))) {
+  if (initializer !== void 0 && (Node56.isArrowFunction(initializer) || Node56.isFunctionExpression(initializer))) {
     return initializer;
   }
   return null;
@@ -13803,7 +14007,7 @@ function here(node, ctx) {
   return { node, scope: ctx.bindings };
 }
 function boundOnce(expr, ctx) {
-  const bound = Node55.isIdentifier(expr) ? ctx.bindings.get(expr.getText()) : void 0;
+  const bound = Node56.isIdentifier(expr) ? ctx.bindings.get(expr.getText()) : void 0;
   return bound !== void 0 && bound.length === 1 ? bound[0] : null;
 }
 function readOrHole(expr, ctx) {
@@ -13815,10 +14019,10 @@ function holeName(expr, ctx) {
   if (bound !== null) {
     return holeName(bound.node, { ...ctx, bindings: bound.scope });
   }
-  if (Node55.isIdentifier(expr)) {
+  if (Node56.isIdentifier(expr)) {
     return expr.getText();
   }
-  if (Node55.isPropertyAccessExpression(expr)) {
+  if (Node56.isPropertyAccessExpression(expr)) {
     return expr.getName();
   }
   return UNNAMED_HOLE;