eyeling 1.22.7 → 1.22.8

package/dist/browser/eyeling.browser.js

@@ -6660,14 +6660,44 @@
       }
     }
 
-    function collectProtectedNamesFromSubst(subst) {
+    function collectProtectedNamesFromTermViaSubst(term, subst, protectedVars, protectedBlanks, seenVarNames) {
+      if (term instanceof Var) {
+        if (!subst || !Object.prototype.hasOwnProperty.call(subst, term.name)) return;
+        if (seenVarNames.has(term.name)) return;
+        seenVarNames.add(term.name);
+        collectProtectedNamesInTerm(subst[term.name], protectedVars, protectedBlanks);
+        return;
+      }
+
+      if (term instanceof ListTerm) {
+        for (const e of term.elems)
+          collectProtectedNamesFromTermViaSubst(e, subst, protectedVars, protectedBlanks, seenVarNames);
+        return;
+      }
+
+      if (term instanceof OpenListTerm) {
+        for (const e of term.prefix)
+          collectProtectedNamesFromTermViaSubst(e, subst, protectedVars, protectedBlanks, seenVarNames);
+        if (subst && Object.prototype.hasOwnProperty.call(subst, term.tailVar) && !seenVarNames.has(term.tailVar)) {
+          seenVarNames.add(term.tailVar);
+          collectProtectedNamesInTerm(subst[term.tailVar], protectedVars, protectedBlanks);
+        }
+        return;
+      }
+
+      if (term instanceof GraphTerm) {
+        for (const tr of term.triples) {
+          collectProtectedNamesFromTermViaSubst(tr.s, subst, protectedVars, protectedBlanks, seenVarNames);
+          collectProtectedNamesFromTermViaSubst(tr.p, subst, protectedVars, protectedBlanks, seenVarNames);
+          collectProtectedNamesFromTermViaSubst(tr.o, subst, protectedVars, protectedBlanks, seenVarNames);
+        }
+      }
+    }
+
+    function collectProtectedNamesForTerm(term, subst) {
       const protectedVars = new Set();
       const protectedBlanks = new Set();
-      if (!subst) return { protectedVars, protectedBlanks };
-      for (const k in subst) {
-        if (!Object.prototype.hasOwnProperty.call(subst, k)) continue;
-        collectProtectedNamesInTerm(subst[k], protectedVars, protectedBlanks);
-      }
+      collectProtectedNamesFromTermViaSubst(term, subst, protectedVars, protectedBlanks, new Set());
       return { protectedVars, protectedBlanks };
     }
 
@@ -7629,6 +7659,9 @@
     }
 
     function unifyTermWithOptions(a, b, subst, opts) {
+      const aRaw = a;
+      const bRaw = b;
+
       a = applySubstTerm(a, subst);
       b = applySubstTerm(b, subst);
 
@@ -7736,13 +7769,14 @@
 
       // Graphs
       if (a instanceof GraphTerm && b instanceof GraphTerm) {
-        const protectedNames = collectProtectedNamesFromSubst(subst);
+        const protectedNamesA = collectProtectedNamesForTerm(aRaw, subst);
+        const protectedNamesB = collectProtectedNamesForTerm(bRaw, subst);
         if (
           alphaEqGraphTriples(a.triples, b.triples, {
-            protectedVarsA: protectedNames.protectedVars,
-            protectedVarsB: protectedNames.protectedVars,
-            protectedBlanksA: protectedNames.protectedBlanks,
-            protectedBlanksB: protectedNames.protectedBlanks,
+            protectedVarsA: protectedNamesA.protectedVars,
+            protectedVarsB: protectedNamesB.protectedVars,
+            protectedBlanksA: protectedNamesA.protectedBlanks,
+            protectedBlanksB: protectedNamesB.protectedBlanks,
           })
         ) {
           return subst;
@@ -8046,6 +8080,9 @@
       }
 
       function unifyTermTrail(a, b) {
+        const aRaw = a;
+        const bRaw = b;
+
         a = applySubstTerm(a, substMut);
         b = applySubstTerm(b, substMut);
 
@@ -8123,24 +8160,25 @@
 
         // Graphs
         if (a instanceof GraphTerm && b instanceof GraphTerm) {
-          const protectedNames = collectProtectedNamesFromSubst(substMut);
+          const protectedNamesA = collectProtectedNamesForTerm(aRaw, substMut);
+          const protectedNamesB = collectProtectedNamesForTerm(bRaw, substMut);
           if (
             alphaEqGraphTriples(a.triples, b.triples, {
-              protectedVarsA: protectedNames.protectedVars,
-              protectedVarsB: protectedNames.protectedVars,
-              protectedBlanksA: protectedNames.protectedBlanks,
-              protectedBlanksB: protectedNames.protectedBlanks,
+              protectedVarsA: protectedNamesA.protectedVars,
+              protectedVarsB: protectedNamesB.protectedVars,
+              protectedBlanksA: protectedNamesA.protectedBlanks,
+              protectedBlanksB: protectedNamesB.protectedBlanks,
             })
           ) {
             return true;
           }
-          // Fallback: reuse allocation-heavy graph unifier rarely hit in typical workloads.
-          const delta = unifyGraphTriples(a.triples, b.triples, {});
-          if (delta === null) return false;
+          const merged = unifyGraphTriples(a.triples, b.triples, substMut);
+          if (merged === null) return false;
           const mark = trail.length;
-          for (const k in delta) {
-            if (!Object.prototype.hasOwnProperty.call(delta, k)) continue;
-            if (!bindVarTrail(k, delta[k])) {
+          for (const k in merged) {
+            if (!Object.prototype.hasOwnProperty.call(merged, k)) continue;
+            if (Object.prototype.hasOwnProperty.call(substMut, k)) continue;
+            if (!bindVarTrail(k, merged[k])) {
               undoTo(mark);
               return false;
             }

package/eyeling.js

@@ -6641,14 +6641,44 @@ function collectProtectedNamesInTerm(t, protectedVars, protectedBlanks) {
   }
 }
 
-function collectProtectedNamesFromSubst(subst) {
+function collectProtectedNamesFromTermViaSubst(term, subst, protectedVars, protectedBlanks, seenVarNames) {
+  if (term instanceof Var) {
+    if (!subst || !Object.prototype.hasOwnProperty.call(subst, term.name)) return;
+    if (seenVarNames.has(term.name)) return;
+    seenVarNames.add(term.name);
+    collectProtectedNamesInTerm(subst[term.name], protectedVars, protectedBlanks);
+    return;
+  }
+
+  if (term instanceof ListTerm) {
+    for (const e of term.elems)
+      collectProtectedNamesFromTermViaSubst(e, subst, protectedVars, protectedBlanks, seenVarNames);
+    return;
+  }
+
+  if (term instanceof OpenListTerm) {
+    for (const e of term.prefix)
+      collectProtectedNamesFromTermViaSubst(e, subst, protectedVars, protectedBlanks, seenVarNames);
+    if (subst && Object.prototype.hasOwnProperty.call(subst, term.tailVar) && !seenVarNames.has(term.tailVar)) {
+      seenVarNames.add(term.tailVar);
+      collectProtectedNamesInTerm(subst[term.tailVar], protectedVars, protectedBlanks);
+    }
+    return;
+  }
+
+  if (term instanceof GraphTerm) {
+    for (const tr of term.triples) {
+      collectProtectedNamesFromTermViaSubst(tr.s, subst, protectedVars, protectedBlanks, seenVarNames);
+      collectProtectedNamesFromTermViaSubst(tr.p, subst, protectedVars, protectedBlanks, seenVarNames);
+      collectProtectedNamesFromTermViaSubst(tr.o, subst, protectedVars, protectedBlanks, seenVarNames);
+    }
+  }
+}
+
+function collectProtectedNamesForTerm(term, subst) {
   const protectedVars = new Set();
   const protectedBlanks = new Set();
-  if (!subst) return { protectedVars, protectedBlanks };
-  for (const k in subst) {
-    if (!Object.prototype.hasOwnProperty.call(subst, k)) continue;
-    collectProtectedNamesInTerm(subst[k], protectedVars, protectedBlanks);
-  }
+  collectProtectedNamesFromTermViaSubst(term, subst, protectedVars, protectedBlanks, new Set());
   return { protectedVars, protectedBlanks };
 }
 
@@ -7610,6 +7640,9 @@ function unifyTermListAppend(a, b, subst) {
 }
 
 function unifyTermWithOptions(a, b, subst, opts) {
+  const aRaw = a;
+  const bRaw = b;
+
   a = applySubstTerm(a, subst);
   b = applySubstTerm(b, subst);
 
@@ -7717,13 +7750,14 @@ function unifyTermWithOptions(a, b, subst, opts) {
 
   // Graphs
   if (a instanceof GraphTerm && b instanceof GraphTerm) {
-    const protectedNames = collectProtectedNamesFromSubst(subst);
+    const protectedNamesA = collectProtectedNamesForTerm(aRaw, subst);
+    const protectedNamesB = collectProtectedNamesForTerm(bRaw, subst);
     if (
       alphaEqGraphTriples(a.triples, b.triples, {
-        protectedVarsA: protectedNames.protectedVars,
-        protectedVarsB: protectedNames.protectedVars,
-        protectedBlanksA: protectedNames.protectedBlanks,
-        protectedBlanksB: protectedNames.protectedBlanks,
+        protectedVarsA: protectedNamesA.protectedVars,
+        protectedVarsB: protectedNamesB.protectedVars,
+        protectedBlanksA: protectedNamesA.protectedBlanks,
+        protectedBlanksB: protectedNamesB.protectedBlanks,
       })
     ) {
       return subst;
@@ -8027,6 +8061,9 @@ function proveGoals(goals, subst, facts, backRules, depth, visited, varGen, maxR
   }
 
   function unifyTermTrail(a, b) {
+    const aRaw = a;
+    const bRaw = b;
+
     a = applySubstTerm(a, substMut);
     b = applySubstTerm(b, substMut);
 
@@ -8104,24 +8141,25 @@ function proveGoals(goals, subst, facts, backRules, depth, visited, varGen, maxR
 
     // Graphs
     if (a instanceof GraphTerm && b instanceof GraphTerm) {
-      const protectedNames = collectProtectedNamesFromSubst(substMut);
+      const protectedNamesA = collectProtectedNamesForTerm(aRaw, substMut);
+      const protectedNamesB = collectProtectedNamesForTerm(bRaw, substMut);
       if (
         alphaEqGraphTriples(a.triples, b.triples, {
-          protectedVarsA: protectedNames.protectedVars,
-          protectedVarsB: protectedNames.protectedVars,
-          protectedBlanksA: protectedNames.protectedBlanks,
-          protectedBlanksB: protectedNames.protectedBlanks,
+          protectedVarsA: protectedNamesA.protectedVars,
+          protectedVarsB: protectedNamesB.protectedVars,
+          protectedBlanksA: protectedNamesA.protectedBlanks,
+          protectedBlanksB: protectedNamesB.protectedBlanks,
         })
       ) {
         return true;
       }
-      // Fallback: reuse allocation-heavy graph unifier rarely hit in typical workloads.
-      const delta = unifyGraphTriples(a.triples, b.triples, {});
-      if (delta === null) return false;
+      const merged = unifyGraphTriples(a.triples, b.triples, substMut);
+      if (merged === null) return false;
       const mark = trail.length;
-      for (const k in delta) {
-        if (!Object.prototype.hasOwnProperty.call(delta, k)) continue;
-        if (!bindVarTrail(k, delta[k])) {
+      for (const k in merged) {
+        if (!Object.prototype.hasOwnProperty.call(merged, k)) continue;
+        if (Object.prototype.hasOwnProperty.call(substMut, k)) continue;
+        if (!bindVarTrail(k, merged[k])) {
           undoTo(mark);
           return false;
         }

package/lib/engine.js

@@ -846,14 +846,44 @@ function collectProtectedNamesInTerm(t, protectedVars, protectedBlanks) {
   }
 }
 
-function collectProtectedNamesFromSubst(subst) {
+function collectProtectedNamesFromTermViaSubst(term, subst, protectedVars, protectedBlanks, seenVarNames) {
+  if (term instanceof Var) {
+    if (!subst || !Object.prototype.hasOwnProperty.call(subst, term.name)) return;
+    if (seenVarNames.has(term.name)) return;
+    seenVarNames.add(term.name);
+    collectProtectedNamesInTerm(subst[term.name], protectedVars, protectedBlanks);
+    return;
+  }
+
+  if (term instanceof ListTerm) {
+    for (const e of term.elems)
+      collectProtectedNamesFromTermViaSubst(e, subst, protectedVars, protectedBlanks, seenVarNames);
+    return;
+  }
+
+  if (term instanceof OpenListTerm) {
+    for (const e of term.prefix)
+      collectProtectedNamesFromTermViaSubst(e, subst, protectedVars, protectedBlanks, seenVarNames);
+    if (subst && Object.prototype.hasOwnProperty.call(subst, term.tailVar) && !seenVarNames.has(term.tailVar)) {
+      seenVarNames.add(term.tailVar);
+      collectProtectedNamesInTerm(subst[term.tailVar], protectedVars, protectedBlanks);
+    }
+    return;
+  }
+
+  if (term instanceof GraphTerm) {
+    for (const tr of term.triples) {
+      collectProtectedNamesFromTermViaSubst(tr.s, subst, protectedVars, protectedBlanks, seenVarNames);
+      collectProtectedNamesFromTermViaSubst(tr.p, subst, protectedVars, protectedBlanks, seenVarNames);
+      collectProtectedNamesFromTermViaSubst(tr.o, subst, protectedVars, protectedBlanks, seenVarNames);
+    }
+  }
+}
+
+function collectProtectedNamesForTerm(term, subst) {
   const protectedVars = new Set();
   const protectedBlanks = new Set();
-  if (!subst) return { protectedVars, protectedBlanks };
-  for (const k in subst) {
-    if (!Object.prototype.hasOwnProperty.call(subst, k)) continue;
-    collectProtectedNamesInTerm(subst[k], protectedVars, protectedBlanks);
-  }
+  collectProtectedNamesFromTermViaSubst(term, subst, protectedVars, protectedBlanks, new Set());
   return { protectedVars, protectedBlanks };
 }
 
@@ -1815,6 +1845,9 @@ function unifyTermListAppend(a, b, subst) {
 }
 
 function unifyTermWithOptions(a, b, subst, opts) {
+  const aRaw = a;
+  const bRaw = b;
+
   a = applySubstTerm(a, subst);
   b = applySubstTerm(b, subst);
 
@@ -1922,13 +1955,14 @@ function unifyTermWithOptions(a, b, subst, opts) {
 
   // Graphs
   if (a instanceof GraphTerm && b instanceof GraphTerm) {
-    const protectedNames = collectProtectedNamesFromSubst(subst);
+    const protectedNamesA = collectProtectedNamesForTerm(aRaw, subst);
+    const protectedNamesB = collectProtectedNamesForTerm(bRaw, subst);
     if (
       alphaEqGraphTriples(a.triples, b.triples, {
-        protectedVarsA: protectedNames.protectedVars,
-        protectedVarsB: protectedNames.protectedVars,
-        protectedBlanksA: protectedNames.protectedBlanks,
-        protectedBlanksB: protectedNames.protectedBlanks,
+        protectedVarsA: protectedNamesA.protectedVars,
+        protectedVarsB: protectedNamesB.protectedVars,
+        protectedBlanksA: protectedNamesA.protectedBlanks,
+        protectedBlanksB: protectedNamesB.protectedBlanks,
       })
     ) {
       return subst;
@@ -2232,6 +2266,9 @@ function proveGoals(goals, subst, facts, backRules, depth, visited, varGen, maxR
   }
 
   function unifyTermTrail(a, b) {
+    const aRaw = a;
+    const bRaw = b;
+
     a = applySubstTerm(a, substMut);
     b = applySubstTerm(b, substMut);
 
@@ -2309,24 +2346,25 @@ function proveGoals(goals, subst, facts, backRules, depth, visited, varGen, maxR
 
     // Graphs
     if (a instanceof GraphTerm && b instanceof GraphTerm) {
-      const protectedNames = collectProtectedNamesFromSubst(substMut);
+      const protectedNamesA = collectProtectedNamesForTerm(aRaw, substMut);
+      const protectedNamesB = collectProtectedNamesForTerm(bRaw, substMut);
       if (
         alphaEqGraphTriples(a.triples, b.triples, {
-          protectedVarsA: protectedNames.protectedVars,
-          protectedVarsB: protectedNames.protectedVars,
-          protectedBlanksA: protectedNames.protectedBlanks,
-          protectedBlanksB: protectedNames.protectedBlanks,
+          protectedVarsA: protectedNamesA.protectedVars,
+          protectedVarsB: protectedNamesB.protectedVars,
+          protectedBlanksA: protectedNamesA.protectedBlanks,
+          protectedBlanksB: protectedNamesB.protectedBlanks,
         })
       ) {
         return true;
       }
-      // Fallback: reuse allocation-heavy graph unifier rarely hit in typical workloads.
-      const delta = unifyGraphTriples(a.triples, b.triples, {});
-      if (delta === null) return false;
+      const merged = unifyGraphTriples(a.triples, b.triples, substMut);
+      if (merged === null) return false;
       const mark = trail.length;
-      for (const k in delta) {
-        if (!Object.prototype.hasOwnProperty.call(delta, k)) continue;
-        if (!bindVarTrail(k, delta[k])) {
+      for (const k in merged) {
+        if (!Object.prototype.hasOwnProperty.call(merged, k)) continue;
+        if (Object.prototype.hasOwnProperty.call(substMut, k)) continue;
+        if (!bindVarTrail(k, merged[k])) {
           undoTo(mark);
           return false;
         }

package/package.json

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

package/test/api.test.js

@@ -2305,6 +2305,37 @@ _:x :hates { _:foo :making :mess }.
       }
     },
   },
+  {
+    name: 'regression: unrelated blank bindings must not block alpha-equivalent quoted-formula matches',
+    opt: { proofComments: false },
+    input: `@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
+@prefix : <http://example.org/ns#> .
+
+{
+    _:b1 a :Mortal .
+} :because {
+    :Socrates a :Human .
+    :Human rdfs:subClassOf :Mortal .
+} .
+
+<> :step {
+  [ a :Mortal ].
+}.
+
+{
+   ?A :step ?B .
+   ?B log:includes { ?S ?P ?O }.
+   { _:b2 a :Mortal } :because ?Y.
+}
+=>
+{
+  :test :is true .
+}.
+`,
+    expect: [/^:test\s+:is\s+true\s*\./m],
+  },
 ];
 
 let passed = 0;