@suss/adapter-ruby 0.26.0 → 0.27.0

package/dist/index.cjs

@@ -51,6 +51,7 @@ __export(index_exports, {
   inheritedStatements: () => inheritedStatements,
   methodDefinitionsIn: () => methodDefinitionsIn,
   methodInAncestry: () => methodInAncestry,
+  nestedStatements: () => nestedStatements,
   nodeId: () => nodeId,
   parseRuby: () => parseRuby,
   parseRubySync: () => parseRubySync,
@@ -94,6 +95,45 @@ function field(node, name) {
 function bodyStatements(body) {
   return body.namedChildren.filter((child) => child !== null);
 }
+var BRANCH_FIELDS = {
+  if: ["consequence", "alternative"],
+  unless: ["consequence", "alternative"],
+  elsif: ["consequence", "alternative"],
+  if_modifier: ["body"],
+  unless_modifier: ["body"],
+  while: ["body"],
+  until: ["body"],
+  while_modifier: ["body"],
+  until_modifier: ["body"],
+  when: ["body"],
+  rescue: ["body"]
+};
+var STATEMENT_LISTS = /* @__PURE__ */ new Set(["then", "else", "do", "ensure", "begin"]);
+var CLAUSE_TYPES = /* @__PURE__ */ new Set(["elsif", "else", "when", "rescue", "ensure"]);
+function nestedStatements(stmt) {
+  const branchFields = BRANCH_FIELDS[stmt.type];
+  if (branchFields !== void 0) {
+    return branchFields.flatMap((name) => {
+      const branch = field(stmt, name);
+      return branch === null ? [] : statementsRunBy(branch);
+    });
+  }
+  if (STATEMENT_LISTS.has(stmt.type)) {
+    return bodyStatements(stmt).flatMap(
+      (child) => CLAUSE_TYPES.has(child.type) ? nestedStatements(child) : [child]
+    );
+  }
+  if (stmt.type === "case") {
+    return bodyStatements(stmt).filter((child) => CLAUSE_TYPES.has(child.type)).flatMap(nestedStatements);
+  }
+  return [];
+}
+function statementsRunBy(branch) {
+  if (STATEMENT_LISTS.has(branch.type) || CLAUSE_TYPES.has(branch.type)) {
+    return nestedStatements(branch);
+  }
+  return [branch];
+}
 var OWN_BODY_TYPES = /* @__PURE__ */ new Set([
   "method",
   "singleton_method",
@@ -157,8 +197,8 @@ var VISIBILITY_KEYWORDS = /* @__PURE__ */ new Set([
   "protected",
   "public"
 ]);
-function visibilityKeyword(text) {
-  return VISIBILITY_KEYWORDS.has(text) ? text : null;
+function visibilityKeyword(text2) {
+  return VISIBILITY_KEYWORDS.has(text2) ? text2 : null;
 }
 function setVisibility(visibility, name, keyword) {
   if (keyword === "public") {
@@ -281,14 +321,31 @@ var NodeMap = class extends import_extractor.IdMap {
 // src/constantPath.ts
 var import_node_fs = __toESM(require("fs"), 1);
 var import_node_path = __toESM(require("path"), 1);
-function underscoreConstantPath(qualifiedName) {
-  return qualifiedName.replaceAll("::", "/").replace(/([A-Z\d]+)([A-Z][a-z])/g, "$1_$2").replace(/([a-z\d])([A-Z])/g, "$1_$2").replaceAll("-", "_").toLowerCase();
+function underscoreConstantPath(qualifiedName, acronyms = []) {
+  return lowerAcronyms(qualifiedName.replaceAll("::", "/"), acronyms).replace(/([A-Z\d]+)([A-Z][a-z])/g, "$1_$2").replace(/([a-z\d])([A-Z])/g, "$1_$2").replaceAll("-", "_").toLowerCase();
+}
+function lowerAcronyms(word, acronyms) {
+  if (acronyms.length === 0) {
+    return word;
+  }
+  const alternatives = acronyms.map(escapeRegExp).join("|");
+  const acronymRegex = new RegExp(
+    `(?:(?<=([A-Za-z\\d]))|\\b)(${alternatives})(?=\\b|[^a-z])`,
+    "g"
+  );
+  return word.replace(
+    acronymRegex,
+    (_match, before, acronym) => `${before === void 0 ? "" : "_"}${acronym.toLowerCase()}`
+  );
+}
+function escapeRegExp(text2) {
+  return text2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 var PATH_CONVENTIONS = {
   railsUnderscore: underscoreConstantPath
 };
-function resolveConstantFile(root, qualifiedName, convention) {
-  const relative = `${PATH_CONVENTIONS[convention](qualifiedName)}.rb`;
+function resolveConstantFile(root, qualifiedName, convention, acronyms = []) {
+  const relative = `${PATH_CONVENTIONS[convention](qualifiedName, acronyms)}.rb`;
   for (const candidate of [root, ...autoloadDirectories(root)]) {
     const file = import_node_path.default.join(candidate, relative);
     if (import_node_fs.default.existsSync(file)) {
@@ -362,12 +419,19 @@ function walkBody(statements, nesting, visit) {
   }
 }
 function ownIdentity(nameNode, outerNesting) {
-  const qualifiedName = qualifyConstantRef(nameNode, outerNesting);
+  const qualifiedName = definedName(nameNode, outerNesting);
   if (qualifiedName === null) {
     return null;
   }
   return { qualifiedName, bodyNesting: [qualifiedName, ...outerNesting] };
 }
+function definedName(nameNode, outerNesting) {
+  const innermost = outerNesting[0] ?? null;
+  if (nameNode.type === "scope_resolution" && innermost !== null && !nameNode.text.startsWith("::")) {
+    return `${innermost}::${nameNode.text}`;
+  }
+  return qualifyConstantRef(nameNode, outerNesting);
+}
 function visitClass(node, nesting, visit) {
   const nameNode = field(node, "name");
   const identity = nameNode !== null ? ownIdentity(nameNode, nesting) : null;
@@ -431,7 +495,8 @@ async function reachDefinition(qualifiedName, lookup) {
   const filePath = resolveConstantFile(
     lookup.root,
     qualifiedName,
-    lookup.pathConvention
+    lookup.pathConvention,
+    lookup.acronyms
   );
   if (filePath === null) {
     return null;
@@ -473,7 +538,10 @@ async function chainOf(self, lookup, active) {
 async function superclassChain(self, lookup, active) {
   const candidates = superclassCandidatesOf(self.blocks);
   for (const candidate of candidates) {
-    if (lookup.ancestryRootClassNames.includes(candidate) || active.has(candidate)) {
+    if (lookup.ancestryRootClassNames.includes(candidate)) {
+      return [{ type: "root", name: candidate }];
+    }
+    if (active.has(candidate)) {
       return [];
     }
     const blocks = await definitionOf(candidate, lookup);
@@ -551,6 +619,9 @@ function superclassCandidatesOf(blocks) {
 }
 function methodInAncestry(ancestry, name) {
   for (const entry of ancestry) {
+    if (entry.type === "root") {
+      return { type: "none" };
+    }
     if (entry.type === "unfollowed") {
       return {
         type: "unsettled",
@@ -2623,11 +2694,18 @@ function bindEvaluator(db, nodes) {
     )
   );
 }
-function evaluatedValue(node, db) {
-  return (0, import_values2.force)(evaluatorFor(node, db).evaluate(node));
+function evaluatedValue(node, db, bindings) {
+  const evaluator = evaluatorFor(node, db);
+  if (bindings === void 0) {
+    return (0, import_values2.force)(evaluator.evaluate(node));
+  }
+  const supplied = new Map(
+    [...bindings].map(([name, value]) => [name, (0, import_values2.text)(value)])
+  );
+  return (0, import_values2.force)(evaluator.evaluate(node, { bindings: supplied }));
 }
-function stringValueOf(node, db) {
-  return (0, import_values2.literalOf)(evaluatedValue(node, db));
+function stringValueOf(node, db, bindings) {
+  return (0, import_values2.literalOf)(evaluatedValue(node, db, bindings));
 }
 function methodDefinitionsIn(file, root) {
   const found = /* @__PURE__ */ new Map();
@@ -3288,8 +3366,7 @@ function controllerFilters(pattern, ancestry) {
       skipNames.set(form.skippedBy, form.name);
     }
   }
-  const declared = [];
-  const skips = [];
+  let declared = [];
   for (const { statement } of inheritedStatements(ancestry)) {
     const called = calledName(statement);
     if (called === null) {
@@ -3297,16 +3374,21 @@ function controllerFilters(pattern, ancestry) {
     }
     const form = byName.get(called);
     if (form !== void 0) {
-      declared.push(...declarationsOf(statement, form));
+      for (const declaration of declarationsOf(statement, form)) {
+        declared = [
+          ...declared.filter((earlier) => !sameFilter(earlier, declaration)),
+          declaration
+        ];
+      }
       continue;
     }
     const skipped = skipNames.get(called);
     if (skipped !== void 0) {
-      skips.push(...skipsOf(statement, skipped));
+      declared = applySkips(declared, skipsOf(statement, skipped));
     }
   }
   const resolved = [];
-  for (const declaration of applySkips(declared, skips)) {
+  for (const declaration of declared) {
     const found = methodInAncestry(ancestry, declaration.methodName);
     if (found.type !== "found") {
       continue;
@@ -3419,6 +3501,9 @@ function skipsOf(statement, filterName) {
   const actions = namesUnder(args.keyword.only);
   return args.positional.map((arg) => symbolValue(arg)).filter((name) => name !== null).map((methodName) => ({ filterName, methodName, actions }));
 }
+function sameFilter(one, other) {
+  return one.filter.name === other.filter.name && one.methodName === other.methodName;
+}
 function applySkips(declared, skips) {
   const left = [];
   for (const declaration of declared) {
@@ -3542,7 +3627,7 @@ function storageEffect(call, model, pattern, kind, selector) {
     binding: (0, import_ir_core.storageBinding)({
       recognition: "ruby-storage",
       storageSystem: pattern.storageSystem,
-      scope: pattern.baseClasses[0] ?? "",
+      scope: "default",
       container: constantName(model)
     }),
     callee: call.text,
@@ -3710,6 +3795,7 @@ function fieldReadContext(pattern, cache, fileBlocks, bodyRead) {
     lookup: {
       root: pattern.root,
       pathConvention: pattern.pathConvention,
+      acronyms: pattern.acronyms ?? [],
       ancestryRootClassNames: pattern.ancestryRootClassNames,
       parsedFile: (absPath) => cache.get(absPath),
       localDefinition: (name) => sameFileBlocks(name, fileBlocks)
@@ -3824,12 +3910,16 @@ async function controllerActionUnits(pattern, pack, info, ownBlocks, fileBlocks,
   const lookup = {
     root: pattern.root,
     pathConvention: pattern.pathConvention,
+    acronyms: pattern.acronyms ?? [],
     ancestryRootClassNames: pattern.ancestryRootClassNames,
     parsedFile: (absPath) => options.cache.get(absPath),
     localDefinition: (name) => sameFileBlocks(name, fileBlocks)
   };
   const ancestry = await ancestryOf(info.qualifiedName, ownBlocks, lookup);
-  if (!reachesConfiguredBase(ancestry, info.qualifiedName, pattern.baseClassNames)) {
+  if (!reachesConfiguredBase(ancestry, info.qualifiedName, [
+    ...pattern.baseClassNames,
+    ...pattern.ancestryRootClassNames
+  ])) {
     return [];
   }
   const filters = controllerFilters(pattern, ancestry);
@@ -3849,43 +3939,73 @@ async function controllerActionUnits(pattern, pack, info, ownBlocks, fileBlocks,
       enclosingQualifiedName: filter.enclosingQualifiedName
     });
   }
-  for (const block of ownBlocks) {
-    if (block.info.bodyNode === null) {
+  const emitAction = (actionName, method, block) => {
+    const around = filters.filter((filter) => filterCoversAction(filter, actionName)).map(
+      (filter) => filterReference(
+        filter,
+        options.displayPathOf?.(filter.file) ?? filter.file
+      )
+    );
+    const raw = buildControllerActionUnit(
+      pack,
+      pattern,
+      info.qualifiedName,
+      actionName,
+      method,
+      {
+        display: block.file === (options.absoluteFile ?? options.filePath) ? options.filePath : options.displayPathOf?.(block.file) ?? block.file,
+        absolute: block.file
+      },
+      options,
+      around
+    );
+    units.push(raw);
+    options.onReachSeed?.(raw, {
+      file: block.file,
+      node: method,
+      enclosingQualifiedName: block.info.qualifiedName
+    });
+  };
+  const own = /* @__PURE__ */ new Set();
+  for (const [actionName, method, block] of publicInstanceMethods(ownBlocks)) {
+    own.add(actionName);
+    emitAction(actionName, method, block);
+  }
+  const seen = new Set(own);
+  for (const entry of ancestry) {
+    if (entry.type !== "bodies" || entry.name === info.qualifiedName) {
       continue;
     }
-    const visibility = instanceMethodVisibility(block.info.bodyNode);
-    for (const [actionName, method] of instanceMethodsByName(
-      block.info.bodyNode
+    for (const [actionName, method, block] of publicInstanceMethods(
+      entry.blocks
     )) {
-      if ((visibility.get(actionName) ?? "public") !== "public") {
+      if (seen.has(actionName)) {
         continue;
       }
-      const around = filters.filter((filter) => filterCoversAction(filter, actionName)).map(
-        (filter) => filterReference(
-          filter,
-          options.displayPathOf?.(filter.file) ?? filter.file
-        )
-      );
-      const raw = buildControllerActionUnit(
-        pack,
-        pattern,
-        info.qualifiedName,
-        actionName,
-        method,
-        { display: options.filePath, absolute: block.file },
-        options,
-        around
-      );
-      units.push(raw);
-      options.onReachSeed?.(raw, {
-        file: block.file,
-        node: method,
-        enclosingQualifiedName: info.qualifiedName
-      });
+      seen.add(actionName);
+      if (pattern.routeFor(info.qualifiedName, actionName) === null) {
+        continue;
+      }
+      emitAction(actionName, method, block);
     }
   }
   return units;
 }
+function publicInstanceMethods(blocks) {
+  const found = [];
+  for (const block of blocks) {
+    if (block.info.bodyNode === null) {
+      continue;
+    }
+    const visibility = instanceMethodVisibility(block.info.bodyNode);
+    for (const [name, method] of instanceMethodsByName(block.info.bodyNode)) {
+      if ((visibility.get(name) ?? "public") === "public") {
+        found.push([name, method, block]);
+      }
+    }
+  }
+  return found;
+}
 function buildControllerActionUnit(pack, pattern, controllerQualifiedName, actionName, method, file, bodyRead, wrappers = []) {
   const range = rangeOf(method);
   const route = pattern.routeFor(controllerQualifiedName, actionName);
@@ -5109,7 +5229,8 @@ function inheritedMethodsIn(packs) {
   return found;
 }
 function alreadyDiscovered(seen, raw) {
-  const key = `${raw.identity.file}::${raw.identity.name}::${raw.identity.range.start}`;
+  const reported = raw.identity.exportPath?.join(".") ?? raw.identity.name;
+  const key = `${raw.identity.file}::${reported}::${raw.identity.range.start}`;
   if (seen.has(key)) {
     return true;
   }
@@ -5408,8 +5529,8 @@ function displayNameOf(node) {
   if (node.type === "class" || node.type === "module") {
     return field(node, "name")?.text ?? node.text;
   }
-  const text = node.text.split("\n")[0].trim();
-  return text.length > 40 ? `${text.slice(0, 40)}...` : text;
+  const text2 = node.text.split("\n")[0].trim();
+  return text2.length > 40 ? `${text2.slice(0, 40)}...` : text2;
 }
 function width(node) {
   return node.endIndex - node.startIndex;
@@ -5436,14 +5557,14 @@ var RubyWhySession = class {
    * The smallest expression on `line` of `file` whose text is exactly
    * `text`, or null.
    */
-  findExpression(file, line, text) {
+  findExpression(file, line, text2) {
     const root = this.rootOf(file);
     if (root === null) {
       return null;
     }
     let found = null;
     const visit = (node) => {
-      if (node.startPosition.row + 1 === line && node.text === text) {
+      if (node.startPosition.row + 1 === line && node.text === text2) {
         if (found === null || width(node) <= width(found)) {
           found = node;
         }
@@ -5614,6 +5735,7 @@ async function rubyStubEvidence(options) {
   inheritedStatements,
   methodDefinitionsIn,
   methodInAncestry,
+  nestedStatements,
   nodeId,
   parseRuby,
   parseRubySync,

package/dist/index.d.cts

@@ -31,6 +31,13 @@ interface Range {
 }
 declare function field(node: Node, name: string): Node | null;
 declare function bodyStatements(body: Node): Node[];
+/**
+ * Every statement written directly inside a branching statement's
+ * branches, across its `elsif`, `else`, `when`, `rescue` and `ensure`
+ * clauses. A statement inside a nested branching statement is not
+ * included; the caller descends into that one itself.
+ */
+declare function nestedStatements(stmt: Node): Node[];
 /** A call whose block is the thing being configured rather than a place statements run. */
 type BlockConfigures = (call: Node) => boolean;
 /**
@@ -68,8 +75,14 @@ declare function readCallArgs(argumentList: Node | null): CallArgs;
  */
 /** A pack picks a convention by name, and the code for each one lives here. */
 type ConstantPathConvention = "railsUnderscore";
-/** Ported from ActiveSupport's own `String#underscore`, which is what Rails autoloading runs a constant path through. */
-declare function underscoreConstantPath(qualifiedName: string): string;
+/**
+ * Ported from ActiveSupport's own `String#underscore`, which is what
+ * Rails autoloading runs a constant path through. An acronym the
+ * project registers with the inflector is one word to it, so with
+ * `ActivityPub` registered the path is `activitypub`, not
+ * `activity_pub`.
+ */
+declare function underscoreConstantPath(qualifiedName: string, acronyms?: readonly string[]): string;
 /**
  * Null when there is no file at that path. Rails autoloads from every
  * directory directly under `app`, so `ApplicationController` is
@@ -77,14 +90,14 @@ declare function underscoreConstantPath(qualifiedName: string): string;
  * `app/application_controller.rb`; those directories are tried after
  * the root itself, in name order, and no other spelling is tried.
  */
-declare function resolveConstantFile(root: string, qualifiedName: string, convention: ConstantPathConvention): string | null;
+declare function resolveConstantFile(root: string, qualifiedName: string, convention: ConstantPathConvention, acronyms?: readonly string[]): string | null;
 
 /**
  * Resolves Ruby constant paths against lexical nesting.
  *
- * A compound path written out, like `Data::Record`, means the same thing
- * wherever it appears, so its text is the qualified name. A bare name is
- * relative to the nesting it is written inside. `require` is never resolved,
+ * A compound path referenced, like `Data::Record`, is read as absolute. A
+ * bare name is relative to the nesting it is written inside, and so is a
+ * compound name `class` or `module` opens. `require` is never resolved,
  * because Rails autoloads by naming convention rather than through a load graph
  * a static reader could follow, so a constant that nesting alone cannot qualify
  * keeps whatever name the source wrote and callers treat it as unresolved.
@@ -141,7 +154,13 @@ interface ReachedBody {
     /** Absolute path of the file the block is written in. */
     file: string;
 }
-/** One ancestor: every block reopening its name, or the name alone when nothing reached it. Blocks stay together because Ruby treats a reopened class as one place in the chain. */
+/**
+ * One ancestor: every block reopening its name, the name alone when
+ * nothing reached it, or the library's own class the walk stopped at.
+ * Blocks stay together because Ruby treats a reopened class as one
+ * place in the chain. The root is kept by name so a caller can tell a
+ * chain that ended at the library from one that ended at nothing.
+ */
 type AncestorEntry = {
     type: "bodies";
     name: string;
@@ -149,6 +168,9 @@ type AncestorEntry = {
 } | {
     type: "unfollowed";
     name: string;
+} | {
+    type: "root";
+    name: string;
 };
 /** A class and everything it inherits from, in Ruby's own method-lookup order. */
 type Ancestry = readonly AncestorEntry[];
@@ -157,6 +179,8 @@ interface AncestorLookup {
     /** Directory the constant-to-path convention resolves an ancestor's name against. */
     root: string;
     pathConvention: ConstantPathConvention;
+    /** Acronyms the convention keeps as one word, `ActivityPub` to `activitypub`. */
+    acronyms?: readonly string[];
     /**
      * The library's own classes a project's chain ends at. Reaching one
      * ends a walk with nothing left unfollowed.
@@ -324,15 +348,17 @@ interface RbLoaderPattern {
     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. */
+/** A class whose ancestry reaches one of `baseClassNames` or `ancestryRootClassNames` 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 {
     type: "controllerActions";
-    /** The library's own base a project's controllers extend, `ActionController::Base` say. */
+    /** A base a project's controllers extend, `ApplicationController` say. The base itself is not a controller. */
     baseClassNames: string[];
     /** The directory a bare superclass name is looked up under, the project's own layout. */
     root: string;
     pathConvention: ConstantPathConvention;
-    /** The library's own classes a project's controller chain ends at. */
+    /** Acronyms the project registers with the inflector, which the path convention keeps as one word: `ActivityPub` is `activitypub`, not `activity_pub`. */
+    acronyms?: string[];
+    /** The library's own classes a project's controller chain ends at. A class extending one directly is a controller too. */
     ancestryRootClassNames: string[];
     /** Status code a wire response gets when the action does not say otherwise. */
     defaultStatusCode: number;
@@ -412,6 +438,8 @@ interface GraphqlObjectFields {
     /** The directory a wiring keyword's referenced class is looked up under. That is the project's own layout, not the library's. */
     root: string;
     pathConvention: ConstantPathConvention;
+    /** Acronyms the project registers with the inflector, which the path convention keeps as one word. */
+    acronyms?: string[];
     /** The DSL call declaring one schema field in an object type's body. */
     fieldCallName: string;
     /** The DSL call declaring a referenced class's own return type. */
@@ -754,10 +782,12 @@ interface ProjectNodes {
 }
 /** Register the parsed project, so reads through `db` can follow the facts back to nodes. */
 declare function bindEvaluator(db: Database, nodes: ProjectNodes): void;
+/** Strings to read for the parameters of the block or method `node` is written in, the way a caller would supply them. */
+type ParameterBindings = ReadonlyMap<string, string>;
 /** The abstract value `node` comes down to, through the facts when `db` was bound. */
-declare function evaluatedValue(node: Node, db?: Database): Value;
+declare function evaluatedValue(node: Node, db?: Database, bindings?: ParameterBindings): Value;
 /** The one string `node` comes down to, or null when it does not settle on one. */
-declare function stringValueOf(node: Node, db?: Database): string | null;
+declare function stringValueOf(node: Node, db?: Database, bindings?: ParameterBindings): string | null;
 /** Every method a file defines, keyed the way the facts key it, for `bindEvaluator`. */
 declare function methodDefinitionsIn(file: string, root: Node): Map<string, Node>;
 
@@ -771,4 +801,4 @@ declare function methodDefinitionsIn(file: string, root: Node): Map<string, Node
  */
 declare const ADAPTER_VERSION = "0.1.0";
 
-export { ADAPTER_VERSION, type AncestorEntry, type AncestorLookup, type Ancestry, type CallArgs, type ClassInfo, type ConstantPathConvention, type ControllerActions, type DiscoveryOptions, type EvaluatedFile, type ExtractRubyOptions, type ExtractRubyResult, type FileCache, type FileConstants, type GraphqlObjectFields, type GraphqlTypeNameConvention, type MethodLookup, type ProjectNodes, type Range, type RbStatusCall, type RbStoragePattern, type ReachedBody, type RubyDiscoveryPattern, type RubyExtendsSite, type RubyPack, type RubyRequireSite, type RubyStubEvidence, type RubyStubEvidenceOptions, type RubyValueHandle, RubyWhySession, type RubyWhySessionOptions, type TypeReadContext, ancestryOf, bindEvaluator, bodyStatements, booleanLiteralValue, collectFileConstants, createFileCache, discoverUnits, emitConstantBindings, emitEntryFact, emitValueFacts, evaluatedValue, extractRubyProject, field, findRubyFiles, graphqlTypeNameFromQualified, hashKeySymbolName, inheritedStatements, methodDefinitionsIn, methodInAncestry, nodeId, parseRuby, parseRubySync, preloadRubyGrammar, qualifyConstantRef, reachDefinition, readCallArgs, readKey, resolveConstantFile, rubyStubEvidence, runStatements, stringLiteralValue, stringValueOf, symbolValue, typeShapeFromNode, underscoreConstantPath, unitKey, walkClasses, walkDefinitions };
+export { ADAPTER_VERSION, type AncestorEntry, type AncestorLookup, type Ancestry, type CallArgs, type ClassInfo, type ConstantPathConvention, type ControllerActions, type DiscoveryOptions, type EvaluatedFile, type ExtractRubyOptions, type ExtractRubyResult, type FileCache, type FileConstants, type GraphqlObjectFields, type GraphqlTypeNameConvention, type MethodLookup, type ParameterBindings, type ProjectNodes, type Range, type RbStatusCall, type RbStoragePattern, type ReachedBody, type RubyDiscoveryPattern, type RubyExtendsSite, type RubyPack, type RubyRequireSite, type RubyStubEvidence, type RubyStubEvidenceOptions, type RubyValueHandle, RubyWhySession, type RubyWhySessionOptions, type TypeReadContext, ancestryOf, bindEvaluator, bodyStatements, booleanLiteralValue, collectFileConstants, createFileCache, discoverUnits, emitConstantBindings, emitEntryFact, emitValueFacts, evaluatedValue, extractRubyProject, field, findRubyFiles, graphqlTypeNameFromQualified, hashKeySymbolName, inheritedStatements, methodDefinitionsIn, methodInAncestry, nestedStatements, nodeId, parseRuby, parseRubySync, preloadRubyGrammar, qualifyConstantRef, reachDefinition, readCallArgs, readKey, resolveConstantFile, rubyStubEvidence, runStatements, stringLiteralValue, stringValueOf, symbolValue, typeShapeFromNode, underscoreConstantPath, unitKey, walkClasses, walkDefinitions };

package/dist/index.d.ts

@@ -31,6 +31,13 @@ interface Range {
 }
 declare function field(node: Node, name: string): Node | null;
 declare function bodyStatements(body: Node): Node[];
+/**
+ * Every statement written directly inside a branching statement's
+ * branches, across its `elsif`, `else`, `when`, `rescue` and `ensure`
+ * clauses. A statement inside a nested branching statement is not
+ * included; the caller descends into that one itself.
+ */
+declare function nestedStatements(stmt: Node): Node[];
 /** A call whose block is the thing being configured rather than a place statements run. */
 type BlockConfigures = (call: Node) => boolean;
 /**
@@ -68,8 +75,14 @@ declare function readCallArgs(argumentList: Node | null): CallArgs;
  */
 /** A pack picks a convention by name, and the code for each one lives here. */
 type ConstantPathConvention = "railsUnderscore";
-/** Ported from ActiveSupport's own `String#underscore`, which is what Rails autoloading runs a constant path through. */
-declare function underscoreConstantPath(qualifiedName: string): string;
+/**
+ * Ported from ActiveSupport's own `String#underscore`, which is what
+ * Rails autoloading runs a constant path through. An acronym the
+ * project registers with the inflector is one word to it, so with
+ * `ActivityPub` registered the path is `activitypub`, not
+ * `activity_pub`.
+ */
+declare function underscoreConstantPath(qualifiedName: string, acronyms?: readonly string[]): string;
 /**
  * Null when there is no file at that path. Rails autoloads from every
  * directory directly under `app`, so `ApplicationController` is
@@ -77,14 +90,14 @@ declare function underscoreConstantPath(qualifiedName: string): string;
  * `app/application_controller.rb`; those directories are tried after
  * the root itself, in name order, and no other spelling is tried.
  */
-declare function resolveConstantFile(root: string, qualifiedName: string, convention: ConstantPathConvention): string | null;
+declare function resolveConstantFile(root: string, qualifiedName: string, convention: ConstantPathConvention, acronyms?: readonly string[]): string | null;
 
 /**
  * Resolves Ruby constant paths against lexical nesting.
  *
- * A compound path written out, like `Data::Record`, means the same thing
- * wherever it appears, so its text is the qualified name. A bare name is
- * relative to the nesting it is written inside. `require` is never resolved,
+ * A compound path referenced, like `Data::Record`, is read as absolute. A
+ * bare name is relative to the nesting it is written inside, and so is a
+ * compound name `class` or `module` opens. `require` is never resolved,
  * because Rails autoloads by naming convention rather than through a load graph
  * a static reader could follow, so a constant that nesting alone cannot qualify
  * keeps whatever name the source wrote and callers treat it as unresolved.
@@ -141,7 +154,13 @@ interface ReachedBody {
     /** Absolute path of the file the block is written in. */
     file: string;
 }
-/** One ancestor: every block reopening its name, or the name alone when nothing reached it. Blocks stay together because Ruby treats a reopened class as one place in the chain. */
+/**
+ * One ancestor: every block reopening its name, the name alone when
+ * nothing reached it, or the library's own class the walk stopped at.
+ * Blocks stay together because Ruby treats a reopened class as one
+ * place in the chain. The root is kept by name so a caller can tell a
+ * chain that ended at the library from one that ended at nothing.
+ */
 type AncestorEntry = {
     type: "bodies";
     name: string;
@@ -149,6 +168,9 @@ type AncestorEntry = {
 } | {
     type: "unfollowed";
     name: string;
+} | {
+    type: "root";
+    name: string;
 };
 /** A class and everything it inherits from, in Ruby's own method-lookup order. */
 type Ancestry = readonly AncestorEntry[];
@@ -157,6 +179,8 @@ interface AncestorLookup {
     /** Directory the constant-to-path convention resolves an ancestor's name against. */
     root: string;
     pathConvention: ConstantPathConvention;
+    /** Acronyms the convention keeps as one word, `ActivityPub` to `activitypub`. */
+    acronyms?: readonly string[];
     /**
      * The library's own classes a project's chain ends at. Reaching one
      * ends a walk with nothing left unfollowed.
@@ -324,15 +348,17 @@ interface RbLoaderPattern {
     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. */
+/** A class whose ancestry reaches one of `baseClassNames` or `ancestryRootClassNames` 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 {
     type: "controllerActions";
-    /** The library's own base a project's controllers extend, `ActionController::Base` say. */
+    /** A base a project's controllers extend, `ApplicationController` say. The base itself is not a controller. */
     baseClassNames: string[];
     /** The directory a bare superclass name is looked up under, the project's own layout. */
     root: string;
     pathConvention: ConstantPathConvention;
-    /** The library's own classes a project's controller chain ends at. */
+    /** Acronyms the project registers with the inflector, which the path convention keeps as one word: `ActivityPub` is `activitypub`, not `activity_pub`. */
+    acronyms?: string[];
+    /** The library's own classes a project's controller chain ends at. A class extending one directly is a controller too. */
     ancestryRootClassNames: string[];
     /** Status code a wire response gets when the action does not say otherwise. */
     defaultStatusCode: number;
@@ -412,6 +438,8 @@ interface GraphqlObjectFields {
     /** The directory a wiring keyword's referenced class is looked up under. That is the project's own layout, not the library's. */
     root: string;
     pathConvention: ConstantPathConvention;
+    /** Acronyms the project registers with the inflector, which the path convention keeps as one word. */
+    acronyms?: string[];
     /** The DSL call declaring one schema field in an object type's body. */
     fieldCallName: string;
     /** The DSL call declaring a referenced class's own return type. */
@@ -754,10 +782,12 @@ interface ProjectNodes {
 }
 /** Register the parsed project, so reads through `db` can follow the facts back to nodes. */
 declare function bindEvaluator(db: Database, nodes: ProjectNodes): void;
+/** Strings to read for the parameters of the block or method `node` is written in, the way a caller would supply them. */
+type ParameterBindings = ReadonlyMap<string, string>;
 /** The abstract value `node` comes down to, through the facts when `db` was bound. */
-declare function evaluatedValue(node: Node, db?: Database): Value;
+declare function evaluatedValue(node: Node, db?: Database, bindings?: ParameterBindings): Value;
 /** The one string `node` comes down to, or null when it does not settle on one. */
-declare function stringValueOf(node: Node, db?: Database): string | null;
+declare function stringValueOf(node: Node, db?: Database, bindings?: ParameterBindings): string | null;
 /** Every method a file defines, keyed the way the facts key it, for `bindEvaluator`. */
 declare function methodDefinitionsIn(file: string, root: Node): Map<string, Node>;
 
@@ -771,4 +801,4 @@ declare function methodDefinitionsIn(file: string, root: Node): Map<string, Node
  */
 declare const ADAPTER_VERSION = "0.1.0";
 
-export { ADAPTER_VERSION, type AncestorEntry, type AncestorLookup, type Ancestry, type CallArgs, type ClassInfo, type ConstantPathConvention, type ControllerActions, type DiscoveryOptions, type EvaluatedFile, type ExtractRubyOptions, type ExtractRubyResult, type FileCache, type FileConstants, type GraphqlObjectFields, type GraphqlTypeNameConvention, type MethodLookup, type ProjectNodes, type Range, type RbStatusCall, type RbStoragePattern, type ReachedBody, type RubyDiscoveryPattern, type RubyExtendsSite, type RubyPack, type RubyRequireSite, type RubyStubEvidence, type RubyStubEvidenceOptions, type RubyValueHandle, RubyWhySession, type RubyWhySessionOptions, type TypeReadContext, ancestryOf, bindEvaluator, bodyStatements, booleanLiteralValue, collectFileConstants, createFileCache, discoverUnits, emitConstantBindings, emitEntryFact, emitValueFacts, evaluatedValue, extractRubyProject, field, findRubyFiles, graphqlTypeNameFromQualified, hashKeySymbolName, inheritedStatements, methodDefinitionsIn, methodInAncestry, nodeId, parseRuby, parseRubySync, preloadRubyGrammar, qualifyConstantRef, reachDefinition, readCallArgs, readKey, resolveConstantFile, rubyStubEvidence, runStatements, stringLiteralValue, stringValueOf, symbolValue, typeShapeFromNode, underscoreConstantPath, unitKey, walkClasses, walkDefinitions };
+export { ADAPTER_VERSION, type AncestorEntry, type AncestorLookup, type Ancestry, type CallArgs, type ClassInfo, type ConstantPathConvention, type ControllerActions, type DiscoveryOptions, type EvaluatedFile, type ExtractRubyOptions, type ExtractRubyResult, type FileCache, type FileConstants, type GraphqlObjectFields, type GraphqlTypeNameConvention, type MethodLookup, type ParameterBindings, type ProjectNodes, type Range, type RbStatusCall, type RbStoragePattern, type ReachedBody, type RubyDiscoveryPattern, type RubyExtendsSite, type RubyPack, type RubyRequireSite, type RubyStubEvidence, type RubyStubEvidenceOptions, type RubyValueHandle, RubyWhySession, type RubyWhySessionOptions, type TypeReadContext, ancestryOf, bindEvaluator, bodyStatements, booleanLiteralValue, collectFileConstants, createFileCache, discoverUnits, emitConstantBindings, emitEntryFact, emitValueFacts, evaluatedValue, extractRubyProject, field, findRubyFiles, graphqlTypeNameFromQualified, hashKeySymbolName, inheritedStatements, methodDefinitionsIn, methodInAncestry, nestedStatements, nodeId, parseRuby, parseRubySync, preloadRubyGrammar, qualifyConstantRef, reachDefinition, readCallArgs, readKey, resolveConstantFile, rubyStubEvidence, runStatements, stringLiteralValue, stringValueOf, symbolValue, typeShapeFromNode, underscoreConstantPath, unitKey, walkClasses, walkDefinitions };

package/dist/index.js

@@ -15,6 +15,45 @@ function field(node, name) {
 function bodyStatements(body) {
   return body.namedChildren.filter((child) => child !== null);
 }
+var BRANCH_FIELDS = {
+  if: ["consequence", "alternative"],
+  unless: ["consequence", "alternative"],
+  elsif: ["consequence", "alternative"],
+  if_modifier: ["body"],
+  unless_modifier: ["body"],
+  while: ["body"],
+  until: ["body"],
+  while_modifier: ["body"],
+  until_modifier: ["body"],
+  when: ["body"],
+  rescue: ["body"]
+};
+var STATEMENT_LISTS = /* @__PURE__ */ new Set(["then", "else", "do", "ensure", "begin"]);
+var CLAUSE_TYPES = /* @__PURE__ */ new Set(["elsif", "else", "when", "rescue", "ensure"]);
+function nestedStatements(stmt) {
+  const branchFields = BRANCH_FIELDS[stmt.type];
+  if (branchFields !== void 0) {
+    return branchFields.flatMap((name) => {
+      const branch = field(stmt, name);
+      return branch === null ? [] : statementsRunBy(branch);
+    });
+  }
+  if (STATEMENT_LISTS.has(stmt.type)) {
+    return bodyStatements(stmt).flatMap(
+      (child) => CLAUSE_TYPES.has(child.type) ? nestedStatements(child) : [child]
+    );
+  }
+  if (stmt.type === "case") {
+    return bodyStatements(stmt).filter((child) => CLAUSE_TYPES.has(child.type)).flatMap(nestedStatements);
+  }
+  return [];
+}
+function statementsRunBy(branch) {
+  if (STATEMENT_LISTS.has(branch.type) || CLAUSE_TYPES.has(branch.type)) {
+    return nestedStatements(branch);
+  }
+  return [branch];
+}
 var OWN_BODY_TYPES = /* @__PURE__ */ new Set([
   "method",
   "singleton_method",
@@ -78,8 +117,8 @@ var VISIBILITY_KEYWORDS = /* @__PURE__ */ new Set([
   "protected",
   "public"
 ]);
-function visibilityKeyword(text) {
-  return VISIBILITY_KEYWORDS.has(text) ? text : null;
+function visibilityKeyword(text2) {
+  return VISIBILITY_KEYWORDS.has(text2) ? text2 : null;
 }
 function setVisibility(visibility, name, keyword) {
   if (keyword === "public") {
@@ -202,14 +241,31 @@ var NodeMap = class extends IdMap {
 // src/constantPath.ts
 import fs from "fs";
 import path from "path";
-function underscoreConstantPath(qualifiedName) {
-  return qualifiedName.replaceAll("::", "/").replace(/([A-Z\d]+)([A-Z][a-z])/g, "$1_$2").replace(/([a-z\d])([A-Z])/g, "$1_$2").replaceAll("-", "_").toLowerCase();
+function underscoreConstantPath(qualifiedName, acronyms = []) {
+  return lowerAcronyms(qualifiedName.replaceAll("::", "/"), acronyms).replace(/([A-Z\d]+)([A-Z][a-z])/g, "$1_$2").replace(/([a-z\d])([A-Z])/g, "$1_$2").replaceAll("-", "_").toLowerCase();
+}
+function lowerAcronyms(word, acronyms) {
+  if (acronyms.length === 0) {
+    return word;
+  }
+  const alternatives = acronyms.map(escapeRegExp).join("|");
+  const acronymRegex = new RegExp(
+    `(?:(?<=([A-Za-z\\d]))|\\b)(${alternatives})(?=\\b|[^a-z])`,
+    "g"
+  );
+  return word.replace(
+    acronymRegex,
+    (_match, before, acronym) => `${before === void 0 ? "" : "_"}${acronym.toLowerCase()}`
+  );
+}
+function escapeRegExp(text2) {
+  return text2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 var PATH_CONVENTIONS = {
   railsUnderscore: underscoreConstantPath
 };
-function resolveConstantFile(root, qualifiedName, convention) {
-  const relative = `${PATH_CONVENTIONS[convention](qualifiedName)}.rb`;
+function resolveConstantFile(root, qualifiedName, convention, acronyms = []) {
+  const relative = `${PATH_CONVENTIONS[convention](qualifiedName, acronyms)}.rb`;
   for (const candidate of [root, ...autoloadDirectories(root)]) {
     const file = path.join(candidate, relative);
     if (fs.existsSync(file)) {
@@ -283,12 +339,19 @@ function walkBody(statements, nesting, visit) {
   }
 }
 function ownIdentity(nameNode, outerNesting) {
-  const qualifiedName = qualifyConstantRef(nameNode, outerNesting);
+  const qualifiedName = definedName(nameNode, outerNesting);
   if (qualifiedName === null) {
     return null;
   }
   return { qualifiedName, bodyNesting: [qualifiedName, ...outerNesting] };
 }
+function definedName(nameNode, outerNesting) {
+  const innermost = outerNesting[0] ?? null;
+  if (nameNode.type === "scope_resolution" && innermost !== null && !nameNode.text.startsWith("::")) {
+    return `${innermost}::${nameNode.text}`;
+  }
+  return qualifyConstantRef(nameNode, outerNesting);
+}
 function visitClass(node, nesting, visit) {
   const nameNode = field(node, "name");
   const identity = nameNode !== null ? ownIdentity(nameNode, nesting) : null;
@@ -352,7 +415,8 @@ async function reachDefinition(qualifiedName, lookup) {
   const filePath = resolveConstantFile(
     lookup.root,
     qualifiedName,
-    lookup.pathConvention
+    lookup.pathConvention,
+    lookup.acronyms
   );
   if (filePath === null) {
     return null;
@@ -394,7 +458,10 @@ async function chainOf(self, lookup, active) {
 async function superclassChain(self, lookup, active) {
   const candidates = superclassCandidatesOf(self.blocks);
   for (const candidate of candidates) {
-    if (lookup.ancestryRootClassNames.includes(candidate) || active.has(candidate)) {
+    if (lookup.ancestryRootClassNames.includes(candidate)) {
+      return [{ type: "root", name: candidate }];
+    }
+    if (active.has(candidate)) {
       return [];
     }
     const blocks = await definitionOf(candidate, lookup);
@@ -472,6 +539,9 @@ function superclassCandidatesOf(blocks) {
 }
 function methodInAncestry(ancestry, name) {
   for (const entry of ancestry) {
+    if (entry.type === "root") {
+      return { type: "none" };
+    }
     if (entry.type === "unfollowed") {
       return {
         type: "unsettled",
@@ -1207,7 +1277,7 @@ function calledMethod(node) {
 
 // src/values/evaluator.ts
 import { nodeOfKey } from "@suss/resolution";
-import { Evaluator, force, literalOf as literalOf2 } from "@suss/values";
+import { Evaluator, force, literalOf as literalOf2, text } from "@suss/values";
 
 // src/facts/resolve.ts
 import {
@@ -2585,11 +2655,18 @@ function bindEvaluator(db, nodes) {
     )
   );
 }
-function evaluatedValue(node, db) {
-  return force(evaluatorFor(node, db).evaluate(node));
+function evaluatedValue(node, db, bindings) {
+  const evaluator = evaluatorFor(node, db);
+  if (bindings === void 0) {
+    return force(evaluator.evaluate(node));
+  }
+  const supplied = new Map(
+    [...bindings].map(([name, value]) => [name, text(value)])
+  );
+  return force(evaluator.evaluate(node, { bindings: supplied }));
 }
-function stringValueOf(node, db) {
-  return literalOf2(evaluatedValue(node, db));
+function stringValueOf(node, db, bindings) {
+  return literalOf2(evaluatedValue(node, db, bindings));
 }
 function methodDefinitionsIn(file, root) {
   const found = /* @__PURE__ */ new Map();
@@ -3250,8 +3327,7 @@ function controllerFilters(pattern, ancestry) {
       skipNames.set(form.skippedBy, form.name);
     }
   }
-  const declared = [];
-  const skips = [];
+  let declared = [];
   for (const { statement } of inheritedStatements(ancestry)) {
     const called = calledName(statement);
     if (called === null) {
@@ -3259,16 +3335,21 @@ function controllerFilters(pattern, ancestry) {
     }
     const form = byName.get(called);
     if (form !== void 0) {
-      declared.push(...declarationsOf(statement, form));
+      for (const declaration of declarationsOf(statement, form)) {
+        declared = [
+          ...declared.filter((earlier) => !sameFilter(earlier, declaration)),
+          declaration
+        ];
+      }
       continue;
     }
     const skipped = skipNames.get(called);
     if (skipped !== void 0) {
-      skips.push(...skipsOf(statement, skipped));
+      declared = applySkips(declared, skipsOf(statement, skipped));
     }
   }
   const resolved = [];
-  for (const declaration of applySkips(declared, skips)) {
+  for (const declaration of declared) {
     const found = methodInAncestry(ancestry, declaration.methodName);
     if (found.type !== "found") {
       continue;
@@ -3381,6 +3462,9 @@ function skipsOf(statement, filterName) {
   const actions = namesUnder(args.keyword.only);
   return args.positional.map((arg) => symbolValue(arg)).filter((name) => name !== null).map((methodName) => ({ filterName, methodName, actions }));
 }
+function sameFilter(one, other) {
+  return one.filter.name === other.filter.name && one.methodName === other.methodName;
+}
 function applySkips(declared, skips) {
   const left = [];
   for (const declaration of declared) {
@@ -3508,7 +3592,7 @@ function storageEffect(call, model, pattern, kind, selector) {
     binding: storageBinding({
       recognition: "ruby-storage",
       storageSystem: pattern.storageSystem,
-      scope: pattern.baseClasses[0] ?? "",
+      scope: "default",
       container: constantName(model)
     }),
     callee: call.text,
@@ -3676,6 +3760,7 @@ function fieldReadContext(pattern, cache, fileBlocks, bodyRead) {
     lookup: {
       root: pattern.root,
       pathConvention: pattern.pathConvention,
+      acronyms: pattern.acronyms ?? [],
       ancestryRootClassNames: pattern.ancestryRootClassNames,
       parsedFile: (absPath) => cache.get(absPath),
       localDefinition: (name) => sameFileBlocks(name, fileBlocks)
@@ -3790,12 +3875,16 @@ async function controllerActionUnits(pattern, pack, info, ownBlocks, fileBlocks,
   const lookup = {
     root: pattern.root,
     pathConvention: pattern.pathConvention,
+    acronyms: pattern.acronyms ?? [],
     ancestryRootClassNames: pattern.ancestryRootClassNames,
     parsedFile: (absPath) => options.cache.get(absPath),
     localDefinition: (name) => sameFileBlocks(name, fileBlocks)
   };
   const ancestry = await ancestryOf(info.qualifiedName, ownBlocks, lookup);
-  if (!reachesConfiguredBase(ancestry, info.qualifiedName, pattern.baseClassNames)) {
+  if (!reachesConfiguredBase(ancestry, info.qualifiedName, [
+    ...pattern.baseClassNames,
+    ...pattern.ancestryRootClassNames
+  ])) {
     return [];
   }
   const filters = controllerFilters(pattern, ancestry);
@@ -3815,43 +3904,73 @@ async function controllerActionUnits(pattern, pack, info, ownBlocks, fileBlocks,
       enclosingQualifiedName: filter.enclosingQualifiedName
     });
   }
-  for (const block of ownBlocks) {
-    if (block.info.bodyNode === null) {
+  const emitAction = (actionName, method, block) => {
+    const around = filters.filter((filter) => filterCoversAction(filter, actionName)).map(
+      (filter) => filterReference(
+        filter,
+        options.displayPathOf?.(filter.file) ?? filter.file
+      )
+    );
+    const raw = buildControllerActionUnit(
+      pack,
+      pattern,
+      info.qualifiedName,
+      actionName,
+      method,
+      {
+        display: block.file === (options.absoluteFile ?? options.filePath) ? options.filePath : options.displayPathOf?.(block.file) ?? block.file,
+        absolute: block.file
+      },
+      options,
+      around
+    );
+    units.push(raw);
+    options.onReachSeed?.(raw, {
+      file: block.file,
+      node: method,
+      enclosingQualifiedName: block.info.qualifiedName
+    });
+  };
+  const own = /* @__PURE__ */ new Set();
+  for (const [actionName, method, block] of publicInstanceMethods(ownBlocks)) {
+    own.add(actionName);
+    emitAction(actionName, method, block);
+  }
+  const seen = new Set(own);
+  for (const entry of ancestry) {
+    if (entry.type !== "bodies" || entry.name === info.qualifiedName) {
       continue;
     }
-    const visibility = instanceMethodVisibility(block.info.bodyNode);
-    for (const [actionName, method] of instanceMethodsByName(
-      block.info.bodyNode
+    for (const [actionName, method, block] of publicInstanceMethods(
+      entry.blocks
     )) {
-      if ((visibility.get(actionName) ?? "public") !== "public") {
+      if (seen.has(actionName)) {
         continue;
       }
-      const around = filters.filter((filter) => filterCoversAction(filter, actionName)).map(
-        (filter) => filterReference(
-          filter,
-          options.displayPathOf?.(filter.file) ?? filter.file
-        )
-      );
-      const raw = buildControllerActionUnit(
-        pack,
-        pattern,
-        info.qualifiedName,
-        actionName,
-        method,
-        { display: options.filePath, absolute: block.file },
-        options,
-        around
-      );
-      units.push(raw);
-      options.onReachSeed?.(raw, {
-        file: block.file,
-        node: method,
-        enclosingQualifiedName: info.qualifiedName
-      });
+      seen.add(actionName);
+      if (pattern.routeFor(info.qualifiedName, actionName) === null) {
+        continue;
+      }
+      emitAction(actionName, method, block);
     }
   }
   return units;
 }
+function publicInstanceMethods(blocks) {
+  const found = [];
+  for (const block of blocks) {
+    if (block.info.bodyNode === null) {
+      continue;
+    }
+    const visibility = instanceMethodVisibility(block.info.bodyNode);
+    for (const [name, method] of instanceMethodsByName(block.info.bodyNode)) {
+      if ((visibility.get(name) ?? "public") === "public") {
+        found.push([name, method, block]);
+      }
+    }
+  }
+  return found;
+}
 function buildControllerActionUnit(pack, pattern, controllerQualifiedName, actionName, method, file, bodyRead, wrappers = []) {
   const range = rangeOf(method);
   const route = pattern.routeFor(controllerQualifiedName, actionName);
@@ -5106,7 +5225,8 @@ function inheritedMethodsIn(packs) {
   return found;
 }
 function alreadyDiscovered(seen, raw) {
-  const key = `${raw.identity.file}::${raw.identity.name}::${raw.identity.range.start}`;
+  const reported = raw.identity.exportPath?.join(".") ?? raw.identity.name;
+  const key = `${raw.identity.file}::${reported}::${raw.identity.range.start}`;
   if (seen.has(key)) {
     return true;
   }
@@ -5405,8 +5525,8 @@ function displayNameOf(node) {
   if (node.type === "class" || node.type === "module") {
     return field(node, "name")?.text ?? node.text;
   }
-  const text = node.text.split("\n")[0].trim();
-  return text.length > 40 ? `${text.slice(0, 40)}...` : text;
+  const text2 = node.text.split("\n")[0].trim();
+  return text2.length > 40 ? `${text2.slice(0, 40)}...` : text2;
 }
 function width(node) {
   return node.endIndex - node.startIndex;
@@ -5433,14 +5553,14 @@ var RubyWhySession = class {
    * The smallest expression on `line` of `file` whose text is exactly
    * `text`, or null.
    */
-  findExpression(file, line, text) {
+  findExpression(file, line, text2) {
     const root = this.rootOf(file);
     if (root === null) {
       return null;
     }
     let found = null;
     const visit = (node) => {
-      if (node.startPosition.row + 1 === line && node.text === text) {
+      if (node.startPosition.row + 1 === line && node.text === text2) {
         if (found === null || width(node) <= width(found)) {
           found = node;
         }
@@ -5610,6 +5730,7 @@ export {
   inheritedStatements,
   methodDefinitionsIn,
   methodInAncestry,
+  nestedStatements,
   nodeId,
   parseRuby,
   parseRubySync,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-ruby",
-  "version": "0.26.0",
+  "version": "0.27.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.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",
+    "@suss/behavioral-ir": "0.27.0",
+    "@suss/datalog": "0.27.0",
+    "@suss/extractor": "0.27.0",
+    "@suss/ir-core": "0.27.0",
+    "@suss/resolution": "0.27.0",
+    "@suss/values": "0.27.0",
     "web-tree-sitter": "^0.26.11"
   },
   "devDependencies": {