@suss/resolution 0.34.0 → 0.34.1

package/dist/index.cjs

@@ -53,6 +53,7 @@ __export(index_exports, {
   allocationSitesOf: () => allocationSitesOf,
   alsoSteps: () => alsoSteps,
   answersFor: () => answersFor,
+  answersFromTestsLeftOut: () => answersFromTestsLeftOut,
   askResolution: () => askResolution,
   askResolutionUnder: () => askResolutionUnder,
   askSources: () => askSources,
@@ -1494,11 +1495,11 @@ function exportTrail(proof, describe) {
 }
 function argumentReason(proof, describe) {
   const [, p, a] = proof.tuple;
-  if (proof.kind !== "derived") {
-    return `${describe(p)} is a parameter, and a call passes it ${describe(a)}`;
-  }
-  const f = proof.premises[0].tuple[0];
-  return `${describe(p)} is a parameter of ${describe(f)}, and a call passes it ${describe(a)}`;
+  const f = proof.kind === "derived" ? proof.premises.find(
+    (premise) => premise.relation === "paramOf" || premise.relation === "paramNamed"
+  )?.tuple[0] : void 0;
+  const ofFunction = f === void 0 ? "" : ` of ${describe(f)}`;
+  return `${describe(p)} is a parameter${ofFunction}, and a call passes it ${describe(a)}`;
 }
 function memberSaid(name) {
   const member = classMemberOf(name);
@@ -1883,6 +1884,9 @@ function startsAtName(node, name, rules) {
 
 // src/nodeKey.ts
 var SPAN_KEY = /^(.*):(\d+)-(\d+)$/;
+function spanFileOf(key) {
+  return key.match(SPAN_KEY)?.[1] ?? null;
+}
 function nodeOfKey(rootsByFile, key) {
   const span = key.match(SPAN_KEY);
   if (span === null) {
@@ -2263,12 +2267,27 @@ function hasRow(db, relation, key, member) {
 
 // src/writtenValue.ts
 var WRITTEN_AS = "wantedIsWrittenAs";
-function writtenValueOf(db, key, ask, relation = WRITTEN_AS) {
-  const answers = settledByKey(db, [key], ask, relation).get(key) ?? [];
+function writtenValueOf(db, key, ask, relation = WRITTEN_AS, keep = () => true) {
+  const settled = settledByKey(db, [key], ask, relation).get(key) ?? [];
+  const answers = settled.filter(keep);
   if (answers.length === 1) {
     return answers[0];
   }
-  return relation === WRITTEN_AS ? fallbackWrittenAs(db, key, ask) : null;
+  if (answers.length === 0 && settled.length > 0) {
+    return null;
+  }
+  const fallback = relation === WRITTEN_AS ? fallbackWrittenAs(db, key, ask) : null;
+  return fallback !== null && keep(fallback) ? fallback : null;
+}
+function answersFromTestsLeftOut(key, isTestFile) {
+  const asked = spanFileOf(key);
+  if (asked === null || isTestFile(asked)) {
+    return () => true;
+  }
+  return (answer) => {
+    const file = spanFileOf(answer);
+    return file === null || !isTestFile(file);
+  };
 }
 var FALLBACK_BEHIND = "wantedFallbackBehind";
 function fallbackWrittenAs(db, key, ask) {
@@ -2948,19 +2967,29 @@ var STATED_RULES = [
     ],
     "construction enters its constructor"
   ),
+  // When methodCallUnder and objectOfUnder bind as many columns, as they do
+  // once contains has run, the rewrite joins the one written first. This
+  // order reads the receiver under the call's own sites, not every site.
   (0, import_datalog5.rule)(
     "entersUnder",
     [(0, import_datalog5.variable)("r"), (0, import_datalog5.variable)("f"), (0, import_datalog5.variable)("site"), (0, import_datalog5.variable)("caller")],
     [
-      (0, import_datalog5.lit)("call", (0, import_datalog5.variable)("r"), (0, import_datalog5.variable)("cal")),
-      (0, import_datalog5.lit)("readsProperty", (0, import_datalog5.variable)("cal"), (0, import_datalog5.variable)("o"), (0, import_datalog5.variable)("m")),
+      (0, import_datalog5.lit)("methodCallUnder", (0, import_datalog5.variable)("r"), (0, import_datalog5.variable)("o"), (0, import_datalog5.variable)("m"), (0, import_datalog5.variable)("caller")),
       (0, import_datalog5.lit)("objectOfUnder", (0, import_datalog5.variable)("o"), (0, import_datalog5.variable)("caller"), (0, import_datalog5.variable)("site")),
       (0, import_datalog5.lit)("allocates", (0, import_datalog5.variable)("site"), (0, import_datalog5.variable)("cls")),
-      (0, import_datalog5.lit)("contains", (0, import_datalog5.variable)("site"), (0, import_datalog5.variable)("m"), (0, import_datalog5.variable)("f")),
-      (0, import_datalog5.lit)("callUnder", (0, import_datalog5.variable)("r"), (0, import_datalog5.variable)("caller"))
+      (0, import_datalog5.lit)("contains", (0, import_datalog5.variable)("site"), (0, import_datalog5.variable)("m"), (0, import_datalog5.variable)("f"))
     ],
     "method call enters under its receiver"
   ),
+  (0, import_datalog5.rule)(
+    "methodCallUnder",
+    [(0, import_datalog5.variable)("r"), (0, import_datalog5.variable)("o"), (0, import_datalog5.variable)("m"), (0, import_datalog5.variable)("caller")],
+    [
+      (0, import_datalog5.lit)("call", (0, import_datalog5.variable)("r"), (0, import_datalog5.variable)("cal")),
+      (0, import_datalog5.lit)("readsProperty", (0, import_datalog5.variable)("cal"), (0, import_datalog5.variable)("o"), (0, import_datalog5.variable)("m")),
+      (0, import_datalog5.lit)("callUnder", (0, import_datalog5.variable)("r"), (0, import_datalog5.variable)("caller"))
+    ]
+  ),
   // A call written as a name runs with whatever receiver the body
   // around it has, so a plain function called from a method keeps the
   // site rather than taking every caller of it.
@@ -3248,13 +3277,15 @@ var STATED_RULES = [
   ),
   // An argument arriving at the parameter it is passed to, by position
   // or by the name the caller wrote, keeping the call it went through
-  // so a caller can tell two call sites apart.
+  // so a caller can tell two call sites apart. The callee comes before the
+  // parameter, so a walk that starts from the argument asks which function
+  // its call runs instead of trying every function with a parameter there.
   (0, import_datalog5.rule)(
     "passesArgument",
     [(0, import_datalog5.variable)("r"), (0, import_datalog5.variable)("p"), (0, import_datalog5.variable)("a")],
     [
-      (0, import_datalog5.lit)("paramOf", (0, import_datalog5.variable)("f"), (0, import_datalog5.variable)("k"), (0, import_datalog5.variable)("p")),
       (0, import_datalog5.lit)("callsFunction", (0, import_datalog5.variable)("r"), (0, import_datalog5.variable)("f")),
+      (0, import_datalog5.lit)("paramOf", (0, import_datalog5.variable)("f"), (0, import_datalog5.variable)("k"), (0, import_datalog5.variable)("p")),
       (0, import_datalog5.lit)("callArg", (0, import_datalog5.variable)("r"), (0, import_datalog5.variable)("k"), (0, import_datalog5.variable)("a"))
     ]
   ),
@@ -3262,8 +3293,8 @@ var STATED_RULES = [
     "passesArgument",
     [(0, import_datalog5.variable)("r"), (0, import_datalog5.variable)("p"), (0, import_datalog5.variable)("a")],
     [
-      (0, import_datalog5.lit)("paramNamed", (0, import_datalog5.variable)("f"), (0, import_datalog5.variable)("n"), (0, import_datalog5.variable)("p")),
       (0, import_datalog5.lit)("callsFunction", (0, import_datalog5.variable)("r"), (0, import_datalog5.variable)("f")),
+      (0, import_datalog5.lit)("paramNamed", (0, import_datalog5.variable)("f"), (0, import_datalog5.variable)("n"), (0, import_datalog5.variable)("p")),
       (0, import_datalog5.lit)("callKeywordArg", (0, import_datalog5.variable)("r"), (0, import_datalog5.variable)("n"), (0, import_datalog5.variable)("a"))
     ]
   ),
@@ -4659,6 +4690,7 @@ var UNDER_ANSWER_RELATIONS = [
   allocationSitesOf,
   alsoSteps,
   answersFor,
+  answersFromTestsLeftOut,
   askResolution,
   askResolutionUnder,
   askSources,

package/dist/index.d.cts

@@ -1087,7 +1087,14 @@ type Ask = (keys: readonly string[]) => void;
  * about as well, through `ask`, so the answer is what that function
  * returns rather than the call itself.
  */
-declare function writtenValueOf(db: Database, key: string, ask: Ask, relation?: string): string | null;
+declare function writtenValueOf(db: Database, key: string, ask: Ask, relation?: string, keep?: (answer: string) => boolean): string | null;
+/**
+ * Whether an answer can decide a value read at `key`: an answer in test
+ * code never decides a value production code reads, so a test calling
+ * `authorize(id, "https://test.com")` leaves `authorize`'s parameter as
+ * open as it was. The adapter says which files are test code.
+ */
+declare function answersFromTestsLeftOut(key: string, isTestFile: (file: string) => boolean): (answer: string) => boolean;
 /**
  * The fallback, `a or b`, that a value was written as, when the rules
  * found several expressions and every one of them came through that
@@ -1196,4 +1203,4 @@ declare const ANSWER_RELATIONS: string[];
  */
 declare const UNDER_ANSWER_RELATIONS: string[];
 
-export { ANSWER_RELATIONS, ASKING_RELATIONS, type AskUnder, type AssociationConstructor, BASE_CLASS_RULE, type CalleeOutcome, type CaseFiles, type ChainReads, type Changes, type ContractCase, type ContractOptions, DEFAULT_IMPORT_NAME, type Dependencies, DependencyLedger, type DescribeAtom, type EntersAsSelf, EntryReuse, type ExplainOptions, type ExplainResolvedKeyOptions, type ExplainStats, FACT_CONTRACT_CASES, FactLog, type FactsOf, GLOBAL_MODULE, type GivesBackOne, type GivesBackOneOfArgument, type GivesBackOneOfImport, INSTANCE_STEP, type MountEdge, type MountEdges, NAMED_STORE_NAME, NAMESPACE_IMPORT, NAMESPACE_IMPORT_NAME, NAMESPACE_MEMBER_RULE, NAME_HOP_RULE, NO_CONTEXT, NO_CONTEXT_NAME, type NameReads, type NameWrite, type OrderedWrite, type PackWords, RECEIVER_STORE_NAME, RESOLUTION_QUESTIONS, RESOLUTION_RULES, RESULT_STEP, type ReadNode, type ResolutionExplanation, type ResolutionStep, type SourceEnd, type SourceLeaf, type SourceQuestion, type SpannedNode, type StepContext, type StepPhrase, type StoredDependencies, type StoredFacts, type StoredFileRecord, type StoredWalkRecord, type SuppliesParameter, UNDER_ANSWER_RELATIONS, UNDER_QUESTION_ROW_BUDGET, UNDER_RUN_ROW_BUDGET, UNPLACED_STORE_NAME, USES_QUESTION, type UnderOutcome, type UnwrapsByName, VALUE_STEP, type ValueLocation, type ValueUses, WatchedMap, type WhyExplained, addPackWords, agreedMountPrefix, allocationSitesOf, alsoSteps, answersFor, askResolution, askResolutionUnder, askSources, calleeOutcomeOf, calleeOutcomes, checkFactContract, classMemberName, classMemberOf, comesToUnder, couldBeSettled, declaredTypesOf, exitCodeFunctions, explainResolutionProof, explainResolvedKey, fallbackWrittenAs, fileOfKey, hashString, importedFilesByFile, isObserved, isWrittenAsUnder, joinMountedPath, mergeStoredDependencies, mountPathsOf, noDependencies, nodeOfKey, noteKeyRead, noteLookup, objectOfUnder, observeDemand, packHashes, proofRules, queryFacts, readUses, recordsToReplay, renderExplanation, resolutionProgram, resolutionUnderProgram, resolvedFunctions, settledFunction, sourceLeavesOf, startsAtName, staysInItsFunction, stillValid, underQuestionSpend, unpackHashes, valueLeftByWrites, walkRecordsByFile, writesRunInOrder, writtenAnswersFor, writtenSourcesOf, writtenValueOf, writtenValueUnder, writtenValuesByKey, writtenValuesOf };
+export { ANSWER_RELATIONS, ASKING_RELATIONS, type AskUnder, type AssociationConstructor, BASE_CLASS_RULE, type CalleeOutcome, type CaseFiles, type ChainReads, type Changes, type ContractCase, type ContractOptions, DEFAULT_IMPORT_NAME, type Dependencies, DependencyLedger, type DescribeAtom, type EntersAsSelf, EntryReuse, type ExplainOptions, type ExplainResolvedKeyOptions, type ExplainStats, FACT_CONTRACT_CASES, FactLog, type FactsOf, GLOBAL_MODULE, type GivesBackOne, type GivesBackOneOfArgument, type GivesBackOneOfImport, INSTANCE_STEP, type MountEdge, type MountEdges, NAMED_STORE_NAME, NAMESPACE_IMPORT, NAMESPACE_IMPORT_NAME, NAMESPACE_MEMBER_RULE, NAME_HOP_RULE, NO_CONTEXT, NO_CONTEXT_NAME, type NameReads, type NameWrite, type OrderedWrite, type PackWords, RECEIVER_STORE_NAME, RESOLUTION_QUESTIONS, RESOLUTION_RULES, RESULT_STEP, type ReadNode, type ResolutionExplanation, type ResolutionStep, type SourceEnd, type SourceLeaf, type SourceQuestion, type SpannedNode, type StepContext, type StepPhrase, type StoredDependencies, type StoredFacts, type StoredFileRecord, type StoredWalkRecord, type SuppliesParameter, UNDER_ANSWER_RELATIONS, UNDER_QUESTION_ROW_BUDGET, UNDER_RUN_ROW_BUDGET, UNPLACED_STORE_NAME, USES_QUESTION, type UnderOutcome, type UnwrapsByName, VALUE_STEP, type ValueLocation, type ValueUses, WatchedMap, type WhyExplained, addPackWords, agreedMountPrefix, allocationSitesOf, alsoSteps, answersFor, answersFromTestsLeftOut, askResolution, askResolutionUnder, askSources, calleeOutcomeOf, calleeOutcomes, checkFactContract, classMemberName, classMemberOf, comesToUnder, couldBeSettled, declaredTypesOf, exitCodeFunctions, explainResolutionProof, explainResolvedKey, fallbackWrittenAs, fileOfKey, hashString, importedFilesByFile, isObserved, isWrittenAsUnder, joinMountedPath, mergeStoredDependencies, mountPathsOf, noDependencies, nodeOfKey, noteKeyRead, noteLookup, objectOfUnder, observeDemand, packHashes, proofRules, queryFacts, readUses, recordsToReplay, renderExplanation, resolutionProgram, resolutionUnderProgram, resolvedFunctions, settledFunction, sourceLeavesOf, startsAtName, staysInItsFunction, stillValid, underQuestionSpend, unpackHashes, valueLeftByWrites, walkRecordsByFile, writesRunInOrder, writtenAnswersFor, writtenSourcesOf, writtenValueOf, writtenValueUnder, writtenValuesByKey, writtenValuesOf };

package/dist/index.d.ts

@@ -1087,7 +1087,14 @@ type Ask = (keys: readonly string[]) => void;
  * about as well, through `ask`, so the answer is what that function
  * returns rather than the call itself.
  */
-declare function writtenValueOf(db: Database, key: string, ask: Ask, relation?: string): string | null;
+declare function writtenValueOf(db: Database, key: string, ask: Ask, relation?: string, keep?: (answer: string) => boolean): string | null;
+/**
+ * Whether an answer can decide a value read at `key`: an answer in test
+ * code never decides a value production code reads, so a test calling
+ * `authorize(id, "https://test.com")` leaves `authorize`'s parameter as
+ * open as it was. The adapter says which files are test code.
+ */
+declare function answersFromTestsLeftOut(key: string, isTestFile: (file: string) => boolean): (answer: string) => boolean;
 /**
  * The fallback, `a or b`, that a value was written as, when the rules
  * found several expressions and every one of them came through that
@@ -1196,4 +1203,4 @@ declare const ANSWER_RELATIONS: string[];
  */
 declare const UNDER_ANSWER_RELATIONS: string[];
 
-export { ANSWER_RELATIONS, ASKING_RELATIONS, type AskUnder, type AssociationConstructor, BASE_CLASS_RULE, type CalleeOutcome, type CaseFiles, type ChainReads, type Changes, type ContractCase, type ContractOptions, DEFAULT_IMPORT_NAME, type Dependencies, DependencyLedger, type DescribeAtom, type EntersAsSelf, EntryReuse, type ExplainOptions, type ExplainResolvedKeyOptions, type ExplainStats, FACT_CONTRACT_CASES, FactLog, type FactsOf, GLOBAL_MODULE, type GivesBackOne, type GivesBackOneOfArgument, type GivesBackOneOfImport, INSTANCE_STEP, type MountEdge, type MountEdges, NAMED_STORE_NAME, NAMESPACE_IMPORT, NAMESPACE_IMPORT_NAME, NAMESPACE_MEMBER_RULE, NAME_HOP_RULE, NO_CONTEXT, NO_CONTEXT_NAME, type NameReads, type NameWrite, type OrderedWrite, type PackWords, RECEIVER_STORE_NAME, RESOLUTION_QUESTIONS, RESOLUTION_RULES, RESULT_STEP, type ReadNode, type ResolutionExplanation, type ResolutionStep, type SourceEnd, type SourceLeaf, type SourceQuestion, type SpannedNode, type StepContext, type StepPhrase, type StoredDependencies, type StoredFacts, type StoredFileRecord, type StoredWalkRecord, type SuppliesParameter, UNDER_ANSWER_RELATIONS, UNDER_QUESTION_ROW_BUDGET, UNDER_RUN_ROW_BUDGET, UNPLACED_STORE_NAME, USES_QUESTION, type UnderOutcome, type UnwrapsByName, VALUE_STEP, type ValueLocation, type ValueUses, WatchedMap, type WhyExplained, addPackWords, agreedMountPrefix, allocationSitesOf, alsoSteps, answersFor, askResolution, askResolutionUnder, askSources, calleeOutcomeOf, calleeOutcomes, checkFactContract, classMemberName, classMemberOf, comesToUnder, couldBeSettled, declaredTypesOf, exitCodeFunctions, explainResolutionProof, explainResolvedKey, fallbackWrittenAs, fileOfKey, hashString, importedFilesByFile, isObserved, isWrittenAsUnder, joinMountedPath, mergeStoredDependencies, mountPathsOf, noDependencies, nodeOfKey, noteKeyRead, noteLookup, objectOfUnder, observeDemand, packHashes, proofRules, queryFacts, readUses, recordsToReplay, renderExplanation, resolutionProgram, resolutionUnderProgram, resolvedFunctions, settledFunction, sourceLeavesOf, startsAtName, staysInItsFunction, stillValid, underQuestionSpend, unpackHashes, valueLeftByWrites, walkRecordsByFile, writesRunInOrder, writtenAnswersFor, writtenSourcesOf, writtenValueOf, writtenValueUnder, writtenValuesByKey, writtenValuesOf };
+export { ANSWER_RELATIONS, ASKING_RELATIONS, type AskUnder, type AssociationConstructor, BASE_CLASS_RULE, type CalleeOutcome, type CaseFiles, type ChainReads, type Changes, type ContractCase, type ContractOptions, DEFAULT_IMPORT_NAME, type Dependencies, DependencyLedger, type DescribeAtom, type EntersAsSelf, EntryReuse, type ExplainOptions, type ExplainResolvedKeyOptions, type ExplainStats, FACT_CONTRACT_CASES, FactLog, type FactsOf, GLOBAL_MODULE, type GivesBackOne, type GivesBackOneOfArgument, type GivesBackOneOfImport, INSTANCE_STEP, type MountEdge, type MountEdges, NAMED_STORE_NAME, NAMESPACE_IMPORT, NAMESPACE_IMPORT_NAME, NAMESPACE_MEMBER_RULE, NAME_HOP_RULE, NO_CONTEXT, NO_CONTEXT_NAME, type NameReads, type NameWrite, type OrderedWrite, type PackWords, RECEIVER_STORE_NAME, RESOLUTION_QUESTIONS, RESOLUTION_RULES, RESULT_STEP, type ReadNode, type ResolutionExplanation, type ResolutionStep, type SourceEnd, type SourceLeaf, type SourceQuestion, type SpannedNode, type StepContext, type StepPhrase, type StoredDependencies, type StoredFacts, type StoredFileRecord, type StoredWalkRecord, type SuppliesParameter, UNDER_ANSWER_RELATIONS, UNDER_QUESTION_ROW_BUDGET, UNDER_RUN_ROW_BUDGET, UNPLACED_STORE_NAME, USES_QUESTION, type UnderOutcome, type UnwrapsByName, VALUE_STEP, type ValueLocation, type ValueUses, WatchedMap, type WhyExplained, addPackWords, agreedMountPrefix, allocationSitesOf, alsoSteps, answersFor, answersFromTestsLeftOut, askResolution, askResolutionUnder, askSources, calleeOutcomeOf, calleeOutcomes, checkFactContract, classMemberName, classMemberOf, comesToUnder, couldBeSettled, declaredTypesOf, exitCodeFunctions, explainResolutionProof, explainResolvedKey, fallbackWrittenAs, fileOfKey, hashString, importedFilesByFile, isObserved, isWrittenAsUnder, joinMountedPath, mergeStoredDependencies, mountPathsOf, noDependencies, nodeOfKey, noteKeyRead, noteLookup, objectOfUnder, observeDemand, packHashes, proofRules, queryFacts, readUses, recordsToReplay, renderExplanation, resolutionProgram, resolutionUnderProgram, resolvedFunctions, settledFunction, sourceLeavesOf, startsAtName, staysInItsFunction, stillValid, underQuestionSpend, unpackHashes, valueLeftByWrites, walkRecordsByFile, writesRunInOrder, writtenAnswersFor, writtenSourcesOf, writtenValueOf, writtenValueUnder, writtenValuesByKey, writtenValuesOf };

package/dist/index.js

@@ -1391,11 +1391,11 @@ function exportTrail(proof, describe) {
 }
 function argumentReason(proof, describe) {
   const [, p, a] = proof.tuple;
-  if (proof.kind !== "derived") {
-    return `${describe(p)} is a parameter, and a call passes it ${describe(a)}`;
-  }
-  const f = proof.premises[0].tuple[0];
-  return `${describe(p)} is a parameter of ${describe(f)}, and a call passes it ${describe(a)}`;
+  const f = proof.kind === "derived" ? proof.premises.find(
+    (premise) => premise.relation === "paramOf" || premise.relation === "paramNamed"
+  )?.tuple[0] : void 0;
+  const ofFunction = f === void 0 ? "" : ` of ${describe(f)}`;
+  return `${describe(p)} is a parameter${ofFunction}, and a call passes it ${describe(a)}`;
 }
 function memberSaid(name) {
   const member = classMemberOf(name);
@@ -1780,6 +1780,9 @@ function startsAtName(node, name, rules) {
 
 // src/nodeKey.ts
 var SPAN_KEY = /^(.*):(\d+)-(\d+)$/;
+function spanFileOf(key) {
+  return key.match(SPAN_KEY)?.[1] ?? null;
+}
 function nodeOfKey(rootsByFile, key) {
   const span = key.match(SPAN_KEY);
   if (span === null) {
@@ -2160,12 +2163,27 @@ function hasRow(db, relation, key, member) {
 
 // src/writtenValue.ts
 var WRITTEN_AS = "wantedIsWrittenAs";
-function writtenValueOf(db, key, ask, relation = WRITTEN_AS) {
-  const answers = settledByKey(db, [key], ask, relation).get(key) ?? [];
+function writtenValueOf(db, key, ask, relation = WRITTEN_AS, keep = () => true) {
+  const settled = settledByKey(db, [key], ask, relation).get(key) ?? [];
+  const answers = settled.filter(keep);
   if (answers.length === 1) {
     return answers[0];
   }
-  return relation === WRITTEN_AS ? fallbackWrittenAs(db, key, ask) : null;
+  if (answers.length === 0 && settled.length > 0) {
+    return null;
+  }
+  const fallback = relation === WRITTEN_AS ? fallbackWrittenAs(db, key, ask) : null;
+  return fallback !== null && keep(fallback) ? fallback : null;
+}
+function answersFromTestsLeftOut(key, isTestFile) {
+  const asked = spanFileOf(key);
+  if (asked === null || isTestFile(asked)) {
+    return () => true;
+  }
+  return (answer) => {
+    const file = spanFileOf(answer);
+    return file === null || !isTestFile(file);
+  };
 }
 var FALLBACK_BEHIND = "wantedFallbackBehind";
 function fallbackWrittenAs(db, key, ask) {
@@ -2845,19 +2863,29 @@ var STATED_RULES = [
     ],
     "construction enters its constructor"
   ),
+  // When methodCallUnder and objectOfUnder bind as many columns, as they do
+  // once contains has run, the rewrite joins the one written first. This
+  // order reads the receiver under the call's own sites, not every site.
   rule2(
     "entersUnder",
     [v2("r"), v2("f"), v2("site"), v2("caller")],
     [
-      lit2("call", v2("r"), v2("cal")),
-      lit2("readsProperty", v2("cal"), v2("o"), v2("m")),
+      lit2("methodCallUnder", v2("r"), v2("o"), v2("m"), v2("caller")),
       lit2("objectOfUnder", v2("o"), v2("caller"), v2("site")),
       lit2("allocates", v2("site"), v2("cls")),
-      lit2("contains", v2("site"), v2("m"), v2("f")),
-      lit2("callUnder", v2("r"), v2("caller"))
+      lit2("contains", v2("site"), v2("m"), v2("f"))
     ],
     "method call enters under its receiver"
   ),
+  rule2(
+    "methodCallUnder",
+    [v2("r"), v2("o"), v2("m"), v2("caller")],
+    [
+      lit2("call", v2("r"), v2("cal")),
+      lit2("readsProperty", v2("cal"), v2("o"), v2("m")),
+      lit2("callUnder", v2("r"), v2("caller"))
+    ]
+  ),
   // A call written as a name runs with whatever receiver the body
   // around it has, so a plain function called from a method keeps the
   // site rather than taking every caller of it.
@@ -3145,13 +3173,15 @@ var STATED_RULES = [
   ),
   // An argument arriving at the parameter it is passed to, by position
   // or by the name the caller wrote, keeping the call it went through
-  // so a caller can tell two call sites apart.
+  // so a caller can tell two call sites apart. The callee comes before the
+  // parameter, so a walk that starts from the argument asks which function
+  // its call runs instead of trying every function with a parameter there.
   rule2(
     "passesArgument",
     [v2("r"), v2("p"), v2("a")],
     [
-      lit2("paramOf", v2("f"), v2("k"), v2("p")),
       lit2("callsFunction", v2("r"), v2("f")),
+      lit2("paramOf", v2("f"), v2("k"), v2("p")),
       lit2("callArg", v2("r"), v2("k"), v2("a"))
     ]
   ),
@@ -3159,8 +3189,8 @@ var STATED_RULES = [
     "passesArgument",
     [v2("r"), v2("p"), v2("a")],
     [
-      lit2("paramNamed", v2("f"), v2("n"), v2("p")),
       lit2("callsFunction", v2("r"), v2("f")),
+      lit2("paramNamed", v2("f"), v2("n"), v2("p")),
       lit2("callKeywordArg", v2("r"), v2("n"), v2("a"))
     ]
   ),
@@ -4555,6 +4585,7 @@ export {
   allocationSitesOf,
   alsoSteps,
   answersFor,
+  answersFromTestsLeftOut,
   askResolution,
   askResolutionUnder,
   askSources,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/resolution",
-  "version": "0.34.0",
+  "version": "0.34.1",
   "type": "module",
   "description": "The rules suss uses to follow a name in TypeScript, Python or Ruby to the function it comes down to.",
   "keywords": [
@@ -56,6 +56,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@suss/datalog": "0.34.0"
+    "@suss/datalog": "0.34.1"
   }
 }