@firtoz/drizzle-indexeddb 0.5.0 → 0.6.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @firtoz/drizzle-indexeddb
 
+## 0.6.0
+
+### Minor Changes
+
+- [`a08a986`](https://github.com/firtoz/fullstack-toolkit/commit/a08a986cc5161b20c9c875328e49565c15417ffc) Thanks [@firtoz](https://github.com/firtoz)! - Slight refactor
+
+  - Renamed `createProxyDbCreator` to `createProxyIDbCreator` for consistency across the codebase.
+  - Updated server sync message type from `sync:clear` to `sync:truncate` to better reflect its functionality.
+  - Adjusted related documentation and test cases to align with these changes.
+
+## 0.5.1
+
+### Patch Changes
+
+- [`8abab0a`](https://github.com/firtoz/fullstack-toolkit/commit/8abab0ae7a99320a4254cb128c0fd823726e58e0) Thanks [@firtoz](https://github.com/firtoz)! - Add cursor-based and offset-based pagination support to `loadSubset` operations, enabling efficient navigation through large datasets with consistent behavior across collection backends.
+
+- Updated dependencies [[`8abab0a`](https://github.com/firtoz/fullstack-toolkit/commit/8abab0ae7a99320a4254cb128c0fd823726e58e0)]:
+  - @firtoz/drizzle-utils@0.3.1
+
 ## 0.5.0
 
 ### Minor Changes
@@ -52,12 +71,12 @@
   - **`IDBProxyServer`** - Server that manages database lifecycle, migrations, and broadcasts mutations to connected clients
   - **`IDBProxyClient`** - Client implementing `IDBDatabaseLike`, routing operations through a transport layer
   - **`createMultiClientTransport()`** - In-memory transport for testing N clients connected to one server
-  - **`createProxyDbCreator()`** - Factory to create `dbCreator` for `DrizzleIndexedDBProvider`
+  - **`createProxyIDbCreator()`** - Factory to create `dbCreator` for `DrizzleIndexedDBProvider`
   - **`createCollectionSyncHandler()`** - Adapter connecting proxy sync messages to collection's external sync
 
   **Real-time Multi-Client Sync**:
 
-  - Server broadcasts `sync:add`, `sync:put`, `sync:delete`, `sync:clear` messages to all clients (excluding initiator)
+  - Server broadcasts `sync:add`, `sync:put`, `sync:delete`, `sync:truncate` messages to all clients (excluding initiator)
   - All mutations automatically sync across connected clients
 
   **Provider Enhancements**:

package/README.md

@@ -460,7 +460,7 @@ For scenarios where IndexedDB needs to be accessed over a messaging layer (e.g.,
 import {
   createMultiClientTransport,
   createProxyServer,
-  createProxyDbCreator,
+  createProxyIDbCreator,
   migrateIndexedDBWithFunctions,
   DrizzleIndexedDBProvider,
 } from "@firtoz/drizzle-indexeddb";
@@ -478,7 +478,7 @@ const server = createProxyServer({
 
 // Create client
 const clientTransport = createClientTransport();
-const dbCreator = createProxyDbCreator(clientTransport);
+const dbCreator = createProxyIDbCreator(clientTransport);
 
 // Use with React provider
 function App() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@firtoz/drizzle-indexeddb",
-	"version": "0.5.0",
+	"version": "0.6.0",
 	"description": "IndexedDB migrations powered by Drizzle ORM",
 	"main": "./src/index.ts",
 	"module": "./src/index.ts",
@@ -68,20 +68,20 @@
 		"access": "public"
 	},
 	"peerDependencies": {
-		"@firtoz/drizzle-utils": ">=0.3.0",
-		"@tanstack/db": ">=0.5.0",
-		"drizzle-orm": ">=0.44.0",
+		"@firtoz/drizzle-utils": ">=0.3.1",
+		"@tanstack/db": ">=0.5.16",
+		"drizzle-orm": ">=0.45.1",
 		"drizzle-valibot": ">=0.4.0",
-		"react": ">=18.0.0",
+		"react": ">=19.2.3",
 		"valibot": ">=1.0.0"
 	},
 	"devDependencies": {
-		"@firtoz/drizzle-utils": "^0.3.0",
-		"@tanstack/db": "^0.5.11",
+		"@firtoz/drizzle-utils": "^0.3.1",
+		"@tanstack/db": "^0.5.16",
 		"@types/react": "^19.2.7",
-		"drizzle-orm": "^0.45.0",
+		"drizzle-orm": "^0.45.1",
 		"drizzle-valibot": "^0.4.2",
-		"react": "^19.2.1",
+		"react": "^19.2.3",
 		"valibot": "^1.2.0"
 	},
 	"dependencies": {

package/src/collections/indexeddb-collection.ts

@@ -381,14 +381,30 @@ export function indexedDBCollectionOptions<const TTable extends Table>(
 
 			let items: IndexedDBSyncItem[];
 
+			// Combine where with cursor expressions if present
+			// The cursor.whereFrom gives us rows after the cursor position
+			let combinedWhere = options.where;
+			if (options.cursor?.whereFrom) {
+				if (combinedWhere) {
+					// Combine main where with cursor expression using AND
+					combinedWhere = {
+						type: "func",
+						name: "and",
+						args: [combinedWhere, options.cursor.whereFrom],
+					} as IR.Func;
+				} else {
+					combinedWhere = options.cursor.whereFrom;
+				}
+			}
+
 			// Try to use an index for efficient querying
-			const indexedQuery = options.where
-				? tryExtractIndexedQuery(options.where, discoveredIndexes, config.debug)
+			const indexedQuery = combinedWhere
+				? tryExtractIndexedQuery(combinedWhere, discoveredIndexes, config.debug)
 				: null;
 
 			if (indexedQuery) {
 				// Use indexed query for better performance
-
+				// Index returns exact results for single-field queries, no additional filtering needed
 				items = await db.getAllByIndex<IndexedDBSyncItem>(
 					config.storeName,
 					indexedQuery.indexName,
@@ -398,9 +414,9 @@ export function indexedDBCollectionOptions<const TTable extends Table>(
 				// Fall back to getting all items
 				items = await db.getAll<IndexedDBSyncItem>(config.storeName);
 
-				// Apply where filter in memory
-				if (options.where) {
-					const whereExpression = options.where;
+				// Apply combined where filter in memory
+				if (combinedWhere) {
+					const whereExpression = combinedWhere;
 					items = items.filter((item) =>
 						evaluateExpression(
 							whereExpression,
@@ -436,6 +452,11 @@ export function indexedDBCollectionOptions<const TTable extends Table>(
 				});
 			}
 
+			// Apply offset (skip first N items for pagination)
+			if (options.offset !== undefined && options.offset > 0) {
+				items = items.slice(options.offset);
+			}
+
 			// Apply limit
 			if (options.limit !== undefined) {
 				items = items.slice(0, options.limit);
@@ -446,32 +467,16 @@ export function indexedDBCollectionOptions<const TTable extends Table>(
 			}
 		},
 
-		handleInsert: async (mutations) => {
+		handleInsert: async (itemsToInsert) => {
 			const db = config.indexedDBRef.current;
 			if (!db) {
 				throw new Error("Database not ready");
 			}
 
-			const results: Array<InferSchemaOutput<SelectSchema<TTable>>> = [];
-
-			try {
-				const itemsToInsert: IndexedDBSyncItem[] = [];
-
-				for (const mutation of mutations) {
-					const itemToInsert = mutation.modified;
-					results.push(itemToInsert);
-					itemsToInsert.push(itemToInsert as IndexedDBSyncItem);
-				}
+			// Add all items in a single batch operation
+			await db.add(config.storeName, itemsToInsert);
 
-				// Add all items in a single batch operation
-				await db.add(config.storeName, itemsToInsert);
-			} catch (error) {
-				// Clear results on error so nothing gets written to reactive store
-				results.length = 0;
-				throw error;
-			}
-
-			return results;
+			return itemsToInsert;
 		},
 
 		handleUpdate: async (mutations) => {

package/src/context/DrizzleIndexedDBProvider.tsx

@@ -280,7 +280,7 @@ export function DrizzleIndexedDBProvider<
 										items: message.keys.map((key) => ({ id: key })),
 									});
 									break;
-								case "sync:clear":
+								case "sync:truncate":
 									pushExternalSync({
 										type: "truncate",
 									});

package/src/index.ts

@@ -76,7 +76,7 @@ export {
 	createMultiClientTransport,
 	// Client
 	IDBProxyClient,
-	createProxyDbCreator,
+	createProxyIDbCreator,
 	type SyncHandler,
 	// Server
 	IDBProxyServer,

package/src/proxy/idb-proxy-client.ts

@@ -1,7 +1,6 @@
 import type {
 	IDBDatabaseLike,
 	IDBCreator,
-	IDBOpenOptions,
 	IndexInfo,
 	CreateStoreOptions,
 	CreateIndexOptions,
@@ -294,13 +293,13 @@ export class IDBProxyClient implements IDBDatabaseLike {
  * @param onSync Optional handler called when any sync message is received
  *
  * @example
- * const dbCreator = createProxyDbCreator(transport, (msg) => {
+ * const dbCreator = createProxyIDbCreator(transport, (msg) => {
  *   console.log('Sync:', msg.type, msg.storeName);
  * });
  *
  * <DrizzleIndexedDBProvider dbCreator={dbCreator} ... />
  */
-export function createProxyDbCreator(
+export function createProxyIDbCreator(
 	transport: IDBProxyClientTransport,
 	onSync?: SyncHandler,
 ): IDBCreator {
@@ -308,10 +307,7 @@ export function createProxyDbCreator(
 	const clientCache = new Map<string, IDBProxyClient>();
 	const connectingCache = new Map<string, Promise<IDBProxyClient>>();
 
-	return async (
-		name: string,
-		_options?: IDBOpenOptions,
-	): Promise<IDBDatabaseLike> => {
+	return async (name: string): Promise<IDBDatabaseLike> => {
 		// Return cached client if already connected
 		const cached = clientCache.get(name);
 		if (cached) {

package/src/proxy/idb-proxy-server.ts

@@ -224,7 +224,7 @@ export class IDBProxyServer {
 				// Broadcast to other clients
 				this.options.transport.broadcast(
 					{
-						type: "sync:clear",
+						type: "sync:truncate",
 						dbName: request.dbName,
 						storeName: request.storeName,
 					},

package/src/proxy/idb-proxy-types.ts

@@ -59,7 +59,7 @@ export type IDBProxySyncMessage = {
 	| { type: "sync:add"; items: unknown[] }
 	| { type: "sync:put"; items: unknown[] }
 	| { type: "sync:delete"; keys: IDBValidKey[] }
-	| { type: "sync:clear" }
+	| { type: "sync:truncate" }
 );
 
 /**

package/src/proxy/idb-sync-adapter.ts

@@ -65,7 +65,7 @@ export function createCollectionSyncHandler<T = unknown>(
 				});
 				break;
 
-			case "sync:clear":
+			case "sync:truncate":
 				pushExternalSync({
 					type: "truncate",
 				});

package/src/proxy/index.ts

@@ -19,7 +19,7 @@ export {
 // Proxy client
 export {
 	IDBProxyClient,
-	createProxyDbCreator,
+	createProxyIDbCreator,
 	type SyncHandler,
 } from "./idb-proxy-client";
 

package/src/standalone-collection.ts

@@ -251,8 +251,8 @@ export function createStandaloneCollection<TTable extends Table>(
 			if (debug) {
 				console.log(`[StandaloneCollection] Database "${dbName}" initialized`);
 			}
-			// biome-ignore lint/style/noNonNullAssertion: resolveReady is set in promise constructor
-			resolveReady!();
+
+			resolveReady();
 		} catch (error) {
 			console.error(
 				`[StandaloneCollection] Failed to initialize database "${dbName}":`,
@@ -294,16 +294,15 @@ export function createStandaloneCollection<TTable extends Table>(
 	const ready = Promise.all([readyPromise, collectionReady]).then(() => {});
 
 	// Helper to wait for transaction to persist
-	const waitForPersist = (
-		// biome-ignore lint/suspicious/noExplicitAny: Transaction types are complex, runtime is correct
-		transaction: any,
-		// biome-ignore lint/suspicious/noExplicitAny: Transaction types are complex, runtime is correct
-		callback?: (transaction: any) => void,
+	const waitForPersist = async (
+		transaction: MutationTransaction<TTable>,
+		callback?: (transaction: MutationTransaction<TTable>) => void,
 	): Promise<MutationTransaction<TTable>> => {
 		if (callback) {
 			callback(transaction);
 		}
-		return transaction.isPersisted.promise.then(() => transaction);
+		await transaction.isPersisted.promise;
+		return transaction;
 	};
 
 	return {
@@ -325,9 +324,12 @@ export function createStandaloneCollection<TTable extends Table>(
 			data: InsertInput<TTable> | InsertInput<TTable>[],
 			callback?: (transaction: MutationTransaction<TTable>) => void,
 		): Promise<MutationTransaction<TTable>> {
-			const items = Array.isArray(data) ? data : [data];
-			// @ts-expect-error - Type inference is complex here but runtime is correct
-			const transaction = collection.insert(...items);
+			const items = (Array.isArray(data) ? data : [data]) as InferSchemaOutput<
+				SelectSchema<TTable>
+			>;
+			const transaction = collection.insert(
+				items,
+			) as MutationTransaction<TTable>;
 			return waitForPersist(transaction, callback);
 		},
 
@@ -338,8 +340,8 @@ export function createStandaloneCollection<TTable extends Table>(
 		): Promise<MutationTransaction<TTable>> {
 			const transaction = collection.update(
 				key,
-				updater as (draft: any) => void,
-			);
+				updater,
+			) as MutationTransaction<TTable>;
 			return waitForPersist(transaction, callback);
 		},