n3 2.11.2 → 2.11.3

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

@@ -77,6 +77,8 @@ class N3Writer {
       this._lineMode = false;
       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`);
@@ -302,6 +304,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 +312,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);

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.3",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [

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

@@ -59,6 +59,8 @@ export default class N3Writer {
       this._lineMode = false;
       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)
@@ -316,18 +318,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

package/src/Util.js

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