@suss/resolution 0.29.0 → 0.30.0

package/dist/index.cjs

@@ -1430,6 +1430,28 @@ var RESOLUTION_RULES = [
       (0, import_datalog4.lit)("contains", (0, import_datalog4.variable)("baseCls"), (0, import_datalog4.variable)("n"), (0, import_datalog4.variable)("held"))
     ]
   ),
+  // An association is read off an instance as a property, and stating
+  // it as `contains` is what puts it on the ancestry rule, so a concern
+  // or a base class can be the one that declares it.
+  (0, import_datalog4.rule)(
+    "contains",
+    [(0, import_datalog4.variable)("cls"), (0, import_datalog4.variable)("n"), (0, import_datalog4.variable)("t")],
+    [(0, import_datalog4.lit)("declaresAssociation", (0, import_datalog4.variable)("cls"), (0, import_datalog4.variable)("n"), (0, import_datalog4.variable)("t"))],
+    "declared association"
+  ),
+  // The same, for a language that buries the declaration in an ordinary
+  // assignment. Keying on the module the callable came from is what
+  // keeps a project function spelled the same way out.
+  (0, import_datalog4.rule)(
+    "contains",
+    [(0, import_datalog4.variable)("cls"), (0, import_datalog4.variable)("n"), (0, import_datalog4.variable)("t")],
+    [
+      (0, import_datalog4.lit)("fieldCall", (0, import_datalog4.variable)("cls"), (0, import_datalog4.variable)("n"), (0, import_datalog4.variable)("c"), (0, import_datalog4.variable)("t")),
+      (0, import_datalog4.lit)("comesFrom", (0, import_datalog4.variable)("c"), (0, import_datalog4.variable)("m"), (0, import_datalog4.variable)("name")),
+      (0, import_datalog4.lit)("associationConstructor", (0, import_datalog4.variable)("m"), (0, import_datalog4.variable)("name"))
+    ],
+    "constructed association"
+  ),
   // The library base a class's ancestry arrives at, however many of a
   // project's own classes sit in between. A base the run declares has a
   // node to keep walking from; one it does not has only a name.
@@ -1815,6 +1837,14 @@ var RESOLUTION_QUESTIONS = [
       (0, import_datalog4.lit)("holdsProperty", (0, import_datalog4.variable)("b"), (0, import_datalog4.variable)("n"), (0, import_datalog4.variable)("held"))
     ]
   ),
+  // A method the class gets under a name the source computes rather than
+  // writes out. The adapter settles the name against the same facts and
+  // says so, and the chain reports it beside the ones written out.
+  (0, import_datalog4.rule)(
+    "wantedDeclaredName",
+    [(0, import_datalog4.variable)("c"), (0, import_datalog4.variable)("n")],
+    [(0, import_datalog4.lit)("ancestryChain", (0, import_datalog4.variable)("c"), (0, import_datalog4.variable)("b")), (0, import_datalog4.lit)("declaresName", (0, import_datalog4.variable)("b"), (0, import_datalog4.variable)("n"))]
+  ),
   (0, import_datalog4.rule)("anchorChain", [(0, import_datalog4.variable)("x"), (0, import_datalog4.variable)("x")], [(0, import_datalog4.lit)("wantedAnchor", (0, import_datalog4.variable)("x"))]),
   (0, import_datalog4.rule)(
     "anchorChain",

package/dist/index.js

@@ -1375,6 +1375,28 @@ var RESOLUTION_RULES = [
       lit("contains", v("baseCls"), v("n"), v("held"))
     ]
   ),
+  // An association is read off an instance as a property, and stating
+  // it as `contains` is what puts it on the ancestry rule, so a concern
+  // or a base class can be the one that declares it.
+  rule(
+    "contains",
+    [v("cls"), v("n"), v("t")],
+    [lit("declaresAssociation", v("cls"), v("n"), v("t"))],
+    "declared association"
+  ),
+  // The same, for a language that buries the declaration in an ordinary
+  // assignment. Keying on the module the callable came from is what
+  // keeps a project function spelled the same way out.
+  rule(
+    "contains",
+    [v("cls"), v("n"), v("t")],
+    [
+      lit("fieldCall", v("cls"), v("n"), v("c"), v("t")),
+      lit("comesFrom", v("c"), v("m"), v("name")),
+      lit("associationConstructor", v("m"), v("name"))
+    ],
+    "constructed association"
+  ),
   // The library base a class's ancestry arrives at, however many of a
   // project's own classes sit in between. A base the run declares has a
   // node to keep walking from; one it does not has only a name.
@@ -1760,6 +1782,14 @@ var RESOLUTION_QUESTIONS = [
       lit("holdsProperty", v("b"), v("n"), v("held"))
     ]
   ),
+  // A method the class gets under a name the source computes rather than
+  // writes out. The adapter settles the name against the same facts and
+  // says so, and the chain reports it beside the ones written out.
+  rule(
+    "wantedDeclaredName",
+    [v("c"), v("n")],
+    [lit("ancestryChain", v("c"), v("b")), lit("declaresName", v("b"), v("n"))]
+  ),
   rule("anchorChain", [v("x"), v("x")], [lit("wantedAnchor", v("x"))]),
   rule(
     "anchorChain",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/resolution",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "type": "module",
   "description": "The rules suss uses to follow a name in TypeScript, Python or Ruby to the function it comes down to.",
   "keywords": [
@@ -56,6 +56,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@suss/datalog": "0.29.0"
+    "@suss/datalog": "0.30.0"
   }
 }