@suss/adapter-ruby 0.24.1 → 0.24.2

package/dist/index.cjs

@@ -2944,7 +2944,7 @@ function clientCallUnits(root, pack, pattern, options) {
       continue;
     }
     for (const call of callsUnder(method)) {
-      const request = requestCall(call, method, pattern, options);
+      const request = requestCall(call, method, root, pattern, options);
       if (request === null) {
         continue;
       }
@@ -2977,13 +2977,13 @@ function callsUnder(node, found = []) {
   }
   return found;
 }
-function requestCall(call, method, pattern, options) {
+function requestCall(call, method, root, pattern, options) {
   const receiver = field(call, "receiver");
   const called = field(call, "method")?.text;
   if (receiver === null || called === void 0) {
     return null;
   }
-  const prefix = receiverPrefix(receiver, method, pattern, options);
+  const prefix = receiverPrefix(receiver, method, root, pattern, options);
   if (prefix === null) {
     return null;
   }
@@ -3024,22 +3024,20 @@ function assignedCall(node, method) {
   const value = assignedValue(node.text, method);
   return value !== null && value.type === "call" ? value : null;
 }
-function receiverPrefix(receiver, method, pattern, options) {
+function receiverPrefix(receiver, method, root, pattern, options) {
   if (namesConstant(receiver, pattern.constantName)) {
     return "";
   }
   if (receiver.type !== "identifier") {
     return null;
   }
-  const built = builtBy(receiver.text, method, pattern);
+  const built = builtBy(receiver.text, method, root, pattern);
   if (built === null) {
     return null;
   }
+  const args = readCallArgs(field(built, "arguments"));
   const keyword = pattern.builderUrlKeyword;
-  if (keyword === void 0) {
-    return "";
-  }
-  const base = readCallArgs(field(built, "arguments")).keyword[keyword];
+  const base = (keyword === void 0 ? void 0 : args.keyword[keyword]) ?? args.positional[0];
   const path7 = base === void 0 ? null : (0, import_values5.pathOf)(evaluatedValue(base, options.facts));
   return path7 === void 0 || path7 === null ? "" : trimmed(path7);
 }
@@ -3049,15 +3047,36 @@ function trimmed(path7) {
 function namesConstant(receiver, constantName) {
   return (receiver.type === "constant" || receiver.type === "scope_resolution") && receiver.text === constantName;
 }
-function builtBy(name, method, pattern) {
+function builtBy(name, method, root, pattern) {
   const builders = pattern.receiverBuilders ?? [];
-  const value = builders.length === 0 ? null : assignedValue(name, method);
+  if (builders.length === 0) {
+    return null;
+  }
+  const value = assignedValue(name, method) ?? valueMethodNamedReturns(name, root);
   if (value === null || value.type !== "call" || !builders.includes(field(value, "method")?.text ?? "")) {
     return null;
   }
   const receiver = field(value, "receiver");
   return receiver !== null && namesConstant(receiver, pattern.constantName) ? value : null;
 }
+function valueMethodNamedReturns(name, root) {
+  const defined = methodDefinitions(root).find(
+    (candidate) => field(candidate, "name")?.text === name
+  );
+  if (defined === void 0) {
+    return null;
+  }
+  const body = field(defined, "body");
+  const statements = body === null ? [] : body.namedChildren;
+  const last = statements[statements.length - 1];
+  if (last === void 0) {
+    return null;
+  }
+  if (last.type === "operator_assignment" || last.type === "assignment") {
+    return field(last, "right");
+  }
+  return last.type === "return" ? last.namedChildren[0] ?? null : last;
+}
 function assignedValue(name, method) {
   const body = field(method, "body");
   if (body === null) {

package/dist/index.js

@@ -2906,7 +2906,7 @@ function clientCallUnits(root, pack, pattern, options) {
       continue;
     }
     for (const call of callsUnder(method)) {
-      const request = requestCall(call, method, pattern, options);
+      const request = requestCall(call, method, root, pattern, options);
       if (request === null) {
         continue;
       }
@@ -2939,13 +2939,13 @@ function callsUnder(node, found = []) {
   }
   return found;
 }
-function requestCall(call, method, pattern, options) {
+function requestCall(call, method, root, pattern, options) {
   const receiver = field(call, "receiver");
   const called = field(call, "method")?.text;
   if (receiver === null || called === void 0) {
     return null;
   }
-  const prefix = receiverPrefix(receiver, method, pattern, options);
+  const prefix = receiverPrefix(receiver, method, root, pattern, options);
   if (prefix === null) {
     return null;
   }
@@ -2986,22 +2986,20 @@ function assignedCall(node, method) {
   const value = assignedValue(node.text, method);
   return value !== null && value.type === "call" ? value : null;
 }
-function receiverPrefix(receiver, method, pattern, options) {
+function receiverPrefix(receiver, method, root, pattern, options) {
   if (namesConstant(receiver, pattern.constantName)) {
     return "";
   }
   if (receiver.type !== "identifier") {
     return null;
   }
-  const built = builtBy(receiver.text, method, pattern);
+  const built = builtBy(receiver.text, method, root, pattern);
   if (built === null) {
     return null;
   }
+  const args = readCallArgs(field(built, "arguments"));
   const keyword = pattern.builderUrlKeyword;
-  if (keyword === void 0) {
-    return "";
-  }
-  const base = readCallArgs(field(built, "arguments")).keyword[keyword];
+  const base = (keyword === void 0 ? void 0 : args.keyword[keyword]) ?? args.positional[0];
   const path7 = base === void 0 ? null : pathOf(evaluatedValue(base, options.facts));
   return path7 === void 0 || path7 === null ? "" : trimmed(path7);
 }
@@ -3011,15 +3009,36 @@ function trimmed(path7) {
 function namesConstant(receiver, constantName) {
   return (receiver.type === "constant" || receiver.type === "scope_resolution") && receiver.text === constantName;
 }
-function builtBy(name, method, pattern) {
+function builtBy(name, method, root, pattern) {
   const builders = pattern.receiverBuilders ?? [];
-  const value = builders.length === 0 ? null : assignedValue(name, method);
+  if (builders.length === 0) {
+    return null;
+  }
+  const value = assignedValue(name, method) ?? valueMethodNamedReturns(name, root);
   if (value === null || value.type !== "call" || !builders.includes(field(value, "method")?.text ?? "")) {
     return null;
   }
   const receiver = field(value, "receiver");
   return receiver !== null && namesConstant(receiver, pattern.constantName) ? value : null;
 }
+function valueMethodNamedReturns(name, root) {
+  const defined = methodDefinitions(root).find(
+    (candidate) => field(candidate, "name")?.text === name
+  );
+  if (defined === void 0) {
+    return null;
+  }
+  const body = field(defined, "body");
+  const statements = body === null ? [] : body.namedChildren;
+  const last = statements[statements.length - 1];
+  if (last === void 0) {
+    return null;
+  }
+  if (last.type === "operator_assignment" || last.type === "assignment") {
+    return field(last, "right");
+  }
+  return last.type === "return" ? last.namedChildren[0] ?? null : last;
+}
 function assignedValue(name, method) {
   const body = field(method, "body");
   if (body === null) {

package/package.json

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