n3 2.2.0 → 2.2.2

package/lib/N3Parser.js

@@ -488,6 +488,11 @@ class N3Parser {
         if (!this._n3Mode) return this._error('Unexpected graph', token);
         this._saveContext('formula', this._graph, this._subject, this._predicate, this._graph = this._factory.blankNode());
         return this._readSubject;
+      case '<<(':
+        this._saveContext('<<(', this._graph, null, null, null);
+        this._graph = null;
+        next = this._readSubject;
+        break;
       case '<<':
         this._saveContext('<<', this._graph, null, null, null);
         this._graph = null;
@@ -500,8 +505,8 @@ class N3Parser {
     // Create a new blank node if no item head was assigned yet
     if (list === null) this._subject = list = this._factory.blankNode();
 
-    // When reading a reified triple, store the list as subject in the stack, as this will be overridden when reading the triple.
-    if (token.type === '<<') stack[stack.length - 1].subject = this._subject;
+    // When reading a reified triple or triple term, store the list as subject in the stack, as this will be overridden when reading the triple.
+    if (token.type === '<<' || token.type === '<<(') stack[stack.length - 1].subject = this._subject;
 
     // Is this the first element of the list?
     if (previousList === null) {
@@ -684,12 +689,17 @@ class N3Parser {
         break;
       // ~ is allowed in the annotation syntax
       case '~':
+        // Only invalidate the cache for a genuinely new triple - chained annotation blocks on the
+        // same triple (subject already null from a preceding annotation) must keep reusing it.
+        if (subject !== null) this._tripleTerm = null;
         next = this._readReifierInAnnotation;
         startingAnnotation = true;
         break;
       // {| means that the current triple is annotated with predicate-object pairs.
       case '{|':
         // Continue using the last triple as reified triple subject for the predicate-object pairs.
+        // Same staleness rule as ~ above.
+        if (subject !== null) this._tripleTerm = null;
         this._subject = this._readTripleTerm();
         this._validAnnotation = false;
         startingAnnotation = true;
@@ -929,6 +939,13 @@ class N3Parser {
     const quad = this._factory.quad(this._subject, this._predicate, this._object, this._graph || this.DEFAULTGRAPH);
     this._restoreContext('<<(', token);
 
+    // If we're in a list, continue processing that list
+    const stack = this._contextStack,
+      parent = stack.length && stack[stack.length - 1];
+    if (parent && parent.type === 'list') {
+      this._emit(this._subject, this.RDF_FIRST, quad, this._graph);
+      return this._getContextEndReader();
+    }
     // If the triple was the subject, continue by reading the predicate.
     if (this._subject === null) {
       this._subject = quad;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [

package/src/N3Parser.js

@@ -520,6 +520,11 @@ export default class N3Parser {
       this._saveContext('formula', this._graph, this._subject, this._predicate,
                         this._graph = this._factory.blankNode());
       return this._readSubject;
+    case '<<(':
+      this._saveContext('<<(', this._graph, null, null, null);
+      this._graph = null;
+      next = this._readSubject;
+      break;
     case '<<':
       this._saveContext('<<', this._graph, null, null, null);
       this._graph = null;
@@ -534,8 +539,8 @@ export default class N3Parser {
     if (list === null)
       this._subject = list = this._factory.blankNode();
 
-    // When reading a reified triple, store the list as subject in the stack, as this will be overridden when reading the triple.
-    if (token.type === '<<')
+    // When reading a reified triple or triple term, store the list as subject in the stack, as this will be overridden when reading the triple.
+    if (token.type === '<<' || token.type === '<<(')
       stack[stack.length - 1].subject = this._subject;
 
     // Is this the first element of the list?
@@ -741,12 +746,19 @@ export default class N3Parser {
       break;
     // ~ is allowed in the annotation syntax
     case '~':
+      // Only invalidate the cache for a genuinely new triple - chained annotation blocks on the
+      // same triple (subject already null from a preceding annotation) must keep reusing it.
+      if (subject !== null)
+        this._tripleTerm = null;
       next = this._readReifierInAnnotation;
       startingAnnotation = true;
       break;
     // {| means that the current triple is annotated with predicate-object pairs.
     case '{|':
       // Continue using the last triple as reified triple subject for the predicate-object pairs.
+      // Same staleness rule as ~ above.
+      if (subject !== null)
+        this._tripleTerm = null;
       this._subject = this._readTripleTerm();
       this._validAnnotation = false;
       startingAnnotation = true;
@@ -1012,6 +1024,12 @@ export default class N3Parser {
         this._graph || this.DEFAULTGRAPH);
     this._restoreContext('<<(', token);
 
+    // If we're in a list, continue processing that list
+    const stack = this._contextStack, parent = stack.length && stack[stack.length - 1];
+    if (parent && parent.type === 'list') {
+      this._emit(this._subject, this.RDF_FIRST, quad, this._graph);
+      return this._getContextEndReader();
+    }
     // If the triple was the subject, continue by reading the predicate.
     if (this._subject === null) {
       this._subject = quad;