eyeling 1.7.0 → 1.7.2

package/README.md

@@ -99,13 +99,15 @@ npm run test:packlist
 ### Usage
 
 ```
-Usage: eyeling.js [options] <file.n3>
+Usage: eyeling [options] <file.n3>
 
 Options:
   -h, --help              Show this help and exit.
   -v, --version           Print version and exit.
   -p, --proof-comments    Enable proof explanations.
   -n, --no-proof-comments Disable proof explanations (default).
+  -s, --super-restricted  Disable all builtins except => and <=.
+  -a, --ast               Print parsed AST as JSON and exit.
 ```
 
 By default, `eyeling`:

package/examples/alignment-demo.n3

@@ -1,7 +1,7 @@
 # alignment-demo.n3
 # Minimal alignment example (SKOS mappings + inferred roll-up to a reference concept)
 
-@prefix ex:   <http://example.org/> .
+@prefix ex:   <http://example.org/#> .
 @prefix ref:  <http://example.org/taxonomy/ref/> .
 @prefix tel:  <http://example.org/taxonomy/telraam/> .
 @prefix anpr: <http://example.org/taxonomy/anpr/> .

package/examples/bind.n3

@@ -0,0 +1,7 @@
+@prefix : <http://example/#> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+@prefix string: <http://www.w3.org/2000/10/swap/string#> .
+
+:phayes a :Person ; :givenName "Pat"; :familyName "Hayes" .
+
+{ ?x a :Person . ?SCOPE log:notIncludes { ?x :name ?someName . } . ?x :givenName ?name1 . ?x :familyName ?name2 . (?name1 " " ?name2) string:concatenation ?FN . } => { ?x :name ?FN } .

package/examples/bind.srl

@@ -0,0 +1,12 @@
+PREFIX : <http://example/#>
+
+DATA { :phayes a :Person ; :givenName "Pat"; :familyName "Hayes" . }
+
+# Default value - calculate a name
+RULE { ?x :name ?FN } WHERE { 
+    ?x a :Person 
+    NOT { ?x :name ?someName }
+    ?x :givenName ?name1 ;
+       :familyName ?name2 .
+    BIND(concat(?name1, " ", ?name2) AS ?FN)
+}

package/examples/family.n3

@@ -0,0 +1,10 @@
+@prefix : <http://example.org/#> .
+
+:A :fatherOf :X . :B :motherOf :X . :C :motherOf :A .
+
+{ ?y :fatherOf ?x . } => { ?x :childOf ?y } .
+{ ?y :motherOf ?x . } => { ?x :childOf ?y } .
+{ ?x :childOf ?y . } => { ?x :descendedFrom ?y } .
+{ ?x :childOf ?z . ?z :childOf ?y . } => { ?x :descendedFrom ?y } .
+{ ?y :descendedFrom ?x . } => { ?x :ancestorOf ?y } .
+{ ?a :ancestorOf ?c . ?c :ancestorOf ?b . } => { ?a :ancestorOf ?b } .

package/examples/family.srl

@@ -0,0 +1,12 @@
+PREFIX : <http://example.org/#>
+
+DATA { :A :fatherOf :X . :B :motherOf :X . :C :motherOf :A . }
+
+RULE { ?x :childOf ?y } WHERE { ?y :fatherOf ?x }
+RULE { ?x :childOf ?y } WHERE { ?y :motherOf ?x }
+
+RULE { ?x :descendedFrom ?y } WHERE { ?x :childOf ?y }
+RULE { ?x :descendedFrom ?y } WHERE { ?x :childOf ?z . ?z :childOf ?y }
+
+RULE { ?x :ancestorOf ?y } WHERE { ?y :descendedFrom ?x }
+RULE { ?a :ancestorOf ?b } WHERE { ?a :ancestorOf ?c . ?c :ancestorOf ?b }

package/examples/filter.n3

@@ -0,0 +1,8 @@
+@prefix : <http://example/#> .
+@prefix math: <http://www.w3.org/2000/10/swap/math#> .
+
+:x :p 1 ; :q 2 .
+
+{ ?x :p ?v1 . ?x :q ?v2 . ?v1 math:greaterThan 0 . ?v2 math:greaterThan 0 . } => { ?x :bothPositive true . } .
+{ ?x :p ?v1 . ?x :q ?v2 . ?v1 math:equalTo 0 . } => { ?x :oneIsZero true . } .
+{ ?x :p ?v1 . ?x :q ?v2 . ?v2 math:equalTo 0 . } => { ?x :oneIsZero true . } .

package/examples/filter.srl

@@ -0,0 +1,9 @@
+PREFIX : <http://example/#>
+
+DATA { :x :p 1 ; :q 2 . }
+
+RULE { ?x :bothPositive true . }
+WHERE { ?x :p ?v1  FILTER ( ?v1 > 0 )  ?x :q ?v2  FILTER ( ?v2 > 0 )  }
+
+RULE { ?x :oneIsZero true . }
+WHERE { ?x :p ?v1 ;  :q ?v2  FILTER ( ( ?v1 = 0 ) || ( ?v2 = 0 ) )  }

package/examples/json-pointer.n3

@@ -7,7 +7,7 @@
 @prefix string: <http://www.w3.org/2000/10/swap/string#> .
 @prefix list:   <http://www.w3.org/2000/10/swap/list#> .
 @prefix log:    <http://www.w3.org/2000/10/swap/log#> .
-@prefix ex:     <http://example.org/> .
+@prefix ex:     <http://example.org/#> .
 
 ex:doc ex:json """{
   "users": [

package/examples/json-reconcile-vat.n3

@@ -9,7 +9,7 @@
 @prefix math:   <http://www.w3.org/2000/10/swap/math#> .
 @prefix log:    <http://www.w3.org/2000/10/swap/log#> .
 @prefix owl:    <http://www.w3.org/2002/07/owl#> .
-@prefix ex:     <http://example.org/> .
+@prefix ex:     <http://example.org/#> .
 
 # ------------------------------------------------------------------
 # Master data (canonical N3 graph)

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

@@ -2,7 +2,7 @@
 # log:collectAllIn example
 # ========================
 
-@prefix : <http://example.org/>.
+@prefix : <http://example.org/#>.
 @prefix log: <http://www.w3.org/2000/10/swap/log#> .
 @prefix string: <http://www.w3.org/2000/10/swap/string#> .
 

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

@@ -2,7 +2,7 @@
 # log:forAllIn example
 # ====================
 
-@prefix : <http://example.org/>.
+@prefix : <http://example.org/#>.
 @prefix log: <http://www.w3.org/2000/10/swap/log#> .
 
 :c a :CompositeTask ;

package/examples/log-not-includes.n3

@@ -2,7 +2,7 @@
 # log:notIncludes example
 # =======================
 
-@prefix : <http://example.org/> .
+@prefix : <http://example.org/#> .
 @prefix log: <http://www.w3.org/2000/10/swap/log#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix math: <http://www.w3.org/2000/10/swap/math#> .

package/examples/log-skolem.n3

@@ -2,7 +2,7 @@
 # log:skolem example
 # ==================
 
-@prefix :   <http://example.org/> .
+@prefix :   <http://example.org/#> .
 @prefix log: <http://www.w3.org/2000/10/swap/log#> .
 
 {

package/examples/log-uri.n3

@@ -2,7 +2,7 @@
 # log:uri example
 # ===============
 
-@prefix :   <http://example.org/> .
+@prefix :   <http://example.org/#> .
 @prefix log: <http://www.w3.org/2000/10/swap/log#> .
 
 {

package/examples/minimal-skos-alignment.n3

@@ -14,7 +14,7 @@
 #   eyeling minimal-skos-alignment.n3
 # ------------------------------------------------------------
 
-@prefix ex:   <http://example.org/> .
+@prefix ex:   <http://example.org/#> .
 @prefix ref:  <http://example.org/ref/> .
 @prefix anpr: <http://example.org/anpr/> .
 @prefix skos: <http://www.w3.org/2004/02/skos/core#> .

package/examples/output/alignment-demo.n3

@@ -1,5 +1,5 @@
 @prefix anpr: <http://example.org/taxonomy/anpr/> .
-@prefix ex: <http://example.org/> .
+@prefix ex: <http://example.org/#> .
 @prefix ref: <http://example.org/taxonomy/ref/> .
 @prefix skos: <http://www.w3.org/2004/02/skos/core#> .
 @prefix tel: <http://example.org/taxonomy/telraam/> .

package/examples/output/bind.n3

@@ -0,0 +1,3 @@
+@prefix : <http://example/#> .
+
+:phayes :name "Pat Hayes" .

package/examples/output/family.n3

@@ -0,0 +1,13 @@
+@prefix : <http://example.org/#> .
+
+:X :childOf :A .
+:X :childOf :B .
+:A :childOf :C .
+:X :descendedFrom :A .
+:X :descendedFrom :B .
+:A :descendedFrom :C .
+:X :descendedFrom :C .
+:A :ancestorOf :X .
+:B :ancestorOf :X .
+:C :ancestorOf :A .
+:C :ancestorOf :X .

package/examples/output/filter.n3

@@ -0,0 +1,3 @@
+@prefix : <http://example/#> .
+
+:x :bothPositive true .

package/examples/output/json-pointer.n3

@@ -1,4 +1,4 @@
-@prefix ex: <http://example.org/> .
+@prefix ex: <http://example.org/#> .
 
 ex:checks ex:firstUserNameOk true .
 <urn:example:user:u1> a ex:AllowedUser .

package/examples/output/json-reconcile-vat.n3

@@ -1,4 +1,4 @@
-@prefix ex: <http://example.org/> .
+@prefix ex: <http://example.org/#> .
 @prefix genid: <https://eyereasoner.github.io/.well-known/genid/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 

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

@@ -1,4 +1,4 @@
-@prefix : <http://example.org/> .
+@prefix : <http://example.org/#> .
 
 :result1 :is ("Huey" "Dewey" "Louie") .
 :result2 :is (("Huey") ("Dewey") ("Louie")) .

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

@@ -1,3 +1,3 @@
-@prefix : <http://example.org/> .
+@prefix : <http://example.org/#> .
 
 :result :is true .

package/examples/output/log-not-includes.n3

@@ -1,4 +1,4 @@
-@prefix : <http://example.org/> .
+@prefix : <http://example.org/#> .
 @prefix log: <http://www.w3.org/2000/10/swap/log#> .
 
 :x :y 1 .

package/examples/output/log-skolem.n3

@@ -1,4 +1,4 @@
-@prefix : <http://example.org/> .
+@prefix : <http://example.org/#> .
 @prefix genid: <https://eyereasoner.github.io/.well-known/genid/> .
 
-:Result :skolem genid:0c562a90-a44f-264a-86e5-9664948aa178 .
+:Result :skolem genid:32007e38-bd28-5f18-4712-ae1df708a5d4 .

package/examples/output/log-uri.n3

@@ -1,4 +1,4 @@
-@prefix : <http://example.org/> .
+@prefix : <http://example.org/#> .
 
 :uriString :is "https://www.w3.org" .
 :uriResource :is <https://www.w3.org> .

package/examples/output/minimal-skos-alignment.n3

@@ -1,5 +1,5 @@
 @prefix anpr: <http://example.org/anpr/> .
-@prefix ex: <http://example.org/> .
+@prefix ex: <http://example.org/#> .
 @prefix ref: <http://example.org/ref/> .
 
 anpr:VehicleWithPlate ex:treatedAs ref:Car .

package/examples/output/snaf.n3

@@ -1,3 +1,3 @@
-@prefix : <http://example.org/> .
+@prefix : <http://example.org/#> .
 
 :Alice :hates :Nobody .

package/examples/output/traffic-skos-aggregate.n3

@@ -1,5 +1,5 @@
 @prefix anpr: <http://example.org/taxonomy/anpr/> .
-@prefix ex: <http://example.org/> .
+@prefix ex: <http://example.org/#> .
 @prefix genid: <https://eyereasoner.github.io/.well-known/genid/> .
 @prefix prov: <http://www.w3.org/ns/prov#> .
 @prefix ref: <http://example.org/taxonomy/ref/> .
@@ -130,18 +130,18 @@ anpr:PassengerCar ex:narrowerOrEqualOf ref:RoadUser .
 anpr:Van ex:narrowerOrEqualOf ref:RoadUser .
 anpr:Truck ex:narrowerOrEqualOf ref:RoadUser .
 anpr:Bus ex:narrowerOrEqualOf ref:RoadUser .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc a sosa:Observation .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc a ex:AggregatedObservation .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc sosa:observedProperty ref:Car .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc sosa:hasFeatureOfInterest ex:segment1 .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc sosa:resultTime "2025-12-23T08:00:00Z"^^xsd:dateTime .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc sosa:hasSimpleResult 22 .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc ex:basedOnRequest ex:request_cars_at_t1 .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc ex:contributingValues (10 2 8 1 1 0) .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc ex:contributingObservations (ex:obs_tel_car ex:obs_tel_heavy ex:obs_anpr_passenger ex:obs_anpr_van ex:obs_anpr_truck ex:obs_anpr_bus) .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc prov:wasDerivedFrom ex:obs_tel_car .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc prov:wasDerivedFrom ex:obs_tel_heavy .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc prov:wasDerivedFrom ex:obs_anpr_passenger .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc prov:wasDerivedFrom ex:obs_anpr_van .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc prov:wasDerivedFrom ex:obs_anpr_truck .
-genid:5d9446e0-5075-531c-f72b-7fb8f210a4dc prov:wasDerivedFrom ex:obs_anpr_bus .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 a sosa:Observation .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 a ex:AggregatedObservation .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 sosa:observedProperty ref:Car .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 sosa:hasFeatureOfInterest ex:segment1 .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 sosa:resultTime "2025-12-23T08:00:00Z"^^xsd:dateTime .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 sosa:hasSimpleResult 22 .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 ex:basedOnRequest ex:request_cars_at_t1 .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 ex:contributingValues (10 2 8 1 1 0) .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 ex:contributingObservations (ex:obs_tel_car ex:obs_tel_heavy ex:obs_anpr_passenger ex:obs_anpr_van ex:obs_anpr_truck ex:obs_anpr_bus) .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 prov:wasDerivedFrom ex:obs_tel_car .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 prov:wasDerivedFrom ex:obs_tel_heavy .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 prov:wasDerivedFrom ex:obs_anpr_passenger .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 prov:wasDerivedFrom ex:obs_anpr_van .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 prov:wasDerivedFrom ex:obs_anpr_truck .
+genid:baddfb7c-3e49-3ca8-bc4f-6de82f22dc60 prov:wasDerivedFrom ex:obs_anpr_bus .

package/examples/snaf.n3

@@ -3,7 +3,7 @@
 # ==========================
 
 @prefix log: <http://www.w3.org/2000/10/swap/log#>.
-@prefix : <http://example.org/>.
+@prefix : <http://example.org/#>.
 
 :Alice :loves :Bob.
 :Bob a :Person.

package/examples/snaf.srl

@@ -1,7 +1,6 @@
 PREFIX log: <http://www.w3.org/2000/10/swap/log#>
-PREFIX : <http://example.org/>
+PREFIX : <http://example.org/#>
 
-:Alice :loves :Bob.
-:Bob a :Person.
+DATA { :Alice :loves :Bob. :Bob a :Person. }
 
 RULE { :Alice :hates :Nobody. } WHERE { NOT { :Alice :hates ?X } ?X a :Person. }

package/examples/traffic-skos-aggregate.n3

@@ -10,7 +10,7 @@
 # or:
 #   node eyeling.js traffic-skos-aggregate.n3
 
-@prefix ex:   <http://example.org/> .
+@prefix ex:   <http://example.org/#> .
 @prefix ref:  <http://example.org/taxonomy/ref/> .
 @prefix tel:  <http://example.org/taxonomy/telraam/> .
 @prefix anpr: <http://example.org/taxonomy/anpr/> .

package/eyeling.js

@@ -315,13 +315,24 @@ class DerivedFact {
 // ===========================================================================
 
 class Token {
-  constructor(typ, value = null) {
+  constructor(typ, value = null, offset = null) {
     this.typ = typ;
     this.value = value;
+    // Codepoint offset in the original source (Array.from(text) index).
+    this.offset = offset;
   }
   toString() {
-    if (this.value == null) return `Token(${this.typ})`;
-    return `Token(${this.typ}, ${JSON.stringify(this.value)})`;
+    const loc = typeof this.offset === 'number' ? `@${this.offset}` : '';
+    if (this.value == null) return `Token(${this.typ}${loc})`;
+    return `Token(${this.typ}${loc}, ${JSON.stringify(this.value)})`;
+  }
+}
+
+class N3SyntaxError extends SyntaxError {
+  constructor(message, offset = null) {
+    super(message);
+    this.name = 'N3SyntaxError';
+    this.offset = offset;
   }
 }
 
@@ -434,12 +445,12 @@ function lex(inputText) {
     // 3) Two-character operators: => and <=
     if (c === '=') {
       if (peek(1) === '>') {
-        tokens.push(new Token('OpImplies'));
+        tokens.push(new Token('OpImplies', null, i));
         i += 2;
         continue;
       } else {
         // N3 syntactic sugar: '=' means owl:sameAs
-        tokens.push(new Token('Equals'));
+        tokens.push(new Token('Equals', null, i));
         i += 1;
         continue;
       }
@@ -447,17 +458,18 @@ function lex(inputText) {
 
     if (c === '<') {
       if (peek(1) === '=') {
-        tokens.push(new Token('OpImpliedBy'));
+        tokens.push(new Token('OpImpliedBy', null, i));
         i += 2;
         continue;
       }
       // N3 predicate inversion: "<-" (swap subject/object for this predicate)
       if (peek(1) === '-') {
-        tokens.push(new Token('OpPredInvert'));
+        tokens.push(new Token('OpPredInvert', null, i));
         i += 2;
         continue;
       }
       // Otherwise IRIREF <...>
+      const start = i;
       i++; // skip '<'
       const iriChars = [];
       while (i < n && chars[i] !== '>') {
@@ -465,27 +477,27 @@ function lex(inputText) {
         i++;
       }
       if (i >= n || chars[i] !== '>') {
-        throw new Error('Unterminated IRI <...>');
+        throw new N3SyntaxError('Unterminated IRI <...>', start);
       }
       i++; // skip '>'
       const iri = iriChars.join('');
-      tokens.push(new Token('IriRef', iri));
+      tokens.push(new Token('IriRef', iri, start));
       continue;
     }
 
     // 4) Path + datatype operators: !, ^, ^^
     if (c === '!') {
-      tokens.push(new Token('OpPathFwd'));
+      tokens.push(new Token('OpPathFwd', null, i));
       i += 1;
       continue;
     }
     if (c === '^') {
       if (peek(1) === '^') {
-        tokens.push(new Token('HatHat'));
+        tokens.push(new Token('HatHat', null, i));
         i += 2;
         continue;
       }
-      tokens.push(new Token('OpPathRev'));
+      tokens.push(new Token('OpPathRev', null, i));
       i += 1;
       continue;
     }
@@ -503,13 +515,15 @@ function lex(inputText) {
         ',': 'Comma',
         '.': 'Dot',
       };
-      tokens.push(new Token(mapping[c]));
+      tokens.push(new Token(mapping[c], null, i));
       i++;
       continue;
     }
 
     // String literal: short "..." or long """..."""
     if (c === '"') {
+      const start = i;
+
       // Long string literal """ ... """
       if (peek(1) === '"' && peek(2) === '"') {
         i += 3; // consume opening """
@@ -553,11 +567,11 @@ function lex(inputText) {
           sChars.push(cc);
           i++;
         }
-        if (!closed) throw new Error('Unterminated long string literal """..."""');
+        if (!closed) throw new N3SyntaxError('Unterminated long string literal """..."""', start);
         const raw = '"""' + sChars.join('') + '"""';
         const decoded = decodeN3StringEscapes(stripQuotes(raw));
         const s = JSON.stringify(decoded); // canonical short quoted form
-        tokens.push(new Token('Literal', s));
+        tokens.push(new Token('Literal', s, start));
         continue;
       }
 
@@ -582,12 +596,14 @@ function lex(inputText) {
       const raw = '"' + sChars.join('') + '"';
       const decoded = decodeN3StringEscapes(stripQuotes(raw));
       const s = JSON.stringify(decoded); // canonical short quoted form
-      tokens.push(new Token('Literal', s));
+      tokens.push(new Token('Literal', s, start));
       continue;
     }
 
     // String literal: short '...' or long '''...'''
     if (c === "'") {
+      const start = i;
+
       // Long string literal ''' ... '''
       if (peek(1) === "'" && peek(2) === "'") {
         i += 3; // consume opening '''
@@ -631,11 +647,11 @@ function lex(inputText) {
           sChars.push(cc);
           i++;
         }
-        if (!closed) throw new Error("Unterminated long string literal '''...'''");
+        if (!closed) throw new N3SyntaxError("Unterminated long string literal '''...'''", start);
         const raw = "'''" + sChars.join('') + "'''";
         const decoded = decodeN3StringEscapes(stripQuotes(raw));
         const s = JSON.stringify(decoded); // canonical short quoted form
-        tokens.push(new Token('Literal', s));
+        tokens.push(new Token('Literal', s, start));
         continue;
       }
 
@@ -660,12 +676,13 @@ function lex(inputText) {
       const raw = "'" + sChars.join('') + "'";
       const decoded = decodeN3StringEscapes(stripQuotes(raw));
       const s = JSON.stringify(decoded); // canonical short quoted form
-      tokens.push(new Token('Literal', s));
+      tokens.push(new Token('Literal', s, start));
       continue;
     }
 
     // Variable ?name
     if (c === '?') {
+      const start = i;
       i++;
       const nameChars = [];
       let cc;
@@ -674,12 +691,13 @@ function lex(inputText) {
         i++;
       }
       const name = nameChars.join('');
-      tokens.push(new Token('Var', name));
+      tokens.push(new Token('Var', name, start));
       continue;
     }
 
     // Directives: @prefix, @base (and language tags after string literals)
     if (c === '@') {
+      const start = i;
       const prevTok = tokens.length ? tokens[tokens.length - 1] : null;
       const prevWasQuotedLiteral =
         prevTok && prevTok.typ === 'Literal' && typeof prevTok.value === 'string' && prevTok.value.startsWith('"');
@@ -692,7 +710,7 @@ function lex(inputText) {
         const tagChars = [];
         let cc = peek();
         if (cc === null || !/[A-Za-z]/.test(cc)) {
-          throw new Error("Invalid language tag (expected [A-Za-z] after '@')");
+          throw new N3SyntaxError("Invalid language tag (expected [A-Za-z] after '@')", start);
         }
         while ((cc = peek()) !== null && /[A-Za-z]/.test(cc)) {
           tagChars.push(cc);
@@ -707,11 +725,11 @@ function lex(inputText) {
             i++;
           }
           if (!segChars.length) {
-            throw new Error("Invalid language tag (expected [A-Za-z0-9]+ after '-')");
+            throw new N3SyntaxError("Invalid language tag (expected [A-Za-z0-9]+ after '-')", start);
           }
           tagChars.push(...segChars);
         }
-        tokens.push(new Token('LangTag', tagChars.join('')));
+        tokens.push(new Token('LangTag', tagChars.join(''), start));
         continue;
       }
 
@@ -723,14 +741,15 @@ function lex(inputText) {
         i++;
       }
       const word = wordChars.join('');
-      if (word === 'prefix') tokens.push(new Token('AtPrefix'));
-      else if (word === 'base') tokens.push(new Token('AtBase'));
-      else throw new Error(`Unknown directive @${word}`);
+      if (word === 'prefix') tokens.push(new Token('AtPrefix', null, start));
+      else if (word === 'base') tokens.push(new Token('AtBase', null, start));
+      else throw new N3SyntaxError(`Unknown directive @${word}`, start);
       continue;
     }
 
     // 6) Numeric literal (integer or float)
     if (/[0-9]/.test(c) || (c === '-' && peek(1) !== null && /[0-9]/.test(peek(1)))) {
+      const start = i;
       const numChars = [c];
       i++;
       while (i < n) {
@@ -770,11 +789,12 @@ function lex(inputText) {
         }
       }
 
-      tokens.push(new Token('Literal', numChars.join('')));
+      tokens.push(new Token('Literal', numChars.join(''), start));
       continue;
     }
 
     // 7) Identifiers / keywords / QNames
+    const start = i;
     const wordChars = [];
     let cc;
     while ((cc = peek()) !== null && isNameChar(cc)) {
@@ -782,19 +802,19 @@ function lex(inputText) {
       i++;
     }
     if (!wordChars.length) {
-      throw new Error(`Unexpected char: ${JSON.stringify(c)}`);
+      throw new N3SyntaxError(`Unexpected char: ${JSON.stringify(c)}`, i);
     }
     const word = wordChars.join('');
     if (word === 'true' || word === 'false') {
-      tokens.push(new Token('Literal', word));
+      tokens.push(new Token('Literal', word, start));
     } else if ([...word].every((ch) => /[0-9.\-]/.test(ch))) {
-      tokens.push(new Token('Literal', word));
+      tokens.push(new Token('Literal', word, start));
     } else {
-      tokens.push(new Token('Ident', word));
+      tokens.push(new Token('Ident', word, start));
     }
   }
 
-  tokens.push(new Token('EOF'));
+  tokens.push(new Token('EOF', null, n));
   return tokens;
 }
 
@@ -984,10 +1004,15 @@ class Parser {
     return tok;
   }
 
+  fail(message, tok = this.peek()) {
+    const off = tok && typeof tok.offset === 'number' ? tok.offset : null;
+    throw new N3SyntaxError(message, off);
+  }
+
   expectDot() {
     const tok = this.next();
     if (tok.typ !== 'Dot') {
-      throw new Error(`Expected '.', got ${tok.toString()}`);
+      this.fail(`Expected '.', got ${tok.toString()}`, tok);
     }
   }
 
@@ -1079,7 +1104,7 @@ class Parser {
   parsePrefixDirective() {
     const tok = this.next();
     if (tok.typ !== 'Ident') {
-      throw new Error(`Expected prefix name, got ${tok.toString()}`);
+      this.fail(`Expected prefix name, got ${tok.toString()}`, tok);
     }
     const pref = tok.value || '';
     const prefName = pref.endsWith(':') ? pref.slice(0, -1) : pref;
@@ -1099,7 +1124,7 @@ class Parser {
     } else if (tok2.typ === 'Ident') {
       iri = this.prefixes.expandQName(tok2.value || '');
     } else {
-      throw new Error(`Expected IRI after @prefix, got ${tok2.toString()}`);
+      this.fail(`Expected IRI after @prefix, got ${tok2.toString()}`, tok2);
     }
     this.expectDot();
     this.prefixes.set(prefName, iri);
@@ -1113,7 +1138,7 @@ class Parser {
     } else if (tok.typ === 'Ident') {
       iri = tok.value || '';
     } else {
-      throw new Error(`Expected IRI after @base, got ${tok.toString()}`);
+      this.fail(`Expected IRI after @base, got ${tok.toString()}`, tok);
     }
     this.expectDot();
     this.prefixes.setBase(iri);
@@ -1123,7 +1148,7 @@ class Parser {
     // SPARQL/Turtle-style PREFIX directive: PREFIX pfx: <iri>  (no trailing '.')
     const tok = this.next();
     if (tok.typ !== 'Ident') {
-      throw new Error(`Expected prefix name after PREFIX, got ${tok.toString()}`);
+      this.fail(`Expected prefix name after PREFIX, got ${tok.toString()}`, tok);
     }
     const pref = tok.value || '';
     const prefName = pref.endsWith(':') ? pref.slice(0, -1) : pref;
@@ -1135,7 +1160,7 @@ class Parser {
     } else if (tok2.typ === 'Ident') {
       iri = this.prefixes.expandQName(tok2.value || '');
     } else {
-      throw new Error(`Expected IRI after PREFIX, got ${tok2.toString()}`);
+      this.fail(`Expected IRI after PREFIX, got ${tok2.toString()}`, tok2);
     }
 
     // N3/Turtle: PREFIX directives do not have a trailing '.', but accept it permissively.
@@ -1153,7 +1178,7 @@ class Parser {
     } else if (tok.typ === 'Ident') {
       iri = tok.value || '';
     } else {
-      throw new Error(`Expected IRI after BASE, got ${tok.toString()}`);
+      this.fail(`Expected IRI after BASE, got ${tok.toString()}`, tok);
     }
 
     // N3/Turtle: BASE directives do not have a trailing '.', but accept it permissively.
@@ -1213,7 +1238,7 @@ class Parser {
       if (this.peek().typ === 'LangTag') {
         // Only quoted string literals can carry a language tag.
         if (!(s.startsWith('"') && s.endsWith('"'))) {
-          throw new Error('Language tag is only allowed on quoted string literals');
+          this.fail('Language tag is only allowed on quoted string literals', this.peek());
         }
         const langTok = this.next();
         const lang = langTok.value || '';
@@ -1221,7 +1246,7 @@ class Parser {
 
         // N3/Turtle: language tags and datatypes are mutually exclusive.
         if (this.peek().typ === 'HatHat') {
-          throw new Error('A literal cannot have both a language tag (@...) and a datatype (^^...)');
+          this.fail('A literal cannot have both a language tag (@...) and a datatype (^^...)', this.peek());
         }
       }
 
@@ -1236,7 +1261,7 @@ class Parser {
           if (qn.includes(':')) dtIri = this.prefixes.expandQName(qn);
           else dtIri = qn;
         } else {
-          throw new Error(`Expected datatype after ^^, got ${dtTok.toString()}`);
+          this.fail(`Expected datatype after ^^, got ${dtTok.toString()}`, dtTok);
         }
         s = `${s}^^<${dtIri}>`;
       }
@@ -1248,7 +1273,7 @@ class Parser {
     if (typ === 'LBracket') return this.parseBlank();
     if (typ === 'LBrace') return this.parseGraph();
 
-    throw new Error(`Unexpected term token: ${tok.toString()}`);
+    this.fail(`Unexpected term token: ${tok.toString()}`, tok);
   }
 
   parseList() {
@@ -1271,12 +1296,12 @@ class Parser {
     // IRI property list: [ id <IRI> predicateObjectList? ]
     // Lets you embed descriptions of an IRI directly in object position.
     if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'id') {
-      this.next(); // consume 'id'
+      const iriTok = this.next(); // consume 'id'
       const iriTerm = this.parseTerm();
 
       // N3 note: 'id' form is not meant to be used with blank node identifiers.
       if (iriTerm instanceof Blank && iriTerm.label.startsWith('_:')) {
-        throw new Error("Cannot use 'id' keyword with a blank node identifier inside [...]");
+        this.fail("Cannot use 'id' keyword with a blank node identifier inside [...]", iriTok);
       }
 
       // Optional ';' right after the id IRI (tolerated).
@@ -1322,7 +1347,7 @@ class Parser {
       }
 
       if (this.peek().typ !== 'RBracket') {
-        throw new Error(`Expected ']' at end of IRI property list, got ${JSON.stringify(this.peek())}`);
+        this.fail(`Expected ']' at end of IRI property list, got ${this.peek().toString()}`);
       }
       this.next();
       return iriTerm;
@@ -1370,7 +1395,7 @@ class Parser {
     if (this.peek().typ === 'RBracket') {
       this.next();
     } else {
-      throw new Error(`Expected ']' at end of blank node property list, got ${JSON.stringify(this.peek())}`);
+      this.fail(`Expected ']' at end of blank node property list, got ${this.peek().toString()}`);
     }
 
     return new Blank(id);
@@ -1389,7 +1414,7 @@ class Parser {
         else if (this.peek().typ === 'RBrace') {
           // ok
         } else {
-          throw new Error(`Expected '.' or '}', got ${this.peek().toString()}`);
+          this.fail(`Expected '.' or '}', got ${this.peek().toString()}`);
         }
       } else if (this.peek().typ === 'OpImpliedBy') {
         this.next();
@@ -1400,7 +1425,7 @@ class Parser {
         else if (this.peek().typ === 'RBrace') {
           // ok
         } else {
-          throw new Error(`Expected '.' or '}', got ${this.peek().toString()}`);
+          this.fail(`Expected '.' or '}', got ${this.peek().toString()}`);
         }
       } else {
         // N3 grammar allows: triples ::= subject predicateObjectList?
@@ -1419,7 +1444,7 @@ class Parser {
         else if (this.peek().typ === 'RBrace') {
           // ok
         } else {
-          throw new Error(`Expected '.' or '}', got ${this.peek().toString()}`);
+          this.fail(`Expected '.' or '}', got ${this.peek().toString()}`);
         }
       }
     }
@@ -1452,7 +1477,7 @@ class Parser {
         this.next(); // consume "is"
         verb = this.parseTerm();
         if (!(this.peek().typ === 'Ident' && (this.peek().value || '') === 'of')) {
-          throw new Error(`Expected 'of' after 'is <expr>', got ${this.peek().toString()}`);
+          this.fail(`Expected 'of' after 'is <expr>', got ${this.peek().toString()}`);
         }
         this.next(); // consume "of"
         invert = true;
@@ -4613,6 +4638,58 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen) {
     return [{ ...subst }];
   }
 
+  // log:conjunction
+  // Schema: ( $s.i+ )+ log:conjunction $o?
+  // $o is a formula containing a copy of each formula in the subject list.
+  // Duplicates are removed.
+  if (pv === LOG_NS + 'conjunction') {
+    if (!(g.s instanceof ListTerm)) return [];
+
+    const parts = g.s.elems;
+    if (!parts.length) return [];
+
+    /** @type {Triple[]} */
+    const merged = [];
+
+    // Fast-path dedup for IRI/Literal-only triples.
+    const fastKeySet = new Set();
+
+    for (const part of parts) {
+      // Support the empty formula token `true`.
+      if (part instanceof Literal && part.value === 'true') continue;
+
+      if (!(part instanceof GraphTerm)) return [];
+
+      for (const tr of part.triples) {
+        const k = tripleFastKey(tr);
+        if (k !== null) {
+          if (fastKeySet.has(k)) continue;
+          fastKeySet.add(k);
+          merged.push(tr);
+          continue;
+        }
+
+        // Fallback: structural equality (still respects plain-string == xsd:string).
+        let dup = false;
+        for (const ex of merged) {
+          if (triplesEqual(tr, ex)) {
+            dup = true;
+            break;
+          }
+        }
+        if (!dup) merged.push(tr);
+      }
+    }
+
+    const outFormula = new GraphTerm(merged);
+
+    // Allow blank nodes as a don't-care output (common in builtin schemas).
+    if (g.o instanceof Blank) return [{ ...subst }];
+
+    const s2 = unifyTerm(g.o, outFormula, subst);
+    return s2 !== null ? [s2] : [];
+  }
+
   // log:dtlit
   // Schema: ( $s.1? $s.2? )? log:dtlit $o?
   // true iff $o is a datatyped literal with string value $s.1 and datatype IRI $s.2
@@ -4779,6 +4856,41 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen) {
     return results;
   }
 
+  // log:includes (provable in scope)
+  // Schema: $s+ log:includes $o+
+  // When the subject is a formula, the scope is that concrete formula (syntactic containment).
+  // Otherwise, the scope is the current document scope (facts + backward rules).
+  if (pv === LOG_NS + 'includes') {
+    // Empty formula is always included.
+    if (g.o instanceof Literal && g.o.value === 'true') return [{ ...subst }];
+    if (!(g.o instanceof GraphTerm)) return [];
+
+    /** @type {Triple[] | null} */
+    let scopeFacts = null;
+    /** @type {Rule[]} */
+    let scopeBackRules = backRules;
+
+    // If the subject is a formula, treat it as a concrete scope graph.
+    // Also support `true` as the empty formula.
+    if (g.s instanceof GraphTerm) {
+      scopeFacts = g.s.triples.slice();
+      ensureFactIndexes(scopeFacts);
+      Object.defineProperty(scopeFacts, '__scopedSnapshot', { value: scopeFacts, enumerable: false, writable: true });
+      scopeBackRules = []; // concrete scope = syntactic containment (no extra rules)
+    } else if (g.s instanceof Literal && g.s.value === 'true') {
+      scopeFacts = [];
+      ensureFactIndexes(scopeFacts);
+      Object.defineProperty(scopeFacts, '__scopedSnapshot', { value: scopeFacts, enumerable: false, writable: true });
+      scopeBackRules = [];
+    } else {
+      scopeFacts = facts; // dynamic scope
+    }
+
+    const visited2 = [];
+    // Start from the incoming substitution so bindings flow outward.
+    return proveGoals(Array.from(g.o.triples), { ...subst }, scopeFacts, scopeBackRules, depth + 1, visited2, varGen);
+  }
+
   // log:notIncludes (not provable in scope)
   // Delay until we have a frozen scope snapshot to avoid early success.
   if (pv === LOG_NS + 'notIncludes') {
@@ -5794,6 +5906,41 @@ function printExplanation(df, prefixes) {
   console.log('# ----------------------------------------------------------------------\n');
 }
 
+
+function offsetToLineCol(text, offset) {
+  const chars = Array.from(text);
+  const n = Math.max(0, Math.min(typeof offset === 'number' ? offset : 0, chars.length));
+  let line = 1;
+  let col = 1;
+  for (let i = 0; i < n; i++) {
+    const c = chars[i];
+    if (c === '\n') {
+      line++;
+      col = 1;
+    } else if (c === '\r') {
+      line++;
+      col = 1;
+      if (i + 1 < n && chars[i + 1] === '\n') i++; // swallow \n in CRLF
+    } else {
+      col++;
+    }
+  }
+  return { line, col };
+}
+
+function formatN3SyntaxError(err, text, path) {
+  const off = err && typeof err.offset === 'number' ? err.offset : null;
+  const label = path ? String(path) : '<input>';
+  if (off === null) {
+    return `Syntax error in ${label}: ${err && err.message ? err.message : String(err)}`;
+  }
+  const { line, col } = offsetToLineCol(text, off);
+  const lines = String(text).split(/\r\n|\n|\r/);
+  const lineText = lines[line - 1] ?? '';
+  const caret = ' '.repeat(Math.max(0, col - 1)) + '^';
+  return `Syntax error in ${label}:${line}:${col}: ${err.message}\n${lineText}\n${caret}`;
+}
+
 // ===========================================================================
 // CLI entry point
 // ===========================================================================
@@ -5875,9 +6022,19 @@ function main() {
     process.exit(1);
   }
 
-  const toks = lex(text);
-  const parser = new Parser(toks);
-  const [prefixes, triples, frules, brules] = parser.parseDocument();
+  let toks;
+  let prefixes, triples, frules, brules;
+  try {
+    toks = lex(text);
+    const parser = new Parser(toks);
+    [prefixes, triples, frules, brules] = parser.parseDocument();
+  } catch (e) {
+    if (e && e.name === 'N3SyntaxError') {
+      console.error(formatN3SyntaxError(e, text, path));
+      process.exit(1);
+    }
+    throw e;
+  }
   if (showAst) {
     function astReplacer(_key, value) {
       if (value instanceof Set) return Array.from(value);

package/package.json

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