n3 3.0.0-alpha.2 → 3.0.0-alpha.4

package/lib/N3Parser.js

@@ -61,8 +61,8 @@ class N3Parser {
     });
     // Disable explicit quantifiers by default
     this._explicitQuantifiers = !!options.explicitQuantifiers;
-    // Disable formula-only blank node scoping by default
-    this._formulaScopedBlankNodes = !!options.formulaScopedBlankNodes;
+    // Scope blank node labels to formulas only, unless explicitly disabled
+    this._formulaScopedBlankNodes = options.formulaScopedBlankNodes !== false;
     // Disable parsing of unsupported versions by default
     this._parseUnsupportedVersions = !!options.parseUnsupportedVersions;
     this._version = options.version;

package/lib/N3Writer.js

@@ -79,7 +79,7 @@ class N3Writer {
       this._prefixIRIs = Object.create(null);
       if (options.baseIRI) {
         this._baseIri = new _BaseIRI.default(options.baseIRI);
-        if (options.writeBase) this._write(`@base <${options.baseIRI}>.\n`);
+        if (options.writeBase !== false) this._write(`@base <${options.baseIRI}>.\n`);
       }
       options.prefixes && this.addPrefixes(options.prefixes);
     } else {
@@ -177,7 +177,7 @@ class N3Writer {
     if (escape.test(iri)) iri = iri.replace(escapeAll, characterReplacer);
     // Try to represent the IRI as prefixed name, unless no prefixes were added
     const prefixMatch = this._hasPrefixes ? this._prefixRegex.exec(iri) : null;
-    return !prefixMatch ? `<${iri}>` : !prefixMatch[1] ? iri : this._prefixIRIs[prefixMatch[1]] + prefixMatch[2];
+    return !prefixMatch ? `<${iri}>` : this._prefixIRIs[prefixMatch[1]] + prefixMatch[2];
   }
 
   // ### `_encodeLiteral` represents a literal
@@ -307,14 +307,10 @@ class N3Writer {
     // Recreate the prefix matcher
     if (hasPrefixes) {
       this._hasPrefixes = true;
-      let IRIlist = '',
-        prefixList = '';
-      for (const prefixIRI in this._prefixIRIs) {
-        IRIlist += IRIlist ? `|${prefixIRI}` : prefixIRI;
-        prefixList += (prefixList ? '|' : '') + this._prefixIRIs[prefixIRI];
-      }
+      let IRIlist = '';
+      for (const prefixIRI in this._prefixIRIs) IRIlist += IRIlist ? `|${prefixIRI}` : prefixIRI;
       IRIlist = (0, _Util.escapeRegex)(IRIlist, /[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
-      this._prefixRegex = new RegExp(`^(?:${prefixList})[^\/]*$|` + `^(${IRIlist})([_a-zA-Z0-9](?:\\.?[\\-_a-zA-Z0-9])*)$`);
+      this._prefixRegex = new RegExp(`^(${IRIlist})([_a-zA-Z0-9](?:\\.?[\\-_a-zA-Z0-9])*)$`);
     }
     // End a prefix block with a newline
     this._write(hasPrefixes ? '\n' : '', done);

package/package.json

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

package/src/N3Parser.js

@@ -50,8 +50,8 @@ export default class N3Parser {
     this._lexer = options.lexer || new N3Lexer({ lineMode: isLineMode, n3: isN3, isImpliedBy: this._isImpliedBy });
     // Disable explicit quantifiers by default
     this._explicitQuantifiers = !!options.explicitQuantifiers;
-    // Disable formula-only blank node scoping by default
-    this._formulaScopedBlankNodes = !!options.formulaScopedBlankNodes;
+    // Scope blank node labels to formulas only, unless explicitly disabled
+    this._formulaScopedBlankNodes = options.formulaScopedBlankNodes !== false;
     // Disable parsing of unsupported versions by default
     this._parseUnsupportedVersions = !!options.parseUnsupportedVersions;
     this._version = options.version;

package/src/N3Writer.js

@@ -61,7 +61,7 @@ export default class N3Writer {
       this._prefixIRIs = Object.create(null);
       if (options.baseIRI) {
         this._baseIri = new BaseIRI(options.baseIRI);
-        if (options.writeBase)
+        if (options.writeBase !== false)
           this._write(`@base <${options.baseIRI}>.\n`);
       }
       options.prefixes && this.addPrefixes(options.prefixes);
@@ -178,8 +178,7 @@ export default class N3Writer {
       iri = iri.replace(escapeAll, characterReplacer);
     // Try to represent the IRI as prefixed name, unless no prefixes were added
     const prefixMatch = this._hasPrefixes ? this._prefixRegex.exec(iri) : null;
-    return !prefixMatch ? `<${iri}>` :
-           (!prefixMatch[1] ? iri : this._prefixIRIs[prefixMatch[1]] + prefixMatch[2]);
+    return !prefixMatch ? `<${iri}>` : this._prefixIRIs[prefixMatch[1]] + prefixMatch[2];
   }
 
   // ### `_encodeLiteral` represents a literal
@@ -321,14 +320,11 @@ export default class N3Writer {
     // Recreate the prefix matcher
     if (hasPrefixes) {
       this._hasPrefixes = true;
-      let IRIlist = '', prefixList = '';
-      for (const prefixIRI in this._prefixIRIs) {
+      let IRIlist = '';
+      for (const prefixIRI in this._prefixIRIs)
         IRIlist += IRIlist ? `|${prefixIRI}` : prefixIRI;
-        prefixList += (prefixList ? '|' : '') + this._prefixIRIs[prefixIRI];
-      }
       IRIlist = escapeRegex(IRIlist, /[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
-      this._prefixRegex = new RegExp(`^(?:${prefixList})[^\/]*$|` +
-                                     `^(${IRIlist})([_a-zA-Z0-9](?:\\.?[\\-_a-zA-Z0-9])*)$`);
+      this._prefixRegex = new RegExp(`^(${IRIlist})([_a-zA-Z0-9](?:\\.?[\\-_a-zA-Z0-9])*)$`);
     }
     // End a prefix block with a newline
     this._write(hasPrefixes ? '\n' : '', done);