@suss/adapter-ruby 0.31.2 → 0.32.0

package/dist/index.cjs

@@ -144,6 +144,17 @@ var OWN_BODY_TYPES = /* @__PURE__ */ new Set([
   "singleton_class"
 ]);
 var NESTING_TYPES = /* @__PURE__ */ new Set(["class", "module"]);
+var METHOD_TYPES = /* @__PURE__ */ new Set(["method", "singleton_method"]);
+function enclosingMethod(node) {
+  let current = node.parent;
+  while (current !== null) {
+    if (METHOD_TYPES.has(current.type)) {
+      return current;
+    }
+    current = current.parent;
+  }
+  return null;
+}
 var INCLUDE_CALL = "include";
 var PREPEND_CALL = "prepend";
 var ARGUMENT_LIST_TYPE = "argument_list";
@@ -460,8 +471,11 @@ var RUBY_PROGRAM = (0, import_resolution.resolutionProgram)(RUBY_RULES);
 function resolveValues(db, keys) {
   (0, import_resolution.askResolution)(db, keys, "wanted", RUBY_PROGRAM);
 }
+function resolveEnvSites(db, sites) {
+  (0, import_resolution.askResolution)(db, sites, "wantedEnvSite", RUBY_PROGRAM);
+}
 function resolvedFunctions(db, key) {
-  return db.facts("wantedResolves").filter((row) => String(row[0]) === key).map((row) => String(row[1]));
+  return db.lookup("wantedResolves", 0, key).map((row) => String(row[1]));
 }
 function writtenValueOf(db, key) {
   resolveValues(db, [key]);
@@ -1340,7 +1354,6 @@ function emitCandidates(emitter, key, group) {
     add(emitter, "writesAllStated", key);
   }
 }
-var METHOD_TYPES = /* @__PURE__ */ new Set(["method", "singleton_method"]);
 var INITIALIZE_METHOD = "initialize";
 function receiverKeyOf(filePath, method, classKey) {
   return method.type === "singleton_method" ? classKey : `${nodeId(filePath, method)}#self`;
@@ -1388,7 +1401,7 @@ function emitClassFacts(emitter, cls) {
           left.text,
           valueKey(emitter, right)
         );
-        emitExpressionFacts(emitter, statement);
+        emitExpressionFacts(within, statement);
       }
       continue;
     }
@@ -2451,7 +2464,6 @@ var evaluators = /* @__PURE__ */ new WeakMap();
 var contexts = /* @__PURE__ */ new WeakMap();
 var withoutFacts = /* @__PURE__ */ new WeakMap();
 var filesByTree = /* @__PURE__ */ new WeakMap();
-var METHOD_TYPES3 = /* @__PURE__ */ new Set(["method", "singleton_method"]);
 function bindEvaluator(db, nodes) {
   for (const entry of nodes.files) {
     filesByTree.set(entry.root.tree, entry.file);
@@ -2505,7 +2517,7 @@ function stringValueOf(node, db, bindings) {
 function methodDefinitionsIn(file, root) {
   const found = /* @__PURE__ */ new Map();
   const visit = (node) => {
-    if (METHOD_TYPES3.has(node.type)) {
+    if (METHOD_TYPES.has(node.type)) {
       found.set(nodeId(file, node), node);
     }
     for (const child of node.namedChildren) {
@@ -2530,16 +2542,6 @@ function evaluatorFor(node, db) {
   }
   return local;
 }
-function enclosingMethod(node) {
-  let current = node.parent;
-  while (current !== null) {
-    if (METHOD_TYPES3.has(current.type)) {
-      return current;
-    }
-    current = current.parent;
-  }
-  return null;
-}
 function contextOver(db, nodes) {
   const filesByRoot = /* @__PURE__ */ new Map();
   const rootsByFile = /* @__PURE__ */ new Map();
@@ -4077,19 +4079,155 @@ function returnBranch(range, effects) {
 var import_behavioral_ir2 = require("@suss/behavioral-ir");
 var import_extractor4 = require("@suss/extractor");
 var RUBY_ENV_RECOGNITION = "ruby-env";
+var ENV_DEFAULTED = "rbEnvDefaulted";
 var DEFERRED_BODY_TYPES = /* @__PURE__ */ new Set(["method", "singleton_method", "lambda"]);
-function envReadEffects(root) {
-  const effects = [];
+function envReadEffects(root, facts) {
+  const helpers = helperFactsOf(facts);
+  const slots = [];
   (0, import_extractor4.walkDescendants)(root, null, {
     at: (node) => {
       const read = envReadAt(node);
       if (read !== null) {
-        effects.push(configReadEffect(read));
+        slots.push({ read });
+        return;
+      }
+      if (helpers !== null && node.type === "call") {
+        slots.push({ call: node });
       }
     },
     into: (node) => DEFERRED_BODY_TYPES.has(node.type) ? import_extractor4.SKIP_CHILDREN : null
   });
-  return effects;
+  const calls = slots.flatMap((slot) => "call" in slot ? [slot.call] : []);
+  const throughHelpers = helpers === null ? new NodeMap() : helperReads(calls, helpers);
+  return slots.flatMap((slot) => {
+    if ("read" in slot) {
+      return [configReadEffect(slot.read)];
+    }
+    return (throughHelpers.get(slot.call) ?? []).map(configReadEffect);
+  });
+}
+function helperFactsOf(facts) {
+  if (facts === void 0) {
+    return null;
+  }
+  const named2 = namedParameters(facts.db);
+  if (named2.size === 0) {
+    return null;
+  }
+  return { ...facts, named: named2 };
+}
+var namedByDb = /* @__PURE__ */ new WeakMap();
+function namedParameters(db) {
+  const memo = namedByDb.get(db);
+  if (memo !== void 0) {
+    return memo;
+  }
+  const named2 = /* @__PURE__ */ new Map();
+  namedByDb.set(db, named2);
+  const sites = db.facts("readsEnvNamed").map((row) => String(row[0]));
+  if (sites.length === 0) {
+    return named2;
+  }
+  resolveEnvSites(db, sites);
+  for (const row of db.facts("wantedParamNamesEnv")) {
+    const found = named2.get(String(row[0]));
+    if (found === void 0) {
+      named2.set(String(row[0]), [String(row[1])]);
+      continue;
+    }
+    found.push(String(row[1]));
+  }
+  return named2;
+}
+function emitEnvNameFacts(db, file, root) {
+  for (const site of envNameSites(root)) {
+    const key = nodeId(file, site.read);
+    db.add("readsEnvNamed", [
+      key,
+      readKey(file, site.name, enclosingMethod(site.name))
+    ]);
+    if (site.defaulted) {
+      db.add(ENV_DEFAULTED, [key]);
+    }
+  }
+}
+function envNameSites(root) {
+  const sites = [];
+  (0, import_extractor4.walkDescendants)(root, null, {
+    at: (node) => {
+      const site = envSiteAt(node);
+      if (site !== null && stringLiteralValue(site.name) === null) {
+        sites.push(site);
+      }
+    },
+    into: () => null
+  });
+  return sites;
+}
+function helperReads(calls, facts) {
+  const { db, file, named: named2 } = facts;
+  const callees = new NodeMap();
+  for (const call of calls) {
+    const key = calleeKeyOf(file, call, enclosingMethod(call));
+    if (key !== null) {
+      callees.set(call, key);
+    }
+  }
+  const reads = new NodeMap();
+  if (callees.size === 0) {
+    return reads;
+  }
+  resolveValues(
+    db,
+    [...callees].map(([, callee]) => callee)
+  );
+  for (const [call, callee] of callees) {
+    const args = namingArguments(db, named2, call, callee);
+    if (args.length === 0) {
+      continue;
+    }
+    const found = readsAtCall(db, call, args);
+    if (found.length > 0) {
+      reads.set(call, found);
+    }
+  }
+  return reads;
+}
+function namingArguments(db, named2, call, callee) {
+  const { positional, keyword } = readCallArgs(field(call, "arguments"));
+  const found = [];
+  for (const func of resolvedFunctions(db, callee)) {
+    for (const row of db.lookup("paramOf", 0, func)) {
+      const sites = named2.get(String(row[2]));
+      const argument = positional[Number(row[1])];
+      if (sites !== void 0 && argument !== void 0) {
+        found.push({ sites, argument });
+      }
+    }
+    for (const row of db.lookup("paramNamed", 0, func)) {
+      const sites = named2.get(String(row[2]));
+      const argument = keyword[String(row[1])];
+      if (sites !== void 0 && argument !== void 0) {
+        found.push({ sites, argument });
+      }
+    }
+  }
+  return found;
+}
+function readsAtCall(db, call, args) {
+  const defaultedAtCall = isDefaultedAt(call);
+  const byName = /* @__PURE__ */ new Map();
+  for (const { sites, argument } of args) {
+    const name = stringLiteralValue(argument) ?? stringValueOf(argument, db);
+    if (name === null) {
+      continue;
+    }
+    for (const site of sites) {
+      const defaulted = defaultedAtCall || db.lookup(ENV_DEFAULTED, 0, site).length > 0;
+      byName.set(name, (byName.get(name) ?? true) && defaulted);
+    }
+  }
+  return [...byName].map(([name, defaulted]) => ({ name, defaulted }));
 }
 function configReadEffect(read) {
   return {
@@ -4108,15 +4246,23 @@ function configReadEffect(read) {
   };
 }
 function envReadAt(node) {
+  const site = envSiteAt(node);
+  if (site === null) {
+    return null;
+  }
+  const name = stringLiteralValue(site.name);
+  return name === null ? null : { name, defaulted: site.defaulted };
+}
+function envSiteAt(node) {
   if (node.type === "element_reference") {
-    return elementRead(node);
+    return elementSite(node);
   }
   if (node.type === "call") {
-    return fetchRead(node);
+    return fetchSite(node);
   }
   return null;
 }
-function elementRead(node) {
+function elementSite(node) {
   const object = field(node, "object");
   if (object === null || !isEnv(object) || isAssignedTo(node)) {
     return null;
@@ -4124,24 +4270,23 @@ function elementRead(node) {
   const index = node.namedChildren.find(
     (child) => child !== null && child.id !== object.id
   );
-  const name = index === void 0 ? null : stringLiteralValue(index);
-  if (name === null) {
+  if (index === void 0) {
     return null;
   }
-  return { name, defaulted: isDefaultedAt(node) };
+  return { read: node, name: index, defaulted: isDefaultedAt(node) };
 }
-function fetchRead(node) {
+function fetchSite(node) {
   const receiver = field(node, "receiver");
   if (receiver === null || !isEnv(receiver) || field(node, "method")?.text !== "fetch") {
     return null;
   }
   const { positional } = readCallArgs(field(node, "arguments"));
-  const name = positional[0] === void 0 ? null : stringLiteralValue(positional[0]);
-  if (name === null) {
+  const name = positional[0];
+  if (name === void 0) {
     return null;
   }
   const hasDefault = positional.length > 1 || field(node, "block") !== null;
-  return { name, defaulted: hasDefault || isDefaultedAt(node) };
+  return { read: node, name, defaulted: hasDefault || isDefaultedAt(node) };
 }
 function isEnv(node) {
   if (node.type === "constant") {
@@ -5124,8 +5269,12 @@ function bodyOfMethod(method, file, bodyRead = {}) {
     bodyRead.facts
   );
   const storage = bodyRead.storage;
+  const facts = bodyRead.facts;
   const extra = [
-    ...envReadEffects(method),
+    ...envReadEffects(
+      method,
+      facts === void 0 ? void 0 : { db: facts, file }
+    ),
     ...storage === void 0 ? [] : storageEffects(callsUnder2(method), file, storage, method)
   ];
   return {
@@ -6495,7 +6644,7 @@ function parameterName(param) {
 }
 
 // src/reach/context.ts
-var METHOD_TYPES4 = /* @__PURE__ */ new Set(["method", "singleton_method"]);
+var METHOD_TYPES3 = /* @__PURE__ */ new Set(["method", "singleton_method"]);
 async function buildReachContext(files, facts, bodyBlocks = NO_BODY_BLOCKS, dynamicNames = /* @__PURE__ */ new Map()) {
   const blocksByQualifiedName = /* @__PURE__ */ new Map();
   const classes = [];
@@ -6506,7 +6655,7 @@ async function buildReachContext(files, facts, bodyBlocks = NO_BODY_BLOCKS, dyna
       classes.push({ file, info });
       classNames.set(nodeId(file, info.node), info.qualifiedName);
       for (const statement of namedChildren(info.bodyNode)) {
-        if (METHOD_TYPES4.has(statement.type)) {
+        if (METHOD_TYPES3.has(statement.type)) {
           classOfMethod.set(nodeId(file, statement), info.qualifiedName);
         }
       }
@@ -6640,6 +6789,7 @@ function factsForFile(options) {
   const db = new import_datalog3.Database();
   const bodyBlocks = bodyBlocksIn(options.packs);
   emitValueFacts(db, options.file, options.root, bodyBlocks);
+  emitEnvNameFacts(db, options.file, options.root);
   emitConstantBindings(db, [
     collectFileConstants(
       options.file,
@@ -6711,6 +6861,7 @@ async function extractRubyProject(options) {
       }
       parsed.push({ file, root });
       emitValueFacts(db, file, root, bodyBlocks);
+      emitEnvNameFacts(db, file, root);
       for (const [key, method] of methodDefinitionsIn(file, root)) {
         definitions.set(key, method);
       }
@@ -6788,7 +6939,10 @@ async function extractRubyProject(options) {
         });
       }
     }
-    const loadTimeReads = timer.time("discover", () => envReadEffects(root));
+    const loadTimeReads = timer.time(
+      "discover",
+      () => envReadEffects(root, { db, file })
+    );
     if (loadTimeReads.length > 0) {
       const summary = timer.time(
         "summarize",
@@ -6951,20 +7105,9 @@ function findRubyFiles(root) {
 
 // src/facts/why.ts
 var WITNESS_RULES = [...import_resolution9.RESOLUTION_RULES, ...RUBY_RULES];
-var METHOD_TYPES5 = /* @__PURE__ */ new Set(["method", "singleton_method"]);
 function namedChildrenOf(node) {
   return node.namedChildren.filter((child) => child !== null);
 }
-function enclosingMethod2(node) {
-  let current = node.parent;
-  while (current !== null) {
-    if (METHOD_TYPES5.has(current.type)) {
-      return current;
-    }
-    current = current.parent;
-  }
-  return null;
-}
 function indexFile(file, root, locations) {
   const walk = (node) => {
     locations.set(nodeId(file, node), { file, node });
@@ -7000,7 +7143,7 @@ function width(node) {
   return node.endIndex - node.startIndex;
 }
 function askedKey(value) {
-  const enclosing = enclosingMethod2(value.node);
+  const enclosing = enclosingMethod(value.node);
   return calleeKeyOf(value.file, value.node, enclosing) ?? readKey(value.file, value.node, enclosing);
 }
 var RubyWhySession = class {

package/dist/index.js

@@ -63,6 +63,17 @@ var OWN_BODY_TYPES = /* @__PURE__ */ new Set([
   "singleton_class"
 ]);
 var NESTING_TYPES = /* @__PURE__ */ new Set(["class", "module"]);
+var METHOD_TYPES = /* @__PURE__ */ new Set(["method", "singleton_method"]);
+function enclosingMethod(node) {
+  let current = node.parent;
+  while (current !== null) {
+    if (METHOD_TYPES.has(current.type)) {
+      return current;
+    }
+    current = current.parent;
+  }
+  return null;
+}
 var INCLUDE_CALL = "include";
 var PREPEND_CALL = "prepend";
 var ARGUMENT_LIST_TYPE = "argument_list";
@@ -390,8 +401,11 @@ var RUBY_PROGRAM = resolutionProgram(RUBY_RULES);
 function resolveValues(db, keys) {
   askResolution(db, keys, "wanted", RUBY_PROGRAM);
 }
+function resolveEnvSites(db, sites) {
+  askResolution(db, sites, "wantedEnvSite", RUBY_PROGRAM);
+}
 function resolvedFunctions(db, key) {
-  return db.facts("wantedResolves").filter((row) => String(row[0]) === key).map((row) => String(row[1]));
+  return db.lookup("wantedResolves", 0, key).map((row) => String(row[1]));
 }
 function writtenValueOf(db, key) {
   resolveValues(db, [key]);
@@ -1270,7 +1284,6 @@ function emitCandidates(emitter, key, group) {
     add(emitter, "writesAllStated", key);
   }
 }
-var METHOD_TYPES = /* @__PURE__ */ new Set(["method", "singleton_method"]);
 var INITIALIZE_METHOD = "initialize";
 function receiverKeyOf(filePath, method, classKey) {
   return method.type === "singleton_method" ? classKey : `${nodeId(filePath, method)}#self`;
@@ -1318,7 +1331,7 @@ function emitClassFacts(emitter, cls) {
           left.text,
           valueKey(emitter, right)
         );
-        emitExpressionFacts(emitter, statement);
+        emitExpressionFacts(within, statement);
       }
       continue;
     }
@@ -2399,7 +2412,6 @@ var evaluators = /* @__PURE__ */ new WeakMap();
 var contexts = /* @__PURE__ */ new WeakMap();
 var withoutFacts = /* @__PURE__ */ new WeakMap();
 var filesByTree = /* @__PURE__ */ new WeakMap();
-var METHOD_TYPES3 = /* @__PURE__ */ new Set(["method", "singleton_method"]);
 function bindEvaluator(db, nodes) {
   for (const entry of nodes.files) {
     filesByTree.set(entry.root.tree, entry.file);
@@ -2453,7 +2465,7 @@ function stringValueOf(node, db, bindings) {
 function methodDefinitionsIn(file, root) {
   const found = /* @__PURE__ */ new Map();
   const visit = (node) => {
-    if (METHOD_TYPES3.has(node.type)) {
+    if (METHOD_TYPES.has(node.type)) {
       found.set(nodeId(file, node), node);
     }
     for (const child of node.namedChildren) {
@@ -2478,16 +2490,6 @@ function evaluatorFor(node, db) {
   }
   return local;
 }
-function enclosingMethod(node) {
-  let current = node.parent;
-  while (current !== null) {
-    if (METHOD_TYPES3.has(current.type)) {
-      return current;
-    }
-    current = current.parent;
-  }
-  return null;
-}
 function contextOver(db, nodes) {
   const filesByRoot = /* @__PURE__ */ new Map();
   const rootsByFile = /* @__PURE__ */ new Map();
@@ -4035,19 +4037,155 @@ function returnBranch(range, effects) {
 import { runtimeConfigBinding } from "@suss/behavioral-ir";
 import { SKIP_CHILDREN as SKIP_CHILDREN2, walkDescendants as walkDescendants2 } from "@suss/extractor";
 var RUBY_ENV_RECOGNITION = "ruby-env";
+var ENV_DEFAULTED = "rbEnvDefaulted";
 var DEFERRED_BODY_TYPES = /* @__PURE__ */ new Set(["method", "singleton_method", "lambda"]);
-function envReadEffects(root) {
-  const effects = [];
+function envReadEffects(root, facts) {
+  const helpers = helperFactsOf(facts);
+  const slots = [];
   walkDescendants2(root, null, {
     at: (node) => {
       const read = envReadAt(node);
       if (read !== null) {
-        effects.push(configReadEffect(read));
+        slots.push({ read });
+        return;
+      }
+      if (helpers !== null && node.type === "call") {
+        slots.push({ call: node });
       }
     },
     into: (node) => DEFERRED_BODY_TYPES.has(node.type) ? SKIP_CHILDREN2 : null
   });
-  return effects;
+  const calls = slots.flatMap((slot) => "call" in slot ? [slot.call] : []);
+  const throughHelpers = helpers === null ? new NodeMap() : helperReads(calls, helpers);
+  return slots.flatMap((slot) => {
+    if ("read" in slot) {
+      return [configReadEffect(slot.read)];
+    }
+    return (throughHelpers.get(slot.call) ?? []).map(configReadEffect);
+  });
+}
+function helperFactsOf(facts) {
+  if (facts === void 0) {
+    return null;
+  }
+  const named2 = namedParameters(facts.db);
+  if (named2.size === 0) {
+    return null;
+  }
+  return { ...facts, named: named2 };
+}
+var namedByDb = /* @__PURE__ */ new WeakMap();
+function namedParameters(db) {
+  const memo = namedByDb.get(db);
+  if (memo !== void 0) {
+    return memo;
+  }
+  const named2 = /* @__PURE__ */ new Map();
+  namedByDb.set(db, named2);
+  const sites = db.facts("readsEnvNamed").map((row) => String(row[0]));
+  if (sites.length === 0) {
+    return named2;
+  }
+  resolveEnvSites(db, sites);
+  for (const row of db.facts("wantedParamNamesEnv")) {
+    const found = named2.get(String(row[0]));
+    if (found === void 0) {
+      named2.set(String(row[0]), [String(row[1])]);
+      continue;
+    }
+    found.push(String(row[1]));
+  }
+  return named2;
+}
+function emitEnvNameFacts(db, file, root) {
+  for (const site of envNameSites(root)) {
+    const key = nodeId(file, site.read);
+    db.add("readsEnvNamed", [
+      key,
+      readKey(file, site.name, enclosingMethod(site.name))
+    ]);
+    if (site.defaulted) {
+      db.add(ENV_DEFAULTED, [key]);
+    }
+  }
+}
+function envNameSites(root) {
+  const sites = [];
+  walkDescendants2(root, null, {
+    at: (node) => {
+      const site = envSiteAt(node);
+      if (site !== null && stringLiteralValue(site.name) === null) {
+        sites.push(site);
+      }
+    },
+    into: () => null
+  });
+  return sites;
+}
+function helperReads(calls, facts) {
+  const { db, file, named: named2 } = facts;
+  const callees = new NodeMap();
+  for (const call of calls) {
+    const key = calleeKeyOf(file, call, enclosingMethod(call));
+    if (key !== null) {
+      callees.set(call, key);
+    }
+  }
+  const reads = new NodeMap();
+  if (callees.size === 0) {
+    return reads;
+  }
+  resolveValues(
+    db,
+    [...callees].map(([, callee]) => callee)
+  );
+  for (const [call, callee] of callees) {
+    const args = namingArguments(db, named2, call, callee);
+    if (args.length === 0) {
+      continue;
+    }
+    const found = readsAtCall(db, call, args);
+    if (found.length > 0) {
+      reads.set(call, found);
+    }
+  }
+  return reads;
+}
+function namingArguments(db, named2, call, callee) {
+  const { positional, keyword } = readCallArgs(field(call, "arguments"));
+  const found = [];
+  for (const func of resolvedFunctions(db, callee)) {
+    for (const row of db.lookup("paramOf", 0, func)) {
+      const sites = named2.get(String(row[2]));
+      const argument = positional[Number(row[1])];
+      if (sites !== void 0 && argument !== void 0) {
+        found.push({ sites, argument });
+      }
+    }
+    for (const row of db.lookup("paramNamed", 0, func)) {
+      const sites = named2.get(String(row[2]));
+      const argument = keyword[String(row[1])];
+      if (sites !== void 0 && argument !== void 0) {
+        found.push({ sites, argument });
+      }
+    }
+  }
+  return found;
+}
+function readsAtCall(db, call, args) {
+  const defaultedAtCall = isDefaultedAt(call);
+  const byName = /* @__PURE__ */ new Map();
+  for (const { sites, argument } of args) {
+    const name = stringLiteralValue(argument) ?? stringValueOf(argument, db);
+    if (name === null) {
+      continue;
+    }
+    for (const site of sites) {
+      const defaulted = defaultedAtCall || db.lookup(ENV_DEFAULTED, 0, site).length > 0;
+      byName.set(name, (byName.get(name) ?? true) && defaulted);
+    }
+  }
+  return [...byName].map(([name, defaulted]) => ({ name, defaulted }));
 }
 function configReadEffect(read) {
   return {
@@ -4066,15 +4204,23 @@ function configReadEffect(read) {
   };
 }
 function envReadAt(node) {
+  const site = envSiteAt(node);
+  if (site === null) {
+    return null;
+  }
+  const name = stringLiteralValue(site.name);
+  return name === null ? null : { name, defaulted: site.defaulted };
+}
+function envSiteAt(node) {
   if (node.type === "element_reference") {
-    return elementRead(node);
+    return elementSite(node);
   }
   if (node.type === "call") {
-    return fetchRead(node);
+    return fetchSite(node);
   }
   return null;
 }
-function elementRead(node) {
+function elementSite(node) {
   const object = field(node, "object");
   if (object === null || !isEnv(object) || isAssignedTo(node)) {
     return null;
@@ -4082,24 +4228,23 @@ function elementRead(node) {
   const index = node.namedChildren.find(
     (child) => child !== null && child.id !== object.id
   );
-  const name = index === void 0 ? null : stringLiteralValue(index);
-  if (name === null) {
+  if (index === void 0) {
     return null;
   }
-  return { name, defaulted: isDefaultedAt(node) };
+  return { read: node, name: index, defaulted: isDefaultedAt(node) };
 }
-function fetchRead(node) {
+function fetchSite(node) {
   const receiver = field(node, "receiver");
   if (receiver === null || !isEnv(receiver) || field(node, "method")?.text !== "fetch") {
     return null;
   }
   const { positional } = readCallArgs(field(node, "arguments"));
-  const name = positional[0] === void 0 ? null : stringLiteralValue(positional[0]);
-  if (name === null) {
+  const name = positional[0];
+  if (name === void 0) {
     return null;
   }
   const hasDefault = positional.length > 1 || field(node, "block") !== null;
-  return { name, defaulted: hasDefault || isDefaultedAt(node) };
+  return { read: node, name, defaulted: hasDefault || isDefaultedAt(node) };
 }
 function isEnv(node) {
   if (node.type === "constant") {
@@ -5082,8 +5227,12 @@ function bodyOfMethod(method, file, bodyRead = {}) {
     bodyRead.facts
   );
   const storage = bodyRead.storage;
+  const facts = bodyRead.facts;
   const extra = [
-    ...envReadEffects(method),
+    ...envReadEffects(
+      method,
+      facts === void 0 ? void 0 : { db: facts, file }
+    ),
     ...storage === void 0 ? [] : storageEffects(callsUnder2(method), file, storage, method)
   ];
   return {
@@ -6489,7 +6638,7 @@ function parameterName(param) {
 }
 
 // src/reach/context.ts
-var METHOD_TYPES4 = /* @__PURE__ */ new Set(["method", "singleton_method"]);
+var METHOD_TYPES3 = /* @__PURE__ */ new Set(["method", "singleton_method"]);
 async function buildReachContext(files, facts, bodyBlocks = NO_BODY_BLOCKS, dynamicNames = /* @__PURE__ */ new Map()) {
   const blocksByQualifiedName = /* @__PURE__ */ new Map();
   const classes = [];
@@ -6500,7 +6649,7 @@ async function buildReachContext(files, facts, bodyBlocks = NO_BODY_BLOCKS, dyna
       classes.push({ file, info });
       classNames.set(nodeId(file, info.node), info.qualifiedName);
       for (const statement of namedChildren(info.bodyNode)) {
-        if (METHOD_TYPES4.has(statement.type)) {
+        if (METHOD_TYPES3.has(statement.type)) {
           classOfMethod.set(nodeId(file, statement), info.qualifiedName);
         }
       }
@@ -6634,6 +6783,7 @@ function factsForFile(options) {
   const db = new Database2();
   const bodyBlocks = bodyBlocksIn(options.packs);
   emitValueFacts(db, options.file, options.root, bodyBlocks);
+  emitEnvNameFacts(db, options.file, options.root);
   emitConstantBindings(db, [
     collectFileConstants(
       options.file,
@@ -6705,6 +6855,7 @@ async function extractRubyProject(options) {
       }
       parsed.push({ file, root });
       emitValueFacts(db, file, root, bodyBlocks);
+      emitEnvNameFacts(db, file, root);
       for (const [key, method] of methodDefinitionsIn(file, root)) {
         definitions.set(key, method);
       }
@@ -6782,7 +6933,10 @@ async function extractRubyProject(options) {
         });
       }
     }
-    const loadTimeReads = timer.time("discover", () => envReadEffects(root));
+    const loadTimeReads = timer.time(
+      "discover",
+      () => envReadEffects(root, { db, file })
+    );
     if (loadTimeReads.length > 0) {
       const summary = timer.time(
         "summarize",
@@ -6945,20 +7099,9 @@ function findRubyFiles(root) {
 
 // src/facts/why.ts
 var WITNESS_RULES = [...RESOLUTION_RULES, ...RUBY_RULES];
-var METHOD_TYPES5 = /* @__PURE__ */ new Set(["method", "singleton_method"]);
 function namedChildrenOf(node) {
   return node.namedChildren.filter((child) => child !== null);
 }
-function enclosingMethod2(node) {
-  let current = node.parent;
-  while (current !== null) {
-    if (METHOD_TYPES5.has(current.type)) {
-      return current;
-    }
-    current = current.parent;
-  }
-  return null;
-}
 function indexFile(file, root, locations) {
   const walk = (node) => {
     locations.set(nodeId(file, node), { file, node });
@@ -6994,7 +7137,7 @@ function width(node) {
   return node.endIndex - node.startIndex;
 }
 function askedKey(value) {
-  const enclosing = enclosingMethod2(value.node);
+  const enclosing = enclosingMethod(value.node);
   return calleeKeyOf(value.file, value.node, enclosing) ?? readKey(value.file, value.node, enclosing);
 }
 var RubyWhySession = class {

package/package.json

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