dataply 0.0.22 → 0.0.23-alpha.0

package/dist/cjs/index.js

@@ -2182,17 +2182,24 @@ var BPTreeSyncTransaction = class extends BPTreeTransaction {
     }
     return void 0;
   }
-  *keysStream(condition, filterValues, limit, order = "asc") {
-    const stream = this.whereStream(condition, limit, order);
+  *keysStream(condition, options) {
+    const { filterValues, limit, order = "asc" } = options ?? {};
+    const stream = this.whereStream(condition, options);
     const intersection = filterValues && filterValues.size > 0 ? filterValues : null;
+    let count = 0;
     for (const [key] of stream) {
       if (intersection && !intersection.has(key)) {
         continue;
       }
       yield key;
+      count++;
+      if (limit !== void 0 && count >= limit) {
+        break;
+      }
     }
   }
-  *whereStream(condition, limit, order = "asc") {
+  *whereStream(condition, options) {
+    const { filterValues, limit, order = "asc" } = options ?? {};
     const driverKey = this.getDriverKey(condition);
     if (!driverKey) return;
     const value = condition[driverKey];
@@ -2215,8 +2222,12 @@ var BPTreeSyncTransaction = class extends BPTreeTransaction {
       earlyTerminate
     );
     let count = 0;
+    const intersection = filterValues && filterValues.size > 0 ? filterValues : null;
     for (const pair of generator) {
       const [k, v] = pair;
+      if (intersection && !intersection.has(k)) {
+        continue;
+      }
       let isMatch = true;
       for (const key in condition) {
         if (key === driverKey) continue;
@@ -2236,16 +2247,16 @@ var BPTreeSyncTransaction = class extends BPTreeTransaction {
       }
     }
   }
-  keys(condition, filterValues, order = "asc") {
+  keys(condition, options) {
     const set = /* @__PURE__ */ new Set();
-    for (const key of this.keysStream(condition, filterValues, void 0, order)) {
+    for (const key of this.keysStream(condition, options)) {
       set.add(key);
     }
     return set;
   }
-  where(condition, order = "asc") {
+  where(condition, options) {
     const map = /* @__PURE__ */ new Map();
-    for (const [key, value] of this.whereStream(condition, void 0, order)) {
+    for (const [key, value] of this.whereStream(condition, options)) {
       map.set(key, value);
     }
     return map;
@@ -3249,17 +3260,24 @@ var BPTreeAsyncTransaction = class extends BPTreeTransaction {
     }
     return void 0;
   }
-  async *keysStream(condition, filterValues, limit, order = "asc") {
-    const stream = this.whereStream(condition, limit, order);
+  async *keysStream(condition, options) {
+    const { filterValues, limit, order = "asc" } = options ?? {};
+    const stream = this.whereStream(condition, options);
     const intersection = filterValues && filterValues.size > 0 ? filterValues : null;
+    let count = 0;
     for await (const [key] of stream) {
       if (intersection && !intersection.has(key)) {
         continue;
       }
       yield key;
+      count++;
+      if (limit !== void 0 && count >= limit) {
+        break;
+      }
     }
   }
-  async *whereStream(condition, limit, order = "asc") {
+  async *whereStream(condition, options) {
+    const { filterValues, limit, order = "asc" } = options ?? {};
     const driverKey = this.getDriverKey(condition);
     if (!driverKey) return;
     const value = condition[driverKey];
@@ -3282,8 +3300,12 @@ var BPTreeAsyncTransaction = class extends BPTreeTransaction {
       earlyTerminate
     );
     let count = 0;
+    const intersection = filterValues && filterValues.size > 0 ? filterValues : null;
     for await (const pair of generator) {
       const [k, v] = pair;
+      if (intersection && !intersection.has(k)) {
+        continue;
+      }
       let isMatch = true;
       for (const key in condition) {
         if (key === driverKey) continue;
@@ -3303,16 +3325,16 @@ var BPTreeAsyncTransaction = class extends BPTreeTransaction {
       }
     }
   }
-  async keys(condition, filterValues, order = "asc") {
+  async keys(condition, options) {
     const set = /* @__PURE__ */ new Set();
-    for await (const key of this.keysStream(condition, filterValues, void 0, order)) {
+    for await (const key of this.keysStream(condition, options)) {
       set.add(key);
     }
     return set;
   }
-  async where(condition, order = "asc") {
+  async where(condition, options) {
     const map = /* @__PURE__ */ new Map();
-    for await (const [key, value] of this.whereStream(condition, void 0, order)) {
+    for await (const [key, value] of this.whereStream(condition, options)) {
       map.set(key, value);
     }
     return map;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataply",
-  "version": "0.0.22",
+  "version": "0.0.23-alpha.0",
   "description": "A lightweight storage engine for Node.js with support for MVCC, WAL.",
   "license": "MIT",
   "author": "izure <admin@izure.org>",
@@ -49,6 +49,6 @@
     "hookall": "^2.2.0",
     "mvcc-api": "^1.3.4",
     "ryoiki": "^1.2.0",
-    "serializable-bptree": "^8.1.7"
+    "serializable-bptree": "^8.2.0"
   }
 }