n3 2.2.3 → 2.2.5

package/lib/N3Parser.js

@@ -711,7 +711,7 @@ class N3Parser {
         if (!this._validAnnotation) return this._error('Annotation block can not be empty', token);
         this._subject = null;
         this._annotation = false;
-        next = this._readPunctuation;
+        next = this._getContextEndReader();
         break;
       default:
         // An entity means this is a quad (only allowed if not already inside a graph)
@@ -745,9 +745,20 @@ class N3Parser {
       case ',':
         next = this._readObject;
         break;
+      // Annotation syntax applies to the quad just read, exactly as it does
+      // outside of a blank node property list.  `|}` arrives here too, because
+      // the objects inside the annotation block are themselves read within the
+      // enclosing blank node context.
+      case '~':
+      case '{|':
+      case '|}':
+        return this._readPunctuation(token);
       default:
         return this._error(`Expected punctuation to follow "${this._object.id}"`, token);
     }
+    // An annotation block consumes the subject it annotates, so there is
+    // nothing left to share with a following predicate-object pair
+    if (this._subject === null) return this._error('Expected ] to follow annotation', token);
     // A quad has been completed now, so return it
     this._emit(this._subject, this._predicate, this._object, this._graph);
     return next;
@@ -1053,7 +1064,7 @@ class N3Parser {
     const reifier = this._reifier || this._factory.blankNode();
     this._reifier = null;
     this._tripleTerm = this._tripleTerm || this._factory.quad(this._subject, this._predicate, this._object);
-    this._emit(reifier, this.RDF_REIFIES, this._tripleTerm, parentGraph || this.DEFAULTGRAPH);
+    this._emit(reifier, this.RDF_REIFIES, this._tripleTerm, parentGraph || this._graph || this.DEFAULTGRAPH);
     return reifier;
   }
 

package/package.json

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

package/src/N3Parser.js

@@ -772,7 +772,7 @@ export default class N3Parser {
         return this._error('Annotation block can not be empty', token);
       this._subject = null;
       this._annotation = false;
-      next = this._readPunctuation;
+      next = this._getContextEndReader();
       break;
     default:
       // An entity means this is a quad (only allowed if not already inside a graph)
@@ -808,9 +808,21 @@ export default class N3Parser {
     case ',':
       next = this._readObject;
       break;
+    // Annotation syntax applies to the quad just read, exactly as it does
+    // outside of a blank node property list.  `|}` arrives here too, because
+    // the objects inside the annotation block are themselves read within the
+    // enclosing blank node context.
+    case '~':
+    case '{|':
+    case '|}':
+      return this._readPunctuation(token);
     default:
       return this._error(`Expected punctuation to follow "${this._object.id}"`, token);
     }
+    // An annotation block consumes the subject it annotates, so there is
+    // nothing left to share with a following predicate-object pair
+    if (this._subject === null)
+      return this._error('Expected ] to follow annotation', token);
     // A quad has been completed now, so return it
     this._emit(this._subject, this._predicate, this._object, this._graph);
     return next;
@@ -1140,7 +1152,7 @@ export default class N3Parser {
     const reifier = this._reifier || this._factory.blankNode();
     this._reifier = null;
     this._tripleTerm = this._tripleTerm || this._factory.quad(this._subject, this._predicate, this._object);
-    this._emit(reifier, this.RDF_REIFIES, this._tripleTerm, parentGraph || this.DEFAULTGRAPH);
+    this._emit(reifier, this.RDF_REIFIES, this._tripleTerm, parentGraph || this._graph || this.DEFAULTGRAPH);
     return reifier;
   }