n3 2.4.0 → 2.5.0

package/lib/N3Lexer.js

@@ -88,6 +88,7 @@ class N3Lexer {
     this._boolean = /^(?:true|false)(?=[.,;!\^\s#()\[\]\{\}"'<>])/;
     this._atKeyword = /^@[a-z]+(?=[\s#<:])/i;
     this._keyword = /^(?:PREFIX|BASE|VERSION|GRAPH)(?=[\s#<])/i;
+    this._n3Id = /^id(?=[\s#<])/;
     this._shortPredicates = /^a(?=[\s#()\[\]\{\}"'<>])/;
     this._newline = /^[ \t]*(?:#[^\n\r]*)?(?:\r\n|\n|\r)[ \t]*/;
     this._comment = /#([^\n\r]*)/;
@@ -315,6 +316,10 @@ class N3Lexer {
           // Try to find an abbreviated predicate
           if (match = this._shortPredicates.exec(input)) type = 'abbreviation', value = 'a';else inconclusive = true;
           break;
+        case 'i':
+          // Try to find the IRI property list identifier
+          if (this._n3Mode && (match = this._n3Id.exec(input))) type = 'id';else inconclusive = true;
+          break;
         case '=':
           // Try to find an implication arrow or equals sign
           if (this._n3Mode && input.length > 1) {

package/lib/N3Parser.js

@@ -457,11 +457,33 @@ class N3Parser {
       if (parentParent.type === '<<') {
         return this._error('Unexpected compound blank node expression in reified triple', token);
       }
+      if (token.type === 'id') return this._readIriPropertyListId;
       this._predicate = null;
       return this._readPredicate(token);
     }
   }
 
+  // ### `_readIriPropertyListId` replaces a property list's blank node with its IRI
+  _readIriPropertyListId(token) {
+    const iri = this._readEntity(token);
+    if (iri === undefined) return;
+    if (iri.termType !== 'NamedNode') return this._error(`Expected IRI after id but got ${token.type}`, token);
+    const placeholder = this._subject;
+    this._subject = iri;
+    const context = this._contextStack[this._contextStack.length - 1];
+    if (context.subject === placeholder) context.subject = iri;
+    if (context.predicate === placeholder) context.predicate = iri;
+    if (context.object === placeholder) context.object = iri;
+    this._predicate = null;
+    return this._readIriPropertyListPredicate;
+  }
+
+  // ### `_readIriPropertyListPredicate` requires properties after an IRI property list ID
+  _readIriPropertyListPredicate(token) {
+    if (token.type === ';' || token.type === ']' || token.type === '.' || token.type === '}') return this._error(`Expected predicate but got ${token.type}`, token);
+    return this._readPredicate(token);
+  }
+
   // ### `_readBlankNodeTail` reads the end of a blank node
   _readBlankNodeTail(token) {
     if (token.type !== ']') return this._readBlankNodePunctuation(token);

package/package.json

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

package/src/N3Lexer.js

@@ -57,6 +57,7 @@ export default class N3Lexer {
     this._boolean = /^(?:true|false)(?=[.,;!\^\s#()\[\]\{\}"'<>])/;
     this._atKeyword = /^@[a-z]+(?=[\s#<:])/i;
     this._keyword = /^(?:PREFIX|BASE|VERSION|GRAPH)(?=[\s#<])/i;
+    this._n3Id = /^id(?=[\s#<])/;
     this._shortPredicates = /^a(?=[\s#()\[\]\{\}"'<>])/;
     this._newline = /^[ \t]*(?:#[^\n\r]*)?(?:\r\n|\n|\r)[ \t]*/;
     this._comment = /#([^\n\r]*)/;
@@ -318,6 +319,14 @@ export default class N3Lexer {
           inconclusive = true;
         break;
 
+      case 'i':
+        // Try to find the IRI property list identifier
+        if (this._n3Mode && (match = this._n3Id.exec(input)))
+          type = 'id';
+        else
+          inconclusive = true;
+        break;
+
       case '=':
         // Try to find an implication arrow or equals sign
         if (this._n3Mode && input.length > 1) {

package/src/N3Parser.js

@@ -480,11 +480,41 @@ export default class N3Parser {
       if (parentParent.type === '<<') {
         return this._error('Unexpected compound blank node expression in reified triple', token);
       }
+      if (token.type === 'id')
+        return this._readIriPropertyListId;
       this._predicate = null;
       return this._readPredicate(token);
     }
   }
 
+  // ### `_readIriPropertyListId` replaces a property list's blank node with its IRI
+  _readIriPropertyListId(token) {
+    const iri = this._readEntity(token);
+    if (iri === undefined)
+      return;
+    if (iri.termType !== 'NamedNode')
+      return this._error(`Expected IRI after id but got ${token.type}`, token);
+
+    const placeholder = this._subject;
+    this._subject = iri;
+    const context = this._contextStack[this._contextStack.length - 1];
+    if (context.subject === placeholder)
+      context.subject = iri;
+    if (context.predicate === placeholder)
+      context.predicate = iri;
+    if (context.object === placeholder)
+      context.object = iri;
+    this._predicate = null;
+    return this._readIriPropertyListPredicate;
+  }
+
+  // ### `_readIriPropertyListPredicate` requires properties after an IRI property list ID
+  _readIriPropertyListPredicate(token) {
+    if (token.type === ';' || token.type === ']' || token.type === '.' || token.type === '}')
+      return this._error(`Expected predicate but got ${token.type}`, token);
+    return this._readPredicate(token);
+  }
+
   // ### `_readBlankNodeTail` reads the end of a blank node
   _readBlankNodeTail(token) {
     if (token.type !== ']')