eyeling 1.24.2 → 1.24.3

package/see/see.js

@@ -284,11 +284,28 @@ class Parser {
   eof() {
     return this.pos >= this.tokens.length;
   }
-  peek(value = undefined) {
-    const tok = this.tokens[this.pos];
+  peek(value = undefined, offset = 0) {
+    const tok = this.tokens[this.pos + offset];
     if (value === undefined) return tok;
     return tok && tok.type === value;
   }
+  isTermToken(tok) {
+    return tok && ['qname', 'iri', 'var', 'string', 'number', 'boolean', '<<(', '(', '{', '['].includes(tok.type);
+  }
+  isNamedGraphStart() {
+    const tok = this.peek();
+    if (tok?.type === 'qname' && /^GRAPH$/i.test(tok.value)) {
+      return this.isTermToken(this.peek(undefined, 1)) && this.peek('{', 2);
+    }
+    return (tok?.type === 'qname' || tok?.type === 'iri') && this.peek('{', 1);
+  }
+  parseNamedGraphFact() {
+    if (this.peek()?.type === 'qname' && /^GRAPH$/i.test(this.peek().value)) this.next();
+    const name = this.parseTerm('fact', []);
+    const atoms = this.parseFormula('fact');
+    this.accept('.');
+    return { s: name, p: I('log:nameOf'), o: { kind: 'formula', atoms } };
+  }
   next() {
     if (this.eof()) throw new Error('Unexpected end of input');
     return this.tokens[this.pos++];
@@ -338,6 +355,10 @@ class Parser {
         this.skipVersion();
         continue;
       }
+      if (this.isNamedGraphStart()) {
+        facts.push(this.parseNamedGraphFact());
+        continue;
+      }
       if (this.peek('{')) {
         const lhs = this.parseFormula('body');
         if (this.accept('=>')) {
@@ -366,6 +387,9 @@ class Parser {
             this.accept('.');
             rules.push({ kind: 'backward', id: rules.length + 1, body: rhs, head: lhs });
           }
+        } else if (this.peek('.') || this.eof()) {
+          this.accept('.');
+          facts.push(...lhs);
         } else {
           const subject = { kind: 'formula', atoms: lhs };
           const triples = this.parseStatementRest('fact', subject);

package/test/api.test.js

@@ -2541,12 +2541,24 @@ _:b a ex:Person ; ex:name "B" .
   },
 
   {
-    name: 'RDF 1.2 triple terms are accepted as N3 singleton graph terms',
+    name: 'RDF 1.2 triple terms require explicit RDF compatibility mode',
     opt: { proofComments: false },
     input: `VERSION "1.2"
 @prefix : <http://example.org/triple-terms#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 
+:observation rdf:reifies <<( :sensor :reports :overheating )>> .
+`,
+    expectError: true,
+  },
+
+  {
+    name: 'RDF 1.2 triple terms are accepted in RDF compatibility mode',
+    opt: { proofComments: false, rdf: true },
+    input: `VERSION "1.2"
+@prefix : <http://example.org/triple-terms#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
 :observation rdf:reifies <<( :sensor :reports :overheating )>> .
 :overheating :requires :inspection .
 
@@ -2557,10 +2569,64 @@ _:b a ex:Person ; ex:name "B" .
   ?observation :entails <<( ?device :needs ?action )>> .
 } .
 `,
-    expect: [/:observation\s+:entails\s+\{\s+:sensor\s+:needs\s+:inspection\s*\.\s*\}\s*\./m],
+    expect: [/:observation\s+:entails\s+<<\(\s+:sensor\s+:needs\s+:inspection\s*\)>>\s*\./m],
+  },
+
+  {
+    name: 'RDF mode serializes only valid triple terms as RDF 1.2 triple terms',
+    opt: { proofComments: false, rdf: true },
+    input: `@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+@prefix math: <http://www.w3.org/2000/10/swap/math#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix : <http://example.org/ns#> .
+
+{
+  (1 3) math:sum ?X .
+}
+=>
+{
+  <<(?X a :Answer)>> a :Result.
+}.
+`,
+    expect: [/\{\s*4\s+a\s+:Answer\s*\.\s*\}\s+a\s+:Result\s*\./m],
+    notExpect: [/<<\(\s*4\s+a\s+:Answer\s*\)>>/m],
+  },
+
+  {
+    name: 'RDF dataset named graphs round-trip as TriG in RDF compatibility mode',
+    opt: { proofComments: false, rdf: true },
+    input: `VERSION "1.2"
+@prefix : <http://example.org/dataset#> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+# Ordinary TriG default-graph triples remain ordinary N3 facts.
+:sensor :reports :overheating .
+:overheating :requires :inspection .
+
+# A TriG named graph block is accepted and normalized to a graph term.
+:factoryDataset {
+  :observation rdf:reifies <<( :sensor :reports :overheating )>> .
+}
+
+{
+  :sensor :reports ?condition .
+  ?condition :requires ?action .
+} => {
+  :workOrder :entails <<( :sensor :needs ?action )>> .
+  :audit log:nameOf {
+    :workOrder :basedOn :factoryDataset .
+  } .
+} .
+`,
+    expect: [
+      /:workOrder\s+:entails\s+<<\(\s+:sensor\s+:needs\s+:inspection\s*\)>>\s*\./m,
+      /:audit\s+\{[\s\S]*:workOrder\s+:basedOn\s+:factoryDataset\s*\.[\s\S]*\}/m,
+    ],
   },
 ];
 
+
 let passed = 0;
 let failed = 0;