@suss/datalog 0.18.0 → 0.20.0

package/dist/index.cjs

@@ -665,38 +665,46 @@ function stratify(rules) {
   }
   return strata.filter((s) => s.length > 0);
 }
+function boundValue(bindings, name) {
+  for (let b = bindings; b !== null; b = b.parent) {
+    if (b.name === name) {
+      return b.value;
+    }
+  }
+  return void 0;
+}
+var NO_MATCH = /* @__PURE__ */ Symbol("no-match");
 function unify(literal, tuple, bindings) {
   if (literal.terms.length !== tuple.length) {
-    return null;
+    return NO_MATCH;
   }
-  let next = null;
+  let next = bindings;
   for (let i = 0; i < literal.terms.length; i++) {
     const term = literal.terms[i];
     const value = tuple[i];
     if (term.type === "constant") {
       if (term.value !== value) {
-        return null;
+        return NO_MATCH;
       }
       continue;
     }
-    const bound = (next ?? bindings).get(term.name);
+    const bound = boundValue(next, term.name);
     if (bound === void 0) {
-      next = next ?? new Map(bindings);
-      next.set(term.name, value);
+      next = { name: term.name, value, parent: next };
       continue;
     }
     if (bound !== value) {
-      return null;
+      return NO_MATCH;
     }
   }
-  return next ?? bindings;
+  return next;
 }
 function groundNegated(literal, bindings) {
   return literal.terms.map((term) => {
     if (term.type === "constant") {
       return term.value;
     }
-    const bound = bindings.get(term.name);
+    const bound = boundValue(bindings, term.name);
     if (bound === void 0) {
       throw new Error(
         `unbound variable "${term.name}" in negated literal "${literal.relation}": negated literals may only use variables bound by earlier positive literals`
@@ -710,7 +718,7 @@ function headTuple(head, bindings) {
     if (term.type === "constant") {
       return term.value;
     }
-    const bound = bindings.get(term.name);
+    const bound = boundValue(bindings, term.name);
     if (bound === void 0) {
       throw new Error(
         `unbound variable "${term.name}" in head of "${head.relation}"`
@@ -736,23 +744,31 @@ function evaluateRule(db, deltas, r, deltaIndex) {
     const source = positiveIndex === deltaIndex ? deltas.get(literal.relation) ?? [] : boundSource(db, literal, bindings);
     for (const tuple of source) {
       const next = unify(literal, tuple, bindings);
-      if (next !== null) {
+      if (next !== NO_MATCH) {
         step(literalIndex + 1, positiveIndex + 1, next);
       }
     }
   };
-  step(0, 0, /* @__PURE__ */ new Map());
+  step(0, 0, null);
   return results;
 }
 function boundSource(db, literal, bindings) {
+  let narrowest = null;
   for (let column = 0; column < literal.terms.length; column++) {
     const term = literal.terms[column];
-    const value = term.type === "constant" ? term.value : bindings.get(term.name);
-    if (value !== void 0) {
-      return db.lookup(literal.relation, column, value);
+    const value = term.type === "constant" ? term.value : boundValue(bindings, term.name);
+    if (value === void 0) {
+      continue;
+    }
+    const bucket = db.lookup(literal.relation, column, value);
+    if (bucket.length === 0) {
+      return bucket;
+    }
+    if (narrowest === null || bucket.length < narrowest.length) {
+      narrowest = bucket;
     }
   }
-  return db.facts(literal.relation);
+  return narrowest ?? db.facts(literal.relation);
 }
 var EMPTY_TAGS = [];
 function evaluateRuleTagged(db, deltas, r, deltaIndex, algebra) {
@@ -794,7 +810,7 @@ function evaluateRuleTagged(db, deltas, r, deltaIndex, algebra) {
     const source = positiveIndex === deltaIndex ? deltas.get(literal.relation) ?? [] : boundSource(db, literal, bindings);
     for (const tuple of source) {
       const next = unify(literal, tuple, bindings);
-      if (next !== null) {
+      if (next !== NO_MATCH) {
         if (readsTags) {
           const stored = db.tagOf(literal.relation, tuple);
           bodyTags.push(
@@ -814,7 +830,7 @@ function evaluateRuleTagged(db, deltas, r, deltaIndex, algebra) {
       }
     }
   };
-  step(0, 0, /* @__PURE__ */ new Map());
+  step(0, 0, null);
   return results;
 }
 var evaluated = /* @__PURE__ */ new WeakMap();

package/dist/index.js

@@ -619,38 +619,46 @@ function stratify(rules) {
   }
   return strata.filter((s) => s.length > 0);
 }
+function boundValue(bindings, name) {
+  for (let b = bindings; b !== null; b = b.parent) {
+    if (b.name === name) {
+      return b.value;
+    }
+  }
+  return void 0;
+}
+var NO_MATCH = /* @__PURE__ */ Symbol("no-match");
 function unify(literal, tuple, bindings) {
   if (literal.terms.length !== tuple.length) {
-    return null;
+    return NO_MATCH;
   }
-  let next = null;
+  let next = bindings;
   for (let i = 0; i < literal.terms.length; i++) {
     const term = literal.terms[i];
     const value = tuple[i];
     if (term.type === "constant") {
       if (term.value !== value) {
-        return null;
+        return NO_MATCH;
       }
       continue;
     }
-    const bound = (next ?? bindings).get(term.name);
+    const bound = boundValue(next, term.name);
     if (bound === void 0) {
-      next = next ?? new Map(bindings);
-      next.set(term.name, value);
+      next = { name: term.name, value, parent: next };
       continue;
     }
     if (bound !== value) {
-      return null;
+      return NO_MATCH;
     }
   }
-  return next ?? bindings;
+  return next;
 }
 function groundNegated(literal, bindings) {
   return literal.terms.map((term) => {
     if (term.type === "constant") {
       return term.value;
     }
-    const bound = bindings.get(term.name);
+    const bound = boundValue(bindings, term.name);
     if (bound === void 0) {
       throw new Error(
         `unbound variable "${term.name}" in negated literal "${literal.relation}": negated literals may only use variables bound by earlier positive literals`
@@ -664,7 +672,7 @@ function headTuple(head, bindings) {
     if (term.type === "constant") {
       return term.value;
     }
-    const bound = bindings.get(term.name);
+    const bound = boundValue(bindings, term.name);
     if (bound === void 0) {
       throw new Error(
         `unbound variable "${term.name}" in head of "${head.relation}"`
@@ -690,23 +698,31 @@ function evaluateRule(db, deltas, r, deltaIndex) {
     const source = positiveIndex === deltaIndex ? deltas.get(literal.relation) ?? [] : boundSource(db, literal, bindings);
     for (const tuple of source) {
       const next = unify(literal, tuple, bindings);
-      if (next !== null) {
+      if (next !== NO_MATCH) {
         step(literalIndex + 1, positiveIndex + 1, next);
       }
     }
   };
-  step(0, 0, /* @__PURE__ */ new Map());
+  step(0, 0, null);
   return results;
 }
 function boundSource(db, literal, bindings) {
+  let narrowest = null;
   for (let column = 0; column < literal.terms.length; column++) {
     const term = literal.terms[column];
-    const value = term.type === "constant" ? term.value : bindings.get(term.name);
-    if (value !== void 0) {
-      return db.lookup(literal.relation, column, value);
+    const value = term.type === "constant" ? term.value : boundValue(bindings, term.name);
+    if (value === void 0) {
+      continue;
+    }
+    const bucket = db.lookup(literal.relation, column, value);
+    if (bucket.length === 0) {
+      return bucket;
+    }
+    if (narrowest === null || bucket.length < narrowest.length) {
+      narrowest = bucket;
     }
   }
-  return db.facts(literal.relation);
+  return narrowest ?? db.facts(literal.relation);
 }
 var EMPTY_TAGS = [];
 function evaluateRuleTagged(db, deltas, r, deltaIndex, algebra) {
@@ -748,7 +764,7 @@ function evaluateRuleTagged(db, deltas, r, deltaIndex, algebra) {
     const source = positiveIndex === deltaIndex ? deltas.get(literal.relation) ?? [] : boundSource(db, literal, bindings);
     for (const tuple of source) {
       const next = unify(literal, tuple, bindings);
-      if (next !== null) {
+      if (next !== NO_MATCH) {
         if (readsTags) {
           const stored = db.tagOf(literal.relation, tuple);
           bodyTags.push(
@@ -768,7 +784,7 @@ function evaluateRuleTagged(db, deltas, r, deltaIndex, algebra) {
       }
     }
   };
-  step(0, 0, /* @__PURE__ */ new Map());
+  step(0, 0, null);
   return results;
 }
 var evaluated = /* @__PURE__ */ new WeakMap();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/datalog",
-  "version": "0.18.0",
+  "version": "0.20.0",
   "type": "module",
   "description": "A small semi-naïve Datalog evaluator with stratified negation — the rules engine behind suss's derived program facts.",
   "keywords": [