eyeling 1.22.13 → 1.22.15

package/lib/engine.js

@@ -76,6 +76,19 @@ const deref = require('./deref');
 
 const hasOwn = Object.prototype.hasOwnProperty;
 
+function __emptySubst() {
+  return Object.create(null);
+}
+
+function __cloneSubst(subst) {
+  if (!subst) return __emptySubst();
+  const out = Object.create(null);
+  for (const k in subst) {
+    if (hasOwn.call(subst, k)) out[k] = subst[k];
+  }
+  return out;
+}
+
 let version = 'dev';
 try {
   // Node: keep package.json version if available
@@ -1287,7 +1300,7 @@ function pushFactIndexed(facts, tr) {
 
 function makeDerivedRecord(fact, rule, premises, subst, captureExplanations) {
   if (captureExplanations === false) return { fact };
-  return new DerivedFact(fact, rule, premises.slice(), { ...subst });
+  return new DerivedFact(fact, rule, premises.slice(), __cloneSubst(subst));
 }
 
 function ensureBackRuleIndexes(backRules) {
@@ -1795,6 +1808,21 @@ function unifyOpenWithList(prefix, tailv, ys, subst) {
   return s2;
 }
 
+function graphTriplesContainVars(triples) {
+  function termHasVar(t) {
+    if (t instanceof Var) return true;
+    if (t instanceof ListTerm) return t.elems.some(termHasVar);
+    if (t instanceof OpenListTerm) return t.prefix.some(termHasVar) || true;
+    if (t instanceof GraphTerm) return t.triples.some((tr) => termHasVar(tr.s) || termHasVar(tr.p) || termHasVar(tr.o));
+    return false;
+  }
+
+  for (const tr of triples) {
+    if (termHasVar(tr.s) || termHasVar(tr.p) || termHasVar(tr.o)) return true;
+  }
+  return false;
+}
+
 function unifyGraphTriples(xs, ys, subst) {
   if (xs.length !== ys.length) return null;
 
@@ -1863,7 +1891,7 @@ function unifyTermWithOptions(a, b, subst, opts) {
     const t = b;
     if (t instanceof Var && t.name === v) return subst;
     if (containsVarTerm(t, v)) return null;
-    const s2 = { ...subst };
+    const s2 = __cloneSubst(subst);
     s2[v] = t;
     return s2;
   }
@@ -1956,17 +1984,22 @@ function unifyTermWithOptions(a, b, subst, opts) {
 
   // Graphs
   if (a instanceof GraphTerm && b instanceof GraphTerm) {
-    const protectedNamesA = collectProtectedNamesForTerm(aRaw, subst);
-    const protectedNamesB = collectProtectedNamesForTerm(bRaw, subst);
-    if (
-      alphaEqGraphTriples(a.triples, b.triples, {
-        protectedVarsA: protectedNamesA.protectedVars,
-        protectedVarsB: protectedNamesB.protectedVars,
-        protectedBlanksA: protectedNamesA.protectedBlanks,
-        protectedBlanksB: protectedNamesB.protectedBlanks,
-      })
-    ) {
-      return subst;
+    // Only use alpha-equivalence as a binding-free fast path when both quoted
+    // formulas are variable-free after substitution. If unbound variables remain,
+    // they may be shared with the outer rule and must unify/bind structurally.
+    if (!graphTriplesContainVars(a.triples) && !graphTriplesContainVars(b.triples)) {
+      const protectedNamesA = collectProtectedNamesForTerm(aRaw, subst);
+      const protectedNamesB = collectProtectedNamesForTerm(bRaw, subst);
+      if (
+        alphaEqGraphTriples(a.triples, b.triples, {
+          protectedVarsA: protectedNamesA.protectedVars,
+          protectedVarsB: protectedNamesB.protectedVars,
+          protectedBlanksA: protectedNamesA.protectedBlanks,
+          protectedBlanksB: protectedNamesB.protectedBlanks,
+        })
+      ) {
+        return subst;
+      }
     }
     return unifyGraphTriples(a.triples, b.triples, subst);
   }
@@ -2048,7 +2081,7 @@ function gcCompactForGoals(subst, goals, answerVars) {
     }
   }
 
-  const out = {};
+  const out = __emptySubst();
   for (const k of Object.keys(subst)) {
     if (keep.has(k)) out[k] = subst[k];
   }
@@ -2111,7 +2144,7 @@ function proveGoals(goals, subst, facts, backRules, depth, visited, varGen, maxR
   const allowDeferredBuiltins = !!(opts && opts.deferBuiltins);
 
   const initialGoals = Array.isArray(goals) ? goals.slice() : [];
-  const substMut = subst ? { ...subst } : {};
+  const substMut = subst ? __cloneSubst(subst) : {};
   const initialVisited = visited ? visited.slice() : [];
 
   // Variables from the original goal list (needed by the caller to instantiate conclusions)
@@ -2347,17 +2380,22 @@ function proveGoals(goals, subst, facts, backRules, depth, visited, varGen, maxR
 
     // Graphs
     if (a instanceof GraphTerm && b instanceof GraphTerm) {
-      const protectedNamesA = collectProtectedNamesForTerm(aRaw, substMut);
-      const protectedNamesB = collectProtectedNamesForTerm(bRaw, substMut);
-      if (
-        alphaEqGraphTriples(a.triples, b.triples, {
-          protectedVarsA: protectedNamesA.protectedVars,
-          protectedVarsB: protectedNamesB.protectedVars,
-          protectedBlanksA: protectedNamesA.protectedBlanks,
-          protectedBlanksB: protectedNamesB.protectedBlanks,
-        })
-      ) {
-        return true;
+      // Only use alpha-equivalence as a binding-free fast path when both quoted
+      // formulas are variable-free after substitution. If unbound variables remain,
+      // they may be shared with the outer rule and must unify/bind structurally.
+      if (!graphTriplesContainVars(a.triples) && !graphTriplesContainVars(b.triples)) {
+        const protectedNamesA = collectProtectedNamesForTerm(aRaw, substMut);
+        const protectedNamesB = collectProtectedNamesForTerm(bRaw, substMut);
+        if (
+          alphaEqGraphTriples(a.triples, b.triples, {
+            protectedVarsA: protectedNamesA.protectedVars,
+            protectedVarsB: protectedNamesB.protectedVars,
+            protectedBlanksA: protectedNamesA.protectedBlanks,
+            protectedBlanksB: protectedNamesB.protectedBlanks,
+          })
+        ) {
+          return true;
+        }
       }
       const merged = unifyGraphTriples(a.triples, b.triples, substMut);
       if (merged === null) return false;
@@ -2568,7 +2606,7 @@ function proveGoals(goals, subst, facts, backRules, depth, visited, varGen, maxR
       const builtinMax = Number.isFinite(remaining) && !restGoals.length ? remaining : undefined;
 
       const builtinGoalForEval = goalPredicateIri === LOG_NS + 'rawType' ? rawGoal : goal0;
-      const builtinSubstForEval = goalPredicateIri === LOG_NS + 'rawType' ? substMut : {};
+      const builtinSubstForEval = goalPredicateIri === LOG_NS + 'rawType' ? substMut : __emptySubst();
       let deltas = evalBuiltin(
         builtinGoalForEval,
         builtinSubstForEval,
@@ -2610,7 +2648,7 @@ function proveGoals(goals, subst, facts, backRules, depth, visited, varGen, maxR
         subjectAndObjectAreFullyUnbound &&
         (!restGoals.length || dc >= goalsNow.length)
       ) {
-        deltas = [{}];
+        deltas = [__emptySubst()];
       }
 
       if (deltas.length) {
@@ -3043,7 +3081,7 @@ function forwardChain(facts, forwardRules, backRules, onDerived /* optional */,
             const r = entry.rule;
             if (__skipForwardRuleNow(r)) continue;
 
-            const s = unifyTriple(entry.goal, fact, {});
+            const s = unifyTriple(entry.goal, fact, __emptySubst());
             if (s === null) continue;
 
             const outcome = __emitForwardRuleSolution(r, entry.ruleIndex, s);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyeling",
-  "version": "1.22.13",
+  "version": "1.22.15",
   "description": "A minimal Notation3 (N3) reasoner in JavaScript.",
   "main": "./index.js",
   "keywords": [

package/test/api.test.js

@@ -2278,6 +2278,34 @@ _:b a ex:Person ; ex:name "B" .
 {
   :test :is true .
 }.
+`,
+    expect: [/^:test\s+:is\s+true\s*\./m],
+  },
+  {
+    name: 'regression: quoted-formula backward-rule heads must bind shared variables for later goals',
+    opt: { proofComments: false },
+    input: `@prefix : <http://example.org/> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+
+{ :a :b :c } a :Statement .
+
+{ ?A :has { ?S ?P ?O } }
+<=
+{
+  ?A log:includes { ?S ?P ?O }.
+}.
+
+{
+  ?A a :Statement .
+  ?A :has { ?S ?P ?O }.
+  ?S log:rawType log:Other.
+  ?P log:rawType log:Other.
+  ?O log:rawType log:Other.
+}
+=>
+{
+  :test :is true .
+}.
 `,
     expect: [/^:test\s+:is\s+true\s*\./m],
   },