n3 1.17.5 → 1.18.0

package/lib/N3Store.js

@@ -13,6 +13,9 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 // **N3Store** objects store N3 quads by graph in memory.
 
+const ITERATOR = Symbol('iter');
+
+// ## Constructor
 class N3EntityIndex {
   constructor(options = {}) {
     this._id = 1;
@@ -382,9 +385,19 @@ class N3Store {
     const stream = new _readableStream.Readable({
       objectMode: true
     });
-    stream._read = () => {
-      for (const quad of this.readQuads(subject, predicate, object, graph)) stream.push(quad);
-      stream.push(null);
+    const iterable = this.readQuads(subject, predicate, object, graph);
+    stream._read = size => {
+      while (size-- > 0) {
+        const {
+          done,
+          value
+        } = iterable.next();
+        if (done) {
+          stream.push(null);
+          return;
+        }
+        stream.push(value);
+      }
     };
     return this.remove(stream);
   }
@@ -400,8 +413,11 @@ class N3Store {
     return [...this.readQuads(subject, predicate, object, graph)];
   }
 
-  // ### `readQuads` returns an generator of quads matching a pattern.
-  // Setting any field to `undefined` or `null` indicates a wildcard.
+  /**
+   * `readQuads` returns a generator of quads matching a pattern.
+   * Setting any field to `undefined` or `null` indicates a wildcard.
+   * @deprecated Use `match` instead.
+   */
   *readQuads(subject, predicate, object, graph) {
     const graphs = this._getGraphs(graph);
     let content, subjectId, predicateId, objectId;
@@ -773,9 +789,20 @@ class DatasetCoreAndReadableStream extends _readableStream.Readable {
   get size() {
     return this.filtered.size;
   }
-  _read() {
-    for (const quad of this) this.push(quad);
-    this.push(null);
+  _read(size) {
+    if (size > 0 && !this[ITERATOR]) this[ITERATOR] = this[Symbol.iterator]();
+    const iterable = this[ITERATOR];
+    while (size-- > 0) {
+      const {
+        done,
+        value
+      } = iterable.next();
+      if (done) {
+        this.push(null);
+        return;
+      }
+      this.push(value);
+    }
   }
   add(quad) {
     return this.filtered.add(quad);

package/lib/N3StoreFactory.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _N3Store = _interopRequireDefault(require("./N3Store"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+class N3DatasetCoreFactory {
+  dataset(quads) {
+    return new _N3Store.default(quads);
+  }
+}
+exports.default = N3DatasetCoreFactory;

package/lib/index.js

@@ -63,6 +63,12 @@ Object.defineProperty(exports, "Store", {
     return _N3Store.default;
   }
 });
+Object.defineProperty(exports, "StoreFactory", {
+  enumerable: true,
+  get: function () {
+    return _N3StoreFactory.default;
+  }
+});
 Object.defineProperty(exports, "StreamParser", {
   enumerable: true,
   get: function () {
@@ -117,6 +123,7 @@ var _N3Lexer = _interopRequireDefault(require("./N3Lexer"));
 var _N3Parser = _interopRequireDefault(require("./N3Parser"));
 var _N3Writer = _interopRequireDefault(require("./N3Writer"));
 var _N3Store = _interopRequireWildcard(require("./N3Store"));
+var _N3StoreFactory = _interopRequireDefault(require("./N3StoreFactory"));
 var _N3StreamParser = _interopRequireDefault(require("./N3StreamParser"));
 var _N3StreamWriter = _interopRequireDefault(require("./N3StreamWriter"));
 var Util = _interopRequireWildcard(require("./N3Util"));
@@ -132,6 +139,8 @@ var _default = exports.default = {
   Parser: _N3Parser.default,
   Writer: _N3Writer.default,
   Store: _N3Store.default,
+  StoreFactory: _N3StoreFactory.default,
+  EntityIndex: _N3Store.N3EntityIndex,
   StreamParser: _N3StreamParser.default,
   StreamWriter: _N3StreamWriter.default,
   Util,

package/package.json

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

package/src/N3Store.js

@@ -4,6 +4,9 @@ import { default as N3DataFactory, termToId, termFromId } from './N3DataFactory'
 import namespaces from './IRIs';
 import { isDefaultGraph } from './N3Util';
 
+const ITERATOR = Symbol('iter');
+
+// ## Constructor
 export class N3EntityIndex {
   constructor(options = {}) {
     this._id = 1;
@@ -386,10 +389,16 @@ export default class N3Store {
   removeMatches(subject, predicate, object, graph) {
     const stream = new Readable({ objectMode: true });
 
-    stream._read = () => {
-      for (const quad of this.readQuads(subject, predicate, object, graph))
-        stream.push(quad);
-      stream.push(null);
+    const iterable = this.readQuads(subject, predicate, object, graph);
+    stream._read = size => {
+      while (size-- > 0) {
+        const { done, value } = iterable.next();
+        if (done) {
+          stream.push(null);
+          return;
+        }
+        stream.push(value);
+      }
     };
 
     return this.remove(stream);
@@ -406,8 +415,11 @@ export default class N3Store {
     return [...this.readQuads(subject, predicate, object, graph)];
   }
 
-  // ### `readQuads` returns an generator of quads matching a pattern.
-  // Setting any field to `undefined` or `null` indicates a wildcard.
+  /**
+   * `readQuads` returns a generator of quads matching a pattern.
+   * Setting any field to `undefined` or `null` indicates a wildcard.
+   * @deprecated Use `match` instead.
+   */
   *readQuads(subject, predicate, object, graph) {
     const graphs = this._getGraphs(graph);
     let content, subjectId, predicateId, objectId;
@@ -805,10 +817,18 @@ class DatasetCoreAndReadableStream extends Readable {
     return this.filtered.size;
   }
 
-  _read() {
-    for (const quad of this)
-      this.push(quad);
-    this.push(null);
+  _read(size) {
+    if (size > 0 && !this[ITERATOR])
+      this[ITERATOR] = this[Symbol.iterator]();
+    const iterable = this[ITERATOR];
+    while (size-- > 0) {
+      const { done, value } = iterable.next();
+      if (done) {
+        this.push(null);
+        return;
+      }
+      this.push(value);
+    }
   }
 
   add(quad) {

package/src/N3StoreFactory.js

@@ -0,0 +1,7 @@
+import N3Store from './N3Store';
+
+export default class N3DatasetCoreFactory {
+  dataset(quads) {
+    return new N3Store(quads);
+  }
+}

package/src/index.js

@@ -2,6 +2,7 @@ import Lexer from './N3Lexer';
 import Parser from './N3Parser';
 import Writer from './N3Writer';
 import Store, { N3EntityIndex as EntityIndex } from './N3Store';
+import StoreFactory from './N3StoreFactory';
 import StreamParser from './N3StreamParser';
 import StreamWriter from './N3StreamWriter';
 import * as Util from './N3Util';
@@ -28,6 +29,7 @@ export {
   Parser,
   Writer,
   Store,
+  StoreFactory,
   EntityIndex,
   StreamParser,
   StreamWriter,
@@ -54,6 +56,8 @@ export default {
   Parser,
   Writer,
   Store,
+  StoreFactory,
+  EntityIndex,
   StreamParser,
   StreamWriter,
   Util,