dataply 0.0.18-alpha.2 → 0.0.18

package/dist/cjs/index.js

@@ -1764,6 +1764,31 @@ var BPTreeTransaction = class _BPTreeTransaction {
     }
     return true;
   }
+  /**
+   * Selects the best driver key from a condition object.
+   * The driver key determines the starting point and traversal direction for queries.
+   * 
+   * @param condition The condition to analyze.
+   * @returns The best driver key or null if no valid key found.
+   */
+  getDriverKey(condition) {
+    if ("primaryEqual" in condition) return "primaryEqual";
+    if ("equal" in condition) return "equal";
+    if ("gt" in condition) return "gt";
+    if ("gte" in condition) return "gte";
+    if ("lt" in condition) return "lt";
+    if ("lte" in condition) return "lte";
+    if ("primaryGt" in condition) return "primaryGt";
+    if ("primaryGte" in condition) return "primaryGte";
+    if ("primaryLt" in condition) return "primaryLt";
+    if ("primaryLte" in condition) return "primaryLte";
+    if ("like" in condition) return "like";
+    if ("notEqual" in condition) return "notEqual";
+    if ("primaryNotEqual" in condition) return "primaryNotEqual";
+    if ("or" in condition) return "or";
+    if ("primaryOr" in condition) return "primaryOr";
+    return null;
+  }
   constructor(rootTx, mvccRoot, mvcc, strategy, comparator, option) {
     this.rootTx = rootTx === null ? this : rootTx;
     this.mvccRoot = mvccRoot;
@@ -2204,8 +2229,8 @@ var BPTreeSyncTransaction = class extends BPTreeTransaction {
     }
     return void 0;
   }
-  *keysStream(condition, filterValues, limit) {
-    const stream = this.whereStream(condition, limit);
+  *keysStream(condition, filterValues, limit, order = "asc") {
+    const stream = this.whereStream(condition, limit, order);
     const intersection = filterValues && filterValues.size > 0 ? filterValues : null;
     for (const [key] of stream) {
       if (intersection && !intersection.has(key)) {
@@ -2214,30 +2239,20 @@ var BPTreeSyncTransaction = class extends BPTreeTransaction {
       yield key;
     }
   }
-  *whereStream(condition, limit) {
-    let driverKey = null;
-    if ("primaryEqual" in condition) driverKey = "primaryEqual";
-    else if ("equal" in condition) driverKey = "equal";
-    else if ("gt" in condition) driverKey = "gt";
-    else if ("gte" in condition) driverKey = "gte";
-    else if ("lt" in condition) driverKey = "lt";
-    else if ("lte" in condition) driverKey = "lte";
-    else if ("primaryGt" in condition) driverKey = "primaryGt";
-    else if ("primaryGte" in condition) driverKey = "primaryGte";
-    else if ("primaryLt" in condition) driverKey = "primaryLt";
-    else if ("primaryLte" in condition) driverKey = "primaryLte";
-    else if ("like" in condition) driverKey = "like";
-    else if ("notEqual" in condition) driverKey = "notEqual";
-    else if ("primaryNotEqual" in condition) driverKey = "primaryNotEqual";
-    else if ("or" in condition) driverKey = "or";
-    else if ("primaryOr" in condition) driverKey = "primaryOr";
+  *whereStream(condition, limit, order = "asc") {
+    const driverKey = this.getDriverKey(condition);
     if (!driverKey) return;
     const value = condition[driverKey];
-    const startNode = this.verifierStartNode[driverKey](value);
-    const endNode = this.verifierEndNode[driverKey](value);
-    const direction = this.verifierDirection[driverKey];
+    let startNode = this.verifierStartNode[driverKey](value);
+    let endNode = this.verifierEndNode[driverKey](value);
+    let direction = this.verifierDirection[driverKey];
     const comparator = this.verifierMap[driverKey];
     const earlyTerminate = this.verifierEarlyTerminate[driverKey];
+    if (order === "desc") {
+      startNode = endNode ?? this.rightestNode();
+      endNode = null;
+      direction *= -1;
+    }
     const generator = this.getPairsGenerator(
       value,
       startNode,
@@ -2268,16 +2283,16 @@ var BPTreeSyncTransaction = class extends BPTreeTransaction {
       }
     }
   }
-  keys(condition, filterValues) {
+  keys(condition, filterValues, order = "asc") {
     const set = /* @__PURE__ */ new Set();
-    for (const key of this.keysStream(condition, filterValues)) {
+    for (const key of this.keysStream(condition, filterValues, void 0, order)) {
       set.add(key);
     }
     return set;
   }
-  where(condition) {
+  where(condition, order = "asc") {
     const map = /* @__PURE__ */ new Map();
-    for (const [key, value] of this.whereStream(condition)) {
+    for (const [key, value] of this.whereStream(condition, void 0, order)) {
       map.set(key, value);
     }
     return map;
@@ -3033,8 +3048,8 @@ var BPTreeAsyncTransaction = class extends BPTreeTransaction {
     }
     return void 0;
   }
-  async *keysStream(condition, filterValues, limit) {
-    const stream = this.whereStream(condition, limit);
+  async *keysStream(condition, filterValues, limit, order = "asc") {
+    const stream = this.whereStream(condition, limit, order);
     const intersection = filterValues && filterValues.size > 0 ? filterValues : null;
     for await (const [key] of stream) {
       if (intersection && !intersection.has(key)) {
@@ -3043,30 +3058,20 @@ var BPTreeAsyncTransaction = class extends BPTreeTransaction {
       yield key;
     }
   }
-  async *whereStream(condition, limit) {
-    let driverKey = null;
-    if ("primaryEqual" in condition) driverKey = "primaryEqual";
-    else if ("equal" in condition) driverKey = "equal";
-    else if ("gt" in condition) driverKey = "gt";
-    else if ("gte" in condition) driverKey = "gte";
-    else if ("lt" in condition) driverKey = "lt";
-    else if ("lte" in condition) driverKey = "lte";
-    else if ("primaryGt" in condition) driverKey = "primaryGt";
-    else if ("primaryGte" in condition) driverKey = "primaryGte";
-    else if ("primaryLt" in condition) driverKey = "primaryLt";
-    else if ("primaryLte" in condition) driverKey = "primaryLte";
-    else if ("like" in condition) driverKey = "like";
-    else if ("notEqual" in condition) driverKey = "notEqual";
-    else if ("primaryNotEqual" in condition) driverKey = "primaryNotEqual";
-    else if ("or" in condition) driverKey = "or";
-    else if ("primaryOr" in condition) driverKey = "primaryOr";
+  async *whereStream(condition, limit, order = "asc") {
+    const driverKey = this.getDriverKey(condition);
     if (!driverKey) return;
     const value = condition[driverKey];
-    const startNode = await this.verifierStartNode[driverKey](value);
-    const endNode = await this.verifierEndNode[driverKey](value);
-    const direction = this.verifierDirection[driverKey];
+    let startNode = await this.verifierStartNode[driverKey](value);
+    let endNode = await this.verifierEndNode[driverKey](value);
+    let direction = this.verifierDirection[driverKey];
     const comparator = this.verifierMap[driverKey];
     const earlyTerminate = this.verifierEarlyTerminate[driverKey];
+    if (order === "desc") {
+      startNode = endNode ?? await this.rightestNode();
+      endNode = null;
+      direction *= -1;
+    }
     const generator = this.getPairsGenerator(
       value,
       startNode,
@@ -3097,16 +3102,16 @@ var BPTreeAsyncTransaction = class extends BPTreeTransaction {
       }
     }
   }
-  async keys(condition, filterValues) {
+  async keys(condition, filterValues, order = "asc") {
     const set = /* @__PURE__ */ new Set();
-    for await (const key of this.keysStream(condition, filterValues)) {
+    for await (const key of this.keysStream(condition, filterValues, void 0, order)) {
       set.add(key);
     }
     return set;
   }
-  async where(condition) {
+  async where(condition, order = "asc") {
     const map = /* @__PURE__ */ new Map();
-    for await (const [key, value] of this.whereStream(condition)) {
+    for await (const [key, value] of this.whereStream(condition, void 0, order)) {
       map.set(key, value);
     }
     return map;
@@ -8868,6 +8873,9 @@ var TransactionContext = class {
   get() {
     return this.storage.getStore();
   }
+  stream(tx, callback) {
+    return this.storage.run(tx, callback);
+  }
 };
 
 // src/core/DataplyAPI.ts
@@ -9087,6 +9095,38 @@ var DataplyAPI = class {
     }
     return result;
   }
+  /**
+   * Runs a generator callback function within a transaction context.
+   * Similar to runWithDefault but allows yielding values from an AsyncGenerator.
+   * If no transaction is provided, a new transaction is created.
+   * The transaction is committed if the generator completes successfully,
+   * or rolled back if an error occurs.
+   * @param callback The generator callback function to run within the transaction context.
+   * @param tx The transaction to use. If not provided, a new transaction is created.
+   * @returns An AsyncGenerator that yields values from the callback.
+   */
+  async *streamWithDefault(callback, tx) {
+    const isInternalTx = !tx;
+    if (!tx) {
+      tx = this.createTransaction();
+    }
+    let hasError = false;
+    try {
+      const generator = this.txContext.stream(tx, () => callback(tx));
+      for await (const value of generator) {
+        yield value;
+      }
+    } catch (error) {
+      hasError = true;
+      if (isInternalTx) {
+        await tx.rollback();
+      }
+      throw error;
+    }
+    if (!hasError && isInternalTx) {
+      await tx.commit();
+    }
+  }
   /**
    * Retrieves metadata from the dataply.
    * @returns Metadata of the dataply.

package/dist/types/core/DataplyAPI.d.ts

@@ -92,6 +92,17 @@ export declare class DataplyAPI {
      * @returns The result of the callback function.
      */
     protected runWithDefault<T>(callback: (tx: Transaction) => Promise<T>, tx?: Transaction): Promise<T>;
+    /**
+     * Runs a generator callback function within a transaction context.
+     * Similar to runWithDefault but allows yielding values from an AsyncGenerator.
+     * If no transaction is provided, a new transaction is created.
+     * The transaction is committed if the generator completes successfully,
+     * or rolled back if an error occurs.
+     * @param callback The generator callback function to run within the transaction context.
+     * @param tx The transaction to use. If not provided, a new transaction is created.
+     * @returns An AsyncGenerator that yields values from the callback.
+     */
+    protected streamWithDefault<T>(callback: (tx: Transaction) => AsyncGenerator<T>, tx?: Transaction): AsyncGenerator<T>;
     /**
      * Retrieves metadata from the dataply.
      * @returns Metadata of the dataply.

package/dist/types/core/transaction/TxContext.d.ts

@@ -3,4 +3,5 @@ export declare class TransactionContext {
     private readonly storage;
     run<T>(tx: Transaction, callback: () => T): T;
     get(): Transaction | undefined;
+    stream<T>(tx: Transaction, callback: () => AsyncIterable<T>): AsyncIterable<T>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataply",
-  "version": "0.0.18-alpha.2",
+  "version": "0.0.18",
   "description": "A lightweight storage engine for Node.js with support for MVCC, WAL.",
   "license": "MIT",
   "author": "izure <admin@izure.org>",