n3 3.0.0-alpha.7 → 3.0.0-alpha.8

package/lib/N3Writer.js

@@ -22,15 +22,11 @@ const {
   hasOwnProperty
 } = Object.prototype;
 
-// Characters that require escaping in Turtle, TriG, and N3,
-// where characters outside the Basic Multilingual Plane are escaped as well
-const escape = /["\\\t\n\r\b\f\u0000-\u0019\ud800-\udbff]/,
-  escapeAll = /["\\\t\n\r\b\f\u0000-\u0019]|[\ud800-\udbff][\udc00-\udfff]/g,
-  // Characters that require escaping in canonical N-Triples and N-Quads:
-  // U+0000–U+001F, `"`, `\`, U+007F, U+FFFE, and U+FFFF.
-  // A negated class is as fast to test as a shorter class listing characters.
-  canonicalEscape = /[^ !#-\[\]-~\u0080-\uFFFD]/,
-  canonicalEscapeAll = /[^ !#-\[\]-~\u0080-\uFFFD]/g,
+// Characters that require escaping, as in canonical N-Triples:
+// U+0000–U+001F, `"`, `\`, U+007F, U+FFFE, and U+FFFF.
+// A negated class is as fast to test as a shorter class listing characters.
+const escape = /[^ !#-\[\]-~\u0080-\uFFFD]/,
+  escapeAll = /[^ !#-\[\]-~\u0080-\uFFFD]/g,
   escapedCharacters = {
     '\\': '\\\\',
     '"': '\\"',
@@ -91,7 +87,6 @@ class N3Writer {
     this._subject = null;
     if (!/triple|quad/i.test(options.format)) {
       this._lineMode = false;
-      this._escape = escape, this._escapeAll = escapeAll, this._characterReplacer = characterReplacer;
       this._graph = DEFAULTGRAPH;
       if (options.version) this._write(`@version "${options.version}".\n`);
       this._prefixIRIs = Object.create(null);
@@ -105,9 +100,6 @@ class N3Writer {
     } else {
       this._lineMode = true;
       this._writeQuad = this._writeQuadLine;
-      // N-Triples and N-Quads are written in their canonical form
-      this._escape = canonicalEscape, this._escapeAll = canonicalEscapeAll;
-      this._characterReplacer = canonicalCharacterReplacer;
       if (options.version) this._write(`VERSION "${options.version}"\n`);
     }
   }
@@ -207,7 +199,7 @@ class N3Writer {
       iri = this._baseIri.toRelative(iri);
     }
     // Escape special characters
-    if (this._escape.test(iri)) iri = iri.replace(this._escapeAll, this._characterReplacer);
+    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 || this._createPrefixRegex()).exec(iri) : null;
     return !prefixMatch ? `<${iri}>` : this._prefixIRIs[prefixMatch[1]] + prefixMatch[2];
@@ -217,7 +209,7 @@ class N3Writer {
   _encodeLiteral(literal) {
     // Escape special characters
     let value = literal.value;
-    if (this._escape.test(value)) value = value.replace(this._escapeAll, this._characterReplacer);
+    if (escape.test(value)) value = value.replace(escapeAll, characterReplacer);
 
     // Write a language-tagged literal
     const language = literal.language;
@@ -287,9 +279,7 @@ class N3Writer {
     object,
     graph
   }) {
-    // Canonical N-Triples and N-Quads put spaces inside the delimiters
-    const space = this._lineMode ? ' ' : '';
-    return `<<(${space}${this._encodeSubject(subject)} ${this._encodePredicate(predicate)} ${this._encodeObject(object)}${(0, _N3Util.isDefaultGraph)(graph) ? '' : ` ${this._encodeIriOrBlank(graph)}`}${space})>>`;
+    return `<<( ${this._encodeSubject(subject)} ${this._encodePredicate(predicate)} ${this._encodeObject(object)}${(0, _N3Util.isDefaultGraph)(graph) ? '' : ` ${this._encodeIriOrBlank(graph)}`} )>>`;
   }
 
   // ### `_blockedWrite` replaces `_write` after the writer has been closed
@@ -425,26 +415,7 @@ class N3Writer {
 // Replaces a character by its escaped version
 exports.default = N3Writer;
 function characterReplacer(character) {
-  // Replace a single character by its escaped version
-  let result = escapedCharacters[character];
-  if (result === undefined) {
-    // Replace a single character with its 4-bit unicode escape sequence
-    if (character.length === 1) {
-      result = character.charCodeAt(0).toString(16);
-      result = '\\u0000'.substr(0, 6 - result.length) + result;
-    }
-    // Replace a surrogate pair with its 8-bit unicode escape sequence
-    else {
-      result = ((character.charCodeAt(0) - 0xD800) * 0x400 + character.charCodeAt(1) + 0x2400).toString(16);
-      result = '\\U00000000'.substr(0, 10 - result.length) + result;
-    }
-  }
-  return result;
-}
-
-// Replaces a character by its canonical N-Triples escape:
-// a short escape where one exists, and an upper-case `\uXXXX` escape otherwise
-function canonicalCharacterReplacer(character) {
+  // Use a short escape where one exists, and an upper-case `\uXXXX` escape otherwise
   let result = escapedCharacters[character];
   if (result === undefined) {
     result = character.charCodeAt(0).toString(16).toUpperCase();

package/package.json

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

package/src/N3Writer.js

@@ -10,15 +10,11 @@ const DEFAULTGRAPH = N3DataFactory.defaultGraph();
 const { rdf, xsd } = namespaces;
 const { hasOwnProperty } = Object.prototype;
 
-// Characters that require escaping in Turtle, TriG, and N3,
-// where characters outside the Basic Multilingual Plane are escaped as well
-const escape    = /["\\\t\n\r\b\f\u0000-\u0019\ud800-\udbff]/,
-    escapeAll = /["\\\t\n\r\b\f\u0000-\u0019]|[\ud800-\udbff][\udc00-\udfff]/g,
-    // Characters that require escaping in canonical N-Triples and N-Quads:
-    // U+0000–U+001F, `"`, `\`, U+007F, U+FFFE, and U+FFFF.
-    // A negated class is as fast to test as a shorter class listing characters.
-    canonicalEscape    = /[^ !#-\[\]-~\u0080-\uFFFD]/,
-    canonicalEscapeAll = /[^ !#-\[\]-~\u0080-\uFFFD]/g,
+// Characters that require escaping, as in canonical N-Triples:
+// U+0000–U+001F, `"`, `\`, U+007F, U+FFFE, and U+FFFF.
+// A negated class is as fast to test as a shorter class listing characters.
+const escape    = /[^ !#-\[\]-~\u0080-\uFFFD]/,
+    escapeAll = /[^ !#-\[\]-~\u0080-\uFFFD]/g,
     escapedCharacters = {
       '\\': '\\\\', '"': '\\"', '\t': '\\t',
       '\n': '\\n', '\r': '\\r', '\b': '\\b', '\f': '\\f',
@@ -72,7 +68,6 @@ export default class N3Writer {
     this._subject = null;
     if (!(/triple|quad/i).test(options.format)) {
       this._lineMode = false;
-      this._escape = escape, this._escapeAll = escapeAll, this._characterReplacer = characterReplacer;
       this._graph = DEFAULTGRAPH;
       if (options.version)
         this._write(`@version "${options.version}".\n`);
@@ -89,9 +84,6 @@ export default class N3Writer {
     else {
       this._lineMode = true;
       this._writeQuad = this._writeQuadLine;
-      // N-Triples and N-Quads are written in their canonical form
-      this._escape = canonicalEscape, this._escapeAll = canonicalEscapeAll;
-      this._characterReplacer = canonicalCharacterReplacer;
       if (options.version)
         this._write(`VERSION "${options.version}"\n`);
     }
@@ -208,8 +200,8 @@ export default class N3Writer {
       iri = this._baseIri.toRelative(iri);
     }
     // Escape special characters
-    if (this._escape.test(iri))
-      iri = iri.replace(this._escapeAll, this._characterReplacer);
+    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 || this._createPrefixRegex()).exec(iri) : null;
     return !prefixMatch ? `<${iri}>` : this._prefixIRIs[prefixMatch[1]] + prefixMatch[2];
@@ -219,8 +211,8 @@ export default class N3Writer {
   _encodeLiteral(literal) {
     // Escape special characters
     let value = literal.value;
-    if (this._escape.test(value))
-      value = value.replace(this._escapeAll, this._characterReplacer);
+    if (escape.test(value))
+      value = value.replace(escapeAll, characterReplacer);
 
     // Write a language-tagged literal
     const language = literal.language;
@@ -291,13 +283,11 @@ export default class N3Writer {
 
   // ### `_encodeQuad` encodes an RDF-star quad
   _encodeQuad({ subject, predicate, object, graph }) {
-    // Canonical N-Triples and N-Quads put spaces inside the delimiters
-    const space = this._lineMode ? ' ' : '';
-    return `<<(${space}${
+    return `<<( ${
       this._encodeSubject(subject)} ${
       this._encodePredicate(predicate)} ${
       this._encodeObject(object)}${
-      isDefaultGraph(graph) ? '' : ` ${this._encodeIriOrBlank(graph)}`}${space})>>`;
+      isDefaultGraph(graph) ? '' : ` ${this._encodeIriOrBlank(graph)}`} )>>`;
   }
 
   // ### `_blockedWrite` replaces `_write` after the writer has been closed
@@ -440,27 +430,7 @@ export default class N3Writer {
 
 // Replaces a character by its escaped version
 function characterReplacer(character) {
-  // Replace a single character by its escaped version
-  let result = escapedCharacters[character];
-  if (result === undefined) {
-    // Replace a single character with its 4-bit unicode escape sequence
-    if (character.length === 1) {
-      result = character.charCodeAt(0).toString(16);
-      result = '\\u0000'.substr(0, 6 - result.length) + result;
-    }
-    // Replace a surrogate pair with its 8-bit unicode escape sequence
-    else {
-      result = ((character.charCodeAt(0) - 0xD800) * 0x400 +
-                 character.charCodeAt(1) + 0x2400).toString(16);
-      result = '\\U00000000'.substr(0, 10 - result.length) + result;
-    }
-  }
-  return result;
-}
-
-// Replaces a character by its canonical N-Triples escape:
-// a short escape where one exists, and an upper-case `\uXXXX` escape otherwise
-function canonicalCharacterReplacer(character) {
+  // Use a short escape where one exists, and an upper-case `\uXXXX` escape otherwise
   let result = escapedCharacters[character];
   if (result === undefined) {
     result = character.charCodeAt(0).toString(16).toUpperCase();