n3 2.11.2 → 2.11.4

package/lib/N3Lexer.js

@@ -89,6 +89,11 @@ function execAtEnd(regExp, input, pos) {
   return regExp.exec(`${input.slice(pos)} `);
 }
 
+// Whitespace or the start of a comment
+function isSeparatorCode(code) {
+  return code === SPACE || code === TAB || code === LF || code === CR || code === HASH;
+}
+
 // ## Constructor
 class N3Lexer {
   constructor(options) {
@@ -194,6 +199,8 @@ class N3Lexer {
         }
       }
       if (pos >= input.length) {
+        // A datatype marker needs a type
+        if (inputFinished && this._previousMarker === '^^') return reportSyntaxError(this, input, pos);
         this._linePosition = currentLineLength;
         if (inputFinished) {
           emitToken('eof', '', '', this._line, currentLineLength, 0);
@@ -215,6 +222,8 @@ class N3Lexer {
         inconclusive = false;
       switch (firstChar) {
         case '^':
+          // A datatype marker separated from its type cannot be followed by another marker
+          if (this._previousMarker === '^^') return reportSyntaxError(this, input, pos);
           // We need at least 3 tokens lookahead to distinguish ^^<IRI> and ^^pre:fixed
           if (input.length - pos < 3) break;
           // Try to match a type
@@ -223,6 +232,8 @@ class N3Lexer {
             // Move to type IRI or prefixed name
             pos += 2;
             if (input[pos] !== '<') {
+              // Whitespace and comments may separate the marker from the type
+              if (isSeparatorCode(input.charCodeAt(pos))) continue; // eslint-disable-line no-continue
               inconclusive = true;
               break;
             }

package/lib/N3Parser.js

@@ -65,6 +65,9 @@ class N3Parser {
     // Disable parsing of unsupported versions by default
     this._parseUnsupportedVersions = !!options.parseUnsupportedVersions;
     this._version = options.version;
+    // Maximum nesting depth of triple terms (default 1024; Infinity disables the limit)
+    const maxTripleTermDepth = options.maxTripleTermDepth;
+    this._maxTripleTermDepth = maxTripleTermDepth === Infinity || Number.isInteger(maxTripleTermDepth) && maxTripleTermDepth >= 0 ? maxTripleTermDepth : 1024;
   }
 
   // ## Static class methods
@@ -96,6 +99,19 @@ class N3Parser {
     }
   }
 
+  // ### `_enterTripleTerm` stores the current parsing context when entering a triple term,
+  // failing if triple terms nest deeper than the maximum depth
+  _enterTripleTerm(type, subject, predicate, token) {
+    if (this._tripleTermDepth >= this._maxTripleTermDepth) {
+      this._error(`Triple terms nested deeper than ${this._maxTripleTermDepth} level${this._maxTripleTermDepth === 1 ? '' : 's'}`, token);
+      return false;
+    }
+    this._tripleTermDepth++;
+    this._saveContext(type, this._graph, subject, predicate, null);
+    this._graph = null;
+    return true;
+  }
+
   // ### `_saveContext` stores the current parsing context
   // when entering a new scope (list, blank node, formula)
   _saveContext(type, graph, subject, predicate, object) {
@@ -338,13 +354,9 @@ class N3Parser {
         }
       case '<<(':
         if (!this._n3Mode) return this._error('Disallowed triple term as subject', token);
-        this._saveContext('<<(', this._graph, null, null, null);
-        this._graph = null;
-        return this._readSubject;
+        return this._enterTripleTerm('<<(', null, null, token) && this._readSubject;
       case '<<':
-        this._saveContext('<<', this._graph, null, null, null);
-        this._graph = null;
-        return this._readSubject;
+        return this._enterTripleTerm('<<', null, null, token) && this._readSubject;
       default:
         // Read the subject entity
         if ((this._subject = this._readEntity(token)) === undefined) return;
@@ -467,13 +479,9 @@ class N3Parser {
         this._saveContext('formula', this._graph, this._subject, this._predicate, this._graph = this._factory.blankNode());
         return this._readInFormulaContext;
       case '<<(':
-        this._saveContext('<<(', this._graph, this._subject, this._predicate, null);
-        this._graph = null;
-        return this._readSubject;
+        return this._enterTripleTerm('<<(', this._subject, this._predicate, token) && this._readSubject;
       case '<<':
-        this._saveContext('<<', this._graph, this._subject, this._predicate, null);
-        this._graph = null;
-        return this._readSubject;
+        return this._enterTripleTerm('<<', this._subject, this._predicate, token) && this._readSubject;
       default:
         // Read the object entity
         if ((this._object = this._readEntity(token)) === undefined) return;
@@ -668,13 +676,8 @@ class N3Parser {
         this._subject = null;
         return this._readInFormulaContext;
       case '<<(':
-        this._saveContext('<<(', this._graph, null, null, null);
-        this._graph = null;
-        next = this._readSubject;
-        break;
       case '<<':
-        this._saveContext('<<', this._graph, null, null, null);
-        this._graph = null;
+        if (!this._enterTripleTerm(token.type, null, null, token)) return;
         next = this._readSubject;
         break;
       default:
@@ -1166,6 +1169,7 @@ class N3Parser {
     // Read the quad and restore the previous context
     const quad = this._createQuad(this._subject, this._predicate, this._object, this._graph, this._inversePredicate);
     this._restoreContext('<<(', token);
+    this._tripleTermDepth--;
 
     // If we're in a list, continue processing that list
     const stack = this._contextStack,
@@ -1201,6 +1205,7 @@ class N3Parser {
     this._tripleTerm = null;
     const reifier = this._readTripleTerm();
     this._restoreContext('<<', token);
+    this._tripleTermDepth--;
 
     // // If we're in a list, continue processing that list
     const stack = this._contextStack,
@@ -1532,6 +1537,7 @@ class N3Parser {
     this._prefixChanges = null;
     this._quantifiedChanges = null;
     this._emptyFormula = false;
+    this._tripleTermDepth = 0;
     let readToken = token => {
       return this._readCallback = this._readCallback(token);
     };

package/lib/N3Writer.js

@@ -19,9 +19,15 @@ const {
   xsd
 } = _IRIs.default;
 
-// Characters in literals that require escaping
+// 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,
   escapedCharacters = {
     '\\': '\\\\',
     '"': '\\"',
@@ -75,8 +81,11 @@ 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;
       this._prefixIRIs = Object.create(null);
+      // Escaped prefix IRIs and names for the prefix matcher, computed once per prefix
+      this._prefixPatterns = Object.create(null);
       if (options.baseIRI) {
         this._baseIri = new _BaseIRI.default(options.baseIRI);
         if (options.writeBase) this._write(`@base <${options.baseIRI}>.\n`);
@@ -85,6 +94,9 @@ 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;
     }
   }
 
@@ -174,7 +186,7 @@ class N3Writer {
       iri = this._baseIri.toRelative(iri);
     }
     // Escape special characters
-    if (escape.test(iri)) iri = iri.replace(escapeAll, characterReplacer);
+    if (this._escape.test(iri)) iri = iri.replace(this._escapeAll, this._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];
@@ -184,7 +196,7 @@ class N3Writer {
   _encodeLiteral(literal) {
     // Escape special characters
     let value = literal.value;
-    if (escape.test(value)) value = value.replace(escapeAll, characterReplacer);
+    if (this._escape.test(value)) value = value.replace(this._escapeAll, this._characterReplacer);
 
     // Write a language-tagged literal
     const language = literal.language;
@@ -254,7 +266,9 @@ class N3Writer {
     object,
     graph
   }) {
-    return `<<(${this._encodeSubject(subject)} ${this._encodePredicate(predicate)} ${this._encodeObject(object)}${(0, _N3Util.isDefaultGraph)(graph) ? '' : ` ${this._encodeIriOrBlank(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})>>`;
   }
 
   // ### `_blockedWrite` replaces `_write` after the writer has been closed
@@ -302,6 +316,7 @@ class N3Writer {
       }
       // Store and write the prefix
       this._prefixIRIs[iri] = prefix += ':';
+      this._prefixPatterns[iri] = [(0, _Util.escapeRegex)(iri), (0, _Util.escapeRegex)(prefix)];
       this._write(`@prefix ${prefix} <${iri}>.\n`);
     }
     // Recreate the prefix matcher
@@ -309,12 +324,12 @@ class N3Writer {
       this._hasPrefixes = true;
       let IRIlist = '',
         prefixList = '';
-      for (const prefixIRI in this._prefixIRIs) {
-        IRIlist += IRIlist ? `|${prefixIRI}` : prefixIRI;
-        prefixList += (prefixList ? '|' : '') + this._prefixIRIs[prefixIRI];
+      for (const prefixIRI in this._prefixPatterns) {
+        const [IRIpattern, prefixPattern] = this._prefixPatterns[prefixIRI];
+        IRIlist += IRIlist ? `|${IRIpattern}` : IRIpattern;
+        prefixList += prefixList ? `|${prefixPattern}` : prefixPattern;
       }
-      IRIlist = (0, _Util.escapeRegex)(IRIlist, /[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
-      this._prefixRegex = new RegExp(`^(?:${prefixList})[^\/]*$|` + `^(${IRIlist})([_a-zA-Z0-9](?:\\.?[\\-_a-zA-Z0-9])*)$`);
+      this._prefixRegex = new RegExp(`^(?:${prefixList})[^/]*$|` + `^(${IRIlist})([_a-zA-Z0-9](?:\\.?[\\-_a-zA-Z0-9])*)$`);
     }
     // End a prefix block with a newline
     this._write(hasPrefixes ? '\n' : '', done);
@@ -409,4 +424,15 @@ function characterReplacer(character) {
     }
   }
   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) {
+  let result = escapedCharacters[character];
+  if (result === undefined) {
+    result = character.charCodeAt(0).toString(16).toUpperCase();
+    result = '\\u0000'.substr(0, 6 - result.length) + result;
+  }
+  return result;
 }

package/lib/Util.js

@@ -5,5 +5,5 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.escapeRegex = escapeRegex;
 function escapeRegex(regex) {
-  return regex.replace(/[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
+  return regex.replace(/[.*+?^${}()|[\]\\/-]/g, '\\$&');
 }

package/package.json

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

package/src/N3Lexer.js

@@ -54,6 +54,11 @@ function execAtEnd(regExp, input, pos) {
   return regExp.exec(`${input.slice(pos)} `);
 }
 
+// Whitespace or the start of a comment
+function isSeparatorCode(code) {
+  return code === SPACE || code === TAB || code === LF || code === CR || code === HASH;
+}
+
 // ## Constructor
 export default class N3Lexer {
   constructor(options) {
@@ -170,6 +175,9 @@ export default class N3Lexer {
         }
       }
       if (pos >= input.length) {
+        // A datatype marker needs a type
+        if (inputFinished && this._previousMarker === '^^')
+          return reportSyntaxError(this, input, pos);
         this._linePosition = currentLineLength;
         if (inputFinished) {
           emitToken('eof', '', '', this._line, currentLineLength, 0);
@@ -185,6 +193,9 @@ export default class N3Lexer {
           finalLineLength = 0, inconclusive = false;
       switch (firstChar) {
       case '^':
+        // A datatype marker separated from its type cannot be followed by another marker
+        if (this._previousMarker === '^^')
+          return reportSyntaxError(this, input, pos);
         // We need at least 3 tokens lookahead to distinguish ^^<IRI> and ^^pre:fixed
         if (input.length - pos < 3)
           break;
@@ -194,6 +205,9 @@ export default class N3Lexer {
           // Move to type IRI or prefixed name
           pos += 2;
           if (input[pos] !== '<') {
+            // Whitespace and comments may separate the marker from the type
+            if (isSeparatorCode(input.charCodeAt(pos)))
+              continue; // eslint-disable-line no-continue
             inconclusive = true;
             break;
           }

package/src/N3Parser.js

@@ -54,6 +54,10 @@ export default class N3Parser {
     // Disable parsing of unsupported versions by default
     this._parseUnsupportedVersions = !!options.parseUnsupportedVersions;
     this._version = options.version;
+    // Maximum nesting depth of triple terms (default 1024; Infinity disables the limit)
+    const maxTripleTermDepth = options.maxTripleTermDepth;
+    this._maxTripleTermDepth = maxTripleTermDepth === Infinity ||
+      Number.isInteger(maxTripleTermDepth) && maxTripleTermDepth >= 0 ? maxTripleTermDepth : 1024;
   }
 
   // ## Static class methods
@@ -88,6 +92,19 @@ export default class N3Parser {
     }
   }
 
+  // ### `_enterTripleTerm` stores the current parsing context when entering a triple term,
+  // failing if triple terms nest deeper than the maximum depth
+  _enterTripleTerm(type, subject, predicate, token) {
+    if (this._tripleTermDepth >= this._maxTripleTermDepth) {
+      this._error(`Triple terms nested deeper than ${this._maxTripleTermDepth} level${this._maxTripleTermDepth === 1 ? '' : 's'}`, token);
+      return false;
+    }
+    this._tripleTermDepth++;
+    this._saveContext(type, this._graph, subject, predicate, null);
+    this._graph = null;
+    return true;
+  }
+
   // ### `_saveContext` stores the current parsing context
   // when entering a new scope (list, blank node, formula)
   _saveContext(type, graph, subject, predicate, object) {
@@ -338,13 +355,9 @@ export default class N3Parser {
     case '<<(':
       if (!this._n3Mode)
         return this._error('Disallowed triple term as subject', token);
-      this._saveContext('<<(', this._graph, null, null, null);
-      this._graph = null;
-      return this._readSubject;
+      return this._enterTripleTerm('<<(', null, null, token) && this._readSubject;
     case '<<':
-      this._saveContext('<<', this._graph, null, null, null);
-      this._graph = null;
-      return this._readSubject;
+      return this._enterTripleTerm('<<', null, null, token) && this._readSubject;
     default:
       // Read the subject entity
       if ((this._subject = this._readEntity(token)) === undefined)
@@ -489,13 +502,9 @@ export default class N3Parser {
                         this._graph = this._factory.blankNode());
       return this._readInFormulaContext;
     case '<<(':
-      this._saveContext('<<(', this._graph, this._subject, this._predicate, null);
-      this._graph = null;
-      return this._readSubject;
+      return this._enterTripleTerm('<<(', this._subject, this._predicate, token) && this._readSubject;
     case '<<':
-      this._saveContext('<<', this._graph, this._subject, this._predicate, null);
-      this._graph = null;
-      return this._readSubject;
+      return this._enterTripleTerm('<<', this._subject, this._predicate, token) && this._readSubject;
     default:
       // Read the object entity
       if ((this._object = this._readEntity(token)) === undefined)
@@ -715,13 +724,9 @@ export default class N3Parser {
       this._subject = null;
       return this._readInFormulaContext;
     case '<<(':
-      this._saveContext('<<(', this._graph, null, null, null);
-      this._graph = null;
-      next = this._readSubject;
-      break;
     case '<<':
-      this._saveContext('<<', this._graph, null, null, null);
-      this._graph = null;
+      if (!this._enterTripleTerm(token.type, null, null, token))
+        return;
       next = this._readSubject;
       break;
     default:
@@ -1271,6 +1276,7 @@ export default class N3Parser {
     const quad = this._createQuad(this._subject, this._predicate, this._object,
         this._graph, this._inversePredicate);
     this._restoreContext('<<(', token);
+    this._tripleTermDepth--;
 
     // If we're in a list, continue processing that list
     const stack = this._contextStack, parent = stack.length && stack[stack.length - 1];
@@ -1306,6 +1312,7 @@ export default class N3Parser {
     this._tripleTerm = null;
     const reifier = this._readTripleTerm();
     this._restoreContext('<<', token);
+    this._tripleTermDepth--;
 
     // // If we're in a list, continue processing that list
     const stack = this._contextStack, parent = stack.length && stack[stack.length - 1];
@@ -1651,6 +1658,7 @@ export default class N3Parser {
     this._prefixChanges = null;
     this._quantifiedChanges = null;
     this._emptyFormula = false;
+    this._tripleTermDepth = 0;
 
     let readToken = token => {
       return this._readCallback = this._readCallback(token);

package/src/N3Writer.js

@@ -9,9 +9,15 @@ const DEFAULTGRAPH = N3DataFactory.defaultGraph();
 
 const { rdf, xsd } = namespaces;
 
-// Characters in literals that require escaping
+// 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,
     escapedCharacters = {
       '\\': '\\\\', '"': '\\"', '\t': '\\t',
       '\n': '\\n', '\r': '\\r', '\b': '\\b', '\f': '\\f',
@@ -57,8 +63,11 @@ 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;
       this._prefixIRIs = Object.create(null);
+      // Escaped prefix IRIs and names for the prefix matcher, computed once per prefix
+      this._prefixPatterns = Object.create(null);
       if (options.baseIRI) {
         this._baseIri = new BaseIRI(options.baseIRI);
         if (options.writeBase)
@@ -69,6 +78,9 @@ 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;
     }
   }
 
@@ -174,8 +186,8 @@ export default class N3Writer {
       iri = this._baseIri.toRelative(iri);
     }
     // Escape special characters
-    if (escape.test(iri))
-      iri = iri.replace(escapeAll, characterReplacer);
+    if (this._escape.test(iri))
+      iri = iri.replace(this._escapeAll, this._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}>` :
@@ -186,8 +198,8 @@ export default class N3Writer {
   _encodeLiteral(literal) {
     // Escape special characters
     let value = literal.value;
-    if (escape.test(value))
-      value = value.replace(escapeAll, characterReplacer);
+    if (this._escape.test(value))
+      value = value.replace(this._escapeAll, this._characterReplacer);
 
     // Write a language-tagged literal
     const language = literal.language;
@@ -258,11 +270,13 @@ export default class N3Writer {
 
   // ### `_encodeQuad` encodes an RDF-star quad
   _encodeQuad({ subject, predicate, object, graph }) {
-    return `<<(${
+    // 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)}${
-      isDefaultGraph(graph) ? '' : ` ${this._encodeIriOrBlank(graph)}`})>>`;
+      isDefaultGraph(graph) ? '' : ` ${this._encodeIriOrBlank(graph)}`}${space})>>`;
   }
 
   // ### `_blockedWrite` replaces `_write` after the writer has been closed
@@ -316,18 +330,19 @@ export default class N3Writer {
       }
       // Store and write the prefix
       this._prefixIRIs[iri] = (prefix += ':');
+      this._prefixPatterns[iri] = [escapeRegex(iri), escapeRegex(prefix)];
       this._write(`@prefix ${prefix} <${iri}>.\n`);
     }
     // 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];
+      for (const prefixIRI in this._prefixPatterns) {
+        const [IRIpattern, prefixPattern] = this._prefixPatterns[prefixIRI];
+        IRIlist += IRIlist ? `|${IRIpattern}` : IRIpattern;
+        prefixList += prefixList ? `|${prefixPattern}` : prefixPattern;
       }
-      IRIlist = escapeRegex(IRIlist, /[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
-      this._prefixRegex = new RegExp(`^(?:${prefixList})[^\/]*$|` +
+      this._prefixRegex = new RegExp(`^(?:${prefixList})[^/]*$|` +
                                      `^(${IRIlist})([_a-zA-Z0-9](?:\\.?[\\-_a-zA-Z0-9])*)$`);
     }
     // End a prefix block with a newline
@@ -425,3 +440,14 @@ function characterReplacer(character) {
   }
   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) {
+  let result = escapedCharacters[character];
+  if (result === undefined) {
+    result = character.charCodeAt(0).toString(16).toUpperCase();
+    result = '\\u0000'.substr(0, 6 - result.length) + result;
+  }
+  return result;
+}

package/src/Util.js

@@ -1,3 +1,3 @@
 export function escapeRegex(regex) {
-  return regex.replace(/[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
+  return regex.replace(/[.*+?^${}()|[\]\\/-]/g, '\\$&');
 }