@suss/adapter-typescript 0.6.0 → 0.7.1

package/dist/index.cjs

@@ -49,10 +49,12 @@ __export(index_exports, {
   findTerminals: () => findTerminals,
   formatPackHealth: () => formatPackHealth,
   isImportedFrom: () => isImportedFrom,
+  methodDeclaredIn: () => methodDeclaredIn,
   parseConditionExpression: () => parseConditionExpression,
   readConfiguredCall: () => readConfiguredCall,
   readContract: () => readContract,
   readContractForClientCall: () => readContractForClientCall,
+  readName: () => readName,
   resolveAliasedSymbol: () => resolveAliasedSymbol,
   resolveSubject: () => resolveSubject,
   rootIdentifier: () => rootIdentifier
@@ -1488,9 +1490,9 @@ var ModuleGraph = class {
     if (known !== void 0) {
       return known;
     }
-    const read = readModuleSpecifiers(sourceFile);
-    this.specifiers.set(filePath, read);
-    return read;
+    const read2 = readModuleSpecifiers(sourceFile);
+    this.specifiers.set(filePath, read2);
+    return read2;
   }
   /**
    * Collect what the rules need in order to settle this file and this
@@ -2253,6 +2255,15 @@ function isImportedFrom(identifier, expectedModule) {
     (decl) => decl.getSourceFile().getFilePath().includes(`/node_modules/${expectedModule}/`)
   );
 }
+function methodDeclaredIn(callee, expectedModule) {
+  if (!import_ts_morph12.Node.isPropertyAccessExpression(callee)) {
+    return false;
+  }
+  const declarations = callee.getNameNode().getSymbol()?.getDeclarations();
+  return declarations !== void 0 && declarations.some(
+    (declaration) => declaration.getSourceFile().getFilePath().includes(`/node_modules/${expectedModule}/`)
+  );
+}
 function importSpecifierMatches(decl, expectedModule) {
   if (import_ts_morph12.Node.isImportSpecifier(decl)) {
     return decl.getImportDeclaration().getModuleSpecifierValue() === expectedModule;
@@ -2856,12 +2867,12 @@ function createDefinitionTable() {
     }
   };
 }
-function withDefinitions(read) {
+function withDefinitions(read2) {
   const table = createDefinitionTable();
   const outer = current;
   current = table;
   try {
-    return { value: read(), definitions: table.collected() };
+    return { value: read2(), definitions: table.collected() };
   } finally {
     current = outer;
   }
@@ -4151,9 +4162,9 @@ function statementOf(node) {
 function isReadBefore(declaration, position) {
   const name = declaration.getName();
   const sourceFile = declaration.getSourceFile();
-  let read = false;
+  let read2 = false;
   sourceFile.forEachDescendant((node, traversal) => {
-    if (read) {
+    if (read2) {
       traversal.stop();
       return;
     }
@@ -4172,10 +4183,10 @@ function isReadBefore(declaration, position) {
       return;
     }
     if (declarationsOf(node).includes(declaration)) {
-      read = true;
+      read2 = true;
     }
   });
-  return read;
+  return read2;
 }
 function startsItsOwnBody(node) {
   return import_ts_morph18.Node.isFunctionDeclaration(node) || import_ts_morph18.Node.isFunctionExpression(node) || import_ts_morph18.Node.isArrowFunction(node) || import_ts_morph18.Node.isMethodDeclaration(node) || import_ts_morph18.Node.isClassDeclaration(node);
@@ -6465,9 +6476,9 @@ function propertyValueOf(property) {
 }
 function functionValueOf(value, resolution) {
   const written = factKeyOf(value);
-  const here = toFunctionRoot(written);
-  if (here !== null) {
-    return here;
+  const here2 = toFunctionRoot(written);
+  if (here2 !== null) {
+    return here2;
   }
   if (resolution === void 0 || !couldNameAValue(written)) {
     return null;
@@ -8223,7 +8234,7 @@ function unitsOfArrayElements(array, match, kind, resolution, prefix, ancestry)
 }
 function unitsForRouteObject(object, match, kind, resolution, prefix, ancestry) {
   const own = ownPathOfObject(object, match);
-  const here = unitForRouteObject(object, match, kind, resolution, prefix, own);
+  const here2 = unitForRouteObject(object, match, kind, resolution, prefix, own);
   const nested = unitsUnderRouteObject(
     object,
     match,
@@ -8232,7 +8243,7 @@ function unitsForRouteObject(object, match, kind, resolution, prefix, ancestry)
     prefixUnder(prefix, own),
     ancestry
   );
-  return here === null ? nested : [here, ...nested];
+  return here2 === null ? nested : [here2, ...nested];
 }
 function unitForRouteObject(object, match, kind, resolution, prefix, own) {
   const target = elementTargetOfValue(
@@ -12001,7 +12012,7 @@ function announcedBoundaryStructure(unit) {
   };
 }
 function extractCodeStructure(unit, pack, invocationRecognizers = [], accessRecognizers = [], barriers = NO_BARRIERS, resolveWrittenValue) {
-  const read = withDefinitions(
+  const read2 = withDefinitions(
     () => readCodeStructure(
       unit,
       pack,
@@ -12011,7 +12022,7 @@ function extractCodeStructure(unit, pack, invocationRecognizers = [], accessReco
       resolveWrittenValue
     )
   );
-  return read.definitions === null ? read.value : { ...read.value, definitions: read.definitions };
+  return read2.definitions === null ? read2.value : { ...read2.value, definitions: read2.definitions };
 }
 function responseAccessorNames(pack, kind) {
   return pack.responseSemantics?.filter((m) => m.semantics.type === kind).map((m) => m.name);
@@ -13516,7 +13527,7 @@ function threwWhileReading(packs) {
   return packs.filter((funnel) => funnel.failures.length > 0).map((funnel) => {
     const first = funnel.failures[0];
     const rest = funnel.failures.length - 1;
-    const alsoIn = rest > 0 ? ` and on ${rest} other ${rest === 1 ? "file" : "files"}` : "";
+    const alsoIn = rest > 0 ? ` and on ${rest} ${rest === 1 ? "other file" : "other files"}` : "";
     return {
       label: funnel.pack,
       detail: `threw from ${first.hook} on ${first.file}${alsoIn}, so its counts below are a floor: ${first.message}`
@@ -13568,6 +13579,241 @@ function formatPackHealth(checks, audiences) {
   return `${lines.join("\n")}
 `;
 }
+
+// src/resolve/readName.ts
+var import_ts_morph58 = require("ts-morph");
+var MAX_HELPER_HOPS = 2;
+var UNNAMED_HOLE = "param";
+function readName(expr, options = {}) {
+  const name = read(expr, {
+    resolve: options.resolve ?? (() => null),
+    bindings: /* @__PURE__ */ new Map(),
+    hops: 0,
+    seen: /* @__PURE__ */ new Set(),
+    insideHole: false
+  });
+  if (name !== null || options.unsettled !== "reference") {
+    return name;
+  }
+  const asked = holeName(expr, {
+    resolve: () => null,
+    bindings: /* @__PURE__ */ new Map(),
+    hops: 0,
+    seen: /* @__PURE__ */ new Set(),
+    insideHole: true
+  });
+  return asked === UNNAMED_HOLE ? null : `{${asked}}`;
+}
+function read(expr, ctx) {
+  if (ctx.seen.has(expr)) {
+    return null;
+  }
+  const seen = new Set(ctx.seen).add(expr);
+  const inner = { ...ctx, seen };
+  if (import_ts_morph58.Node.isStringLiteral(expr) || import_ts_morph58.Node.isNoSubstitutionTemplateLiteral(expr)) {
+    return expr.getLiteralValue();
+  }
+  if (import_ts_morph58.Node.isNumericLiteral(expr)) {
+    return expr.getLiteralText();
+  }
+  if (import_ts_morph58.Node.isTemplateExpression(expr)) {
+    return fromTemplate(expr, inner);
+  }
+  if (import_ts_morph58.Node.isParenthesizedExpression(expr)) {
+    return read(expr.getExpression(), inner);
+  }
+  if (import_ts_morph58.Node.isBinaryExpression(expr)) {
+    return fromBinary(expr, inner);
+  }
+  if (import_ts_morph58.Node.isCallExpression(expr)) {
+    return fromCall(expr, inner);
+  }
+  if (import_ts_morph58.Node.isIdentifier(expr)) {
+    const only = boundOnce(expr, ctx);
+    if (only !== null) {
+      return read(only.node, { ...inner, bindings: only.scope });
+    }
+  }
+  const written = ctx.resolve(expr);
+  return written === null || written === expr ? null : read(written, inner);
+}
+function fromTemplate(expr, ctx) {
+  if (!import_ts_morph58.Node.isTemplateExpression(expr)) {
+    return null;
+  }
+  let name = expr.getHead().getLiteralText();
+  for (const span of expr.getTemplateSpans()) {
+    name += readOrHole(span.getExpression(), { ...ctx, insideHole: true });
+    name += span.getLiteral().getLiteralText();
+  }
+  return name;
+}
+function fromBinary(expr, ctx) {
+  if (!import_ts_morph58.Node.isBinaryExpression(expr)) {
+    return null;
+  }
+  const operator = expr.getOperatorToken().getKind();
+  if (operator === import_ts_morph58.SyntaxKind.BarBarToken || operator === import_ts_morph58.SyntaxKind.QuestionQuestionToken) {
+    return ctx.insideHole ? null : read(expr.getRight(), ctx);
+  }
+  if (operator !== import_ts_morph58.SyntaxKind.PlusToken) {
+    return null;
+  }
+  const parts = { ...ctx, insideHole: true };
+  return readOrHole(expr.getLeft(), parts) + readOrHole(expr.getRight(), parts);
+}
+function fromCall(expr, ctx) {
+  if (!import_ts_morph58.Node.isCallExpression(expr)) {
+    return null;
+  }
+  const callee = expr.getExpression();
+  if (import_ts_morph58.Node.isPropertyAccessExpression(callee) && callee.getName() === "join") {
+    return fromJoin(callee.getExpression(), expr.getArguments(), ctx);
+  }
+  if (import_ts_morph58.Node.isIdentifier(callee) && callee.getText() === "String") {
+    const only = expr.getArguments()[0];
+    return only === void 0 ? null : readOrHole(only, ctx);
+  }
+  if (ctx.hops >= MAX_HELPER_HOPS) {
+    return null;
+  }
+  const helper = singleReturnBody(callee, ctx);
+  if (helper === null) {
+    return null;
+  }
+  return read(helper.returned, {
+    ...ctx,
+    hops: ctx.hops + 1,
+    bindings: bind(helper.parameters, expr.getArguments(), ctx.bindings)
+  });
+}
+function fromJoin(subject, args, ctx) {
+  const separator = args[0];
+  if (separator === void 0 || !import_ts_morph58.Node.isStringLiteral(separator)) {
+    return null;
+  }
+  const parts = elementsOf(subject, ctx);
+  if (parts === null) {
+    return null;
+  }
+  return parts.map(
+    (part) => readOrHole(part.node, {
+      ...ctx,
+      bindings: part.scope,
+      insideHole: true
+    })
+  ).join(separator.getLiteralValue());
+}
+function elementsOf(subject, ctx) {
+  if (import_ts_morph58.Node.isArrayLiteralExpression(subject)) {
+    return subject.getElements().map((element) => here(element, ctx));
+  }
+  if (import_ts_morph58.Node.isCallExpression(subject)) {
+    const callee = subject.getExpression();
+    if (import_ts_morph58.Node.isPropertyAccessExpression(callee) && callee.getName() === "map") {
+      return elementsOf(callee.getExpression(), ctx);
+    }
+    return null;
+  }
+  if (!import_ts_morph58.Node.isIdentifier(subject)) {
+    return null;
+  }
+  const bound = ctx.bindings.get(subject.getText());
+  if (bound === void 0) {
+    return null;
+  }
+  const only = bound.length === 1 ? bound[0] : void 0;
+  return only !== void 0 && import_ts_morph58.Node.isArrayLiteralExpression(only.node) ? only.node.getElements().map((element) => here(element, ctx)) : bound;
+}
+function singleReturnBody(callee, ctx) {
+  const declaration = declarationOf2(callee, ctx);
+  if (declaration === null) {
+    return null;
+  }
+  const parameters = declaration.getParameters().map((parameter) => ({
+    name: parameter.getName(),
+    rest: parameter.isRestParameter()
+  }));
+  const body = declaration.getBody();
+  if (body === void 0) {
+    return null;
+  }
+  if (import_ts_morph58.Node.isExpression(body)) {
+    return { parameters, returned: body };
+  }
+  if (!import_ts_morph58.Node.isBlock(body)) {
+    return null;
+  }
+  const statements = body.getStatements();
+  const only = statements[0];
+  if (statements.length !== 1 || only === void 0 || !import_ts_morph58.Node.isReturnStatement(only)) {
+    return null;
+  }
+  const returned = only.getExpression();
+  return returned === void 0 ? null : { parameters, returned };
+}
+function declarationOf2(callee, ctx) {
+  const symbol = import_ts_morph58.Node.isPropertyAccessExpression(callee) ? callee.getNameNode().getSymbol() : callee.getSymbol();
+  const declarations = symbol?.getAliasedSymbol()?.getDeclarations() ?? symbol?.getDeclarations() ?? [];
+  for (const declaration of declarations) {
+    const callable = asCallable(declaration);
+    if (callable !== null) {
+      return callable;
+    }
+  }
+  const written = ctx.resolve(callee);
+  return written === null || written === callee ? null : declarationOf2(written, { ...ctx, resolve: () => null });
+}
+function asCallable(declaration) {
+  if (import_ts_morph58.Node.isFunctionDeclaration(declaration) || import_ts_morph58.Node.isMethodDeclaration(declaration) || import_ts_morph58.Node.isArrowFunction(declaration) || import_ts_morph58.Node.isFunctionExpression(declaration)) {
+    return declaration;
+  }
+  if (!import_ts_morph58.Node.isVariableDeclaration(declaration)) {
+    return null;
+  }
+  const initializer = declaration.getInitializer();
+  if (initializer !== void 0 && (import_ts_morph58.Node.isArrowFunction(initializer) || import_ts_morph58.Node.isFunctionExpression(initializer))) {
+    return initializer;
+  }
+  return null;
+}
+function bind(parameters, args, scope) {
+  const bindings = /* @__PURE__ */ new Map();
+  parameters.forEach((parameter, index) => {
+    const passed = parameter.rest ? args.slice(index) : args.slice(index, index + 1);
+    if (passed.length > 0) {
+      bindings.set(
+        parameter.name,
+        passed.map((node) => ({ node, scope }))
+      );
+    }
+  });
+  return bindings;
+}
+function here(node, ctx) {
+  return { node, scope: ctx.bindings };
+}
+function boundOnce(expr, ctx) {
+  const bound = import_ts_morph58.Node.isIdentifier(expr) ? ctx.bindings.get(expr.getText()) : void 0;
+  return bound !== void 0 && bound.length === 1 ? bound[0] : null;
+}
+function readOrHole(expr, ctx) {
+  const name = read(expr, ctx);
+  return name ?? `{${holeName(expr, ctx)}}`;
+}
+function holeName(expr, ctx) {
+  const bound = boundOnce(expr, ctx);
+  if (bound !== null) {
+    return holeName(bound.node, { ...ctx, bindings: bound.scope });
+  }
+  if (import_ts_morph58.Node.isIdentifier(expr)) {
+    return expr.getText();
+  }
+  if (import_ts_morph58.Node.isPropertyAccessExpression(expr)) {
+    return expr.getName();
+  }
+  return UNNAMED_HOLE;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ADAPTER_VERSION,
@@ -13589,10 +13835,12 @@ function formatPackHealth(checks, audiences) {
   findTerminals,
   formatPackHealth,
   isImportedFrom,
+  methodDeclaredIn,
   parseConditionExpression,
   readConfiguredCall,
   readContract,
   readContractForClientCall,
+  readName,
   resolveAliasedSymbol,
   resolveSubject,
   rootIdentifier

package/dist/index.d.cts

@@ -820,6 +820,39 @@ declare function formatPackHealth(checks: ReadonlyArray<HealthCheck>, audiences:
 declare function parseConditionExpression(expr: Expression, depth?: number): Predicate | null;
 
 declare function isImportedFrom(identifier: Node, expectedModule: string): boolean;
+/**
+ * Whether `expectedModule` declares the method a call goes to. A pack
+ * asks this when the receiver came from somewhere the source does not
+ * spell out: `const redis = await this.getClient()` says nothing about
+ * ioredis, and the type of `redis.get` says everything.
+ */
+declare function methodDeclaredIn(callee: Node, expectedModule: string): boolean;
+
+/**
+ * What a name-valued expression says, as fixed text with a hole for
+ * each part built at run time. A table name, a bucket, a queue URL and
+ * a cache key are all built the same handful of ways, and each storage
+ * pack had its own copy of this before it existed. The README beside
+ * this file says what each shape reads as.
+ */
+
+interface ReadNameOptions {
+    /**
+     * What to say about a name nothing here settles. `"nothing"` gives
+     * null. `"reference"` gives a hole named after what the source asked
+     * for, `{location.bucket}`, which says which value to go and ask
+     * about rather than which bucket this is.
+     */
+    unsettled?: "nothing" | "reference";
+    /**
+     * The expression a value was written as, from the run's facts. A
+     * caller with no store passes nothing, and the read runs on what the
+     * source spells at the call site.
+     */
+    resolve?: (value: Node) => Node | null;
+}
+/** The name an expression states, or null when nothing settles it. */
+declare function readName(expr: Node, options?: ReadNameOptions): string | null;
 
 interface BranchFieldAccesses {
     /** Terminal location (start, end lines): used to match back to transitions */
@@ -952,4 +985,4 @@ declare function computeAdapterPacksDigest(packVersions: ReadonlyArray<{
     version?: string;
 }>): string;
 
-export { ADAPTER_VERSION, type CacheDiagnostic, type CacheLookup, type ClientCallSite, type ConfiguredCallContext, type ConfiguredCallRead, type ConfiguredCallSpec, type ContractReadResult, type DiscoveredUnit, type EmptyStage, type ExtractionReport, type FoundTerminal, type FunctionRoot, type HealthCheck, type HealthViolation, type PackFunnel, ResolutionStore, type Timer, type TimingReport, type TsDiscoveryContext, type TsJsxAttributeLocation, type TsSubUnitContext, type TypeScriptAdapter, type TypeScriptAdapterConfig, collectAncestorBranches, collectClientFieldAccesses, computeAdapterPacksDigest, computeContentHash, createProjectWithoutTsconfig, createTsDiscoveryContext, createTsSubUnitContext, createTypeScriptAdapter, discoverUnits, evaluatePackHealth, exportedDeclarationsOf, extractCodeStructure, extractRawBranches, findNearestTsconfig, findTerminals, formatPackHealth, isImportedFrom, parseConditionExpression, readConfiguredCall, readContract, readContractForClientCall, resolveAliasedSymbol, resolveSubject, rootIdentifier };
+export { ADAPTER_VERSION, type CacheDiagnostic, type CacheLookup, type ClientCallSite, type ConfiguredCallContext, type ConfiguredCallRead, type ConfiguredCallSpec, type ContractReadResult, type DiscoveredUnit, type EmptyStage, type ExtractionReport, type FoundTerminal, type FunctionRoot, type HealthCheck, type HealthViolation, type PackFunnel, type ReadNameOptions, ResolutionStore, type Timer, type TimingReport, type TsDiscoveryContext, type TsJsxAttributeLocation, type TsSubUnitContext, type TypeScriptAdapter, type TypeScriptAdapterConfig, collectAncestorBranches, collectClientFieldAccesses, computeAdapterPacksDigest, computeContentHash, createProjectWithoutTsconfig, createTsDiscoveryContext, createTsSubUnitContext, createTypeScriptAdapter, discoverUnits, evaluatePackHealth, exportedDeclarationsOf, extractCodeStructure, extractRawBranches, findNearestTsconfig, findTerminals, formatPackHealth, isImportedFrom, methodDeclaredIn, parseConditionExpression, readConfiguredCall, readContract, readContractForClientCall, readName, resolveAliasedSymbol, resolveSubject, rootIdentifier };

package/dist/index.d.ts

@@ -820,6 +820,39 @@ declare function formatPackHealth(checks: ReadonlyArray<HealthCheck>, audiences:
 declare function parseConditionExpression(expr: Expression, depth?: number): Predicate | null;
 
 declare function isImportedFrom(identifier: Node, expectedModule: string): boolean;
+/**
+ * Whether `expectedModule` declares the method a call goes to. A pack
+ * asks this when the receiver came from somewhere the source does not
+ * spell out: `const redis = await this.getClient()` says nothing about
+ * ioredis, and the type of `redis.get` says everything.
+ */
+declare function methodDeclaredIn(callee: Node, expectedModule: string): boolean;
+
+/**
+ * What a name-valued expression says, as fixed text with a hole for
+ * each part built at run time. A table name, a bucket, a queue URL and
+ * a cache key are all built the same handful of ways, and each storage
+ * pack had its own copy of this before it existed. The README beside
+ * this file says what each shape reads as.
+ */
+
+interface ReadNameOptions {
+    /**
+     * What to say about a name nothing here settles. `"nothing"` gives
+     * null. `"reference"` gives a hole named after what the source asked
+     * for, `{location.bucket}`, which says which value to go and ask
+     * about rather than which bucket this is.
+     */
+    unsettled?: "nothing" | "reference";
+    /**
+     * The expression a value was written as, from the run's facts. A
+     * caller with no store passes nothing, and the read runs on what the
+     * source spells at the call site.
+     */
+    resolve?: (value: Node) => Node | null;
+}
+/** The name an expression states, or null when nothing settles it. */
+declare function readName(expr: Node, options?: ReadNameOptions): string | null;
 
 interface BranchFieldAccesses {
     /** Terminal location (start, end lines): used to match back to transitions */
@@ -952,4 +985,4 @@ declare function computeAdapterPacksDigest(packVersions: ReadonlyArray<{
     version?: string;
 }>): string;
 
-export { ADAPTER_VERSION, type CacheDiagnostic, type CacheLookup, type ClientCallSite, type ConfiguredCallContext, type ConfiguredCallRead, type ConfiguredCallSpec, type ContractReadResult, type DiscoveredUnit, type EmptyStage, type ExtractionReport, type FoundTerminal, type FunctionRoot, type HealthCheck, type HealthViolation, type PackFunnel, ResolutionStore, type Timer, type TimingReport, type TsDiscoveryContext, type TsJsxAttributeLocation, type TsSubUnitContext, type TypeScriptAdapter, type TypeScriptAdapterConfig, collectAncestorBranches, collectClientFieldAccesses, computeAdapterPacksDigest, computeContentHash, createProjectWithoutTsconfig, createTsDiscoveryContext, createTsSubUnitContext, createTypeScriptAdapter, discoverUnits, evaluatePackHealth, exportedDeclarationsOf, extractCodeStructure, extractRawBranches, findNearestTsconfig, findTerminals, formatPackHealth, isImportedFrom, parseConditionExpression, readConfiguredCall, readContract, readContractForClientCall, resolveAliasedSymbol, resolveSubject, rootIdentifier };
+export { ADAPTER_VERSION, type CacheDiagnostic, type CacheLookup, type ClientCallSite, type ConfiguredCallContext, type ConfiguredCallRead, type ConfiguredCallSpec, type ContractReadResult, type DiscoveredUnit, type EmptyStage, type ExtractionReport, type FoundTerminal, type FunctionRoot, type HealthCheck, type HealthViolation, type PackFunnel, type ReadNameOptions, ResolutionStore, type Timer, type TimingReport, type TsDiscoveryContext, type TsJsxAttributeLocation, type TsSubUnitContext, type TypeScriptAdapter, type TypeScriptAdapterConfig, collectAncestorBranches, collectClientFieldAccesses, computeAdapterPacksDigest, computeContentHash, createProjectWithoutTsconfig, createTsDiscoveryContext, createTsSubUnitContext, createTypeScriptAdapter, discoverUnits, evaluatePackHealth, exportedDeclarationsOf, extractCodeStructure, extractRawBranches, findNearestTsconfig, findTerminals, formatPackHealth, isImportedFrom, methodDeclaredIn, parseConditionExpression, readConfiguredCall, readContract, readContractForClientCall, readName, resolveAliasedSymbol, resolveSubject, rootIdentifier };

package/dist/index.js

@@ -1451,9 +1451,9 @@ var ModuleGraph = class {
     if (known !== void 0) {
       return known;
     }
-    const read = readModuleSpecifiers(sourceFile);
-    this.specifiers.set(filePath, read);
-    return read;
+    const read2 = readModuleSpecifiers(sourceFile);
+    this.specifiers.set(filePath, read2);
+    return read2;
   }
   /**
    * Collect what the rules need in order to settle this file and this
@@ -2216,6 +2216,15 @@ function isImportedFrom(identifier, expectedModule) {
     (decl) => decl.getSourceFile().getFilePath().includes(`/node_modules/${expectedModule}/`)
   );
 }
+function methodDeclaredIn(callee, expectedModule) {
+  if (!Node11.isPropertyAccessExpression(callee)) {
+    return false;
+  }
+  const declarations = callee.getNameNode().getSymbol()?.getDeclarations();
+  return declarations !== void 0 && declarations.some(
+    (declaration) => declaration.getSourceFile().getFilePath().includes(`/node_modules/${expectedModule}/`)
+  );
+}
 function importSpecifierMatches(decl, expectedModule) {
   if (Node11.isImportSpecifier(decl)) {
     return decl.getImportDeclaration().getModuleSpecifierValue() === expectedModule;
@@ -2824,12 +2833,12 @@ function createDefinitionTable() {
     }
   };
 }
-function withDefinitions(read) {
+function withDefinitions(read2) {
   const table = createDefinitionTable();
   const outer = current;
   current = table;
   try {
-    return { value: read(), definitions: table.collected() };
+    return { value: read2(), definitions: table.collected() };
   } finally {
     current = outer;
   }
@@ -4121,9 +4130,9 @@ function statementOf(node) {
 function isReadBefore(declaration, position) {
   const name = declaration.getName();
   const sourceFile = declaration.getSourceFile();
-  let read = false;
+  let read2 = false;
   sourceFile.forEachDescendant((node, traversal) => {
-    if (read) {
+    if (read2) {
       traversal.stop();
       return;
     }
@@ -4142,10 +4151,10 @@ function isReadBefore(declaration, position) {
       return;
     }
     if (declarationsOf(node).includes(declaration)) {
-      read = true;
+      read2 = true;
     }
   });
-  return read;
+  return read2;
 }
 function startsItsOwnBody(node) {
   return Node17.isFunctionDeclaration(node) || Node17.isFunctionExpression(node) || Node17.isArrowFunction(node) || Node17.isMethodDeclaration(node) || Node17.isClassDeclaration(node);
@@ -6442,9 +6451,9 @@ function propertyValueOf(property) {
 }
 function functionValueOf(value, resolution) {
   const written = factKeyOf(value);
-  const here = toFunctionRoot(written);
-  if (here !== null) {
-    return here;
+  const here2 = toFunctionRoot(written);
+  if (here2 !== null) {
+    return here2;
   }
   if (resolution === void 0 || !couldNameAValue(written)) {
     return null;
@@ -8206,7 +8215,7 @@ function unitsOfArrayElements(array, match, kind, resolution, prefix, ancestry)
 }
 function unitsForRouteObject(object, match, kind, resolution, prefix, ancestry) {
   const own = ownPathOfObject(object, match);
-  const here = unitForRouteObject(object, match, kind, resolution, prefix, own);
+  const here2 = unitForRouteObject(object, match, kind, resolution, prefix, own);
   const nested = unitsUnderRouteObject(
     object,
     match,
@@ -8215,7 +8224,7 @@ function unitsForRouteObject(object, match, kind, resolution, prefix, ancestry)
     prefixUnder(prefix, own),
     ancestry
   );
-  return here === null ? nested : [here, ...nested];
+  return here2 === null ? nested : [here2, ...nested];
 }
 function unitForRouteObject(object, match, kind, resolution, prefix, own) {
   const target = elementTargetOfValue(
@@ -12007,7 +12016,7 @@ function announcedBoundaryStructure(unit) {
   };
 }
 function extractCodeStructure(unit, pack, invocationRecognizers = [], accessRecognizers = [], barriers = NO_BARRIERS, resolveWrittenValue) {
-  const read = withDefinitions(
+  const read2 = withDefinitions(
     () => readCodeStructure(
       unit,
       pack,
@@ -12017,7 +12026,7 @@ function extractCodeStructure(unit, pack, invocationRecognizers = [], accessReco
       resolveWrittenValue
     )
   );
-  return read.definitions === null ? read.value : { ...read.value, definitions: read.definitions };
+  return read2.definitions === null ? read2.value : { ...read2.value, definitions: read2.definitions };
 }
 function responseAccessorNames(pack, kind) {
   return pack.responseSemantics?.filter((m) => m.semantics.type === kind).map((m) => m.name);
@@ -13527,7 +13536,7 @@ function threwWhileReading(packs) {
   return packs.filter((funnel) => funnel.failures.length > 0).map((funnel) => {
     const first = funnel.failures[0];
     const rest = funnel.failures.length - 1;
-    const alsoIn = rest > 0 ? ` and on ${rest} other ${rest === 1 ? "file" : "files"}` : "";
+    const alsoIn = rest > 0 ? ` and on ${rest} ${rest === 1 ? "other file" : "other files"}` : "";
     return {
       label: funnel.pack,
       detail: `threw from ${first.hook} on ${first.file}${alsoIn}, so its counts below are a floor: ${first.message}`
@@ -13579,6 +13588,241 @@ function formatPackHealth(checks, audiences) {
   return `${lines.join("\n")}
 `;
 }
+
+// src/resolve/readName.ts
+import { Node as Node55, SyntaxKind as SyntaxKind10 } from "ts-morph";
+var MAX_HELPER_HOPS = 2;
+var UNNAMED_HOLE = "param";
+function readName(expr, options = {}) {
+  const name = read(expr, {
+    resolve: options.resolve ?? (() => null),
+    bindings: /* @__PURE__ */ new Map(),
+    hops: 0,
+    seen: /* @__PURE__ */ new Set(),
+    insideHole: false
+  });
+  if (name !== null || options.unsettled !== "reference") {
+    return name;
+  }
+  const asked = holeName(expr, {
+    resolve: () => null,
+    bindings: /* @__PURE__ */ new Map(),
+    hops: 0,
+    seen: /* @__PURE__ */ new Set(),
+    insideHole: true
+  });
+  return asked === UNNAMED_HOLE ? null : `{${asked}}`;
+}
+function read(expr, ctx) {
+  if (ctx.seen.has(expr)) {
+    return null;
+  }
+  const seen = new Set(ctx.seen).add(expr);
+  const inner = { ...ctx, seen };
+  if (Node55.isStringLiteral(expr) || Node55.isNoSubstitutionTemplateLiteral(expr)) {
+    return expr.getLiteralValue();
+  }
+  if (Node55.isNumericLiteral(expr)) {
+    return expr.getLiteralText();
+  }
+  if (Node55.isTemplateExpression(expr)) {
+    return fromTemplate(expr, inner);
+  }
+  if (Node55.isParenthesizedExpression(expr)) {
+    return read(expr.getExpression(), inner);
+  }
+  if (Node55.isBinaryExpression(expr)) {
+    return fromBinary(expr, inner);
+  }
+  if (Node55.isCallExpression(expr)) {
+    return fromCall(expr, inner);
+  }
+  if (Node55.isIdentifier(expr)) {
+    const only = boundOnce(expr, ctx);
+    if (only !== null) {
+      return read(only.node, { ...inner, bindings: only.scope });
+    }
+  }
+  const written = ctx.resolve(expr);
+  return written === null || written === expr ? null : read(written, inner);
+}
+function fromTemplate(expr, ctx) {
+  if (!Node55.isTemplateExpression(expr)) {
+    return null;
+  }
+  let name = expr.getHead().getLiteralText();
+  for (const span of expr.getTemplateSpans()) {
+    name += readOrHole(span.getExpression(), { ...ctx, insideHole: true });
+    name += span.getLiteral().getLiteralText();
+  }
+  return name;
+}
+function fromBinary(expr, ctx) {
+  if (!Node55.isBinaryExpression(expr)) {
+    return null;
+  }
+  const operator = expr.getOperatorToken().getKind();
+  if (operator === SyntaxKind10.BarBarToken || operator === SyntaxKind10.QuestionQuestionToken) {
+    return ctx.insideHole ? null : read(expr.getRight(), ctx);
+  }
+  if (operator !== SyntaxKind10.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)) {
+    return null;
+  }
+  const callee = expr.getExpression();
+  if (Node55.isPropertyAccessExpression(callee) && callee.getName() === "join") {
+    return fromJoin(callee.getExpression(), expr.getArguments(), ctx);
+  }
+  if (Node55.isIdentifier(callee) && callee.getText() === "String") {
+    const only = expr.getArguments()[0];
+    return only === void 0 ? null : readOrHole(only, ctx);
+  }
+  if (ctx.hops >= MAX_HELPER_HOPS) {
+    return null;
+  }
+  const helper = singleReturnBody(callee, ctx);
+  if (helper === null) {
+    return null;
+  }
+  return read(helper.returned, {
+    ...ctx,
+    hops: ctx.hops + 1,
+    bindings: bind(helper.parameters, expr.getArguments(), ctx.bindings)
+  });
+}
+function fromJoin(subject, args, ctx) {
+  const separator = args[0];
+  if (separator === void 0 || !Node55.isStringLiteral(separator)) {
+    return null;
+  }
+  const parts = elementsOf(subject, ctx);
+  if (parts === null) {
+    return null;
+  }
+  return parts.map(
+    (part) => readOrHole(part.node, {
+      ...ctx,
+      bindings: part.scope,
+      insideHole: true
+    })
+  ).join(separator.getLiteralValue());
+}
+function elementsOf(subject, ctx) {
+  if (Node55.isArrayLiteralExpression(subject)) {
+    return subject.getElements().map((element) => here(element, ctx));
+  }
+  if (Node55.isCallExpression(subject)) {
+    const callee = subject.getExpression();
+    if (Node55.isPropertyAccessExpression(callee) && callee.getName() === "map") {
+      return elementsOf(callee.getExpression(), ctx);
+    }
+    return null;
+  }
+  if (!Node55.isIdentifier(subject)) {
+    return null;
+  }
+  const bound = ctx.bindings.get(subject.getText());
+  if (bound === void 0) {
+    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;
+}
+function singleReturnBody(callee, ctx) {
+  const declaration = declarationOf2(callee, ctx);
+  if (declaration === null) {
+    return null;
+  }
+  const parameters = declaration.getParameters().map((parameter) => ({
+    name: parameter.getName(),
+    rest: parameter.isRestParameter()
+  }));
+  const body = declaration.getBody();
+  if (body === void 0) {
+    return null;
+  }
+  if (Node55.isExpression(body)) {
+    return { parameters, returned: body };
+  }
+  if (!Node55.isBlock(body)) {
+    return null;
+  }
+  const statements = body.getStatements();
+  const only = statements[0];
+  if (statements.length !== 1 || only === void 0 || !Node55.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 declarations = symbol?.getAliasedSymbol()?.getDeclarations() ?? symbol?.getDeclarations() ?? [];
+  for (const declaration of declarations) {
+    const callable = asCallable(declaration);
+    if (callable !== null) {
+      return callable;
+    }
+  }
+  const written = ctx.resolve(callee);
+  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)) {
+    return declaration;
+  }
+  if (!Node55.isVariableDeclaration(declaration)) {
+    return null;
+  }
+  const initializer = declaration.getInitializer();
+  if (initializer !== void 0 && (Node55.isArrowFunction(initializer) || Node55.isFunctionExpression(initializer))) {
+    return initializer;
+  }
+  return null;
+}
+function bind(parameters, args, scope) {
+  const bindings = /* @__PURE__ */ new Map();
+  parameters.forEach((parameter, index) => {
+    const passed = parameter.rest ? args.slice(index) : args.slice(index, index + 1);
+    if (passed.length > 0) {
+      bindings.set(
+        parameter.name,
+        passed.map((node) => ({ node, scope }))
+      );
+    }
+  });
+  return bindings;
+}
+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;
+  return bound !== void 0 && bound.length === 1 ? bound[0] : null;
+}
+function readOrHole(expr, ctx) {
+  const name = read(expr, ctx);
+  return name ?? `{${holeName(expr, ctx)}}`;
+}
+function holeName(expr, ctx) {
+  const bound = boundOnce(expr, ctx);
+  if (bound !== null) {
+    return holeName(bound.node, { ...ctx, bindings: bound.scope });
+  }
+  if (Node55.isIdentifier(expr)) {
+    return expr.getText();
+  }
+  if (Node55.isPropertyAccessExpression(expr)) {
+    return expr.getName();
+  }
+  return UNNAMED_HOLE;
+}
 export {
   ADAPTER_VERSION,
   ResolutionStore,
@@ -13599,10 +13843,12 @@ export {
   findTerminals,
   formatPackHealth,
   isImportedFrom,
+  methodDeclaredIn,
   parseConditionExpression,
   readConfiguredCall,
   readContract,
   readContractForClientCall,
+  readName,
   resolveAliasedSymbol,
   resolveSubject,
   rootIdentifier

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-typescript",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "type": "module",
   "description": "TypeScript adapter for suss — walks source files with ts-morph and emits raw extractions for the suss pipeline.",
   "keywords": [
@@ -46,10 +46,10 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.6.0",
-    "@suss/datalog": "0.6.0",
-    "@suss/extractor": "0.6.0",
-    "@suss/resolution": "0.6.0",
+    "@suss/behavioral-ir": "0.7.1",
+    "@suss/datalog": "0.7.1",
+    "@suss/extractor": "0.7.1",
+    "@suss/resolution": "0.7.1",
     "graphql": "^16.8.0",
     "picomatch": "^4.0.4",
     "ts-morph": "^23.0.0"