eyeling 1.28.3 → 1.28.5

package/dist/browser/eyeling.browser.js

@@ -142,6 +142,10 @@ function __assertBuiltinHandlerResult(iri, out) {
   }
 }
 
+function apiTermToN3(term, prefixes = PrefixEnv.newDefault()) {
+  return termToN3(term, prefixes || PrefixEnv.newDefault());
+}
+
 function __buildBuiltinRegistrationApi() {
   if (__builtinApiSingleton) return __builtinApiSingleton;
 
@@ -154,7 +158,7 @@ function __buildBuiltinRegistrationApi() {
     literalParts,
     termToJsString,
     termToJsStringDecoded,
-    termToN3,
+    termToN3: apiTermToN3,
     iriValue,
     unifyTerm,
     applySubstTerm,
@@ -16389,11 +16393,18 @@ function liftBlankRuleVars(premise, conclusion) {
   const mapping = Object.create(null);
   let counter = 0;
 
+  // These variables are implementation details used to correlate one blank
+  // node across the lifted rule body.  Their names must not be spellable by
+  // user input; otherwise a user variable such as ?_b1 can capture the
+  // lifted blank node and leak it into the rule head.  U+E000 is a private-use
+  // code point and is not accepted by the lexer as part of a variable name.
+  const INTERNAL_BLANK_VAR_PREFIX = '\uE000eyeling_b';
+
   function blankToVar(label) {
     let name = mapping[label];
     if (name === undefined) {
       counter += 1;
-      name = `_b${counter}`;
+      name = `${INTERNAL_BLANK_VAR_PREFIX}${counter}`;
       mapping[label] = name;
     }
     return new Var(name);
@@ -16445,7 +16456,7 @@ function liftBlankRuleVars(premise, conclusion) {
     // 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.
+    // instead of synthetic rule variables.
     const keepFormulaBlanks = isLogIncludesLikePredicate(tr.p);
     return new Triple(
       keepFormulaBlanks && tr.s instanceof GraphTerm ? copyQuotedTerm(tr.s) : convertTerm(tr.s, true),

package/examples/proof/log-collect-all-in.n3

@@ -18,31 +18,31 @@
       {
           (?param {
               :Let :param ?param .
-          } ("Huey" "Dewey" "Louie")) log:collectAllIn ?_b1 .
+          } ("Huey" "Dewey" "Louie")) log:collectAllIn ?eyeling_b1 .
       },
       {
           ((?param) {
               :Let :param ?param .
-          } (("Huey") ("Dewey") ("Louie"))) log:collectAllIn ?_b1 .
+          } (("Huey") ("Dewey") ("Louie"))) log:collectAllIn ?eyeling_b1 .
       },
       {
           (?param {
               :Let :param ?param .
               ?param string:lessThan "Louie" .
-          } ("Huey" "Dewey")) log:collectAllIn ?_b1 .
+          } ("Huey" "Dewey")) log:collectAllIn ?eyeling_b1 .
       }.
 
   {
     (?param {
         :Let :param ?param .
-    } ("Huey" "Dewey" "Louie")) log:collectAllIn ?_b1 .
+    } ("Huey" "Dewey" "Louie")) log:collectAllIn ?eyeling_b1 .
 }
     pe:by [ pe:builtin log:collectAllIn ].
 
   {
     ((?param) {
         :Let :param ?param .
-    } (("Huey") ("Dewey") ("Louie"))) log:collectAllIn ?_b1 .
+    } (("Huey") ("Dewey") ("Louie"))) log:collectAllIn ?eyeling_b1 .
 }
     pe:by [ pe:builtin log:collectAllIn ].
 
@@ -50,7 +50,7 @@
     (?param {
         :Let :param ?param .
         ?param string:lessThan "Louie" .
-    } ("Huey" "Dewey")) log:collectAllIn ?_b1 .
+    } ("Huey" "Dewey")) log:collectAllIn ?eyeling_b1 .
 }
     pe:by [ pe:builtin log:collectAllIn ].
 }.
@@ -66,31 +66,31 @@
       {
           (?param {
               :Let :param ?param .
-          } ("Huey" "Dewey" "Louie")) log:collectAllIn ?_b1 .
+          } ("Huey" "Dewey" "Louie")) log:collectAllIn ?eyeling_b1 .
       },
       {
           ((?param) {
               :Let :param ?param .
-          } (("Huey") ("Dewey") ("Louie"))) log:collectAllIn ?_b1 .
+          } (("Huey") ("Dewey") ("Louie"))) log:collectAllIn ?eyeling_b1 .
       },
       {
           (?param {
               :Let :param ?param .
               ?param string:lessThan "Louie" .
-          } ("Huey" "Dewey")) log:collectAllIn ?_b1 .
+          } ("Huey" "Dewey")) log:collectAllIn ?eyeling_b1 .
       }.
 
   {
     (?param {
         :Let :param ?param .
-    } ("Huey" "Dewey" "Louie")) log:collectAllIn ?_b1 .
+    } ("Huey" "Dewey" "Louie")) log:collectAllIn ?eyeling_b1 .
 }
     pe:by [ pe:builtin log:collectAllIn ].
 
   {
     ((?param) {
         :Let :param ?param .
-    } (("Huey") ("Dewey") ("Louie"))) log:collectAllIn ?_b1 .
+    } (("Huey") ("Dewey") ("Louie"))) log:collectAllIn ?eyeling_b1 .
 }
     pe:by [ pe:builtin log:collectAllIn ].
 
@@ -98,7 +98,7 @@
     (?param {
         :Let :param ?param .
         ?param string:lessThan "Louie" .
-    } ("Huey" "Dewey")) log:collectAllIn ?_b1 .
+    } ("Huey" "Dewey")) log:collectAllIn ?eyeling_b1 .
 }
     pe:by [ pe:builtin log:collectAllIn ].
 }.
@@ -114,31 +114,31 @@
       {
           (?param {
               :Let :param ?param .
-          } ("Huey" "Dewey" "Louie")) log:collectAllIn ?_b1 .
+          } ("Huey" "Dewey" "Louie")) log:collectAllIn ?eyeling_b1 .
       },
       {
           ((?param) {
               :Let :param ?param .
-          } (("Huey") ("Dewey") ("Louie"))) log:collectAllIn ?_b1 .
+          } (("Huey") ("Dewey") ("Louie"))) log:collectAllIn ?eyeling_b1 .
       },
       {
           (?param {
               :Let :param ?param .
               ?param string:lessThan "Louie" .
-          } ("Huey" "Dewey")) log:collectAllIn ?_b1 .
+          } ("Huey" "Dewey")) log:collectAllIn ?eyeling_b1 .
       }.
 
   {
     (?param {
         :Let :param ?param .
-    } ("Huey" "Dewey" "Louie")) log:collectAllIn ?_b1 .
+    } ("Huey" "Dewey" "Louie")) log:collectAllIn ?eyeling_b1 .
 }
     pe:by [ pe:builtin log:collectAllIn ].
 
   {
     ((?param) {
         :Let :param ?param .
-    } (("Huey") ("Dewey") ("Louie"))) log:collectAllIn ?_b1 .
+    } (("Huey") ("Dewey") ("Louie"))) log:collectAllIn ?eyeling_b1 .
 }
     pe:by [ pe:builtin log:collectAllIn ].
 
@@ -146,7 +146,7 @@
     (?param {
         :Let :param ?param .
         ?param string:lessThan "Louie" .
-    } ("Huey" "Dewey")) log:collectAllIn ?_b1 .
+    } ("Huey" "Dewey")) log:collectAllIn ?eyeling_b1 .
 }
     pe:by [ pe:builtin log:collectAllIn ].
 }.

package/examples/proof/log-for-all-in.n3

@@ -16,7 +16,7 @@
               :c :subTask ?s .
           } {
               ?s :state :Completed .
-          }) log:forAllIn ?_b1 .
+          }) log:forAllIn ?eyeling_b1 .
       }.
 
   { :c a :CompositeTask . }
@@ -27,7 +27,7 @@
         :c :subTask ?s .
     } {
         ?s :state :Completed .
-    }) log:forAllIn ?_b1 .
+    }) log:forAllIn ?eyeling_b1 .
 }
     pe:by [ pe:builtin log:forAllIn ].
 }.

package/eyeling.js

@@ -142,6 +142,10 @@ function __assertBuiltinHandlerResult(iri, out) {
   }
 }
 
+function apiTermToN3(term, prefixes = PrefixEnv.newDefault()) {
+  return termToN3(term, prefixes || PrefixEnv.newDefault());
+}
+
 function __buildBuiltinRegistrationApi() {
   if (__builtinApiSingleton) return __builtinApiSingleton;
 
@@ -154,7 +158,7 @@ function __buildBuiltinRegistrationApi() {
     literalParts,
     termToJsString,
     termToJsStringDecoded,
-    termToN3,
+    termToN3: apiTermToN3,
     iriValue,
     unifyTerm,
     applySubstTerm,
@@ -16389,11 +16393,18 @@ function liftBlankRuleVars(premise, conclusion) {
   const mapping = Object.create(null);
   let counter = 0;
 
+  // These variables are implementation details used to correlate one blank
+  // node across the lifted rule body.  Their names must not be spellable by
+  // user input; otherwise a user variable such as ?_b1 can capture the
+  // lifted blank node and leak it into the rule head.  U+E000 is a private-use
+  // code point and is not accepted by the lexer as part of a variable name.
+  const INTERNAL_BLANK_VAR_PREFIX = '\uE000eyeling_b';
+
   function blankToVar(label) {
     let name = mapping[label];
     if (name === undefined) {
       counter += 1;
-      name = `_b${counter}`;
+      name = `${INTERNAL_BLANK_VAR_PREFIX}${counter}`;
       mapping[label] = name;
     }
     return new Var(name);
@@ -16445,7 +16456,7 @@ function liftBlankRuleVars(premise, conclusion) {
     // 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.
+    // instead of synthetic rule variables.
     const keepFormulaBlanks = isLogIncludesLikePredicate(tr.p);
     return new Triple(
       keepFormulaBlanks && tr.s instanceof GraphTerm ? copyQuotedTerm(tr.s) : convertTerm(tr.s, true),

package/lib/builtins.js

@@ -131,6 +131,10 @@ function __assertBuiltinHandlerResult(iri, out) {
   }
 }
 
+function apiTermToN3(term, prefixes = PrefixEnv.newDefault()) {
+  return termToN3(term, prefixes || PrefixEnv.newDefault());
+}
+
 function __buildBuiltinRegistrationApi() {
   if (__builtinApiSingleton) return __builtinApiSingleton;
 
@@ -143,7 +147,7 @@ function __buildBuiltinRegistrationApi() {
     literalParts,
     termToJsString,
     termToJsStringDecoded,
-    termToN3,
+    termToN3: apiTermToN3,
     iriValue,
     unifyTerm,
     applySubstTerm,

package/lib/rules.js

@@ -29,11 +29,18 @@ function liftBlankRuleVars(premise, conclusion) {
   const mapping = Object.create(null);
   let counter = 0;
 
+  // These variables are implementation details used to correlate one blank
+  // node across the lifted rule body.  Their names must not be spellable by
+  // user input; otherwise a user variable such as ?_b1 can capture the
+  // lifted blank node and leak it into the rule head.  U+E000 is a private-use
+  // code point and is not accepted by the lexer as part of a variable name.
+  const INTERNAL_BLANK_VAR_PREFIX = '\uE000eyeling_b';
+
   function blankToVar(label) {
     let name = mapping[label];
     if (name === undefined) {
       counter += 1;
-      name = `_b${counter}`;
+      name = `${INTERNAL_BLANK_VAR_PREFIX}${counter}`;
       mapping[label] = name;
     }
     return new Var(name);
@@ -85,7 +92,7 @@ function liftBlankRuleVars(premise, conclusion) {
     // 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.
+    // instead of synthetic rule variables.
     const keepFormulaBlanks = isLogIncludesLikePredicate(tr.p);
     return new Triple(
       keepFormulaBlanks && tr.s instanceof GraphTerm ? copyQuotedTerm(tr.s) : convertTerm(tr.s, true),

package/package.json

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

package/test/api.test.js

@@ -3123,6 +3123,36 @@ MESSAGE
     ],
   },
 
+
+  {
+    name: 'regression: user variable ?_b1 cannot capture lifted blank-node internals',
+    opt: { proofComments: false },
+    input: `@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix : <http://example.org/> .
+
+:test :value (6).
+
+{
+    :test :value [
+        rdf:first 6;
+        rdf:rest rdf:nil].
+}
+=>
+{
+    ?_b1 a :test
+}.
+
+{
+    ?What a :test .
+} => { :test :is false }.
+`,
+    // API output contains newly derived triples only; the input fact is not echoed.
+    check(out) {
+      assert.equal(out, '');
+    },
+    notExpect: [/\(6\)\s+a\s+:test\s*\./m, /:test\s+:is\s+false\s*\./m],
+  },
+
   {
     name: 'API empty input returns empty output',
     opt: { proofComments: false },

package/test/builtins.test.js

@@ -110,6 +110,14 @@ const cases = [
       assert.deepEqual(Object.keys(api.ns).sort(), expectedNsKeys);
     },
   },
+  {
+    name: 'custom builtin helper termToN3 uses default prefixes when omitted',
+    run() {
+      const api = builtins.__testBuildBuiltinApi();
+      assert.equal(api.termToN3(api.internIri('http://www.w3.org/2000/10/swap/log#implies')), 'log:implies');
+      assert.equal(api.termToN3(api.internLiteral('"abc"')), '"abc"');
+    },
+  },
   {
     name: 'registerBuiltinModule accepts supported module export forms',
     run() {