n3 2.13.6 → 2.13.8

package/lib/N3DataFactory.js

@@ -53,8 +53,9 @@ class Term {
   // ### Returns whether this object represents the same term as the other
   equals(other) {
     // If both terms were created by this library,
-    // equality can be computed through ids
-    if (other instanceof Term) return this.id === other.id;
+    // equality can be computed through ids of the same term type,
+    // since IRIs such as `?x` have the same id as other terms
+    if (other instanceof Term) return this.id === other.id && this.termType === other.termType;
     // Otherwise, compare term type and value
     return !!other && this.termType === other.termType && this.value === other.value;
   }

package/lib/N3Lexer.js

@@ -218,7 +218,7 @@ class N3Lexer {
     this._blank = /_:((?:[0-9A-Z_a-z\xc0-\xd6\xd8-\xf6\xf8-\u02ff\u0370-\u037d\u037f-\u1fff\u200c\u200d\u2070-\u218f\u2c00-\u2fef\u3001-\ud7ff\uf900-\ufdcf\ufdf0-\ufffd]|[\ud800-\udb7f][\udc00-\udfff])(?:\.?[\-0-9A-Z_a-z\xb7\xc0-\xd6\xd8-\xf6\xf8-\u037d\u037f-\u1fff\u200c\u200d\u203f\u2040\u2070-\u218f\u2c00-\u2fef\u3001-\ud7ff\uf900-\ufdcf\ufdf0-\ufffd]|[\ud800-\udb7f][\udc00-\udfff])*)(?:[ \t]+|(?=\.?[,;:!\^\s#()\[\]\{\}"'<>]))/y;
     this._number = /[\-+]?(?:(\d+\.\d*|\.?\d+)[eE][\-+]?\d+|(?=\.?\d)\d*(?:(\.)\d+)?)(?=\.?[,;:!\^\s#()\[\]\{\}"'<>])/y;
     this._boolean = /(?:true|false)(?=[.,;!\^\s#()\[\]\{\}"'<>])/y;
-    this._atKeyword = /@[a-z]+(?=[\s#<:"'])/iy;
+    this._atKeyword = /@[a-z]+(?=[\s#<:"'.])/iy;
     this._keyword = /(?:PREFIX|BASE|VERSION|GRAPH)(?=[\s#<"'])/iy;
     this._n3Verb = /(?:has|is|of)(?=[\s#()\[\]\{\}"'<>?_+\-0-9])/y;
     this._n3Id = /id(?=[\s#<])/y;

package/package.json

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

package/src/N3DataFactory.js

@@ -41,9 +41,10 @@ export class Term {
   // ### Returns whether this object represents the same term as the other
   equals(other) {
     // If both terms were created by this library,
-    // equality can be computed through ids
+    // equality can be computed through ids of the same term type,
+    // since IRIs such as `?x` have the same id as other terms
     if (other instanceof Term)
-      return this.id === other.id;
+      return this.id === other.id && this.termType === other.termType;
     // Otherwise, compare term type and value
     return !!other && this.termType === other.termType &&
                       this.value    === other.value;

package/src/N3Lexer.js

@@ -203,7 +203,7 @@ export default class N3Lexer {
     this._blank = /_:((?:[0-9A-Z_a-z\xc0-\xd6\xd8-\xf6\xf8-\u02ff\u0370-\u037d\u037f-\u1fff\u200c\u200d\u2070-\u218f\u2c00-\u2fef\u3001-\ud7ff\uf900-\ufdcf\ufdf0-\ufffd]|[\ud800-\udb7f][\udc00-\udfff])(?:\.?[\-0-9A-Z_a-z\xb7\xc0-\xd6\xd8-\xf6\xf8-\u037d\u037f-\u1fff\u200c\u200d\u203f\u2040\u2070-\u218f\u2c00-\u2fef\u3001-\ud7ff\uf900-\ufdcf\ufdf0-\ufffd]|[\ud800-\udb7f][\udc00-\udfff])*)(?:[ \t]+|(?=\.?[,;:!\^\s#()\[\]\{\}"'<>]))/y;
     this._number = /[\-+]?(?:(\d+\.\d*|\.?\d+)[eE][\-+]?\d+|(?=\.?\d)\d*(?:(\.)\d+)?)(?=\.?[,;:!\^\s#()\[\]\{\}"'<>])/y;
     this._boolean = /(?:true|false)(?=[.,;!\^\s#()\[\]\{\}"'<>])/y;
-    this._atKeyword = /@[a-z]+(?=[\s#<:"'])/iy;
+    this._atKeyword = /@[a-z]+(?=[\s#<:"'.])/iy;
     this._keyword = /(?:PREFIX|BASE|VERSION|GRAPH)(?=[\s#<"'])/iy;
     this._n3Verb = /(?:has|is|of)(?=[\s#()\[\]\{\}"'<>?_+\-0-9])/y;
     this._n3Id = /id(?=[\s#<])/y;