@bunnykit/orm 0.1.16 → 0.1.17

package/dist/src/query/Builder.d.ts

@@ -160,7 +160,7 @@ export declare class Builder<T = Record<string, any>> {
     paginate(perPage?: number, page?: number): Promise<Paginator<T>>;
     chunk(count: number, callback: (items: T[]) => void | Promise<void>): Promise<void>;
     each(count: number, callback: (item: T) => void | Promise<void>): Promise<void>;
-    cursor(keyset?: Record<string, any>): AsyncGenerator<T>;
+    cursor(chunkSize?: number): AsyncGenerator<T>;
     lazy(count?: number): AsyncGenerator<T>;
     insert(data: ModelAttributeInput<T> | ModelAttributeInput<T>[]): Promise<any>;
     insertGetId(data: ModelAttributeInput<T>, idColumn?: ModelColumn<T>): Promise<any>;

package/dist/src/query/Builder.js

@@ -718,34 +718,40 @@ export class Builder {
             }
         });
     }
-    async *cursor(keyset) {
+    async *cursor(chunkSize = 1000) {
         const model = this.model;
         const primaryKey = model ? model.primaryKey || "id" : "id";
         const orderColumn = this.orders[0]?.column || primaryKey;
         const orderDirection = this.orders[0]?.direction || "asc";
-        const builder = this.clone();
-        builder.orders = [{ column: orderColumn, direction: orderDirection }];
-        builder.offsetValue = undefined;
-        if (keyset) {
-            const op = orderDirection === "asc" ? ">" : "<";
-            builder.wheres.push({
-                type: "basic",
-                column: orderColumn,
-                operator: op,
-                value: keyset[orderColumn],
-                boolean: "and",
-                scope: undefined,
-            });
-        }
-        const items = await builder.limit(1).get();
-        if (items.length === 0)
-            return;
-        yield items[0];
-        const nextKeyset = items[0] && typeof items[0] === "object"
-            ? { [orderColumn]: items[0][orderColumn] }
-            : undefined;
-        if (nextKeyset) {
-            yield* this.cursor(nextKeyset);
+        let lastValue = undefined;
+        while (true) {
+            const builder = this.clone();
+            builder.orders = [{ column: orderColumn, direction: orderDirection }];
+            builder.offsetValue = undefined;
+            builder.limitValue = chunkSize;
+            if (lastValue !== undefined) {
+                const op = orderDirection === "asc" ? ">" : "<";
+                builder.wheres.push({
+                    type: "basic",
+                    column: orderColumn,
+                    operator: op,
+                    value: lastValue,
+                    boolean: "and",
+                    scope: undefined,
+                });
+            }
+            const items = await builder.get();
+            if (items.length === 0)
+                break;
+            for (const item of items) {
+                yield item;
+            }
+            if (items.length < chunkSize)
+                break;
+            const lastItem = items[items.length - 1];
+            lastValue = lastItem && typeof lastItem === "object"
+                ? lastItem[orderColumn]
+                : undefined;
         }
     }
     async *lazy(count = 1000) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunnykit/orm",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "An Eloquent-inspired ORM for Bun's native SQL client supporting SQLite, MySQL, and PostgreSQL.",
   "license": "MIT",
   "packageManager": "bun@1.3.12",