@suss/resolution 0.31.0 → 0.31.1

package/dist/index.cjs

@@ -34,6 +34,8 @@ __export(index_exports, {
   RESOLUTION_RULES: () => RESOLUTION_RULES,
   RESULT_STEP: () => RESULT_STEP,
   UNDER_ANSWER_RELATIONS: () => UNDER_ANSWER_RELATIONS,
+  UNDER_QUESTION_ROW_BUDGET: () => UNDER_QUESTION_ROW_BUDGET,
+  UNDER_RUN_ROW_BUDGET: () => UNDER_RUN_ROW_BUDGET,
   VALUE_STEP: () => VALUE_STEP,
   addPackWords: () => addPackWords,
   agreedMountPrefix: () => agreedMountPrefix,
@@ -61,6 +63,7 @@ __export(index_exports, {
   resolutionUnderProgram: () => resolutionUnderProgram,
   singleAnswers: () => singleAnswers,
   startsAtName: () => startsAtName,
+  underQuestionSpend: () => underQuestionSpend,
   valueLeftByWrites: () => valueLeftByWrites,
   writesRunInOrder: () => writesRunInOrder,
   writtenSourcesOf: () => writtenSourcesOf,
@@ -147,7 +150,21 @@ function askResolution(db, keys, asking = "wanted", program = resolutionProgram(
   }
 }
 var askedUnderByDb = /* @__PURE__ */ new WeakMap();
-function askResolutionUnder(db, pairs, program = resolutionUnderProgram()) {
+var UNDER_QUESTION_ROW_BUDGET = 2e7;
+var UNDER_RUN_ROW_BUDGET = 4e7;
+var spentUnderByDb = /* @__PURE__ */ new WeakMap();
+function spendOf(db) {
+  let spend = spentUnderByDb.get(db);
+  if (spend === void 0) {
+    spend = { rows: 0, asked: 0, abandoned: 0, skipped: 0 };
+    spentUnderByDb.set(db, spend);
+  }
+  return spend;
+}
+function underQuestionSpend(db) {
+  return { ...spendOf(db) };
+}
+function askResolutionUnder(db, pairs, program = resolutionUnderProgram(), questionBudget = UNDER_QUESTION_ROW_BUDGET, runBudget = UNDER_RUN_ROW_BUDGET) {
   let asked = askedUnderByDb.get(db);
   if (asked === void 0) {
     asked = /* @__PURE__ */ new Set();
@@ -157,17 +174,49 @@ function askResolutionUnder(db, pairs, program = resolutionUnderProgram()) {
     ([key, site]) => !asked.has((0, import_datalog.tupleKey)([key, site]))
   );
   if (fresh.length === 0) {
-    return;
+    return "answered";
   }
+  const spend = spendOf(db);
   for (const [key, site] of fresh) {
     asked.add((0, import_datalog.tupleKey)([key, site]));
+  }
+  spend.asked += 1;
+  if (spend.rows >= runBudget) {
+    spend.skipped += 1;
+    (0, import_datalog.chargeQuestion)("skipped");
+    return "abandoned";
+  }
+  for (const [key, site] of fresh) {
     db.add("wantedUnder", [key, site]);
   }
-  (0, import_datalog.evaluate)(db, program.rules);
   const forget = queryFacts(program);
-  if (forget.length > 0) {
-    (0, import_datalog.clearRelations)(db, program.rules, forget);
+  const clearDerived = () => {
+    if (forget.length > 0) {
+      (0, import_datalog.clearRelations)(db, program.rules, forget);
+    }
+  };
+  const budget = (0, import_datalog.rowBudget)(questionBudget);
+  try {
+    (0, import_datalog.evaluate)(db, program.rules, void 0, budget);
+  } catch (error) {
+    if (!(error instanceof import_datalog.BudgetExhausted)) {
+      throw error;
+    }
+    spend.rows += error.examined;
+    spend.abandoned += 1;
+    (0, import_datalog.chargeQuestion)("abandoned");
+    db.retract("wantedUnder", fresh);
+    clearDerived();
+    (0, import_datalog.chargeAbandoned)(
+      fresh.map(([key, site]) => `${key} under ${site}`).join(", "),
+      error.examined
+    );
+    return "abandoned";
   }
+  spend.rows += budget.examined;
+  (0, import_datalog.chargeQuestion)();
+  clearDerived();
+  return "answered";
 }
 
 // src/callee.ts
@@ -2076,18 +2125,44 @@ var STATED_RULES = [
     [(0, import_datalog4.lit)("binds", (0, import_datalog4.variable)("g"), (0, import_datalog4.variable)("f")), (0, import_datalog4.lit)("callsFunction", (0, import_datalog4.variable)("r"), (0, import_datalog4.variable)("g"))]
   ),
   // A function written on an object, called off it: `client.get(o)`.
-  // Every rule above joins on a name the callee binds to, and a read of
-  // a property binds to nothing.
+  // The receiver comes from the object through `refersToObject`, not from
+  // `objectOf`: a walk from every reader of the name was most of a run.
   (0, import_datalog4.rule)(
     "callsFunction",
     [(0, import_datalog4.variable)("r"), (0, import_datalog4.variable)("f")],
     [
       (0, import_datalog4.lit)("holdsProperty", (0, import_datalog4.variable)("obj"), (0, import_datalog4.variable)("n"), (0, import_datalog4.variable)("f")),
+      (0, import_datalog4.lit)("refersToObject", (0, import_datalog4.variable)("o"), (0, import_datalog4.variable)("obj")),
       (0, import_datalog4.lit)("readsProperty", (0, import_datalog4.variable)("c"), (0, import_datalog4.variable)("o"), (0, import_datalog4.variable)("n")),
-      (0, import_datalog4.lit)("objectOf", (0, import_datalog4.variable)("o"), (0, import_datalog4.variable)("obj")),
       (0, import_datalog4.lit)("call", (0, import_datalog4.variable)("r"), (0, import_datalog4.variable)("c"))
     ]
   ),
+  // The expressions that refer to an object literal by binding alone: the
+  // declaration written as it, a reference or import of that, and a
+  // fallback over any of those. Asked from the object, so it visits only them.
+  (0, import_datalog4.rule)("refersToObject", [(0, import_datalog4.variable)("obj"), (0, import_datalog4.variable)("obj")], [(0, import_datalog4.lit)("objectValue", (0, import_datalog4.variable)("obj"))]),
+  (0, import_datalog4.rule)(
+    "refersToObject",
+    [(0, import_datalog4.variable)("x"), (0, import_datalog4.variable)("obj")],
+    [(0, import_datalog4.lit)("refersToObject", (0, import_datalog4.variable)("y"), (0, import_datalog4.variable)("obj")), (0, import_datalog4.lit)("binds", (0, import_datalog4.variable)("x"), (0, import_datalog4.variable)("y"))]
+  ),
+  (0, import_datalog4.rule)(
+    "refersToObject",
+    [(0, import_datalog4.variable)("x"), (0, import_datalog4.variable)("obj")],
+    [
+      (0, import_datalog4.lit)("refersToObject", (0, import_datalog4.variable)("y"), (0, import_datalog4.variable)("obj")),
+      (0, import_datalog4.lit)("moduleExport", (0, import_datalog4.variable)("m"), (0, import_datalog4.variable)("n"), (0, import_datalog4.variable)("y")),
+      (0, import_datalog4.lit)("imports", (0, import_datalog4.variable)("x"), (0, import_datalog4.variable)("m"), (0, import_datalog4.variable)("n"))
+    ]
+  ),
+  (0, import_datalog4.rule)(
+    "refersToObject",
+    [(0, import_datalog4.variable)("x"), (0, import_datalog4.variable)("obj")],
+    [
+      (0, import_datalog4.lit)("refersToObject", (0, import_datalog4.variable)("b"), (0, import_datalog4.variable)("obj")),
+      (0, import_datalog4.lit)("fallbackBranch", (0, import_datalog4.variable)("x"), (0, import_datalog4.variable)("b"))
+    ]
+  ),
   // What an object contains, its base class included, so a method the base
   // declares is found on a subclass that never overrode it. A method both
   // declare gives two, and the caller decides. This is its own relation
@@ -2739,6 +2814,8 @@ var UNDER_ANSWER_RELATIONS = [
   RESOLUTION_RULES,
   RESULT_STEP,
   UNDER_ANSWER_RELATIONS,
+  UNDER_QUESTION_ROW_BUDGET,
+  UNDER_RUN_ROW_BUDGET,
   VALUE_STEP,
   addPackWords,
   agreedMountPrefix,
@@ -2766,6 +2843,7 @@ var UNDER_ANSWER_RELATIONS = [
   resolutionUnderProgram,
   singleAnswers,
   startsAtName,
+  underQuestionSpend,
   valueLeftByWrites,
   writesRunInOrder,
   writtenSourcesOf,

package/dist/index.d.cts

@@ -426,12 +426,59 @@ declare function queryFacts(program: OnDemandRules): readonly string[];
  * question, which is how each adapter reads a project.
  */
 declare function askResolution(db: Database, keys: Iterable<string>, asking?: string, program?: OnDemandRules): void;
+/**
+ * How many rows the joins may read for one question under a site.
+ *
+ * The biggest question a project could answer read 200k rows on the
+ * largest public corpus target and 600k on the regression fixtures. A
+ * question that cannot be answered walks every node under every context
+ * and reads that much per rule, round after round, without settling.
+ * The gap is wide enough for thirty times the biggest healthy question,
+ * which is a few seconds before the walk is given up on.
+ */
+declare const UNDER_QUESTION_ROW_BUDGET = 20000000;
+/**
+ * How many rows the joins may read for every under-question a run asks,
+ * together.
+ *
+ * The per-question budget stops one question walking forever. It says
+ * nothing about how many questions a project asks, and a value read
+ * under every site of a class built in seventy places is seventy
+ * questions, each a fixpoint of its own. Twenty of those at the
+ * per-question limit is seven minutes, which is a hang however well
+ * each behaved on its own.
+ *
+ * This is two runaway questions' worth, or sixty-six of the biggest
+ * one measured. Past it a run keeps the context-free answer.
+ */
+declare const UNDER_RUN_ROW_BUDGET = 40000000;
+/** Whether a question was worked through, or given up on a budget. */
+type UnderOutcome = "answered" | "abandoned";
+/** What the under-questions of one run have cost it so far. */
+interface UnderSpend {
+    rows: number;
+    asked: number;
+    abandoned: number;
+    skipped: number;
+}
+/**
+ * What the under-questions of this database have cost, for a caller
+ * reporting on a run.
+ */
+declare function underQuestionSpend(db: Database): Readonly<UnderSpend>;
 /**
  * `askResolution` for a value read under one allocation site. Each pair
  * is a question of its own, so asking about a value under two sites is
  * two rows, and asking the same pair twice costs nothing.
- */
-declare function askResolutionUnder(db: Database, pairs: Iterable<readonly [string, string]>, program?: OnDemandRules): void;
+ *
+ * A question that runs past `questionBudget`, or one asked after the
+ * run has spent `runBudget` on questions before it, is abandoned: the
+ * rows it added come back out, the answer relations stay as empty as
+ * they were, and the caller is told so it can keep the context-free
+ * answer instead. The pair stays marked as asked either way, so nobody
+ * pays for it twice.
+ */
+declare function askResolutionUnder(db: Database, pairs: Iterable<readonly [string, string]>, program?: OnDemandRules, questionBudget?: number, runBudget?: number): UnderOutcome;
 
 /**
  * The result shape a why session hands back, shared by every language
@@ -687,4 +734,4 @@ declare const ANSWER_RELATIONS: string[];
  */
 declare const UNDER_ANSWER_RELATIONS: string[];
 
-export { ANSWER_RELATIONS, ASKING_RELATIONS, type AssociationConstructor, BASE_CLASS_RULE, type CalleeOutcome, type CaseFiles, type ChainReads, type ContractCase, type ContractOptions, type DescribeAtom, type EntersAsSelf, type ExplainOptions, type ExplainResolvedKeyOptions, type ExplainStats, FACT_CONTRACT_CASES, type FactsOf, type GivesBackOne, type GivesBackOneOfArgument, type GivesBackOneOfImport, INSTANCE_STEP, type MountEdge, type MountEdges, NAMESPACE_IMPORT, NAMESPACE_IMPORT_NAME, NAMESPACE_MEMBER_RULE, NO_CONTEXT, NO_CONTEXT_NAME, type NameReads, type NameWrite, type OrderedWrite, type PackWords, RESOLUTION_QUESTIONS, RESOLUTION_RULES, RESULT_STEP, type ReadNode, type ResolutionExplanation, type ResolutionStep, type SpannedNode, type StepContext, type StepPhrase, UNDER_ANSWER_RELATIONS, type UnwrapsByName, VALUE_STEP, type ValueLocation, type WhyExplained, addPackWords, agreedMountPrefix, allocationSitesOf, alsoSteps, answersByKey, askResolution, askResolutionUnder, calleeOutcomeOf, calleeOutcomes, checkFactContract, comesToUnder, couldBeSettled, explainResolutionProof, explainResolvedKey, isWrittenAsUnder, joinMountedPath, mountPathsOf, nodeOfKey, objectOfUnder, placeholderValues, queryFacts, renderExplanation, resolutionProgram, resolutionUnderProgram, singleAnswers, startsAtName, valueLeftByWrites, writesRunInOrder, writtenSourcesOf, writtenValueOf, writtenValueUnder, writtenValuesByKey, writtenValuesOf };
+export { ANSWER_RELATIONS, ASKING_RELATIONS, type AssociationConstructor, BASE_CLASS_RULE, type CalleeOutcome, type CaseFiles, type ChainReads, type ContractCase, type ContractOptions, type DescribeAtom, type EntersAsSelf, type ExplainOptions, type ExplainResolvedKeyOptions, type ExplainStats, FACT_CONTRACT_CASES, type FactsOf, type GivesBackOne, type GivesBackOneOfArgument, type GivesBackOneOfImport, INSTANCE_STEP, type MountEdge, type MountEdges, NAMESPACE_IMPORT, NAMESPACE_IMPORT_NAME, NAMESPACE_MEMBER_RULE, NO_CONTEXT, NO_CONTEXT_NAME, type NameReads, type NameWrite, type OrderedWrite, type PackWords, RESOLUTION_QUESTIONS, RESOLUTION_RULES, RESULT_STEP, type ReadNode, type ResolutionExplanation, type ResolutionStep, type SpannedNode, type StepContext, type StepPhrase, UNDER_ANSWER_RELATIONS, UNDER_QUESTION_ROW_BUDGET, UNDER_RUN_ROW_BUDGET, type UnderOutcome, type UnwrapsByName, VALUE_STEP, type ValueLocation, type WhyExplained, addPackWords, agreedMountPrefix, allocationSitesOf, alsoSteps, answersByKey, askResolution, askResolutionUnder, calleeOutcomeOf, calleeOutcomes, checkFactContract, comesToUnder, couldBeSettled, explainResolutionProof, explainResolvedKey, isWrittenAsUnder, joinMountedPath, mountPathsOf, nodeOfKey, objectOfUnder, placeholderValues, queryFacts, renderExplanation, resolutionProgram, resolutionUnderProgram, singleAnswers, startsAtName, underQuestionSpend, valueLeftByWrites, writesRunInOrder, writtenSourcesOf, writtenValueOf, writtenValueUnder, writtenValuesByKey, writtenValuesOf };

package/dist/index.d.ts

@@ -426,12 +426,59 @@ declare function queryFacts(program: OnDemandRules): readonly string[];
  * question, which is how each adapter reads a project.
  */
 declare function askResolution(db: Database, keys: Iterable<string>, asking?: string, program?: OnDemandRules): void;
+/**
+ * How many rows the joins may read for one question under a site.
+ *
+ * The biggest question a project could answer read 200k rows on the
+ * largest public corpus target and 600k on the regression fixtures. A
+ * question that cannot be answered walks every node under every context
+ * and reads that much per rule, round after round, without settling.
+ * The gap is wide enough for thirty times the biggest healthy question,
+ * which is a few seconds before the walk is given up on.
+ */
+declare const UNDER_QUESTION_ROW_BUDGET = 20000000;
+/**
+ * How many rows the joins may read for every under-question a run asks,
+ * together.
+ *
+ * The per-question budget stops one question walking forever. It says
+ * nothing about how many questions a project asks, and a value read
+ * under every site of a class built in seventy places is seventy
+ * questions, each a fixpoint of its own. Twenty of those at the
+ * per-question limit is seven minutes, which is a hang however well
+ * each behaved on its own.
+ *
+ * This is two runaway questions' worth, or sixty-six of the biggest
+ * one measured. Past it a run keeps the context-free answer.
+ */
+declare const UNDER_RUN_ROW_BUDGET = 40000000;
+/** Whether a question was worked through, or given up on a budget. */
+type UnderOutcome = "answered" | "abandoned";
+/** What the under-questions of one run have cost it so far. */
+interface UnderSpend {
+    rows: number;
+    asked: number;
+    abandoned: number;
+    skipped: number;
+}
+/**
+ * What the under-questions of this database have cost, for a caller
+ * reporting on a run.
+ */
+declare function underQuestionSpend(db: Database): Readonly<UnderSpend>;
 /**
  * `askResolution` for a value read under one allocation site. Each pair
  * is a question of its own, so asking about a value under two sites is
  * two rows, and asking the same pair twice costs nothing.
- */
-declare function askResolutionUnder(db: Database, pairs: Iterable<readonly [string, string]>, program?: OnDemandRules): void;
+ *
+ * A question that runs past `questionBudget`, or one asked after the
+ * run has spent `runBudget` on questions before it, is abandoned: the
+ * rows it added come back out, the answer relations stay as empty as
+ * they were, and the caller is told so it can keep the context-free
+ * answer instead. The pair stays marked as asked either way, so nobody
+ * pays for it twice.
+ */
+declare function askResolutionUnder(db: Database, pairs: Iterable<readonly [string, string]>, program?: OnDemandRules, questionBudget?: number, runBudget?: number): UnderOutcome;
 
 /**
  * The result shape a why session hands back, shared by every language
@@ -687,4 +734,4 @@ declare const ANSWER_RELATIONS: string[];
  */
 declare const UNDER_ANSWER_RELATIONS: string[];
 
-export { ANSWER_RELATIONS, ASKING_RELATIONS, type AssociationConstructor, BASE_CLASS_RULE, type CalleeOutcome, type CaseFiles, type ChainReads, type ContractCase, type ContractOptions, type DescribeAtom, type EntersAsSelf, type ExplainOptions, type ExplainResolvedKeyOptions, type ExplainStats, FACT_CONTRACT_CASES, type FactsOf, type GivesBackOne, type GivesBackOneOfArgument, type GivesBackOneOfImport, INSTANCE_STEP, type MountEdge, type MountEdges, NAMESPACE_IMPORT, NAMESPACE_IMPORT_NAME, NAMESPACE_MEMBER_RULE, NO_CONTEXT, NO_CONTEXT_NAME, type NameReads, type NameWrite, type OrderedWrite, type PackWords, RESOLUTION_QUESTIONS, RESOLUTION_RULES, RESULT_STEP, type ReadNode, type ResolutionExplanation, type ResolutionStep, type SpannedNode, type StepContext, type StepPhrase, UNDER_ANSWER_RELATIONS, type UnwrapsByName, VALUE_STEP, type ValueLocation, type WhyExplained, addPackWords, agreedMountPrefix, allocationSitesOf, alsoSteps, answersByKey, askResolution, askResolutionUnder, calleeOutcomeOf, calleeOutcomes, checkFactContract, comesToUnder, couldBeSettled, explainResolutionProof, explainResolvedKey, isWrittenAsUnder, joinMountedPath, mountPathsOf, nodeOfKey, objectOfUnder, placeholderValues, queryFacts, renderExplanation, resolutionProgram, resolutionUnderProgram, singleAnswers, startsAtName, valueLeftByWrites, writesRunInOrder, writtenSourcesOf, writtenValueOf, writtenValueUnder, writtenValuesByKey, writtenValuesOf };
+export { ANSWER_RELATIONS, ASKING_RELATIONS, type AssociationConstructor, BASE_CLASS_RULE, type CalleeOutcome, type CaseFiles, type ChainReads, type ContractCase, type ContractOptions, type DescribeAtom, type EntersAsSelf, type ExplainOptions, type ExplainResolvedKeyOptions, type ExplainStats, FACT_CONTRACT_CASES, type FactsOf, type GivesBackOne, type GivesBackOneOfArgument, type GivesBackOneOfImport, INSTANCE_STEP, type MountEdge, type MountEdges, NAMESPACE_IMPORT, NAMESPACE_IMPORT_NAME, NAMESPACE_MEMBER_RULE, NO_CONTEXT, NO_CONTEXT_NAME, type NameReads, type NameWrite, type OrderedWrite, type PackWords, RESOLUTION_QUESTIONS, RESOLUTION_RULES, RESULT_STEP, type ReadNode, type ResolutionExplanation, type ResolutionStep, type SpannedNode, type StepContext, type StepPhrase, UNDER_ANSWER_RELATIONS, UNDER_QUESTION_ROW_BUDGET, UNDER_RUN_ROW_BUDGET, type UnderOutcome, type UnwrapsByName, VALUE_STEP, type ValueLocation, type WhyExplained, addPackWords, agreedMountPrefix, allocationSitesOf, alsoSteps, answersByKey, askResolution, askResolutionUnder, calleeOutcomeOf, calleeOutcomes, checkFactContract, comesToUnder, couldBeSettled, explainResolutionProof, explainResolvedKey, isWrittenAsUnder, joinMountedPath, mountPathsOf, nodeOfKey, objectOfUnder, placeholderValues, queryFacts, renderExplanation, resolutionProgram, resolutionUnderProgram, singleAnswers, startsAtName, underQuestionSpend, valueLeftByWrites, writesRunInOrder, writtenSourcesOf, writtenValueOf, writtenValueUnder, writtenValuesByKey, writtenValuesOf };

package/dist/index.js

@@ -1,8 +1,12 @@
 // src/program.ts
 import {
+  BudgetExhausted,
+  chargeAbandoned,
+  chargeQuestion,
   clearRelations,
   deriveOnDemand,
   evaluate,
+  rowBudget,
   tupleKey
 } from "@suss/datalog";
 var ASKING_RELATIONS = [
@@ -79,7 +83,21 @@ function askResolution(db, keys, asking = "wanted", program = resolutionProgram(
   }
 }
 var askedUnderByDb = /* @__PURE__ */ new WeakMap();
-function askResolutionUnder(db, pairs, program = resolutionUnderProgram()) {
+var UNDER_QUESTION_ROW_BUDGET = 2e7;
+var UNDER_RUN_ROW_BUDGET = 4e7;
+var spentUnderByDb = /* @__PURE__ */ new WeakMap();
+function spendOf(db) {
+  let spend = spentUnderByDb.get(db);
+  if (spend === void 0) {
+    spend = { rows: 0, asked: 0, abandoned: 0, skipped: 0 };
+    spentUnderByDb.set(db, spend);
+  }
+  return spend;
+}
+function underQuestionSpend(db) {
+  return { ...spendOf(db) };
+}
+function askResolutionUnder(db, pairs, program = resolutionUnderProgram(), questionBudget = UNDER_QUESTION_ROW_BUDGET, runBudget = UNDER_RUN_ROW_BUDGET) {
   let asked = askedUnderByDb.get(db);
   if (asked === void 0) {
     asked = /* @__PURE__ */ new Set();
@@ -89,17 +107,49 @@ function askResolutionUnder(db, pairs, program = resolutionUnderProgram()) {
     ([key, site]) => !asked.has(tupleKey([key, site]))
   );
   if (fresh.length === 0) {
-    return;
+    return "answered";
   }
+  const spend = spendOf(db);
   for (const [key, site] of fresh) {
     asked.add(tupleKey([key, site]));
+  }
+  spend.asked += 1;
+  if (spend.rows >= runBudget) {
+    spend.skipped += 1;
+    chargeQuestion("skipped");
+    return "abandoned";
+  }
+  for (const [key, site] of fresh) {
     db.add("wantedUnder", [key, site]);
   }
-  evaluate(db, program.rules);
   const forget = queryFacts(program);
-  if (forget.length > 0) {
-    clearRelations(db, program.rules, forget);
+  const clearDerived = () => {
+    if (forget.length > 0) {
+      clearRelations(db, program.rules, forget);
+    }
+  };
+  const budget = rowBudget(questionBudget);
+  try {
+    evaluate(db, program.rules, void 0, budget);
+  } catch (error) {
+    if (!(error instanceof BudgetExhausted)) {
+      throw error;
+    }
+    spend.rows += error.examined;
+    spend.abandoned += 1;
+    chargeQuestion("abandoned");
+    db.retract("wantedUnder", fresh);
+    clearDerived();
+    chargeAbandoned(
+      fresh.map(([key, site]) => `${key} under ${site}`).join(", "),
+      error.examined
+    );
+    return "abandoned";
   }
+  spend.rows += budget.examined;
+  chargeQuestion();
+  clearDerived();
+  return "answered";
 }
 
 // src/callee.ts
@@ -2008,18 +2058,44 @@ var STATED_RULES = [
     [lit("binds", v("g"), v("f")), lit("callsFunction", v("r"), v("g"))]
   ),
   // A function written on an object, called off it: `client.get(o)`.
-  // Every rule above joins on a name the callee binds to, and a read of
-  // a property binds to nothing.
+  // The receiver comes from the object through `refersToObject`, not from
+  // `objectOf`: a walk from every reader of the name was most of a run.
   rule(
     "callsFunction",
     [v("r"), v("f")],
     [
       lit("holdsProperty", v("obj"), v("n"), v("f")),
+      lit("refersToObject", v("o"), v("obj")),
       lit("readsProperty", v("c"), v("o"), v("n")),
-      lit("objectOf", v("o"), v("obj")),
       lit("call", v("r"), v("c"))
     ]
   ),
+  // The expressions that refer to an object literal by binding alone: the
+  // declaration written as it, a reference or import of that, and a
+  // fallback over any of those. Asked from the object, so it visits only them.
+  rule("refersToObject", [v("obj"), v("obj")], [lit("objectValue", v("obj"))]),
+  rule(
+    "refersToObject",
+    [v("x"), v("obj")],
+    [lit("refersToObject", v("y"), v("obj")), lit("binds", v("x"), v("y"))]
+  ),
+  rule(
+    "refersToObject",
+    [v("x"), v("obj")],
+    [
+      lit("refersToObject", v("y"), v("obj")),
+      lit("moduleExport", v("m"), v("n"), v("y")),
+      lit("imports", v("x"), v("m"), v("n"))
+    ]
+  ),
+  rule(
+    "refersToObject",
+    [v("x"), v("obj")],
+    [
+      lit("refersToObject", v("b"), v("obj")),
+      lit("fallbackBranch", v("x"), v("b"))
+    ]
+  ),
   // What an object contains, its base class included, so a method the base
   // declares is found on a subclass that never overrode it. A method both
   // declare gives two, and the caller decides. This is its own relation
@@ -2670,6 +2746,8 @@ export {
   RESOLUTION_RULES,
   RESULT_STEP,
   UNDER_ANSWER_RELATIONS,
+  UNDER_QUESTION_ROW_BUDGET,
+  UNDER_RUN_ROW_BUDGET,
   VALUE_STEP,
   addPackWords,
   agreedMountPrefix,
@@ -2697,6 +2775,7 @@ export {
   resolutionUnderProgram,
   singleAnswers,
   startsAtName,
+  underQuestionSpend,
   valueLeftByWrites,
   writesRunInOrder,
   writtenSourcesOf,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/resolution",
-  "version": "0.31.0",
+  "version": "0.31.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.31.0"
+    "@suss/datalog": "0.31.1"
   }
 }