@suss/adapter-ruby 0.5.3 → 0.5.4

package/dist/index.cjs

@@ -335,7 +335,7 @@ async function mixinChain(self, callName, lookup, active, present) {
   return chain;
 }
 async function chainFor(qualifiedName, lookup, active) {
-  const blocks = await reachDefinition(qualifiedName, lookup);
+  const blocks = lookup.localDefinition?.(qualifiedName) ?? await reachDefinition(qualifiedName, lookup);
   if (blocks === null) {
     return [{ type: "unfollowed", name: qualifiedName }];
   }
@@ -16003,7 +16003,7 @@ function createFileCache(parse3, readFile) {
     }
   };
 }
-function fieldReadContext(pattern, cache, storage) {
+function fieldReadContext(pattern, cache, fileBlocks, storage) {
   return {
     pattern,
     cache,
@@ -16012,10 +16012,17 @@ function fieldReadContext(pattern, cache, storage) {
       root: pattern.root,
       pathConvention: pattern.pathConvention,
       ancestryRootClassNames: pattern.ancestryRootClassNames,
-      parsedFile: (absPath) => cache.get(absPath)
+      parsedFile: (absPath) => cache.get(absPath),
+      localDefinition: (name) => sameFileBlocks(name, fileBlocks)
     }
   };
 }
+function sameFileBlocks(name, fileBlocks) {
+  const matches = fileBlocks.filter(
+    (block) => block.info.qualifiedName === name
+  );
+  return matches.length === 0 ? null : matches;
+}
 function typeContext(scope, pattern) {
   return {
     nesting: scope.nesting,
@@ -16027,39 +16034,65 @@ function typeContext(scope, pattern) {
 }
 async function discoverUnits(root, options) {
   const classes = [];
-  walkClasses(root, (info) => classes.push(info));
+  walkDefinitions(root, (info) => classes.push(info));
   const knownClasses = new Set(classes.map((info) => info.qualifiedName));
+  const fileBlocks = classes.map((info) => ({
+    info,
+    knownClasses
+  }));
   const units = [];
   for (const info of classes) {
-    const ownBlocks = classes.filter((other) => other.qualifiedName === info.qualifiedName).map((other) => ({ info: other, knownClasses }));
+    const ownBlocks = fileBlocks.filter(
+      (block) => block.info.qualifiedName === info.qualifiedName
+    );
     for (const pack of options.packs) {
       for (const pattern of pack.discovery) {
         units.push(
-          ...await unitsFor(pattern, pack, info, ownBlocks, options)
+          ...await unitsFor(
+            pattern,
+            pack,
+            info,
+            ownBlocks,
+            fileBlocks,
+            options
+          )
         );
       }
     }
   }
   return units;
 }
-function unitsFor(pattern, pack, info, ownBlocks, options) {
+function reachesConfiguredBase(ancestry, self, pattern) {
+  return ancestry.some(
+    (entry) => entry.name !== self && pattern.baseClassNames.includes(entry.name)
+  );
+}
+function unitsFor(pattern, pack, info, ownBlocks, fileBlocks, options) {
   const table = {
-    graphqlObjectFields: (p) => graphqlObjectFieldUnits(p, pack, info, ownBlocks, options)
+    graphqlObjectFields: (p) => graphqlObjectFieldUnits(p, pack, info, ownBlocks, fileBlocks, options)
   };
   return (0, import_behavioral_ir.dispatchByType)(table, pattern);
 }
-async function graphqlObjectFieldUnits(pattern, pack, info, ownBlocks, options) {
-  if (info.superclassQualifiedName === null || !pattern.baseClassNames.includes(info.superclassQualifiedName) || info.bodyNode === null) {
+async function graphqlObjectFieldUnits(pattern, pack, info, ownBlocks, fileBlocks, options) {
+  if (info.bodyNode === null || pattern.baseClassNames.includes(info.qualifiedName)) {
+    return [];
+  }
+  const ctx = fieldReadContext(
+    pattern,
+    options.cache,
+    fileBlocks,
+    options.storage
+  );
+  const ancestry = await ancestryOf(info.qualifiedName, ownBlocks, ctx.lookup);
+  if (!reachesConfiguredBase(ancestry, info.qualifiedName, pattern)) {
     return [];
   }
   const typeName = graphqlTypeNameFromQualified(
     info.qualifiedName,
     pattern.typeNameConvention
   );
-  const ctx = fieldReadContext(pattern, options.cache, options.storage);
   const knownClasses = ownBlocks[0]?.knownClasses ?? /* @__PURE__ */ new Set();
   const scope = { nesting: info.bodyNesting, knownClasses };
-  const ancestry = await ancestryOf(info.qualifiedName, ownBlocks, ctx.lookup);
   const declsByName = /* @__PURE__ */ new Map();
   for (const stmt of bodyStatements(info.bodyNode)) {
     const decl = await readFieldCall(stmt, scope, ctx, ancestry);

package/dist/index.d.cts

@@ -101,6 +101,12 @@ interface AncestorLookup {
      */
     ancestryRootClassNames: readonly string[];
     parsedFile(absPath: string): Promise<Node | null>;
+    /**
+     * The blocks the file being read defines under a name, consulted
+     * before the path convention, since a constant defined in the same
+     * file is visible without a file of its own.
+     */
+    localDefinition?(qualifiedName: string): ReachedBody[] | null;
 }
 /**
  * Every block a file defines under `qualifiedName`, or null when the
@@ -164,10 +170,10 @@ interface RbStoragePattern {
     storageSystem: "postgres" | "mysql" | "sqlite";
 }
 type RubyDiscoveryPattern = GraphqlObjectFields;
-/** A class whose `< ...` superclass is one of `baseClassNames` declares GraphQL fields through DSL calls in its own body. */
+/** A class or module whose ancestry reaches one of `baseClassNames` declares GraphQL fields through DSL calls in its own body. */
 interface GraphqlObjectFields {
     type: "graphqlObjectFields";
-    /** The base class the library itself generates. A project's own intermediate base class is added through pack config. */
+    /** The base classes the library itself generates. The walk crosses a project's own intermediate bases on its own, so config only has to add a base with another name. */
     baseClassNames: string[];
     /** 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;

package/dist/index.d.ts

@@ -101,6 +101,12 @@ interface AncestorLookup {
      */
     ancestryRootClassNames: readonly string[];
     parsedFile(absPath: string): Promise<Node | null>;
+    /**
+     * The blocks the file being read defines under a name, consulted
+     * before the path convention, since a constant defined in the same
+     * file is visible without a file of its own.
+     */
+    localDefinition?(qualifiedName: string): ReachedBody[] | null;
 }
 /**
  * Every block a file defines under `qualifiedName`, or null when the
@@ -164,10 +170,10 @@ interface RbStoragePattern {
     storageSystem: "postgres" | "mysql" | "sqlite";
 }
 type RubyDiscoveryPattern = GraphqlObjectFields;
-/** A class whose `< ...` superclass is one of `baseClassNames` declares GraphQL fields through DSL calls in its own body. */
+/** A class or module whose ancestry reaches one of `baseClassNames` declares GraphQL fields through DSL calls in its own body. */
 interface GraphqlObjectFields {
     type: "graphqlObjectFields";
-    /** The base class the library itself generates. A project's own intermediate base class is added through pack config. */
+    /** The base classes the library itself generates. The walk crosses a project's own intermediate bases on its own, so config only has to add a base with another name. */
     baseClassNames: string[];
     /** 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;

package/dist/index.js

@@ -284,7 +284,7 @@ async function mixinChain(self, callName, lookup, active, present) {
   return chain;
 }
 async function chainFor(qualifiedName, lookup, active) {
-  const blocks = await reachDefinition(qualifiedName, lookup);
+  const blocks = lookup.localDefinition?.(qualifiedName) ?? await reachDefinition(qualifiedName, lookup);
   if (blocks === null) {
     return [{ type: "unfollowed", name: qualifiedName }];
   }
@@ -15952,7 +15952,7 @@ function createFileCache(parse3, readFile) {
     }
   };
 }
-function fieldReadContext(pattern, cache, storage) {
+function fieldReadContext(pattern, cache, fileBlocks, storage) {
   return {
     pattern,
     cache,
@@ -15961,10 +15961,17 @@ function fieldReadContext(pattern, cache, storage) {
       root: pattern.root,
       pathConvention: pattern.pathConvention,
       ancestryRootClassNames: pattern.ancestryRootClassNames,
-      parsedFile: (absPath) => cache.get(absPath)
+      parsedFile: (absPath) => cache.get(absPath),
+      localDefinition: (name) => sameFileBlocks(name, fileBlocks)
     }
   };
 }
+function sameFileBlocks(name, fileBlocks) {
+  const matches = fileBlocks.filter(
+    (block) => block.info.qualifiedName === name
+  );
+  return matches.length === 0 ? null : matches;
+}
 function typeContext(scope, pattern) {
   return {
     nesting: scope.nesting,
@@ -15976,39 +15983,65 @@ function typeContext(scope, pattern) {
 }
 async function discoverUnits(root, options) {
   const classes = [];
-  walkClasses(root, (info) => classes.push(info));
+  walkDefinitions(root, (info) => classes.push(info));
   const knownClasses = new Set(classes.map((info) => info.qualifiedName));
+  const fileBlocks = classes.map((info) => ({
+    info,
+    knownClasses
+  }));
   const units = [];
   for (const info of classes) {
-    const ownBlocks = classes.filter((other) => other.qualifiedName === info.qualifiedName).map((other) => ({ info: other, knownClasses }));
+    const ownBlocks = fileBlocks.filter(
+      (block) => block.info.qualifiedName === info.qualifiedName
+    );
     for (const pack of options.packs) {
       for (const pattern of pack.discovery) {
         units.push(
-          ...await unitsFor(pattern, pack, info, ownBlocks, options)
+          ...await unitsFor(
+            pattern,
+            pack,
+            info,
+            ownBlocks,
+            fileBlocks,
+            options
+          )
         );
       }
     }
   }
   return units;
 }
-function unitsFor(pattern, pack, info, ownBlocks, options) {
+function reachesConfiguredBase(ancestry, self, pattern) {
+  return ancestry.some(
+    (entry) => entry.name !== self && pattern.baseClassNames.includes(entry.name)
+  );
+}
+function unitsFor(pattern, pack, info, ownBlocks, fileBlocks, options) {
   const table = {
-    graphqlObjectFields: (p) => graphqlObjectFieldUnits(p, pack, info, ownBlocks, options)
+    graphqlObjectFields: (p) => graphqlObjectFieldUnits(p, pack, info, ownBlocks, fileBlocks, options)
   };
   return dispatchByType(table, pattern);
 }
-async function graphqlObjectFieldUnits(pattern, pack, info, ownBlocks, options) {
-  if (info.superclassQualifiedName === null || !pattern.baseClassNames.includes(info.superclassQualifiedName) || info.bodyNode === null) {
+async function graphqlObjectFieldUnits(pattern, pack, info, ownBlocks, fileBlocks, options) {
+  if (info.bodyNode === null || pattern.baseClassNames.includes(info.qualifiedName)) {
+    return [];
+  }
+  const ctx = fieldReadContext(
+    pattern,
+    options.cache,
+    fileBlocks,
+    options.storage
+  );
+  const ancestry = await ancestryOf(info.qualifiedName, ownBlocks, ctx.lookup);
+  if (!reachesConfiguredBase(ancestry, info.qualifiedName, pattern)) {
     return [];
   }
   const typeName = graphqlTypeNameFromQualified(
     info.qualifiedName,
     pattern.typeNameConvention
   );
-  const ctx = fieldReadContext(pattern, options.cache, options.storage);
   const knownClasses = ownBlocks[0]?.knownClasses ?? /* @__PURE__ */ new Set();
   const scope = { nesting: info.bodyNesting, knownClasses };
-  const ancestry = await ancestryOf(info.qualifiedName, ownBlocks, ctx.lookup);
   const declsByName = /* @__PURE__ */ new Map();
   for (const stmt of bodyStatements(info.bodyNode)) {
     const decl = await readFieldCall(stmt, scope, ctx, ancestry);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-ruby",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "type": "module",
   "description": "Ruby language adapter for suss, parsing source with tree-sitter (WASM), resolving constant nesting with a lexical binder, and emitting raw extractions for the suss pipeline.",
   "keywords": [
@@ -47,9 +47,9 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.5.3",
-    "@suss/datalog": "0.5.3",
-    "@suss/extractor": "0.5.3",
+    "@suss/behavioral-ir": "0.5.4",
+    "@suss/datalog": "0.5.4",
+    "@suss/extractor": "0.5.4",
     "web-tree-sitter": "^0.26.11"
   },
   "devDependencies": {