sqlite-zod-orm 3.5.0 → 3.5.2

package/README.md

@@ -41,6 +41,7 @@ const db = new Database(':memory:', {
   relations: {
     books: { author_id: 'authors' },
   },
+  pollInterval: 300, // global default for .on() and .subscribe() (default: 500ms)
 });
 ```
 

package/dist/index.js

@@ -177,7 +177,8 @@ class QueryBuilder {
   conditionResolver;
   revisionGetter;
   eagerLoader;
-  constructor(tableName, executor, singleExecutor, joinResolver, conditionResolver, revisionGetter, eagerLoader) {
+  defaultPollInterval;
+  constructor(tableName, executor, singleExecutor, joinResolver, conditionResolver, revisionGetter, eagerLoader, pollInterval) {
     this.tableName = tableName;
     this.executor = executor;
     this.singleExecutor = singleExecutor;
@@ -185,6 +186,7 @@ class QueryBuilder {
     this.conditionResolver = conditionResolver ?? null;
     this.revisionGetter = revisionGetter ?? null;
     this.eagerLoader = eagerLoader ?? null;
+    this.defaultPollInterval = pollInterval ?? 500;
     this.iqo = {
       selects: [],
       wheres: [],
@@ -357,7 +359,7 @@ class QueryBuilder {
     return results[0]?.count ?? 0;
   }
   subscribe(callback, options = {}) {
-    const { interval = 500, immediate = true } = options;
+    const { interval = this.defaultPollInterval, immediate = true } = options;
     const fingerprintSQL = this.buildFingerprintSQL();
     let lastFingerprint = null;
     const poll = () => {
@@ -4686,6 +4688,7 @@ class _Database {
   schemas;
   relationships;
   options;
+  pollInterval;
   _revisions = {};
   constructor(dbFile, schemas, options = {}) {
     this.db = new SqliteDatabase(dbFile);
@@ -4693,6 +4696,7 @@ class _Database {
     this.db.run("PRAGMA foreign_keys = ON");
     this.schemas = schemas;
     this.options = options;
+    this.pollInterval = options.pollInterval ?? 500;
     this.relationships = options.relations ? parseRelationsConfig(options.relations, schemas) : [];
     this.initializeTables();
     this.runMigrations();
@@ -4710,7 +4714,7 @@ class _Database {
         upsert: (conditions, data) => this.upsert(entityName, data, conditions),
         delete: (id) => this.delete(entityName, id),
         select: (...cols) => this._createQueryBuilder(entityName, cols),
-        on: (callback, options2) => this._createOnStream(entityName, callback, options2),
+        on: (callback, options2) => this._createOnStream(entityName, callback, options2?.interval),
         _tableName: entityName
       };
       this[key] = accessor;
@@ -4760,24 +4764,34 @@ class _Database {
     const dataVersion = this.db.query("PRAGMA data_version").get()?.data_version ?? 0;
     return `${rev}:${dataVersion}`;
   }
-  _createOnStream(entityName, callback, options) {
-    const { interval = 500 } = options ?? {};
+  _createOnStream(entityName, callback, intervalOverride) {
+    const interval = intervalOverride ?? this.pollInterval;
     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];
@@ -5034,7 +5048,7 @@ class _Database {
       }
       return null;
     };
-    const builder = new QueryBuilder(entityName, executor, singleExecutor, joinResolver, conditionResolver, revisionGetter, eagerLoader);
+    const builder = new QueryBuilder(entityName, executor, singleExecutor, joinResolver, conditionResolver, revisionGetter, eagerLoader, this.pollInterval);
     if (initialCols.length > 0)
       builder.select(...initialCols);
     return builder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlite-zod-orm",
-  "version": "3.5.0",
+  "version": "3.5.2",
   "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

@@ -29,6 +29,7 @@ class _Database<Schemas extends SchemaMap> {
     private schemas: Schemas;
     private relationships: Relationship[];
     private options: DatabaseOptions;
+    private pollInterval: number;
 
     /** In-memory revision counter per table — bumps on every write (insert/update/delete).
      *  Used by QueryBuilder.subscribe() fingerprint to detect ALL changes with zero overhead. */
@@ -40,6 +41,7 @@ class _Database<Schemas extends SchemaMap> {
         this.db.run('PRAGMA foreign_keys = ON');
         this.schemas = schemas;
         this.options = options;
+        this.pollInterval = options.pollInterval ?? 500;
         this.relationships = options.relations ? parseRelationsConfig(options.relations, schemas) : [];
         this.initializeTables();
         this.runMigrations();
@@ -57,8 +59,8 @@ class _Database<Schemas extends SchemaMap> {
                 upsert: (conditions, data) => this.upsert(entityName, data, conditions),
                 delete: (id) => this.delete(entityName, id),
                 select: (...cols: string[]) => this._createQueryBuilder(entityName, cols),
-                on: (callback: (row: any) => void, options?: { interval?: number }) =>
-                    this._createOnStream(entityName, callback, options),
+                on: (callback: (row: any) => void | Promise<void>, options?: { interval?: number }) =>
+                    this._createOnStream(entityName, callback, options?.interval),
                 _tableName: entityName,
             };
             (this as any)[key] = accessor;
@@ -151,39 +153,52 @@ class _Database<Schemas extends SchemaMap> {
      */
     public _createOnStream(
         entityName: string,
-        callback: (row: any) => void,
-        options?: { interval?: number },
+        callback: (row: any) => void | Promise<void>,
+        intervalOverride?: number,
     ): () => void {
-        const { interval = 500 } = options ?? {};
+        const interval = intervalOverride ?? this.pollInterval;
 
         // Initialize watermark to current max id (only emit NEW rows)
         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; };
     }
 
     // ===========================================================================
@@ -534,7 +549,7 @@ class _Database<Schemas extends SchemaMap> {
             return null;
         };
 
-        const builder = new QueryBuilder(entityName, executor, singleExecutor, joinResolver, conditionResolver, revisionGetter, eagerLoader);
+        const builder = new QueryBuilder(entityName, executor, singleExecutor, joinResolver, conditionResolver, revisionGetter, eagerLoader, this.pollInterval);
         if (initialCols.length > 0) builder.select(...initialCols);
         return builder;
     }

package/src/query-builder.ts

@@ -174,6 +174,7 @@ export class QueryBuilder<T extends Record<string, any>> {
     private conditionResolver: ((conditions: Record<string, any>) => Record<string, any>) | null;
     private revisionGetter: (() => string) | null;
     private eagerLoader: ((parentTable: string, relation: string, parentIds: number[]) => { key: string; groups: Map<number, any[]> } | null) | null;
+    private defaultPollInterval: number;
 
     constructor(
         tableName: string,
@@ -183,6 +184,7 @@ export class QueryBuilder<T extends Record<string, any>> {
         conditionResolver?: ((conditions: Record<string, any>) => Record<string, any>) | null,
         revisionGetter?: (() => string) | null,
         eagerLoader?: ((parentTable: string, relation: string, parentIds: number[]) => { key: string; groups: Map<number, any[]> } | null) | null,
+        pollInterval?: number,
     ) {
         this.tableName = tableName;
         this.executor = executor;
@@ -191,6 +193,7 @@ export class QueryBuilder<T extends Record<string, any>> {
         this.conditionResolver = conditionResolver ?? null;
         this.revisionGetter = revisionGetter ?? null;
         this.eagerLoader = eagerLoader ?? null;
+        this.defaultPollInterval = pollInterval ?? 500;
         this.iqo = {
             selects: [],
             wheres: [],
@@ -497,7 +500,7 @@ export class QueryBuilder<T extends Record<string, any>> {
         callback: (rows: T[]) => void,
         options: { interval?: number; immediate?: boolean } = {},
     ): () => void {
-        const { interval = 500, immediate = true } = options;
+        const { interval = this.defaultPollInterval, immediate = true } = options;
 
         // Build the fingerprint SQL (COUNT + MAX(id)) using the same WHERE
         const fingerprintSQL = this.buildFingerprintSQL();

package/src/types.ts

@@ -30,6 +30,11 @@ export type DatabaseOptions<R extends RelationsConfig = RelationsConfig> = {
      * `books: { author_id: 'authors' }` → FOREIGN KEY, lazy nav, fluent join.
      */
     relations?: R;
+    /**
+     * Global polling interval (ms) for `.on()` and `.subscribe()`.
+     * Can be overridden per-call. Default: 500ms.
+     */
+    pollInterval?: number;
 };
 
 export type Relationship = {
@@ -146,9 +151,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 +183,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;
 };