n3 1.23.0 → 1.23.2

package/lib/N3Parser.js

@@ -165,22 +165,22 @@ class N3Parser {
       case 'typeIRI':
         const iri = this._resolveIRI(token.value);
         if (iri === null) return this._error('Invalid IRI', token);
-        value = this._namedNode(iri);
+        value = this._factory.namedNode(iri);
         break;
       // Read a prefixed name
       case 'type':
       case 'prefixed':
         const prefix = this._prefixes[token.prefix];
         if (prefix === undefined) return this._error(`Undefined prefix "${token.prefix}:"`, token);
-        value = this._namedNode(prefix + token.value);
+        value = this._factory.namedNode(prefix + token.value);
         break;
       // Read a blank node
       case 'blank':
-        value = this._blankNode(this._prefixes[token.prefix] + token.value);
+        value = this._factory.blankNode(this._prefixes[token.prefix] + token.value);
         break;
       // Read a variable
       case 'var':
-        value = this._variable(token.value.substr(1));
+        value = this._factory.variable(token.value.substr(1));
         break;
       // Everything else is not an entity
       default:
@@ -197,7 +197,7 @@ class N3Parser {
     switch (token.type) {
       case '[':
         // Start a new quad with a new blank node as subject
-        this._saveContext('blank', this._graph, this._subject = this._blankNode(), null, null);
+        this._saveContext('blank', this._graph, this._subject = this._factory.blankNode(), null, null);
         return this._readBlankNodeHead;
       case '(':
         // Start a new list
@@ -207,7 +207,7 @@ class N3Parser {
       case '{':
         // Start a new formula
         if (!this._n3Mode) return this._error('Unexpected graph', token);
-        this._saveContext('formula', this._graph, this._graph = this._blankNode(), null, null);
+        this._saveContext('formula', this._graph, this._graph = this._factory.blankNode(), null, null);
         return this._readSubject;
       case '}':
         // No subject; the graph in which we are reading is closed instead
@@ -216,20 +216,20 @@ class N3Parser {
         if (!this._n3Mode) return this._error('Unexpected "@forSome"', token);
         this._subject = null;
         this._predicate = this.N3_FORSOME;
-        this._quantifier = this._blankNode;
+        this._quantifier = 'blankNode';
         return this._readQuantifierList;
       case '@forAll':
         if (!this._n3Mode) return this._error('Unexpected "@forAll"', token);
         this._subject = null;
         this._predicate = this.N3_FORALL;
-        this._quantifier = this._variable;
+        this._quantifier = 'variable';
         return this._readQuantifierList;
       case 'literal':
         if (!this._n3Mode) return this._error('Unexpected literal', token);
         if (token.prefix.length === 0) {
           this._literalValue = token.value;
           return this._completeSubjectLiteral;
-        } else this._subject = this._literal(token.value, this._namedNode(token.prefix));
+        } else this._subject = this._factory.literal(token.value, this._factory.namedNode(token.prefix));
         break;
       case '<<':
         if (!this._supportsRDFStar) return this._error('Unexpected RDF-star syntax', token);
@@ -270,7 +270,7 @@ class N3Parser {
       case '[':
         if (this._n3Mode) {
           // Start a new quad with a new blank node as subject
-          this._saveContext('blank', this._graph, this._subject, this._subject = this._blankNode(), null);
+          this._saveContext('blank', this._graph, this._subject, this._subject = this._factory.blankNode(), null);
           return this._readBlankNodeHead;
         }
       case 'blank':
@@ -292,11 +292,11 @@ class N3Parser {
           return this._readDataTypeOrLang;
         }
         // Pre-datatyped string literal (prefix stores the datatype)
-        else this._object = this._literal(token.value, this._namedNode(token.prefix));
+        else this._object = this._factory.literal(token.value, this._factory.namedNode(token.prefix));
         break;
       case '[':
         // Start a new quad with a new blank node as subject
-        this._saveContext('blank', this._graph, this._subject, this._predicate, this._subject = this._blankNode());
+        this._saveContext('blank', this._graph, this._subject, this._predicate, this._subject = this._factory.blankNode());
         return this._readBlankNodeHead;
       case '(':
         // Start a new list
@@ -306,7 +306,7 @@ class N3Parser {
       case '{':
         // Start a new formula
         if (!this._n3Mode) return this._error('Unexpected graph', token);
-        this._saveContext('formula', this._graph, this._subject, this._predicate, this._graph = this._blankNode());
+        this._saveContext('formula', this._graph, this._subject, this._predicate, this._graph = this._factory.blankNode());
         return this._readSubject;
       case '<<':
         if (!this._supportsRDFStar) return this._error('Unexpected RDF-star syntax', token);
@@ -395,12 +395,12 @@ class N3Parser {
     switch (token.type) {
       case '[':
         // Stack the current list quad and start a new quad with a blank node as subject
-        this._saveContext('blank', this._graph, list = this._blankNode(), this.RDF_FIRST, this._subject = item = this._blankNode());
+        this._saveContext('blank', this._graph, list = this._factory.blankNode(), this.RDF_FIRST, this._subject = item = this._factory.blankNode());
         next = this._readBlankNodeHead;
         break;
       case '(':
         // Stack the current list quad and start a new list
-        this._saveContext('list', this._graph, list = this._blankNode(), this.RDF_FIRST, this.RDF_NIL);
+        this._saveContext('list', this._graph, list = this._factory.blankNode(), this.RDF_FIRST, this.RDF_NIL);
         this._subject = null;
         break;
       case ')':
@@ -433,21 +433,21 @@ class N3Parser {
         }
         // Pre-datatyped string literal (prefix stores the datatype)
         else {
-          item = this._literal(token.value, this._namedNode(token.prefix));
+          item = this._factory.literal(token.value, this._factory.namedNode(token.prefix));
           next = this._getContextEndReader();
         }
         break;
       case '{':
         // Start a new formula
         if (!this._n3Mode) return this._error('Unexpected graph', token);
-        this._saveContext('formula', this._graph, this._subject, this._predicate, this._graph = this._blankNode());
+        this._saveContext('formula', this._graph, this._subject, this._predicate, this._graph = this._factory.blankNode());
         return this._readSubject;
       default:
         if ((item = this._readEntity(token)) === undefined) return;
     }
 
     // Create a new blank node if no item head was assigned yet
-    if (list === null) this._subject = list = this._blankNode();
+    if (list === null) this._subject = list = this._factory.blankNode();
 
     // Is this the first element of the list?
     if (previousList === null) {
@@ -486,19 +486,19 @@ class N3Parser {
   // ### `_completeLiteral` completes a literal with an optional datatype or language
   _completeLiteral(token) {
     // Create a simple string literal by default
-    let literal = this._literal(this._literalValue);
+    let literal = this._factory.literal(this._literalValue);
     switch (token.type) {
       // Create a datatyped literal
       case 'type':
       case 'typeIRI':
         const datatype = this._readEntity(token);
         if (datatype === undefined) return; // No datatype means an error occurred
-        literal = this._literal(this._literalValue, datatype);
+        literal = this._factory.literal(this._literalValue, datatype);
         token = null;
         break;
       // Create a language-tagged string
       case 'langcode':
-        literal = this._literal(this._literalValue, token.value);
+        literal = this._factory.literal(this._literalValue, token.value);
         token = null;
         break;
     }
@@ -578,7 +578,7 @@ class N3Parser {
         // Continue using the last triple as quoted triple subject for the predicate-object pairs.
         const predicate = this._predicate,
           object = this._object;
-        this._subject = this._quad(subject, predicate, object, this.DEFAULTGRAPH);
+        this._subject = this._factory.quad(subject, predicate, object, this.DEFAULTGRAPH);
         next = this._readPredicate;
         break;
       // |} means that the current quoted triple in annotation syntax is finalized.
@@ -671,7 +671,7 @@ class N3Parser {
   // ### `_readNamedGraphLabel` reads a blank node label of a named graph
   _readNamedGraphBlankLabel(token) {
     if (token.type !== ']') return this._error('Invalid graph label', token);
-    this._subject = this._blankNode();
+    this._subject = this._factory.blankNode();
     return this._readGraph;
   }
 
@@ -697,13 +697,13 @@ class N3Parser {
         return this._error(`Unexpected ${token.type}`, token);
     }
     // Without explicit quantifiers, map entities to a quantified entity
-    if (!this._explicitQuantifiers) this._quantified[entity.id] = this._quantifier(this._blankNode().value);
+    if (!this._explicitQuantifiers) this._quantified[entity.id] = this._factory[this._quantifier](this._factory.blankNode().value);
     // With explicit quantifiers, output the reified quantifier
     else {
       // If this is the first item, start a new quantifier list
-      if (this._subject === null) this._emit(this._graph || this.DEFAULTGRAPH, this._predicate, this._subject = this._blankNode(), this.QUANTIFIERS_GRAPH);
+      if (this._subject === null) this._emit(this._graph || this.DEFAULTGRAPH, this._predicate, this._subject = this._factory.blankNode(), this.QUANTIFIERS_GRAPH);
       // Otherwise, continue the previous list
-      else this._emit(this._subject, this.RDF_REST, this._subject = this._blankNode(), this.QUANTIFIERS_GRAPH);
+      else this._emit(this._subject, this.RDF_REST, this._subject = this._factory.blankNode(), this.QUANTIFIERS_GRAPH);
       // Output the list item
       this._emit(this._subject, this.RDF_FIRST, entity, this.QUANTIFIERS_GRAPH);
     }
@@ -762,7 +762,7 @@ class N3Parser {
   // ### `_readForwardPath` reads a '!' path
   _readForwardPath(token) {
     let subject, predicate;
-    const object = this._blankNode();
+    const object = this._factory.blankNode();
     // The next token is the predicate
     if ((predicate = this._readEntity(token)) === undefined) return;
     // If we were reading a subject, replace the subject by the path's object
@@ -776,7 +776,7 @@ class N3Parser {
 
   // ### `_readBackwardPath` reads a '^' path
   _readBackwardPath(token) {
-    const subject = this._blankNode();
+    const subject = this._factory.blankNode();
     let predicate, object;
     // The next token is the predicate
     if ((predicate = this._readEntity(token)) === undefined) return;
@@ -803,7 +803,7 @@ class N3Parser {
   _readRDFStarTail(token) {
     if (token.type !== '>>') return this._error(`Expected >> but got ${token.type}`, token);
     // Read the quad and restore the previous context
-    const quad = this._quad(this._subject, this._predicate, this._object, this._graph || this.DEFAULTGRAPH);
+    const quad = this._factory.quad(this._subject, this._predicate, this._object, this._graph || this.DEFAULTGRAPH);
     this._restoreContext('<<', token);
     // If the triple was the subject, continue by reading the predicate.
     if (this._subject === null) {
@@ -835,7 +835,7 @@ class N3Parser {
 
   // ### `_emit` sends a quad through the callback
   _emit(subject, predicate, object, graph) {
-    this._callback(null, this._quad(subject, predicate, object, graph || this.DEFAULTGRAPH));
+    this._callback(null, this._factory.quad(subject, predicate, object, graph || this.DEFAULTGRAPH));
   }
 
   // ### `_error` emits an error message through the callback
@@ -1007,26 +1007,20 @@ function noop() {}
 
 // Initializes the parser with the given data factory
 function initDataFactory(parser, factory) {
-  // Set factory methods
-  const namedNode = factory.namedNode;
-  parser._namedNode = namedNode;
-  parser._blankNode = factory.blankNode;
-  parser._literal = factory.literal;
-  parser._variable = factory.variable;
-  parser._quad = factory.quad;
+  parser._factory = factory;
   parser.DEFAULTGRAPH = factory.defaultGraph();
 
   // Set common named nodes
-  parser.RDF_FIRST = namedNode(_IRIs.default.rdf.first);
-  parser.RDF_REST = namedNode(_IRIs.default.rdf.rest);
-  parser.RDF_NIL = namedNode(_IRIs.default.rdf.nil);
-  parser.N3_FORALL = namedNode(_IRIs.default.r.forAll);
-  parser.N3_FORSOME = namedNode(_IRIs.default.r.forSome);
+  parser.RDF_FIRST = factory.namedNode(_IRIs.default.rdf.first);
+  parser.RDF_REST = factory.namedNode(_IRIs.default.rdf.rest);
+  parser.RDF_NIL = factory.namedNode(_IRIs.default.rdf.nil);
+  parser.N3_FORALL = factory.namedNode(_IRIs.default.r.forAll);
+  parser.N3_FORSOME = factory.namedNode(_IRIs.default.r.forSome);
   parser.ABBREVIATIONS = {
-    'a': namedNode(_IRIs.default.rdf.type),
-    '=': namedNode(_IRIs.default.owl.sameAs),
-    '>': namedNode(_IRIs.default.log.implies)
+    'a': factory.namedNode(_IRIs.default.rdf.type),
+    '=': factory.namedNode(_IRIs.default.owl.sameAs),
+    '>': factory.namedNode(_IRIs.default.log.implies)
   };
-  parser.QUANTIFIERS_GRAPH = namedNode('urn:n3:quantifiers');
+  parser.QUANTIFIERS_GRAPH = factory.namedNode('urn:n3:quantifiers');
 }
 initDataFactory(N3Parser.prototype, _N3DataFactory.default);

package/lib/N3Store.js

@@ -1083,26 +1083,28 @@ class DatasetCoreAndReadableStream extends _readableStream.Readable {
       if (subject && !(subjectId = newStore._termToNumericId(subject)) || predicate && !(predicateId = newStore._termToNumericId(predicate)) || object && !(objectId = newStore._termToNumericId(object))) return newStore;
       const graphs = n3Store._getGraphs(graph);
       for (const graphKey in graphs) {
-        let subjects, predicates, objects;
-        if (!subjectId && predicateId) {
-          if (predicates = indexMatch(graphs[graphKey].predicates, [predicateId, objectId, subjectId])) {
-            subjects = indexMatch(graphs[graphKey].subjects, [subjectId, predicateId, objectId]);
-            objects = indexMatch(graphs[graphKey].objects, [objectId, subjectId, predicateId]);
-          }
-        } else if (objectId) {
-          if (objects = indexMatch(graphs[graphKey].objects, [objectId, subjectId, predicateId])) {
-            subjects = indexMatch(graphs[graphKey].subjects, [subjectId, predicateId, objectId]);
-            predicates = indexMatch(graphs[graphKey].predicates, [predicateId, objectId, subjectId]);
+        let subjects, predicates, objects, content;
+        if (content = graphs[graphKey]) {
+          if (!subjectId && predicateId) {
+            if (predicates = indexMatch(content.predicates, [predicateId, objectId, subjectId])) {
+              subjects = indexMatch(content.subjects, [subjectId, predicateId, objectId]);
+              objects = indexMatch(content.objects, [objectId, subjectId, predicateId]);
+            }
+          } else if (objectId) {
+            if (objects = indexMatch(content.objects, [objectId, subjectId, predicateId])) {
+              subjects = indexMatch(content.subjects, [subjectId, predicateId, objectId]);
+              predicates = indexMatch(content.predicates, [predicateId, objectId, subjectId]);
+            }
+          } else if (subjects = indexMatch(content.subjects, [subjectId, predicateId, objectId])) {
+            predicates = indexMatch(content.predicates, [predicateId, objectId, subjectId]);
+            objects = indexMatch(content.objects, [objectId, subjectId, predicateId]);
           }
-        } else if (subjects = indexMatch(graphs[graphKey].subjects, [subjectId, predicateId, objectId])) {
-          predicates = indexMatch(graphs[graphKey].predicates, [predicateId, objectId, subjectId]);
-          objects = indexMatch(graphs[graphKey].objects, [objectId, subjectId, predicateId]);
+          if (subjects) newStore._graphs[graphKey] = {
+            subjects,
+            predicates,
+            objects
+          };
         }
-        if (subjects) newStore._graphs[graphKey] = {
-          subjects,
-          predicates,
-          objects
-        };
       }
       newStore._size = null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "1.23.0",
+  "version": "1.23.2",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [
@@ -38,12 +38,12 @@
     "browserify": "^17.0.0",
     "deep-taxonomy-benchmark": "^2.0.0",
     "docco": "^0.9.1",
-    "eslint": "^9.12.0",
+    "eslint": "^8.57.1",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jest": "^28.8.3",
     "jest": "^29.7.0",
     "pre-commit": "^1.2.2",
-    "rdf-isomorphic": "^1.3.1",
+    "rdf-isomorphic": "^2.0.0",
     "rdf-test-suite": "^1.25.0",
     "streamify-string": "^1.0.1",
     "uglify-js": "^3.14.3"

package/src/N3Parser.js

@@ -159,7 +159,7 @@ export default class N3Parser {
       const iri = this._resolveIRI(token.value);
       if (iri === null)
         return this._error('Invalid IRI', token);
-      value = this._namedNode(iri);
+      value = this._factory.namedNode(iri);
       break;
     // Read a prefixed name
     case 'type':
@@ -167,15 +167,15 @@ export default class N3Parser {
       const prefix = this._prefixes[token.prefix];
       if (prefix === undefined)
         return this._error(`Undefined prefix "${token.prefix}:"`, token);
-      value = this._namedNode(prefix + token.value);
+      value = this._factory.namedNode(prefix + token.value);
       break;
     // Read a blank node
     case 'blank':
-      value = this._blankNode(this._prefixes[token.prefix] + token.value);
+      value = this._factory.blankNode(this._prefixes[token.prefix] + token.value);
       break;
     // Read a variable
     case 'var':
-      value = this._variable(token.value.substr(1));
+      value = this._factory.variable(token.value.substr(1));
       break;
     // Everything else is not an entity
     default:
@@ -194,7 +194,7 @@ export default class N3Parser {
     case '[':
       // Start a new quad with a new blank node as subject
       this._saveContext('blank', this._graph,
-                        this._subject = this._blankNode(), null, null);
+                        this._subject = this._factory.blankNode(), null, null);
       return this._readBlankNodeHead;
     case '(':
       // Start a new list
@@ -206,7 +206,7 @@ export default class N3Parser {
       if (!this._n3Mode)
         return this._error('Unexpected graph', token);
       this._saveContext('formula', this._graph,
-                        this._graph = this._blankNode(), null, null);
+                        this._graph = this._factory.blankNode(), null, null);
       return this._readSubject;
     case '}':
        // No subject; the graph in which we are reading is closed instead
@@ -216,14 +216,14 @@ export default class N3Parser {
         return this._error('Unexpected "@forSome"', token);
       this._subject = null;
       this._predicate = this.N3_FORSOME;
-      this._quantifier = this._blankNode;
+      this._quantifier = 'blankNode';
       return this._readQuantifierList;
     case '@forAll':
       if (!this._n3Mode)
         return this._error('Unexpected "@forAll"', token);
       this._subject = null;
       this._predicate = this.N3_FORALL;
-      this._quantifier = this._variable;
+      this._quantifier = 'variable';
       return this._readQuantifierList;
     case 'literal':
       if (!this._n3Mode)
@@ -234,7 +234,7 @@ export default class N3Parser {
         return this._completeSubjectLiteral;
       }
       else
-        this._subject = this._literal(token.value, this._namedNode(token.prefix));
+        this._subject = this._factory.literal(token.value, this._factory.namedNode(token.prefix));
 
       break;
     case '<<':
@@ -282,7 +282,7 @@ export default class N3Parser {
       if (this._n3Mode) {
         // Start a new quad with a new blank node as subject
         this._saveContext('blank', this._graph, this._subject,
-                          this._subject = this._blankNode(), null);
+                          this._subject = this._factory.blankNode(), null);
         return this._readBlankNodeHead;
       }
     case 'blank':
@@ -307,12 +307,12 @@ export default class N3Parser {
       }
       // Pre-datatyped string literal (prefix stores the datatype)
       else
-        this._object = this._literal(token.value, this._namedNode(token.prefix));
+        this._object = this._factory.literal(token.value, this._factory.namedNode(token.prefix));
       break;
     case '[':
       // Start a new quad with a new blank node as subject
       this._saveContext('blank', this._graph, this._subject, this._predicate,
-                        this._subject = this._blankNode());
+                        this._subject = this._factory.blankNode());
       return this._readBlankNodeHead;
     case '(':
       // Start a new list
@@ -324,7 +324,7 @@ export default class N3Parser {
       if (!this._n3Mode)
         return this._error('Unexpected graph', token);
       this._saveContext('formula', this._graph, this._subject, this._predicate,
-                        this._graph = this._blankNode());
+                        this._graph = this._factory.blankNode());
       return this._readSubject;
     case '<<':
       if (!this._supportsRDFStar)
@@ -419,14 +419,14 @@ export default class N3Parser {
     case '[':
       // Stack the current list quad and start a new quad with a blank node as subject
       this._saveContext('blank', this._graph,
-                        list = this._blankNode(), this.RDF_FIRST,
-                        this._subject = item = this._blankNode());
+                        list = this._factory.blankNode(), this.RDF_FIRST,
+                        this._subject = item = this._factory.blankNode());
       next = this._readBlankNodeHead;
       break;
     case '(':
       // Stack the current list quad and start a new list
       this._saveContext('list', this._graph,
-                        list = this._blankNode(), this.RDF_FIRST, this.RDF_NIL);
+                        list = this._factory.blankNode(), this.RDF_FIRST, this.RDF_NIL);
       this._subject = null;
       break;
     case ')':
@@ -462,7 +462,7 @@ export default class N3Parser {
       }
       // Pre-datatyped string literal (prefix stores the datatype)
       else {
-        item = this._literal(token.value, this._namedNode(token.prefix));
+        item = this._factory.literal(token.value, this._factory.namedNode(token.prefix));
         next = this._getContextEndReader();
       }
       break;
@@ -471,7 +471,7 @@ export default class N3Parser {
       if (!this._n3Mode)
         return this._error('Unexpected graph', token);
       this._saveContext('formula', this._graph, this._subject, this._predicate,
-                        this._graph = this._blankNode());
+                        this._graph = this._factory.blankNode());
       return this._readSubject;
     default:
       if ((item = this._readEntity(token)) === undefined)
@@ -480,7 +480,7 @@ export default class N3Parser {
 
      // Create a new blank node if no item head was assigned yet
     if (list === null)
-      this._subject = list = this._blankNode();
+      this._subject = list = this._factory.blankNode();
 
     // Is this the first element of the list?
     if (previousList === null) {
@@ -524,7 +524,7 @@ export default class N3Parser {
   // ### `_completeLiteral` completes a literal with an optional datatype or language
   _completeLiteral(token) {
     // Create a simple string literal by default
-    let literal = this._literal(this._literalValue);
+    let literal = this._factory.literal(this._literalValue);
 
     switch (token.type) {
     // Create a datatyped literal
@@ -532,12 +532,12 @@ export default class N3Parser {
     case 'typeIRI':
       const datatype = this._readEntity(token);
       if (datatype === undefined) return; // No datatype means an error occurred
-      literal = this._literal(this._literalValue, datatype);
+      literal = this._factory.literal(this._literalValue, datatype);
       token = null;
       break;
     // Create a language-tagged string
     case 'langcode':
-      literal = this._literal(this._literalValue, token.value);
+      literal = this._factory.literal(this._literalValue, token.value);
       token = null;
       break;
     }
@@ -620,7 +620,7 @@ export default class N3Parser {
         return this._error('Unexpected RDF-star syntax', token);
       // Continue using the last triple as quoted triple subject for the predicate-object pairs.
       const predicate = this._predicate, object = this._object;
-      this._subject = this._quad(subject, predicate, object, this.DEFAULTGRAPH);
+      this._subject = this._factory.quad(subject, predicate, object, this.DEFAULTGRAPH);
       next = this._readPredicate;
       break;
     // |} means that the current quoted triple in annotation syntax is finalized.
@@ -721,7 +721,7 @@ export default class N3Parser {
   _readNamedGraphBlankLabel(token) {
     if (token.type !== ']')
       return this._error('Invalid graph label', token);
-    this._subject = this._blankNode();
+    this._subject = this._factory.blankNode();
     return this._readGraph;
   }
 
@@ -751,17 +751,17 @@ export default class N3Parser {
     }
     // Without explicit quantifiers, map entities to a quantified entity
     if (!this._explicitQuantifiers)
-      this._quantified[entity.id] = this._quantifier(this._blankNode().value);
+      this._quantified[entity.id] = this._factory[this._quantifier](this._factory.blankNode().value);
     // With explicit quantifiers, output the reified quantifier
     else {
       // If this is the first item, start a new quantifier list
       if (this._subject === null)
         this._emit(this._graph || this.DEFAULTGRAPH, this._predicate,
-                   this._subject = this._blankNode(), this.QUANTIFIERS_GRAPH);
+                   this._subject = this._factory.blankNode(), this.QUANTIFIERS_GRAPH);
       // Otherwise, continue the previous list
       else
         this._emit(this._subject, this.RDF_REST,
-                   this._subject = this._blankNode(), this.QUANTIFIERS_GRAPH);
+                   this._subject = this._factory.blankNode(), this.QUANTIFIERS_GRAPH);
       // Output the list item
       this._emit(this._subject, this.RDF_FIRST, entity, this.QUANTIFIERS_GRAPH);
     }
@@ -818,7 +818,7 @@ export default class N3Parser {
   // ### `_readForwardPath` reads a '!' path
   _readForwardPath(token) {
     let subject, predicate;
-    const object = this._blankNode();
+    const object = this._factory.blankNode();
     // The next token is the predicate
     if ((predicate = this._readEntity(token)) === undefined)
       return;
@@ -835,7 +835,7 @@ export default class N3Parser {
 
   // ### `_readBackwardPath` reads a '^' path
   _readBackwardPath(token) {
-    const subject = this._blankNode();
+    const subject = this._factory.blankNode();
     let predicate, object;
     // The next token is the predicate
     if ((predicate = this._readEntity(token)) === undefined)
@@ -867,7 +867,7 @@ export default class N3Parser {
     if (token.type !== '>>')
       return this._error(`Expected >> but got ${token.type}`, token);
     // Read the quad and restore the previous context
-    const quad = this._quad(this._subject, this._predicate, this._object,
+    const quad = this._factory.quad(this._subject, this._predicate, this._object,
       this._graph || this.DEFAULTGRAPH);
     this._restoreContext('<<', token);
     // If the triple was the subject, continue by reading the predicate.
@@ -902,7 +902,7 @@ export default class N3Parser {
 
   // ### `_emit` sends a quad through the callback
   _emit(subject, predicate, object, graph) {
-    this._callback(null, this._quad(subject, predicate, object, graph || this.DEFAULTGRAPH));
+    this._callback(null, this._factory.quad(subject, predicate, object, graph || this.DEFAULTGRAPH));
   }
 
   // ### `_error` emits an error message through the callback
@@ -1082,26 +1082,21 @@ function noop() {}
 
 // Initializes the parser with the given data factory
 function initDataFactory(parser, factory) {
-  // Set factory methods
-  const namedNode = factory.namedNode;
-  parser._namedNode   = namedNode;
-  parser._blankNode   = factory.blankNode;
-  parser._literal     = factory.literal;
-  parser._variable    = factory.variable;
-  parser._quad        = factory.quad;
+  parser._factory = factory;
+
   parser.DEFAULTGRAPH = factory.defaultGraph();
 
   // Set common named nodes
-  parser.RDF_FIRST  = namedNode(namespaces.rdf.first);
-  parser.RDF_REST   = namedNode(namespaces.rdf.rest);
-  parser.RDF_NIL    = namedNode(namespaces.rdf.nil);
-  parser.N3_FORALL  = namedNode(namespaces.r.forAll);
-  parser.N3_FORSOME = namedNode(namespaces.r.forSome);
+  parser.RDF_FIRST  = factory.namedNode(namespaces.rdf.first);
+  parser.RDF_REST   = factory.namedNode(namespaces.rdf.rest);
+  parser.RDF_NIL    = factory.namedNode(namespaces.rdf.nil);
+  parser.N3_FORALL  = factory.namedNode(namespaces.r.forAll);
+  parser.N3_FORSOME = factory.namedNode(namespaces.r.forSome);
   parser.ABBREVIATIONS = {
-    'a': namedNode(namespaces.rdf.type),
-    '=': namedNode(namespaces.owl.sameAs),
-    '>': namedNode(namespaces.log.implies),
+    'a': factory.namedNode(namespaces.rdf.type),
+    '=': factory.namedNode(namespaces.owl.sameAs),
+    '>': factory.namedNode(namespaces.log.implies),
   };
-  parser.QUANTIFIERS_GRAPH = namedNode('urn:n3:quantifiers');
+  parser.QUANTIFIERS_GRAPH = factory.namedNode('urn:n3:quantifiers');
 }
 initDataFactory(N3Parser.prototype, N3DataFactory);