@suss/adapter-typescript 0.7.2 → 0.8.0

package/dist/index.cjs

@@ -3985,6 +3985,7 @@ var import_ts_morph19 = require("ts-morph");
 var import_ts_morph18 = require("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) {
@@ -4017,22 +4018,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) {
@@ -4041,14 +4039,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 import_ts_morph18.Node.isParameterDeclaration(declaration) ? declaration : declaration.getInitializer();
+}
 function writeRunsInConstructor(declaration, write) {
   const statement = statementOf(write.node);
   if (statement === null) {
@@ -4059,13 +4059,16 @@ function writeRunsInConstructor(declaration, write) {
     return false;
   }
   const owner = body.getParent();
-  return owner !== void 0 && import_ts_morph18.Node.isConstructorDeclaration(owner) && owner.getParent() === declaration.getParent();
+  return owner !== void 0 && import_ts_morph18.Node.isConstructorDeclaration(owner) && owner.getParent() === classHolding(declaration);
+}
+function classHolding(declaration) {
+  return import_ts_morph18.Node.isParameterDeclaration(declaration) ? declaration.getParent().getParent() : declaration.getParent();
 }
 function isWrittenAgain(declaration) {
   return assignmentsTo(declaration).length > 0;
 }
 function assignmentsTo(declaration) {
-  if (import_ts_morph18.Node.isPropertyDeclaration(declaration)) {
+  if (import_ts_morph18.Node.isPropertyDeclaration(declaration) || import_ts_morph18.Node.isParameterDeclaration(declaration)) {
     const sourceFile2 = declaration.getSourceFile();
     return sourceFile2.isDeclarationFile() ? [] : assignmentsInFile(sourceFile2).get(declaration) ?? [];
   }
@@ -4132,7 +4135,9 @@ function declarationsOf(name) {
   }
   const declarations = [];
   for (const declaration of symbol.getDeclarations()) {
-    if (import_ts_morph18.Node.isVariableDeclaration(declaration) || import_ts_morph18.Node.isPropertyDeclaration(declaration)) {
+    if (import_ts_morph18.Node.isVariableDeclaration(declaration) || import_ts_morph18.Node.isPropertyDeclaration(declaration) || // A parameter property is the field's only declaration, so
+    // `this.dao = other` in the constructor writes to it.
+    import_ts_morph18.Node.isParameterDeclaration(declaration) && declaration.isParameterProperty()) {
       declarations.push(declaration);
     }
   }
@@ -5909,7 +5914,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) {
@@ -6130,7 +6136,7 @@ function emitValue(db, table, value) {
     }
     return id;
   }
-  if (import_ts_morph28.Node.isCallExpression(expression)) {
+  if (import_ts_morph28.Node.isCallExpression(expression) || import_ts_morph28.Node.isNewExpression(expression)) {
     emitCallFacts(db, table, expression);
     fact(db, "writtenValue", id);
     return id;
@@ -6157,11 +6163,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 || !import_ts_morph28.Node.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 (!import_ts_morph28.Node.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);
@@ -6243,7 +6262,16 @@ function emitReferenceFacts(db, table, reference) {
       continue;
     }
     if (import_ts_morph28.Node.isParameterDeclaration(declaration)) {
+      if (declaration.isParameterProperty() && import_ts_morph28.Node.isPropertyAccessExpression(reference)) {
+        emitParameterPropertyRead(db, table, referenceId, declaration);
+      } else {
+        fact(db, "binds", referenceId, declarationId);
+      }
+      continue;
+    }
+    if (import_ts_morph28.Node.isClassDeclaration(declaration)) {
       fact(db, "binds", referenceId, declarationId);
+      emitClassFacts(db, table, declaration);
       continue;
     }
     if (import_ts_morph28.Node.isBindingElement(declaration)) {
@@ -6288,9 +6316,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);
@@ -6311,6 +6344,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;
@@ -6319,17 +6371,7 @@ function emitFunctionFacts(db, table, fn) {
   const fnId = nodeId(fn);
   table.byId.set(fnId, fn);
   if (import_ts_morph28.Node.isFunctionDeclaration(fn) || import_ts_morph28.Node.isFunctionExpression(fn) || import_ts_morph28.Node.isArrowFunction(fn) || import_ts_morph28.Node.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 (import_ts_morph28.Node.isExpression(body)) {
@@ -10055,9 +10097,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);
@@ -10125,18 +10179,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) {
@@ -10657,24 +10711,41 @@ function declName(decl) {
   }
   return null;
 }
-function resolveCallee(call, calleeName) {
+function resolveCallee(call, calleeName, scan) {
   if (!import_ts_morph51.Node.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 = callee.getSymbol()?.getDeclarations() ?? [];
+  for (const decl of declarations) {
     const resolved = resolveDecl(decl, calleeName);
     if (resolved !== null) {
       return resolved;
     }
   }
-  return null;
+  if (scan.resolveCallable === void 0 || !readsAField(callee)) {
+    return null;
+  }
+  if (!declarations.some(isDeclaredShape)) {
+    return null;
+  }
+  const value = scan.resolveCallable(callee, scan.reachedFrom);
+  return value === null ? null : resolveDecl(value, calleeName);
 }
-function collectReachable(func) {
+function readsAField(callee) {
+  if (!import_ts_morph51.Node.isPropertyAccessExpression(callee)) {
+    return false;
+  }
+  let receiver = callee.getExpression();
+  while (import_ts_morph51.Node.isPropertyAccessExpression(receiver)) {
+    receiver = receiver.getExpression();
+  }
+  return import_ts_morph51.Node.isThisExpression(receiver);
+}
+function isDeclaredShape(declaration) {
+  return (import_ts_morph51.Node.isMethodSignature(declaration) || import_ts_morph51.Node.isPropertySignature(declaration)) && !isInExternalCode(declaration.getSourceFile());
+}
+function collectReachable(func, scan) {
   const found = [];
   const seen = /* @__PURE__ */ new Set();
   func.forEachDescendant((node) => {
@@ -10682,7 +10753,7 @@ function collectReachable(func) {
       return;
     }
     const calleeText = node.getExpression().getText();
-    const resolved = resolveCallee(node, calleeText);
+    const resolved = resolveCallee(node, calleeText, scan);
     if (resolved === null) {
       return;
     }
@@ -10733,6 +10804,7 @@ function expandReachableClosure(seeds, project, options, projectFileSet, facts,
   const functionByKey = /* @__PURE__ */ new Map();
   const seedKeys = /* @__PURE__ */ new Set();
   const scanned = /* @__PURE__ */ new Set();
+  const reachedFrom = /* @__PURE__ */ new Map();
   for (const seed of seeds) {
     const func = lookup.functionAt(seed.location);
     if (func !== null) {
@@ -10755,11 +10827,19 @@ 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 }
+      };
+      for (const candidate of collectReachable(source.func, scan)) {
         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]);
       }
     }
@@ -13148,7 +13228,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;

package/dist/index.d.cts

@@ -184,7 +184,14 @@ declare class ResolutionStore {
     private readonly graph;
     private stale;
     constructor(wrappers?: TransparentWrapper[]);
-    resolveCallable(value: Node): Node | null;
+    /**
+     * `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: Node, alsoFrom?: SourceFile): Node | null;
     resolveObject(value: Node): Node | null;
     /**
      * For a value that is neither a function nor an object, such as a
@@ -382,8 +389,8 @@ interface DiscoveredUnit {
      * shape for decorator-driven controllers).
      */
     routeInfo?: {
-        method: string;
-        path: string;
+        method: string | null;
+        path: string | null;
     };
     /**
      * Populated by a pack's `discoverUnits` callback for a message-bus

package/dist/index.d.ts

@@ -184,7 +184,14 @@ declare class ResolutionStore {
     private readonly graph;
     private stale;
     constructor(wrappers?: TransparentWrapper[]);
-    resolveCallable(value: Node): Node | null;
+    /**
+     * `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: Node, alsoFrom?: SourceFile): Node | null;
     resolveObject(value: Node): Node | null;
     /**
      * For a value that is neither a function nor an object, such as a
@@ -382,8 +389,8 @@ interface DiscoveredUnit {
      * shape for decorator-driven controllers).
      */
     routeInfo?: {
-        method: string;
-        path: string;
+        method: string | null;
+        path: string | null;
     };
     /**
      * Populated by a pack's `discoverUnits` callback for a message-bus

package/dist/index.js

@@ -3953,6 +3953,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 +3986,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 +4007,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 +4027,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 +4103,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 +5889,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 +6111,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 +6138,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 +6237,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 +6291,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 +6319,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 +6346,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)) {
@@ -10050,9 +10092,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 +10174,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) {
@@ -10655,24 +10709,41 @@ function declName(decl) {
   }
   return null;
 }
-function resolveCallee(call, calleeName) {
+function resolveCallee(call, calleeName, scan) {
   if (!Node49.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 = callee.getSymbol()?.getDeclarations() ?? [];
+  for (const decl of declarations) {
     const resolved = resolveDecl(decl, calleeName);
     if (resolved !== null) {
       return resolved;
     }
   }
-  return null;
+  if (scan.resolveCallable === void 0 || !readsAField(callee)) {
+    return null;
+  }
+  if (!declarations.some(isDeclaredShape)) {
+    return null;
+  }
+  const value = scan.resolveCallable(callee, scan.reachedFrom);
+  return value === null ? null : resolveDecl(value, calleeName);
 }
-function collectReachable(func) {
+function readsAField(callee) {
+  if (!Node49.isPropertyAccessExpression(callee)) {
+    return false;
+  }
+  let receiver = callee.getExpression();
+  while (Node49.isPropertyAccessExpression(receiver)) {
+    receiver = receiver.getExpression();
+  }
+  return Node49.isThisExpression(receiver);
+}
+function isDeclaredShape(declaration) {
+  return (Node49.isMethodSignature(declaration) || Node49.isPropertySignature(declaration)) && !isInExternalCode(declaration.getSourceFile());
+}
+function collectReachable(func, scan) {
   const found = [];
   const seen = /* @__PURE__ */ new Set();
   func.forEachDescendant((node) => {
@@ -10680,7 +10751,7 @@ function collectReachable(func) {
       return;
     }
     const calleeText = node.getExpression().getText();
-    const resolved = resolveCallee(node, calleeText);
+    const resolved = resolveCallee(node, calleeText, scan);
     if (resolved === null) {
       return;
     }
@@ -10731,6 +10802,7 @@ function expandReachableClosure(seeds, project, options, projectFileSet, facts,
   const functionByKey = /* @__PURE__ */ new Map();
   const seedKeys = /* @__PURE__ */ new Set();
   const scanned = /* @__PURE__ */ new Set();
+  const reachedFrom = /* @__PURE__ */ new Map();
   for (const seed of seeds) {
     const func = lookup.functionAt(seed.location);
     if (func !== null) {
@@ -10753,11 +10825,19 @@ 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 }
+      };
+      for (const candidate of collectReachable(source.func, scan)) {
         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]);
       }
     }
@@ -13152,7 +13232,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-typescript",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "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.7.2",
-    "@suss/datalog": "0.7.2",
-    "@suss/extractor": "0.7.2",
-    "@suss/resolution": "0.7.2",
+    "@suss/behavioral-ir": "0.8.0",
+    "@suss/datalog": "0.8.0",
+    "@suss/extractor": "0.8.0",
+    "@suss/resolution": "0.8.0",
     "graphql": "^16.8.0",
     "picomatch": "^4.0.4",
     "ts-morph": "^23.0.0"