sqlite-zod-orm 3.5.0 → 3.5.1

package/dist/index.js

@@ -4765,19 +4765,29 @@ class _Database {
     const maxRow = this.db.query(`SELECT MAX(id) as _max FROM "${entityName}"`).get();
     let lastMaxId = maxRow?._max ?? 0;
     let lastRevision = this._getRevision(entityName);
-    const timer = setInterval(() => {
-      const currentRevision = this._getRevision(entityName);
-      if (currentRevision === lastRevision)
+    let stopped = false;
+    const poll = async () => {
+      if (stopped)
         return;
-      lastRevision = currentRevision;
-      const newRows = this.db.query(`SELECT * FROM "${entityName}" WHERE id > ? ORDER BY id ASC`).all(lastMaxId);
-      for (const rawRow of newRows) {
-        const entity = this._attachMethods(entityName, transformFromStorage(rawRow, this.schemas[entityName]));
-        callback(entity);
-        lastMaxId = rawRow.id;
+      const currentRevision = this._getRevision(entityName);
+      if (currentRevision !== lastRevision) {
+        lastRevision = currentRevision;
+        const newRows = this.db.query(`SELECT * FROM "${entityName}" WHERE id > ? ORDER BY id ASC`).all(lastMaxId);
+        for (const rawRow of newRows) {
+          if (stopped)
+            return;
+          const entity = this._attachMethods(entityName, transformFromStorage(rawRow, this.schemas[entityName]));
+          await callback(entity);
+          lastMaxId = rawRow.id;
+        }
       }
-    }, interval);
-    return () => clearInterval(timer);
+      if (!stopped)
+        setTimeout(poll, interval);
+    };
+    setTimeout(poll, interval);
+    return () => {
+      stopped = true;
+    };
   }
   insert(entityName, data) {
     const schema = this.schemas[entityName];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlite-zod-orm",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "Type-safe SQLite ORM for Bun — Zod schemas, fluent queries, auto relationships, zero SQL",
   "type": "module",
   "main": "./dist/index.js",

package/src/database.ts

@@ -151,7 +151,7 @@ class _Database<Schemas extends SchemaMap> {
      */
     public _createOnStream(
         entityName: string,
-        callback: (row: any) => void,
+        callback: (row: any) => void | Promise<void>,
         options?: { interval?: number },
     ): () => void {
         const { interval = 500 } = options ?? {};
@@ -160,30 +160,43 @@ class _Database<Schemas extends SchemaMap> {
         const maxRow = this.db.query(`SELECT MAX(id) as _max FROM "${entityName}"`).get() as any;
         let lastMaxId: number = maxRow?._max ?? 0;
         let lastRevision: string = this._getRevision(entityName);
+        let stopped = false;
+
+        // Self-scheduling async loop: guarantees strict ordering
+        // - Each callback (sync or async) completes before the next row is emitted
+        // - Next poll only starts after the current batch is fully processed
+        const poll = async () => {
+            if (stopped) return;
 
-        const timer = setInterval(() => {
             // Fast check: did anything change?
             const currentRevision = this._getRevision(entityName);
-            if (currentRevision === lastRevision) return;
-            lastRevision = currentRevision;
-
-            // Fetch new rows since watermark
-            const newRows = this.db.query(
-                `SELECT * FROM "${entityName}" WHERE id > ? ORDER BY id ASC`
-            ).all(lastMaxId) as any[];
-
-            for (const rawRow of newRows) {
-                // Hydrate with entity methods and schema transforms
-                const entity = this._attachMethods(
-                    entityName,
-                    transformFromStorage(rawRow, this.schemas[entityName]!)
-                );
-                callback(entity);
-                lastMaxId = rawRow.id;
+            if (currentRevision !== lastRevision) {
+                lastRevision = currentRevision;
+
+                // Fetch new rows since watermark
+                const newRows = this.db.query(
+                    `SELECT * FROM "${entityName}" WHERE id > ? ORDER BY id ASC`
+                ).all(lastMaxId) as any[];
+
+                for (const rawRow of newRows) {
+                    if (stopped) return; // bail if unsubscribed mid-batch
+                    const entity = this._attachMethods(
+                        entityName,
+                        transformFromStorage(rawRow, this.schemas[entityName]!)
+                    );
+                    await callback(entity); // await async callbacks
+                    lastMaxId = rawRow.id;
+                }
             }
-        }, interval);
 
-        return () => clearInterval(timer);
+            // Schedule next poll only after this one is done
+            if (!stopped) setTimeout(poll, interval);
+        };
+
+        // Start the loop
+        setTimeout(poll, interval);
+
+        return () => { stopped = true; };
     }
 
     // ===========================================================================

package/src/types.ts

@@ -146,9 +146,10 @@ export type NavEntityAccessor<
     /**
      * Stream new rows one at a time, in insertion order.
      * Only emits rows inserted AFTER subscription starts.
+     * Callbacks are awaited — strict ordering guaranteed even with async handlers.
      * @returns Unsubscribe function.
      */
-    on: (callback: (row: NavEntity<S, R, Table>) => void, options?: { interval?: number }) => () => void;
+    on: (callback: (row: NavEntity<S, R, Table>) => void | Promise<void>, options?: { interval?: number }) => () => void;
     _tableName: string;
     readonly _schema?: S[Table & keyof S];
 };
@@ -177,9 +178,10 @@ export type EntityAccessor<S extends z.ZodType<any>> = {
     /**
      * Stream new rows one at a time, in insertion order.
      * Only emits rows inserted AFTER subscription starts.
+     * Callbacks are awaited — strict ordering guaranteed even with async handlers.
      * @returns Unsubscribe function.
      */
-    on: (callback: (row: AugmentedEntity<S>) => void, options?: { interval?: number }) => () => void;
+    on: (callback: (row: AugmentedEntity<S>) => void | Promise<void>, options?: { interval?: number }) => () => void;
     _tableName: string;
     readonly _schema?: S;
 };