eyeling 1.5.35 → 1.5.36

package/examples/json-pointer.n3

@@ -1,3 +1,8 @@
+# =================================================
+# JSON Pointer example
+# See https://datatracker.ietf.org/doc/html/rfc6901
+# =================================================
+
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix string: <http://www.w3.org/2000/10/swap/string#> .
 @prefix list:   <http://www.w3.org/2000/10/swap/list#> .

package/examples/json-reconcile-vat.n3

@@ -1,3 +1,8 @@
+# =================================================
+# Rconcile VAT JSON Pointer example
+# See https://datatracker.ietf.org/doc/html/rfc6901
+# =================================================
+
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix string: <http://www.w3.org/2000/10/swap/string#> .
 @prefix list:   <http://www.w3.org/2000/10/swap/list#> .

package/examples/rdf-list.n3

@@ -1,12 +1,16 @@
+# =================================
+# RDF list
+# Example from Patrick Hochstenbach
+# =================================
+
 @prefix log: <http://www.w3.org/2000/10/swap/log#> .
-@prefix list: <http://www.w3.org/2000/10/swap/list#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix : <http://example.org/ns#> .
 
 :X :val (1 2).
 
-{ ?X :head ?Y } <= { ?X list:first ?Y }.
-{ ?X :tail ?Y } <= { ?X list:rest ?Y} .
+{ ?X :head ?Y } <= { ?X rdf:first ?Y }.
+{ ?X :tail ?Y } <= { ?X rdf:rest ?Y} .
 
 { 
   ?X :val ?Y.

package/eyeling.js

@@ -3692,6 +3692,12 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen) {
 function isBuiltinPred(p) {
   if (!(p instanceof Iri)) return false;
   const v = p.value;
+
+  // Treat RDF Collections as list-term builtins too.
+  if (v === RDF_NS + "first" || v === RDF_NS + "rest") {
+    return true;
+  }
+
   return (
     v.startsWith(CRYPTO_NS) ||
     v.startsWith(MATH_NS)   ||

package/package.json

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

package/test/api.test.js

@@ -672,6 +672,36 @@ ${U('a')} <-${U('p')} ${U('b')}.`,
       new RegExp(`_:b2\\s+<${EX}q>\\s+<${EX}joe>\\s*\\.`),
     ],
   },
+
+  { name: '48 rdf:first: works on list terms (alias of list:first)',
+    opt: { proofComments: false }, input: ` { ( ${U('a')} ${U('b')} ${U('c')} ) rdf:first ?x. } => { ${U('s')} ${U('first')} ?x. }.
+`,
+    expect: [new RegExp(`${EX}s>\\s+<${EX}first>\\s+<${EX}a>\\s*\\.`)],
+  },
+
+  { name: '49 rdf:rest: works on list terms (alias of list:rest)',
+    opt: { proofComments: false }, input: ` { ( ${U('a')} ${U('b')} ${U('c')} ) rdf:rest ?r. ?r rdf:first ?y. } => { ${U('s')} ${U('second')} ?y. }.
+`,
+    expect: [new RegExp(`${EX}s>\\s+<${EX}second>\\s+<${EX}b>\\s*\\.`)],
+  },
+
+  { name: '50 rdf collection materialization: rdf:first/rdf:rest triples become list terms',
+    opt: { proofComments: false }, input: ` ${U('s')} ${U('p')} _:l1.
+_:l1 rdf:first ${U('a')}.
+_:l1 rdf:rest _:l2.
+_:l2 rdf:first ${U('b')}.
+_:l2 rdf:rest rdf:nil.
+
+{ ${U('s')} ${U('p')} ?lst. ?lst rdf:first ?x. } => { ${U('s')} ${U('q')} ?x. }.
+{ ${U('s')} ${U('p')} ?lst. ?lst rdf:rest ?r. ?r rdf:first ?y. } => { ${U('s')} ${U('q2')} ?y. }.
+{ ${U('s')} ${U('p')} ?lst. ?lst list:rest ?r. ?r list:first ?y. } => { ${U('s')} ${U('q3')} ?y. }.
+`,
+    expect: [
+      new RegExp(`${EX}s>\\s+<${EX}q>\\s+<${EX}a>\\s*\\.`),
+      new RegExp(`${EX}s>\\s+<${EX}q2>\\s+<${EX}b>\\s*\\.`),
+      new RegExp(`${EX}s>\\s+<${EX}q3>\\s+<${EX}b>\\s*\\.`),
+    ],
+  },
 ];
 
 let passed = 0;