n3 2.2.6 → 2.2.7

package/lib/N3Parser.js

@@ -1093,7 +1093,10 @@ class N3Parser {
 
   // ### `_error` emits an error message through the callback
   _error(message, token) {
-    const err = new Error(`${message} on line ${token.line}.`);
+    // Bound input-derived content while preserving the line suffix and full token context.
+    const suffix = ` on line ${token.line}.`;
+    if (message.length + suffix.length > 200) message = `${message.slice(0, 199 - suffix.length)}…`;
+    const err = new Error(`${message}${suffix}`);
     err.context = {
       token: token,
       line: token.line,

package/lib/N3Store.js

@@ -14,6 +14,11 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 // **N3Store** objects store N3 quads by graph in memory.
 
 const ITERATOR = Symbol('iter');
+function hasInIndex(index0, key0, key1, key2) {
+  const index1 = index0 && index0[key0];
+  const index2 = index1 && index1[key1];
+  return !!index2 && key2 in index2;
+}
 function merge(target, source, depth = 4) {
   if (depth === 0) return Object.assign(target, source);
   for (const key in source) target[key] = merge(target[key] || Object.create(null), source[key], depth - 1);
@@ -404,6 +409,15 @@ class N3Store {
       object,
       graph
     } = subjectOrQuad);
+    // Fully bound quads can bypass the generator machinery of `readQuads`.
+    if (subjectOrQuad && predicate && object && graph !== undefined && graph !== null) {
+      const subjectId = this._termToNumericId(subjectOrQuad);
+      const predicateId = this._termToNumericId(predicate);
+      const objectId = this._termToNumericId(object);
+      const graphId = graph === '' || (0, _N3Util.isDefaultGraph)(graph) ? 1 : this._termToNumericId(graph);
+      const graphItem = graphId && this._graphs[graphId];
+      return !!subjectId && !!predicateId && !!objectId && !!graphItem && hasInIndex(graphItem.subjects, subjectId, predicateId, objectId);
+    }
     return !this.readQuads(subjectOrQuad, predicate, object, graph).next().done;
   }
 

package/package.json

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

package/src/N3Parser.js

@@ -1183,7 +1183,11 @@ export default class N3Parser {
 
   // ### `_error` emits an error message through the callback
   _error(message, token) {
-    const err = new Error(`${message} on line ${token.line}.`);
+    // Bound input-derived content while preserving the line suffix and full token context.
+    const suffix = ` on line ${token.line}.`;
+    if (message.length + suffix.length > 200)
+      message = `${message.slice(0, 199 - suffix.length)}…`;
+    const err = new Error(`${message}${suffix}`);
     err.context = {
       token: token,
       line: token.line,

package/src/N3Store.js

@@ -7,6 +7,12 @@ import N3Writer from './N3Writer';
 
 const ITERATOR = Symbol('iter');
 
+function hasInIndex(index0, key0, key1, key2) {
+  const index1 = index0 && index0[key0];
+  const index2 = index1 && index1[key1];
+  return !!index2 && key2 in index2;
+}
+
 function merge(target, source, depth = 4) {
   if (depth === 0)
     return Object.assign(target, source);
@@ -418,6 +424,16 @@ export default class N3Store {
   has(subjectOrQuad, predicate, object, graph) {
     if (subjectOrQuad && subjectOrQuad.subject)
       ({ subject: subjectOrQuad, predicate, object, graph } = subjectOrQuad);
+    // Fully bound quads can bypass the generator machinery of `readQuads`.
+    if (subjectOrQuad && predicate && object && graph !== undefined && graph !== null) {
+      const subjectId = this._termToNumericId(subjectOrQuad);
+      const predicateId = this._termToNumericId(predicate);
+      const objectId = this._termToNumericId(object);
+      const graphId = graph === '' || isDefaultGraph(graph) ? 1 : this._termToNumericId(graph);
+      const graphItem = graphId && this._graphs[graphId];
+      return !!subjectId && !!predicateId && !!objectId && !!graphItem &&
+        hasInIndex(graphItem.subjects, subjectId, predicateId, objectId);
+    }
     return !this.readQuads(subjectOrQuad, predicate, object, graph).next().done;
   }