eyeling 1.23.0 → 1.23.1

package/HANDBOOK.md

@@ -358,7 +358,9 @@ That distinction matters because quoted formulas still play **two different role
 
 The practical rule is:
 
-> **Eyeling lifts blanks inside quoted formulas only when the quoted formula appears directly in a premise triple position. Nested quoted formulas remain scoped data unless a query-like builtin interprets them as patterns.**
+> **Eyeling lifts blanks inside quoted formulas only when the quoted formula appears directly in an ordinary premise triple position.**
+>
+> For `log:includes` and `log:notIncludes`, quoted formula operands keep their own blank-node scope. The builtin may treat blanks in the goal formula existentially while proving it, but blanks in an explicit scope graph remain formula-local blanks and may be returned as blank nodes rather than synthetic variables such as `?_b1`.
 
 This keeps `log:conjunction` and formula printing honest, while still allowing direct quoted-formula premise patterns such as `{ _:X :B :C } a :Statement.` to match interoperably.
 
@@ -1526,6 +1528,7 @@ Eyeling has **two modes**:
 1. **Explicit scope graph**: if `Scope` is a formula `{...}`
    - Eyeling reasons _only inside that formula_ (its triples are the fact store).
    - External rules are not used.
+   - Blank nodes inside the explicit scope graph are preserved as graph-local blanks; if a goal variable matches one, the binding is a blank node, not a lifted rule variable.
 
 2. **Priority-gated global scope**: otherwise
    - Eyeling uses a _frozen snapshot_ of the current global closure.

package/dist/browser/eyeling.browser.js

@@ -13272,9 +13272,23 @@ ${triples.map((tr) => `  ${tripleToN3(tr, prefixes)}`).join('\n')}
 
     'use strict';
 
-    const { Var, Blank, ListTerm, OpenListTerm, GraphTerm, Triple, copyQuotedGraphMetadata } = require('./prelude');
+    const {
+      LOG_NS,
+      Iri,
+      Var,
+      Blank,
+      ListTerm,
+      OpenListTerm,
+      GraphTerm,
+      Triple,
+      copyQuotedGraphMetadata,
+    } = require('./prelude');
 
     function liftBlankRuleVars(premise, conclusion) {
+      function isLogIncludesLikePredicate(p) {
+        return p instanceof Iri && (p.value === LOG_NS + 'includes' || p.value === LOG_NS + 'notIncludes');
+      }
+
       // Map blank labels to stable rule-local variable names.
       // This runs at rule construction time; keep it simple and allocation-light.
       const mapping = Object.create(null);
@@ -13335,9 +13349,19 @@ ${triples.map((tr) => `  ${tripleToN3(tr, prefixes)}`).join('\n')}
         return t;
       }
 
-      const newPremise = premise.map(
-        (tr) => new Triple(convertTerm(tr.s, true), convertTerm(tr.p, true), convertTerm(tr.o, true)),
-      );
+      const newPremise = premise.map((tr) => {
+        // In log:includes / log:notIncludes, quoted formula operands are formulas
+        // consumed by the builtin rather than ordinary triple patterns. Keep their
+        // local blank nodes as Blank terms so the builtin can treat them as local
+        // existentials, and bindings returned from an explicit scope are blank nodes
+        // instead of synthetic rule variables such as ?_b1.
+        const keepFormulaBlanks = isLogIncludesLikePredicate(tr.p);
+        return new Triple(
+          keepFormulaBlanks && tr.s instanceof GraphTerm ? copyQuotedTerm(tr.s) : convertTerm(tr.s, true),
+          convertTerm(tr.p, true),
+          keepFormulaBlanks && tr.o instanceof GraphTerm ? copyQuotedTerm(tr.o) : convertTerm(tr.o, true),
+        );
+      });
       return [newPremise, conclusion];
     }
 

package/eyeling.js

@@ -10673,8 +10673,7 @@ function mergePrefixEnvs(target, source) {
 
 function mergeParsedDocuments(docs, opts = {}) {
   const documents = Array.isArray(docs) ? docs : [];
-  const scopeBlankNodes =
-    typeof opts.scopeBlankNodes === 'boolean' ? opts.scopeBlankNodes : documents.length > 1;
+  const scopeBlankNodes = typeof opts.scopeBlankNodes === 'boolean' ? opts.scopeBlankNodes : documents.length > 1;
 
   const merged = emptyParsedDocument();
   const mergedSources = [];
@@ -10702,12 +10701,7 @@ function mergeParsedDocuments(docs, opts = {}) {
 }
 
 function isN3SourceListInput(input) {
-  return !!(
-    input &&
-    typeof input === 'object' &&
-    !Array.isArray(input) &&
-    Array.isArray(input.sources)
-  );
+  return !!(input && typeof input === 'object' && !Array.isArray(input) && Array.isArray(input.sources));
 }
 
 function normalizeN3SourceItem(source, index) {
@@ -13237,9 +13231,13 @@ module.exports = {
 
 'use strict';
 
-const { Var, Blank, ListTerm, OpenListTerm, GraphTerm, Triple, copyQuotedGraphMetadata } = require('./prelude');
+const { LOG_NS, Iri, Var, Blank, ListTerm, OpenListTerm, GraphTerm, Triple, copyQuotedGraphMetadata } = require('./prelude');
 
 function liftBlankRuleVars(premise, conclusion) {
+  function isLogIncludesLikePredicate(p) {
+    return p instanceof Iri && (p.value === LOG_NS + 'includes' || p.value === LOG_NS + 'notIncludes');
+  }
+
   // Map blank labels to stable rule-local variable names.
   // This runs at rule construction time; keep it simple and allocation-light.
   const mapping = Object.create(null);
@@ -13296,9 +13294,19 @@ function liftBlankRuleVars(premise, conclusion) {
     return t;
   }
 
-  const newPremise = premise.map(
-    (tr) => new Triple(convertTerm(tr.s, true), convertTerm(tr.p, true), convertTerm(tr.o, true)),
-  );
+  const newPremise = premise.map((tr) => {
+    // In log:includes / log:notIncludes, quoted formula operands are formulas
+    // consumed by the builtin rather than ordinary triple patterns. Keep their
+    // local blank nodes as Blank terms so the builtin can treat them as local
+    // existentials, and bindings returned from an explicit scope are blank nodes
+    // instead of synthetic rule variables such as ?_b1.
+    const keepFormulaBlanks = isLogIncludesLikePredicate(tr.p);
+    return new Triple(
+      keepFormulaBlanks && tr.s instanceof GraphTerm ? copyQuotedTerm(tr.s) : convertTerm(tr.s, true),
+      convertTerm(tr.p, true),
+      keepFormulaBlanks && tr.o instanceof GraphTerm ? copyQuotedTerm(tr.o) : convertTerm(tr.o, true),
+    );
+  });
   return [newPremise, conclusion];
 }
 

package/lib/rules.js

@@ -7,9 +7,23 @@
 
 'use strict';
 
-const { Var, Blank, ListTerm, OpenListTerm, GraphTerm, Triple, copyQuotedGraphMetadata } = require('./prelude');
+const {
+  LOG_NS,
+  Iri,
+  Var,
+  Blank,
+  ListTerm,
+  OpenListTerm,
+  GraphTerm,
+  Triple,
+  copyQuotedGraphMetadata,
+} = require('./prelude');
 
 function liftBlankRuleVars(premise, conclusion) {
+  function isLogIncludesLikePredicate(p) {
+    return p instanceof Iri && (p.value === LOG_NS + 'includes' || p.value === LOG_NS + 'notIncludes');
+  }
+
   // Map blank labels to stable rule-local variable names.
   // This runs at rule construction time; keep it simple and allocation-light.
   const mapping = Object.create(null);
@@ -66,9 +80,19 @@ function liftBlankRuleVars(premise, conclusion) {
     return t;
   }
 
-  const newPremise = premise.map(
-    (tr) => new Triple(convertTerm(tr.s, true), convertTerm(tr.p, true), convertTerm(tr.o, true)),
-  );
+  const newPremise = premise.map((tr) => {
+    // In log:includes / log:notIncludes, quoted formula operands are formulas
+    // consumed by the builtin rather than ordinary triple patterns. Keep their
+    // local blank nodes as Blank terms so the builtin can treat them as local
+    // existentials, and bindings returned from an explicit scope are blank nodes
+    // instead of synthetic rule variables such as ?_b1.
+    const keepFormulaBlanks = isLogIncludesLikePredicate(tr.p);
+    return new Triple(
+      keepFormulaBlanks && tr.s instanceof GraphTerm ? copyQuotedTerm(tr.s) : convertTerm(tr.s, true),
+      convertTerm(tr.p, true),
+      keepFormulaBlanks && tr.o instanceof GraphTerm ? copyQuotedTerm(tr.o) : convertTerm(tr.o, true),
+    );
+  });
   return [newPremise, conclusion];
 }
 

package/package.json

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

package/test/api.test.js

@@ -1643,6 +1643,30 @@ _:x :hates { _:foo :making :mess }.
     expect: [/:(?:test)\s+:(?:contains)\s+:(?:success-literal-3)\s*\./, /:(?:test)\s+:(?:is)\s+true\s*\./],
   },
 
+  {
+    name: '60a regression: log:includes explicit-scope blank node is returned as blank, not synthetic variable',
+    opt: { proofComments: false },
+    input: `@prefix : <http://example.org/ns#> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#>.
+
+{
+  {
+    _:b1 a :Mortal .
+  } log:includes {
+    ?CS ?CP ?CO .
+  } .
+}
+=>
+{
+  _:b2 :conclusion {
+    ?CS ?CP ?CO .
+  } .
+} .
+`,
+    expect: [/_:sk_\d+\s+:(?:conclusion)\s+\{\s*_:b\d+\s+a\s+:(?:Mortal)\s*\.\s*\}\s*\./s],
+    notExpect: [/\?_b\d+\s+a\s+:(?:Mortal)/],
+  },
+
   {
     name: '61 RDF/JS input + rule objects: reason() accepts quads with rules',
     run() {