@suss/adapter-ruby 0.24.4 → 0.26.0

package/dist/index.cjs

@@ -308,7 +308,7 @@ function autoloadDirectories(root) {
 // src/scope.ts
 function qualifyConstantRef(node, nesting) {
   if (node.type === "scope_resolution") {
-    return node.text;
+    return compoundName(node);
   }
   if (node.type === "constant") {
     const innermost = nesting[0] ?? null;
@@ -318,13 +318,16 @@ function qualifyConstantRef(node, nesting) {
 }
 function constantRefCandidates(node, nesting) {
   if (node.type === "scope_resolution") {
-    return [node.text];
+    return [compoundName(node)];
   }
   if (node.type === "constant") {
     return [...nesting.map((level) => `${level}::${node.text}`), node.text];
   }
   return [];
 }
+function compoundName(node) {
+  return node.text.replace(/^::/, "");
+}
 function shadowingClassFor(node, nesting, knownClasses) {
   if (node.type !== "constant") {
     return null;
@@ -850,7 +853,7 @@ var Lowerer = class {
     return [nested];
   }
   /**
-   * `unless ok` runs its body when `ok` is false, so it reads as an `if` on
+   * `unless ok` runs its body when `ok` is false, so it lowers to an `if` on
    * the same test with the two arms the other way around. Without the swap
    * a summary would say a branch runs on the test that skips it.
    */
@@ -866,7 +869,7 @@ var Lowerer = class {
       exitKind: exitKindOf(node)
     };
   }
-  /** `render :gone if expired?` gates one statement on one test, so it reads as an if with one arm, on whichever side the test puts it. */
+  /** `render :gone if expired?` gates one statement on one test, so it lowers to an if with one arm, on whichever side the test puts it. */
   lowerIfModifier(node) {
     const body = field(node, "body");
     const gated = body === null ? [] : [this.lower(body)];
@@ -3044,8 +3047,11 @@ function receiverPrefix(receiver, method, root, pattern, options) {
 function trimmed(path7) {
   return path7 === "/" ? "" : path7.replace(/\/+$/, "");
 }
-function namesConstant(receiver, constantName) {
-  return (receiver.type === "constant" || receiver.type === "scope_resolution") && receiver.text === constantName;
+function namesConstant(receiver, constantName2) {
+  if (receiver.type === "constant") {
+    return receiver.text === constantName2;
+  }
+  return receiver.type === "scope_resolution" && compoundName(receiver) === constantName2;
 }
 function builtBy(name, method, root, pattern) {
   const builders = pattern.receiverBuilders ?? [];
@@ -3477,6 +3483,12 @@ function rootConstant(node) {
   }
   return rootConstant(receiver);
 }
+function isConstant(node) {
+  return node.type === "constant" || node.type === "scope_resolution";
+}
+function constantName(constant2) {
+  return constant2.type === "constant" ? constant2.text : compoundName(constant2);
+}
 var ANCESTRY_PROGRAM = (0, import_datalog2.deriveOnDemand)(
   [...import_resolution3.RESOLUTION_RULES, ...import_resolution3.RESOLUTION_QUESTIONS],
   import_resolution3.ANSWER_RELATIONS
@@ -3486,13 +3498,22 @@ function reachesBase(facts, classKey, bases) {
   (0, import_datalog2.evaluate)(facts, ANCESTRY_PROGRAM.rules);
   return facts.lookup("wantedBaseName", 0, classKey).some((row) => bases.includes(String(row[1])));
 }
-function classBehind(facts, constant2) {
-  const wanted = `#${constant2.text}`;
+function classBehind(facts, file, constant2) {
+  const key = constant2.type === "constant" ? `${file}#${constant2.text}` : nodeId(file, constant2);
   const bound = new Set(
-    facts.facts("binds").filter((row) => String(row[0]).endsWith(wanted)).map((row) => String(row[1]))
+    facts.lookup("binds", 0, key).map((row) => String(row[1]))
   );
   return bound.size === 1 ? [...bound][0] : void 0;
 }
+function modelPattern(constant2, file, options) {
+  const classKey = classBehind(options.facts, file, constant2);
+  if (classKey === void 0) {
+    return void 0;
+  }
+  return options.patterns.find(
+    (candidate) => reachesBase(options.facts, classKey, candidate.baseClasses)
+  );
+}
 function selectorOf(node) {
   const picked = [];
   const walk = (current) => {
@@ -3514,7 +3535,87 @@ function selectorOf(node) {
   walk(node);
   return [...new Set(picked)];
 }
-function storageEffects(calls, options) {
+function storageEffect(call, model, pattern, kind, selector) {
+  const operation = methodOf(call);
+  return {
+    type: "interaction",
+    binding: (0, import_ir_core.storageBinding)({
+      recognition: "ruby-storage",
+      storageSystem: pattern.storageSystem,
+      scope: pattern.baseClasses[0] ?? "",
+      container: constantName(model)
+    }),
+    callee: call.text,
+    interaction: {
+      class: "storage-access",
+      kind,
+      fields: [],
+      operation,
+      ...selector.length > 0 ? { selector } : {}
+    }
+  };
+}
+function modelCallEffects(call, file, options) {
+  const constant2 = rootConstant(call);
+  if (constant2 === null) {
+    return [];
+  }
+  const pattern = modelPattern(constant2, file, options);
+  if (pattern === void 0) {
+    return [];
+  }
+  const kind = pattern.writes.includes(methodOf(call)) ? "write" : "read";
+  return [storageEffect(call, constant2, pattern, kind, selectorOf(call))];
+}
+function isLoader(node, loader) {
+  if (node === null) {
+    return false;
+  }
+  if (node.type === "identifier") {
+    return node.text === loader.loader;
+  }
+  return node.type === "call" && receiverOf(node) === null && methodOf(node) === loader.loader;
+}
+function loaderPick(call, loader) {
+  const method = methodOf(call);
+  const receiver = receiverOf(call);
+  if (receiver === null) {
+    return loader.shortcuts.includes(method) ? call : null;
+  }
+  if (!loader.reads.includes(method) || receiver.type !== "call") {
+    return null;
+  }
+  const picks = methodOf(receiver) === loader.pick && isLoader(receiverOf(receiver), loader);
+  return picks ? receiver : null;
+}
+function loaderCallEffects(call, file, options) {
+  const effects = [];
+  for (const loader of options.loaders ?? []) {
+    const pick = loaderPick(call, loader);
+    if (pick === null) {
+      continue;
+    }
+    const args = field(pick, "arguments");
+    for (const argument of args === null ? [] : children3(args)) {
+      if (!isConstant(argument)) {
+        continue;
+      }
+      const pattern = modelPattern(argument, file, options);
+      if (pattern !== void 0) {
+        effects.push(storageEffect(call, argument, pattern, "read", []));
+      }
+    }
+  }
+  return effects;
+}
+function effectsOfCall(call, file, options) {
+  const onModel = modelCallEffects(call, file, options);
+  return onModel.length > 0 ? onModel : loaderCallEffects(call, file, options);
+}
+function storageClaims(call, file, options) {
+  return options.patterns.length > 0 && effectsOfCall(call, file, options).length > 0;
+}
+function storageEffects(calls, file, options) {
   if (options.patterns.length === 0) {
     return [];
   }
@@ -3530,39 +3631,7 @@ function storageEffects(calls, options) {
     if (partOfOne.has(call.id)) {
       continue;
     }
-    const constant2 = rootConstant(call);
-    if (constant2 === null) {
-      continue;
-    }
-    const classKey = classBehind(options.facts, constant2);
-    if (classKey === void 0) {
-      continue;
-    }
-    const pattern = options.patterns.find(
-      (candidate) => reachesBase(options.facts, classKey, candidate.baseClasses)
-    );
-    if (pattern === void 0) {
-      continue;
-    }
-    const operation = methodOf(call);
-    const picked = selectorOf(call);
-    effects.push({
-      type: "interaction",
-      binding: (0, import_ir_core.storageBinding)({
-        recognition: "ruby-storage",
-        storageSystem: pattern.storageSystem,
-        scope: pattern.baseClasses[0] ?? "",
-        container: constant2.text
-      }),
-      callee: call.text,
-      interaction: {
-        class: "storage-access",
-        kind: pattern.writes.includes(operation) ? "write" : "read",
-        fields: [],
-        operation,
-        ...picked.length > 0 ? { selector: picked } : {}
-      }
-    });
+    effects.push(...effectsOfCall(call, file, options));
   }
   return effects;
 }
@@ -3604,7 +3673,7 @@ function typeShapeFromNode(node, ctx) {
     };
   }
   if (node.type === "scope_resolution") {
-    const qualified = node.text;
+    const qualified = compoundName(node);
     const scalar = ctx.scalars[scalarLookupName(qualified, ctx.scalarNamePrefixes)];
     if (scalar !== void 0) {
       return scalar;
@@ -3771,7 +3840,7 @@ async function controllerActionUnits(pattern, pack, info, ownBlocks, fileBlocks,
       filter,
       pattern,
       displayPath,
-      bodyOfMethod(filter.method, options)
+      bodyOfMethod(filter.method, filter.file, options)
     );
     units.push(raw);
     options.onReachSeed?.(raw, {
@@ -3803,7 +3872,7 @@ async function controllerActionUnits(pattern, pack, info, ownBlocks, fileBlocks,
         info.qualifiedName,
         actionName,
         method,
-        options.filePath,
+        { display: options.filePath, absolute: block.file },
         options,
         around
       );
@@ -3817,10 +3886,10 @@ async function controllerActionUnits(pattern, pack, info, ownBlocks, fileBlocks,
   }
   return units;
 }
-function buildControllerActionUnit(pack, pattern, controllerQualifiedName, actionName, method, filePath, bodyRead, wrappers = []) {
+function buildControllerActionUnit(pack, pattern, controllerQualifiedName, actionName, method, file, bodyRead, wrappers = []) {
   const range = rangeOf(method);
   const route = pattern.routeFor(controllerQualifiedName, actionName);
-  const body = bodyOfMethod(method, bodyRead);
+  const body = bodyOfMethod(method, file.absolute, bodyRead);
   const perResponse = responseBranches(
     method,
     pattern,
@@ -3832,7 +3901,7 @@ function buildControllerActionUnit(pack, pattern, controllerQualifiedName, actio
       name: actionName,
       nameKind: "binding",
       kind: "handler",
-      file: filePath,
+      file: file.display,
       range,
       span: spanOf(method),
       exportName: actionName,
@@ -3951,12 +4020,12 @@ function branchesFor(body, range) {
     }
   ];
 }
-function bodyOfMethod(method, bodyRead = {}) {
+function bodyOfMethod(method, file, bodyRead = {}) {
   const effects = invocationEffects(method, bodyRead.inheritedMethods);
   const storage = bodyRead.storage;
   const extra = [
     ...envReadEffects(method),
-    ...storage === void 0 ? [] : storageEffects(callsUnder2(method), storage)
+    ...storage === void 0 ? [] : storageEffects(callsUnder2(method), file, storage)
   ];
   return {
     bodyContent: methodHasStatements(method) ? "statements" : "empty",
@@ -3987,7 +4056,7 @@ function methodNotSettled(reason, range) {
 function bodyFromLookup(found, range, subject, nothingThere, bodyRead) {
   const table = {
     found: (lookup) => ({
-      ...bodyOfMethod(lookup.method, bodyRead),
+      ...bodyOfMethod(lookup.method, lookup.block.file, bodyRead),
       reachSeed: {
         file: lookup.block.file,
         node: lookup.method,
@@ -4351,11 +4420,10 @@ function collectFileConstants(filePath, root) {
     if ((node.type === "constant" || node.type === "scope_resolution") && !isDeclaration(node, parent)) {
       const written = writtenName(node);
       if (written !== null) {
-        references.push({
-          key: node.type === "constant" ? `${filePath}#${node.text}` : nodeId(filePath, node),
-          written,
-          nesting
-        });
+        const key = node.type === "constant" ? `${filePath}#${node.text}` : nodeId(filePath, node);
+        references.push(
+          written.startsWith("::") ? { key, written: written.slice(2), nesting: [] } : { key, written, nesting }
+        );
       }
     }
     for (const child of children4(node)) {
@@ -4916,7 +4984,8 @@ async function scanBody(source, ctx, options) {
     );
     if (outcome.kind === "stopped") {
       const stopKey = `${outcome.reason}:${callee}`;
-      if (!seen.has(stopKey) && (0, import_behavioral_ir4.worthRecording)(outcome.reason)) {
+      const claimed = options.storage !== void 0 && storageClaims(call, source.file, options.storage);
+      if (!seen.has(stopKey) && !claimed && (0, import_behavioral_ir4.worthRecording)(outcome.reason)) {
         seen.add(stopKey);
         stops.push({ callee, reason: outcome.reason });
       }
@@ -4947,7 +5016,7 @@ async function scanBody(source, ctx, options) {
 }
 function libraryUnit(target, options) {
   const { file, node, name, exportPath } = target;
-  const body = bodyOfMethod(node, options);
+  const body = bodyOfMethod(node, file, options);
   const range = rangeOf(node);
   return {
     identity: {
@@ -5104,6 +5173,8 @@ async function extractRubyProject(options) {
     bindEvaluator(db, { files: parsed, definitions });
   });
   const storagePatterns = options.packs.flatMap((pack) => pack.storage ?? []);
+  const loaderPatterns = options.packs.flatMap((pack) => pack.loaders ?? []);
+  const storage = storagePatterns.length > 0 ? { facts: db, patterns: storagePatterns, loaders: loaderPatterns } : void 0;
   const inheritedMethods = inheritedMethodsIn(options.packs);
   const displayPathOf = (file) => options.workspaceRoot !== void 0 ? import_node_path4.default.relative(options.workspaceRoot, file) : file;
   const seeds = [];
@@ -5119,7 +5190,7 @@ async function extractRubyProject(options) {
         filePath: displayPath,
         absoluteFile: file,
         cache,
-        ...storagePatterns.length > 0 ? { storage: { facts: db, patterns: storagePatterns } } : {},
+        ...storage === void 0 ? {} : { storage },
         inheritedMethods,
         displayPathOf,
         facts: db,
@@ -5198,7 +5269,7 @@ async function extractRubyProject(options) {
     () => reachedFunctions(seeds, {
       files: parsed,
       displayPathOf,
-      ...storagePatterns.length > 0 ? { storage: { facts: db, patterns: storagePatterns } } : {},
+      ...storage === void 0 ? {} : { storage },
       inheritedMethods
     })
   );

package/dist/index.d.cts

@@ -244,6 +244,8 @@ interface RubyPack {
     clients?: RbClientCall[];
     /** What the library's own database calls look like. The README says how one is matched. */
     storage?: RbStoragePattern[];
+    /** Calls the library gives a project for reading a model through a batching loader, rather than on the model itself. */
+    loaders?: RbLoaderPattern[];
 }
 /**
  * The calls a library gives a project for making a request. A method
@@ -264,7 +266,7 @@ interface RbClientCall {
     receiverBuilders?: string[];
     /** The keyword such a builder takes the base URL under, which comes in front of the path of a call on it. */
     builderUrlKeyword?: string;
-    /** What the response object gives a caller, so a test on it reads as a test on a status. */
+    /** What the response object gives a caller, so a test on one of its members counts as a test on a status. */
     response?: RbClientResponse;
     /** A call that sends a request object built somewhere else, which is how Net::HTTP sends anything with a body. */
     requestObject?: {
@@ -304,6 +306,23 @@ interface RbStoragePattern {
     /** Which database is behind the connection, which the project settles. */
     storageSystem: "postgresql" | "mysql" | "sqlite";
 }
+/**
+ * A loader that batches reads of a model on the caller's behalf, graphql-ruby's
+ * dataloader for one. The call that picks what to load is given the model as
+ * a constant argument, so the read is recorded against that model the same
+ * way a call on the model itself would be, and a storage pattern from another
+ * pack in the run says whether the constant is a model at all.
+ */
+interface RbLoaderPattern {
+    /** The receiverless call that gives the loader, `dataloader`. */
+    loader: string;
+    /** The method on the loader that picks a source and its arguments, `with`. */
+    pick: string;
+    /** The methods on a picked source that perform the read, `load` and `load_all`. */
+    reads: string[];
+    /** Receiverless calls that pick and read in one, whose arguments include the model, `dataload` and `dataload_record`. */
+    shortcuts: string[];
+}
 type RubyDiscoveryPattern = GraphqlObjectFields | ControllerActions;
 /** A class whose ancestry reaches one of `baseClassNames` is a controller, and every instance method it defines directly is one of its actions, bound by `routeFor` to the method and path a project's own routing gives it, or discovered with no boundary binding when `routeFor` finds none. */
 interface ControllerActions {
@@ -356,7 +375,7 @@ interface RbControllerFilter {
      * `rescue_from ActiveRecord::RecordNotFound, with: :not_found`.
      */
     methodFrom: "argument" | "withKeyword";
-    /** Set when the library runs the method only for an action that raised, which is what `rescue_from` does. */
+    /** Set when the library runs the method only for an action that raised, as `rescue_from` does. */
     onThrow?: boolean;
     /** The name of the call that takes a filter back off, `skip_before_action` for `before_action`. */
     skippedBy?: string;
@@ -369,7 +388,7 @@ interface RbControllerFilter {
 /**
  * One call an action writes to send a response, and where that call takes
  * the status. A call may take it both ways, and then the keyword wins,
- * which is what Rails does with `head :ok, status: :created`.
+ * as it does in Rails for `head :ok, status: :created`.
  */
 interface RbStatusCall {
     /** The call's own name as an action writes it, `render` for Rails. */
@@ -436,9 +455,19 @@ interface GraphqlObjectFields {
     };
 }
 
+/**
+ * storage.ts: which calls in a body talk to the database, for Ruby.
+ *
+ * A pack says which base class the library gives a model, and a call on a
+ * class that reaches that base is a database call. The README says why
+ * ancestry. A loader pattern from another pack adds calls that are given
+ * the model as an argument instead, and those go through the same test.
+ */
+
 interface RbStorageOptions {
     readonly facts: Database;
     readonly patterns: readonly RbStoragePattern[];
+    readonly loaders?: readonly RbLoaderPattern[];
 }
 
 /** The methods a pack declared the library defines itself, so a receiverless call to one of them is not work the project does. */

package/dist/index.d.ts

@@ -244,6 +244,8 @@ interface RubyPack {
     clients?: RbClientCall[];
     /** What the library's own database calls look like. The README says how one is matched. */
     storage?: RbStoragePattern[];
+    /** Calls the library gives a project for reading a model through a batching loader, rather than on the model itself. */
+    loaders?: RbLoaderPattern[];
 }
 /**
  * The calls a library gives a project for making a request. A method
@@ -264,7 +266,7 @@ interface RbClientCall {
     receiverBuilders?: string[];
     /** The keyword such a builder takes the base URL under, which comes in front of the path of a call on it. */
     builderUrlKeyword?: string;
-    /** What the response object gives a caller, so a test on it reads as a test on a status. */
+    /** What the response object gives a caller, so a test on one of its members counts as a test on a status. */
     response?: RbClientResponse;
     /** A call that sends a request object built somewhere else, which is how Net::HTTP sends anything with a body. */
     requestObject?: {
@@ -304,6 +306,23 @@ interface RbStoragePattern {
     /** Which database is behind the connection, which the project settles. */
     storageSystem: "postgresql" | "mysql" | "sqlite";
 }
+/**
+ * A loader that batches reads of a model on the caller's behalf, graphql-ruby's
+ * dataloader for one. The call that picks what to load is given the model as
+ * a constant argument, so the read is recorded against that model the same
+ * way a call on the model itself would be, and a storage pattern from another
+ * pack in the run says whether the constant is a model at all.
+ */
+interface RbLoaderPattern {
+    /** The receiverless call that gives the loader, `dataloader`. */
+    loader: string;
+    /** The method on the loader that picks a source and its arguments, `with`. */
+    pick: string;
+    /** The methods on a picked source that perform the read, `load` and `load_all`. */
+    reads: string[];
+    /** Receiverless calls that pick and read in one, whose arguments include the model, `dataload` and `dataload_record`. */
+    shortcuts: string[];
+}
 type RubyDiscoveryPattern = GraphqlObjectFields | ControllerActions;
 /** A class whose ancestry reaches one of `baseClassNames` is a controller, and every instance method it defines directly is one of its actions, bound by `routeFor` to the method and path a project's own routing gives it, or discovered with no boundary binding when `routeFor` finds none. */
 interface ControllerActions {
@@ -356,7 +375,7 @@ interface RbControllerFilter {
      * `rescue_from ActiveRecord::RecordNotFound, with: :not_found`.
      */
     methodFrom: "argument" | "withKeyword";
-    /** Set when the library runs the method only for an action that raised, which is what `rescue_from` does. */
+    /** Set when the library runs the method only for an action that raised, as `rescue_from` does. */
     onThrow?: boolean;
     /** The name of the call that takes a filter back off, `skip_before_action` for `before_action`. */
     skippedBy?: string;
@@ -369,7 +388,7 @@ interface RbControllerFilter {
 /**
  * One call an action writes to send a response, and where that call takes
  * the status. A call may take it both ways, and then the keyword wins,
- * which is what Rails does with `head :ok, status: :created`.
+ * as it does in Rails for `head :ok, status: :created`.
  */
 interface RbStatusCall {
     /** The call's own name as an action writes it, `render` for Rails. */
@@ -436,9 +455,19 @@ interface GraphqlObjectFields {
     };
 }
 
+/**
+ * storage.ts: which calls in a body talk to the database, for Ruby.
+ *
+ * A pack says which base class the library gives a model, and a call on a
+ * class that reaches that base is a database call. The README says why
+ * ancestry. A loader pattern from another pack adds calls that are given
+ * the model as an argument instead, and those go through the same test.
+ */
+
 interface RbStorageOptions {
     readonly facts: Database;
     readonly patterns: readonly RbStoragePattern[];
+    readonly loaders?: readonly RbLoaderPattern[];
 }
 
 /** The methods a pack declared the library defines itself, so a receiverless call to one of them is not work the project does. */

package/dist/index.js

@@ -229,7 +229,7 @@ function autoloadDirectories(root) {
 // src/scope.ts
 function qualifyConstantRef(node, nesting) {
   if (node.type === "scope_resolution") {
-    return node.text;
+    return compoundName(node);
   }
   if (node.type === "constant") {
     const innermost = nesting[0] ?? null;
@@ -239,13 +239,16 @@ function qualifyConstantRef(node, nesting) {
 }
 function constantRefCandidates(node, nesting) {
   if (node.type === "scope_resolution") {
-    return [node.text];
+    return [compoundName(node)];
   }
   if (node.type === "constant") {
     return [...nesting.map((level) => `${level}::${node.text}`), node.text];
   }
   return [];
 }
+function compoundName(node) {
+  return node.text.replace(/^::/, "");
+}
 function shadowingClassFor(node, nesting, knownClasses) {
   if (node.type !== "constant") {
     return null;
@@ -775,7 +778,7 @@ var Lowerer = class {
     return [nested];
   }
   /**
-   * `unless ok` runs its body when `ok` is false, so it reads as an `if` on
+   * `unless ok` runs its body when `ok` is false, so it lowers to an `if` on
    * the same test with the two arms the other way around. Without the swap
    * a summary would say a branch runs on the test that skips it.
    */
@@ -791,7 +794,7 @@ var Lowerer = class {
       exitKind: exitKindOf(node)
     };
   }
-  /** `render :gone if expired?` gates one statement on one test, so it reads as an if with one arm, on whichever side the test puts it. */
+  /** `render :gone if expired?` gates one statement on one test, so it lowers to an if with one arm, on whichever side the test puts it. */
   lowerIfModifier(node) {
     const body = field(node, "body");
     const gated = body === null ? [] : [this.lower(body)];
@@ -3006,8 +3009,11 @@ function receiverPrefix(receiver, method, root, pattern, options) {
 function trimmed(path7) {
   return path7 === "/" ? "" : path7.replace(/\/+$/, "");
 }
-function namesConstant(receiver, constantName) {
-  return (receiver.type === "constant" || receiver.type === "scope_resolution") && receiver.text === constantName;
+function namesConstant(receiver, constantName2) {
+  if (receiver.type === "constant") {
+    return receiver.text === constantName2;
+  }
+  return receiver.type === "scope_resolution" && compoundName(receiver) === constantName2;
 }
 function builtBy(name, method, root, pattern) {
   const builders = pattern.receiverBuilders ?? [];
@@ -3443,6 +3449,12 @@ function rootConstant(node) {
   }
   return rootConstant(receiver);
 }
+function isConstant(node) {
+  return node.type === "constant" || node.type === "scope_resolution";
+}
+function constantName(constant2) {
+  return constant2.type === "constant" ? constant2.text : compoundName(constant2);
+}
 var ANCESTRY_PROGRAM = deriveOnDemand2(
   [...RESOLUTION_RULES2, ...RESOLUTION_QUESTIONS2],
   ANSWER_RELATIONS2
@@ -3452,13 +3464,22 @@ function reachesBase(facts, classKey, bases) {
   evaluate2(facts, ANCESTRY_PROGRAM.rules);
   return facts.lookup("wantedBaseName", 0, classKey).some((row) => bases.includes(String(row[1])));
 }
-function classBehind(facts, constant2) {
-  const wanted = `#${constant2.text}`;
+function classBehind(facts, file, constant2) {
+  const key = constant2.type === "constant" ? `${file}#${constant2.text}` : nodeId(file, constant2);
   const bound = new Set(
-    facts.facts("binds").filter((row) => String(row[0]).endsWith(wanted)).map((row) => String(row[1]))
+    facts.lookup("binds", 0, key).map((row) => String(row[1]))
   );
   return bound.size === 1 ? [...bound][0] : void 0;
 }
+function modelPattern(constant2, file, options) {
+  const classKey = classBehind(options.facts, file, constant2);
+  if (classKey === void 0) {
+    return void 0;
+  }
+  return options.patterns.find(
+    (candidate) => reachesBase(options.facts, classKey, candidate.baseClasses)
+  );
+}
 function selectorOf(node) {
   const picked = [];
   const walk = (current) => {
@@ -3480,7 +3501,87 @@ function selectorOf(node) {
   walk(node);
   return [...new Set(picked)];
 }
-function storageEffects(calls, options) {
+function storageEffect(call, model, pattern, kind, selector) {
+  const operation = methodOf(call);
+  return {
+    type: "interaction",
+    binding: storageBinding({
+      recognition: "ruby-storage",
+      storageSystem: pattern.storageSystem,
+      scope: pattern.baseClasses[0] ?? "",
+      container: constantName(model)
+    }),
+    callee: call.text,
+    interaction: {
+      class: "storage-access",
+      kind,
+      fields: [],
+      operation,
+      ...selector.length > 0 ? { selector } : {}
+    }
+  };
+}
+function modelCallEffects(call, file, options) {
+  const constant2 = rootConstant(call);
+  if (constant2 === null) {
+    return [];
+  }
+  const pattern = modelPattern(constant2, file, options);
+  if (pattern === void 0) {
+    return [];
+  }
+  const kind = pattern.writes.includes(methodOf(call)) ? "write" : "read";
+  return [storageEffect(call, constant2, pattern, kind, selectorOf(call))];
+}
+function isLoader(node, loader) {
+  if (node === null) {
+    return false;
+  }
+  if (node.type === "identifier") {
+    return node.text === loader.loader;
+  }
+  return node.type === "call" && receiverOf(node) === null && methodOf(node) === loader.loader;
+}
+function loaderPick(call, loader) {
+  const method = methodOf(call);
+  const receiver = receiverOf(call);
+  if (receiver === null) {
+    return loader.shortcuts.includes(method) ? call : null;
+  }
+  if (!loader.reads.includes(method) || receiver.type !== "call") {
+    return null;
+  }
+  const picks = methodOf(receiver) === loader.pick && isLoader(receiverOf(receiver), loader);
+  return picks ? receiver : null;
+}
+function loaderCallEffects(call, file, options) {
+  const effects = [];
+  for (const loader of options.loaders ?? []) {
+    const pick = loaderPick(call, loader);
+    if (pick === null) {
+      continue;
+    }
+    const args = field(pick, "arguments");
+    for (const argument of args === null ? [] : children3(args)) {
+      if (!isConstant(argument)) {
+        continue;
+      }
+      const pattern = modelPattern(argument, file, options);
+      if (pattern !== void 0) {
+        effects.push(storageEffect(call, argument, pattern, "read", []));
+      }
+    }
+  }
+  return effects;
+}
+function effectsOfCall(call, file, options) {
+  const onModel = modelCallEffects(call, file, options);
+  return onModel.length > 0 ? onModel : loaderCallEffects(call, file, options);
+}
+function storageClaims(call, file, options) {
+  return options.patterns.length > 0 && effectsOfCall(call, file, options).length > 0;
+}
+function storageEffects(calls, file, options) {
   if (options.patterns.length === 0) {
     return [];
   }
@@ -3496,39 +3597,7 @@ function storageEffects(calls, options) {
     if (partOfOne.has(call.id)) {
       continue;
     }
-    const constant2 = rootConstant(call);
-    if (constant2 === null) {
-      continue;
-    }
-    const classKey = classBehind(options.facts, constant2);
-    if (classKey === void 0) {
-      continue;
-    }
-    const pattern = options.patterns.find(
-      (candidate) => reachesBase(options.facts, classKey, candidate.baseClasses)
-    );
-    if (pattern === void 0) {
-      continue;
-    }
-    const operation = methodOf(call);
-    const picked = selectorOf(call);
-    effects.push({
-      type: "interaction",
-      binding: storageBinding({
-        recognition: "ruby-storage",
-        storageSystem: pattern.storageSystem,
-        scope: pattern.baseClasses[0] ?? "",
-        container: constant2.text
-      }),
-      callee: call.text,
-      interaction: {
-        class: "storage-access",
-        kind: pattern.writes.includes(operation) ? "write" : "read",
-        fields: [],
-        operation,
-        ...picked.length > 0 ? { selector: picked } : {}
-      }
-    });
+    effects.push(...effectsOfCall(call, file, options));
   }
   return effects;
 }
@@ -3570,7 +3639,7 @@ function typeShapeFromNode(node, ctx) {
     };
   }
   if (node.type === "scope_resolution") {
-    const qualified = node.text;
+    const qualified = compoundName(node);
     const scalar = ctx.scalars[scalarLookupName(qualified, ctx.scalarNamePrefixes)];
     if (scalar !== void 0) {
       return scalar;
@@ -3737,7 +3806,7 @@ async function controllerActionUnits(pattern, pack, info, ownBlocks, fileBlocks,
       filter,
       pattern,
       displayPath,
-      bodyOfMethod(filter.method, options)
+      bodyOfMethod(filter.method, filter.file, options)
     );
     units.push(raw);
     options.onReachSeed?.(raw, {
@@ -3769,7 +3838,7 @@ async function controllerActionUnits(pattern, pack, info, ownBlocks, fileBlocks,
         info.qualifiedName,
         actionName,
         method,
-        options.filePath,
+        { display: options.filePath, absolute: block.file },
         options,
         around
       );
@@ -3783,10 +3852,10 @@ async function controllerActionUnits(pattern, pack, info, ownBlocks, fileBlocks,
   }
   return units;
 }
-function buildControllerActionUnit(pack, pattern, controllerQualifiedName, actionName, method, filePath, bodyRead, wrappers = []) {
+function buildControllerActionUnit(pack, pattern, controllerQualifiedName, actionName, method, file, bodyRead, wrappers = []) {
   const range = rangeOf(method);
   const route = pattern.routeFor(controllerQualifiedName, actionName);
-  const body = bodyOfMethod(method, bodyRead);
+  const body = bodyOfMethod(method, file.absolute, bodyRead);
   const perResponse = responseBranches(
     method,
     pattern,
@@ -3798,7 +3867,7 @@ function buildControllerActionUnit(pack, pattern, controllerQualifiedName, actio
       name: actionName,
       nameKind: "binding",
       kind: "handler",
-      file: filePath,
+      file: file.display,
       range,
       span: spanOf(method),
       exportName: actionName,
@@ -3917,12 +3986,12 @@ function branchesFor(body, range) {
     }
   ];
 }
-function bodyOfMethod(method, bodyRead = {}) {
+function bodyOfMethod(method, file, bodyRead = {}) {
   const effects = invocationEffects(method, bodyRead.inheritedMethods);
   const storage = bodyRead.storage;
   const extra = [
     ...envReadEffects(method),
-    ...storage === void 0 ? [] : storageEffects(callsUnder2(method), storage)
+    ...storage === void 0 ? [] : storageEffects(callsUnder2(method), file, storage)
   ];
   return {
     bodyContent: methodHasStatements(method) ? "statements" : "empty",
@@ -3953,7 +4022,7 @@ function methodNotSettled(reason, range) {
 function bodyFromLookup(found, range, subject, nothingThere, bodyRead) {
   const table = {
     found: (lookup) => ({
-      ...bodyOfMethod(lookup.method, bodyRead),
+      ...bodyOfMethod(lookup.method, lookup.block.file, bodyRead),
       reachSeed: {
         file: lookup.block.file,
         node: lookup.method,
@@ -4317,11 +4386,10 @@ function collectFileConstants(filePath, root) {
     if ((node.type === "constant" || node.type === "scope_resolution") && !isDeclaration(node, parent)) {
       const written = writtenName(node);
       if (written !== null) {
-        references.push({
-          key: node.type === "constant" ? `${filePath}#${node.text}` : nodeId(filePath, node),
-          written,
-          nesting
-        });
+        const key = node.type === "constant" ? `${filePath}#${node.text}` : nodeId(filePath, node);
+        references.push(
+          written.startsWith("::") ? { key, written: written.slice(2), nesting: [] } : { key, written, nesting }
+        );
       }
     }
     for (const child of children4(node)) {
@@ -4913,7 +4981,8 @@ async function scanBody(source, ctx, options) {
     );
     if (outcome.kind === "stopped") {
       const stopKey = `${outcome.reason}:${callee}`;
-      if (!seen.has(stopKey) && worthRecording(outcome.reason)) {
+      const claimed = options.storage !== void 0 && storageClaims(call, source.file, options.storage);
+      if (!seen.has(stopKey) && !claimed && worthRecording(outcome.reason)) {
         seen.add(stopKey);
         stops.push({ callee, reason: outcome.reason });
       }
@@ -4944,7 +5013,7 @@ async function scanBody(source, ctx, options) {
 }
 function libraryUnit(target, options) {
   const { file, node, name, exportPath } = target;
-  const body = bodyOfMethod(node, options);
+  const body = bodyOfMethod(node, file, options);
   const range = rangeOf(node);
   return {
     identity: {
@@ -5101,6 +5170,8 @@ async function extractRubyProject(options) {
     bindEvaluator(db, { files: parsed, definitions });
   });
   const storagePatterns = options.packs.flatMap((pack) => pack.storage ?? []);
+  const loaderPatterns = options.packs.flatMap((pack) => pack.loaders ?? []);
+  const storage = storagePatterns.length > 0 ? { facts: db, patterns: storagePatterns, loaders: loaderPatterns } : void 0;
   const inheritedMethods = inheritedMethodsIn(options.packs);
   const displayPathOf = (file) => options.workspaceRoot !== void 0 ? path4.relative(options.workspaceRoot, file) : file;
   const seeds = [];
@@ -5116,7 +5187,7 @@ async function extractRubyProject(options) {
         filePath: displayPath,
         absoluteFile: file,
         cache,
-        ...storagePatterns.length > 0 ? { storage: { facts: db, patterns: storagePatterns } } : {},
+        ...storage === void 0 ? {} : { storage },
         inheritedMethods,
         displayPathOf,
         facts: db,
@@ -5195,7 +5266,7 @@ async function extractRubyProject(options) {
     () => reachedFunctions(seeds, {
       files: parsed,
       displayPathOf,
-      ...storagePatterns.length > 0 ? { storage: { facts: db, patterns: storagePatterns } } : {},
+      ...storage === void 0 ? {} : { storage },
       inheritedMethods
     })
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-ruby",
-  "version": "0.24.4",
+  "version": "0.26.0",
   "type": "module",
   "description": "Read a Ruby codebase with suss and check what each Rails action or graphql-ruby resolver returns against the code that calls it.",
   "keywords": [
@@ -49,12 +49,12 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.24.4",
-    "@suss/datalog": "0.24.4",
-    "@suss/extractor": "0.24.4",
-    "@suss/ir-core": "0.24.4",
-    "@suss/resolution": "0.24.4",
-    "@suss/values": "0.24.4",
+    "@suss/behavioral-ir": "0.26.0",
+    "@suss/datalog": "0.26.0",
+    "@suss/extractor": "0.26.0",
+    "@suss/ir-core": "0.26.0",
+    "@suss/resolution": "0.26.0",
+    "@suss/values": "0.26.0",
     "web-tree-sitter": "^0.26.11"
   },
   "devDependencies": {