n3 2.6.3 → 2.7.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._n3Verb = /^(?:has|is|of)(?=[\s#()\[\]\{\}"'<>?_+\-0-9])/;
     this._n3Id = /^id(?=[\s#<])/;
     this._shortPredicates = /^a(?=[\s#()\[\]\{\}"'<>])/;
     this._newline = /^[ \t]*(?:#[^\n\r]*)?(?:\r\n|\n|\r)[ \t]*/;
@@ -200,6 +201,8 @@ class N3Lexer {
             matchLength = 2;
             if (this._isImpliedBy) type = 'abbreviation', value = '<';else type = 'inverse', value = '>';
           }
+          // Try to find an inverted predicate marker
+          else if (this._n3Mode && input.length > 1 && input[1] === '-') type = 'inversePredicate', matchLength = 2;
           break;
         case '>':
           // Try to find a reified triple
@@ -316,9 +319,14 @@ class N3Lexer {
           // Try to find an abbreviated predicate
           if (match = this._shortPredicates.exec(input)) type = 'abbreviation', value = 'a';else inconclusive = true;
           break;
+        case 'h':
+        case 'o':
+          // Try to find an N3 verb keyword
+          if (this._n3Mode && (match = this._n3Verb.exec(input))) type = match[0];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;
+          // Try to find an IRI property list identifier or N3 verb keyword
+          if (this._n3Mode && (match = this._n3Id.exec(input))) type = 'id';else if (this._n3Mode && (match = this._n3Verb.exec(input))) type = match[0];else inconclusive = true;
           break;
         case '=':
           // Try to find an implication arrow or equals sign

package/lib/N3Parser.js

@@ -106,6 +106,7 @@ class N3Parser {
       object,
       graph,
       inverse: this._inversePredicate,
+      expectOf: this._expectOf,
       blankPrefix: this._prefixes._,
       quantified: this._quantified,
       emptyFormula: this._emptyFormula
@@ -119,6 +120,7 @@ class N3Parser {
     this._contextStack.push(context);
     // Every new scope resets the predicate direction
     this._inversePredicate = false;
+    this._expectOf = false;
     // In N3, blank nodes are scoped to a formula
     // (using a dot as separator, as a blank node label cannot start with it)
     this._prefixes._ = this._graph ? `${this._graph.value}.` : '.';
@@ -147,6 +149,7 @@ class N3Parser {
     // Restore N3 context settings
     if (this._n3Mode) {
       this._inversePredicate = context.inverse;
+      this._expectOf = context.expectOf;
       if (type === 'formula') {
         this._prefixes = context.prefixes;
         [this._base, this._basePath, this._baseRoot, this._baseScheme] = context.base;
@@ -343,6 +346,15 @@ class N3Parser {
       case 'abbreviation':
         this._predicate = this.ABBREVIATIONS[token.value];
         break;
+      case 'has':
+        return this._readPredicateAfterVerb;
+      case 'is':
+        this._inversePredicate = true;
+        this._expectOf = true;
+        return this._readPredicateAfterVerb;
+      case 'inversePredicate':
+        this._inversePredicate = true;
+        return this._readPredicateAfterVerb;
       case '.':
       case ']':
       case '}':
@@ -391,8 +403,19 @@ class N3Parser {
     return pathable ? this._getPathReader(this._readObject, 'predicate') : this._readObject;
   }
 
+  // ### `_readPredicateAfterVerb` reads the predicate following `has` or `is`
+  _readPredicateAfterVerb(token) {
+    if (token.type === 'has' || token.type === 'is' || token.type === 'of' || token.type === 'inversePredicate') return this._error(`Expected expression but got ${token.type}`, token);
+    return this._readPredicate(token);
+  }
+
   // ### `_readObject` reads a quad's object
   _readObject(token) {
+    if (this._expectOf) {
+      if (token.type !== 'of') return this._error(`Expected of but got ${token.type}`, token);
+      this._expectOf = false;
+      return this._readObject;
+    }
     switch (token.type) {
       case 'literal':
         // Regular literal, can still get a datatype or language
@@ -1413,6 +1436,7 @@ class N3Parser {
     this._prefixCallback = onPrefix || noop;
     this._versionCallback = onVersion || noop;
     this._inversePredicate = false;
+    this._expectOf = false;
     this._quantified = Object.create(null);
     this._emptyFormula = false;
 

package/lib/N3Store.js

@@ -331,28 +331,25 @@ class N3Store {
 
   // ### `_countInIndex` counts matching quads in a three-layered index.
   // The index base is `index0` and the keys at each level are `key0`, `key1`, and `key2`.
-  // Any of these keys can be undefined, which is interpreted as a wildcard.
+  // A key and any keys after it can be null or undefined, which is interpreted as a wildcard.
   _countInIndex(index0, key0, key1, key2) {
     let count = 0,
-      tmp,
       index1,
       index2;
 
-    // If a key is specified, count only that part of index 0
-    if (key0) (tmp = index0, index0 = {})[key0] = tmp[key0];
-    for (const value0 in index0) {
-      if (index1 = index0[value0]) {
-        // If a key is specified, count only that part of index 1
-        if (key1) (tmp = index1, index1 = {})[key1] = tmp[key1];
-        for (const value1 in index1) {
-          if (index2 = index1[value1]) {
-            // If a key is specified, count the quad if it exists
-            if (key2) key2 in index2 && count++;
-            // Otherwise, count all quads
-            else count += index2[SIZE];
-          }
-        }
+    // Bound outer keys can be looked up directly.
+    if (key0) {
+      if (!(index1 = index0[key0])) return 0;
+      if (key1) {
+        if (!(index2 = index1[key1])) return 0;
+        return key2 ? key2 in index2 ? 1 : 0 : index2[SIZE];
       }
+      for (const value1 in index1) count += index1[value1][SIZE];
+      return count;
+    }
+    for (const value0 in index0) {
+      index1 = index0[value0];
+      for (const value1 in index1) count += index1[value1][SIZE];
     }
     return count;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "2.6.3",
+  "version": "2.7.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._n3Verb = /^(?:has|is|of)(?=[\s#()\[\]\{\}"'<>?_+\-0-9])/;
     this._n3Id = /^id(?=[\s#<])/;
     this._shortPredicates = /^a(?=[\s#()\[\]\{\}"'<>])/;
     this._newline = /^[ \t]*(?:#[^\n\r]*)?(?:\r\n|\n|\r)[ \t]*/;
@@ -174,6 +175,9 @@ export default class N3Lexer {
           if (this._isImpliedBy) type = 'abbreviation', value = '<';
           else type = 'inverse', value = '>';
         }
+        // Try to find an inverted predicate marker
+        else if (this._n3Mode && input.length > 1 && input[1] === '-')
+          type = 'inversePredicate', matchLength = 2;
         break;
 
       case '>':
@@ -319,10 +323,21 @@ export default class N3Lexer {
           inconclusive = true;
         break;
 
+      case 'h':
+      case 'o':
+        // Try to find an N3 verb keyword
+        if (this._n3Mode && (match = this._n3Verb.exec(input)))
+          type = match[0];
+        else
+          inconclusive = true;
+        break;
+
       case 'i':
-        // Try to find the IRI property list identifier
+        // Try to find an IRI property list identifier or N3 verb keyword
         if (this._n3Mode && (match = this._n3Id.exec(input)))
           type = 'id';
+        else if (this._n3Mode && (match = this._n3Verb.exec(input)))
+          type = match[0];
         else
           inconclusive = true;
         break;

package/src/N3Parser.js

@@ -89,6 +89,7 @@ export default class N3Parser {
       type,
       subject, predicate, object, graph,
       inverse: this._inversePredicate,
+      expectOf: this._expectOf,
       blankPrefix: this._prefixes._,
       quantified: this._quantified,
       emptyFormula: this._emptyFormula,
@@ -102,6 +103,7 @@ export default class N3Parser {
     this._contextStack.push(context);
     // Every new scope resets the predicate direction
     this._inversePredicate = false;
+    this._expectOf = false;
     // In N3, blank nodes are scoped to a formula
     // (using a dot as separator, as a blank node label cannot start with it)
     this._prefixes._ = (this._graph ? `${this._graph.value}.` : '.');
@@ -131,6 +133,7 @@ export default class N3Parser {
     // Restore N3 context settings
     if (this._n3Mode) {
       this._inversePredicate = context.inverse;
+      this._expectOf = context.expectOf;
       if (type === 'formula') {
         this._prefixes = context.prefixes;
         [this._base, this._basePath, this._baseRoot, this._baseScheme] = context.base;
@@ -346,6 +349,15 @@ export default class N3Parser {
     case 'abbreviation':
       this._predicate = this.ABBREVIATIONS[token.value];
       break;
+    case 'has':
+      return this._readPredicateAfterVerb;
+    case 'is':
+      this._inversePredicate = true;
+      this._expectOf = true;
+      return this._readPredicateAfterVerb;
+    case 'inversePredicate':
+      this._inversePredicate = true;
+      return this._readPredicateAfterVerb;
     case '.':
     case ']':
     case '}':
@@ -407,8 +419,22 @@ export default class N3Parser {
     return pathable ? this._getPathReader(this._readObject, 'predicate') : this._readObject;
   }
 
+  // ### `_readPredicateAfterVerb` reads the predicate following `has` or `is`
+  _readPredicateAfterVerb(token) {
+    if (token.type === 'has' || token.type === 'is' || token.type === 'of' ||
+        token.type === 'inversePredicate')
+      return this._error(`Expected expression but got ${token.type}`, token);
+    return this._readPredicate(token);
+  }
+
   // ### `_readObject` reads a quad's object
   _readObject(token) {
+    if (this._expectOf) {
+      if (token.type !== 'of')
+        return this._error(`Expected of but got ${token.type}`, token);
+      this._expectOf = false;
+      return this._readObject;
+    }
     switch (token.type) {
     case 'literal':
       // Regular literal, can still get a datatype or language
@@ -1530,6 +1556,7 @@ export default class N3Parser {
     this._prefixCallback = onPrefix || noop;
     this._versionCallback = onVersion || noop;
     this._inversePredicate = false;
+    this._expectOf = false;
     this._quantified = Object.create(null);
     this._emptyFormula = false;
 

package/src/N3Store.js

@@ -351,25 +351,29 @@ export default class N3Store {
 
   // ### `_countInIndex` counts matching quads in a three-layered index.
   // The index base is `index0` and the keys at each level are `key0`, `key1`, and `key2`.
-  // Any of these keys can be undefined, which is interpreted as a wildcard.
+  // A key and any keys after it can be null or undefined, which is interpreted as a wildcard.
   _countInIndex(index0, key0, key1, key2) {
-    let count = 0, tmp, index1, index2;
+    let count = 0, index1, index2;
+
+    // Bound outer keys can be looked up directly.
+    if (key0) {
+      if (!(index1 = index0[key0]))
+        return 0;
+      if (key1) {
+        if (!(index2 = index1[key1]))
+          return 0;
+        return key2 ? (key2 in index2 ? 1 : 0) : index2[SIZE];
+      }
+
+      for (const value1 in index1)
+        count += index1[value1][SIZE];
+      return count;
+    }
 
-    // If a key is specified, count only that part of index 0
-    if (key0) (tmp = index0, index0 = {})[key0] = tmp[key0];
     for (const value0 in index0) {
-      if (index1 = index0[value0]) {
-        // If a key is specified, count only that part of index 1
-        if (key1) (tmp = index1, index1 = {})[key1] = tmp[key1];
-        for (const value1 in index1) {
-          if (index2 = index1[value1]) {
-            // If a key is specified, count the quad if it exists
-            if (key2) (key2 in index2) && count++;
-            // Otherwise, count all quads
-            else count += index2[SIZE];
-          }
-        }
-      }
+      index1 = index0[value0];
+      for (const value1 in index1)
+        count += index1[value1][SIZE];
     }
     return count;
   }