@firtoz/drizzle-indexeddb 0.5.0 → 0.5.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @firtoz/drizzle-indexeddb
 
+## 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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@firtoz/drizzle-indexeddb",
-	"version": "0.5.0",
+	"version": "0.5.1",
 	"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.15",
+		"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.15",
 		"@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);

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);
 		},