@firtoz/drizzle-indexeddb 0.4.1 → 0.4.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @firtoz/drizzle-indexeddb
 
+## 0.4.2
+
+### Patch Changes
+
+- [`58afa0a`](https://github.com/firtoz/fullstack-toolkit/commit/58afa0a5365f55f536e50194a73f847293102e7f) Thanks [@firtoz](https://github.com/firtoz)! - Hopefully this should work
+
 ## 0.4.1
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@firtoz/drizzle-indexeddb",
-	"version": "0.4.1",
+	"version": "0.4.2",
 	"description": "IndexedDB migrations powered by Drizzle ORM",
 	"main": "./src/index.ts",
 	"module": "./src/index.ts",
@@ -42,9 +42,7 @@
 		"typecheck": "tsc --noEmit -p ./tsconfig.json",
 		"lint": "biome check --write src",
 		"lint:ci": "biome ci src",
-		"format": "biome format src --write",
-		"test": "bun test --pass-with-no-tests",
-		"test:watch": "bun test --watch"
+		"format": "biome format src --write"
 	},
 	"keywords": [
 		"typescript",
@@ -69,17 +67,21 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"dependencies": {
+	"peerDependencies": {
+		"@firtoz/drizzle-utils": ">=0.3.0",
+		"@tanstack/db": ">=0.5.0",
+		"drizzle-orm": ">=0.44.0",
+		"drizzle-valibot": ">=0.4.0",
+		"react": ">=18.0.0",
+		"valibot": ">=1.0.0"
+	},
+	"devDependencies": {
 		"@firtoz/drizzle-utils": "^0.3.0",
 		"@tanstack/db": "^0.5.11",
+		"@types/react": "^19.2.7",
 		"drizzle-orm": "^0.45.0",
 		"drizzle-valibot": "^0.4.2",
+		"react": "^19.2.1",
 		"valibot": "^1.2.0"
-	},
-	"peerDependencies": {
-		"react": "^19.2.1"
-	},
-	"devDependencies": {
-		"@types/react": "^19.2.7"
 	}
 }

package/src/context/DrizzleIndexedDBProvider.tsx

@@ -134,10 +134,9 @@ export function DrizzleIndexedDBProvider<
 	});
 
 	useEffect(() => {
+		let db: IDBDatabaseLike | null = null;
 		const initDB = async () => {
 			try {
-				let db: IDBDatabaseLike;
-
 				if (migrations.length === 0) {
 					// Open database directly without migration logic
 					db = await openIndexedDb(dbName, dbCreator);
@@ -161,11 +160,11 @@ export function DrizzleIndexedDBProvider<
 
 		// Cleanup on unmount
 		return () => {
-			if (indexedDB) {
-				indexedDB.close();
+			if (db) {
+				db.close();
 			}
 		};
-	}, [dbName, migrations, migrateFunction, debug, readyPromise]);
+	}, [dbName, migrations, migrateFunction, debug, readyPromise, dbCreator]);
 
 	// Collection cache with ref counting
 	const collections = useMemo<Map<string, CollectionCacheEntry>>(
@@ -219,15 +218,7 @@ export function DrizzleIndexedDBProvider<
 			return collections.get(cacheKey)!
 				.collection as unknown as IndexedDbCollection<TSchema, TTableName>;
 		},
-		[
-			indexedDBRef,
-			collections,
-			schema,
-			readyPromise.promise,
-			debug,
-			dbName,
-			syncMode,
-		],
+		[collections, schema, readyPromise.promise, debug, dbName, syncMode],
 	);
 
 	const incrementRefCount: DrizzleIndexedDBContextValue<TSchema>["incrementRefCount"] =

package/src/context/useDrizzleIndexedDB.ts

@@ -1,4 +1,4 @@
-import { useContext } from "react";
+import { useCallback, useContext } from "react";
 import {
 	DrizzleIndexedDBContext,
 	useIndexedDBCollection,
@@ -28,10 +28,15 @@ export function useDrizzleIndexedDB<
 		);
 	}
 
+	const useCollection = useCallback(
+		<TTableName extends keyof TSchema & string>(tableName: TTableName) =>
+			// biome-ignore lint/correctness/useHookAtTopLevel: This is on purpose.
+			useIndexedDBCollection(context, tableName),
+		[context],
+	);
+
 	return {
-		useCollection: <TTableName extends keyof TSchema & string>(
-			tableName: TTableName,
-		) => useIndexedDBCollection(context, tableName),
+		useCollection,
 		indexedDB: context.indexedDB,
 	};
 }

package/src/idb-operations.ts

@@ -23,9 +23,14 @@ export async function openIndexedDb(
  */
 const defaultIDBDeleter: IDBDeleter = (name: string): Promise<void> => {
 	return new Promise((resolve, reject) => {
-		const request = indexedDB.deleteDatabase(name);
-		request.onerror = () => reject(request.error);
-		request.onsuccess = () => resolve();
+		try {
+			const request = indexedDB.deleteDatabase(name);
+			request.onerror = () => reject(request.error);
+			request.onsuccess = () => resolve();
+		} catch (error) {
+			console.error("Error deleting database", error);
+			reject(error);
+		}
 	});
 };
 

package/src/native-idb-database.ts

@@ -104,12 +104,17 @@ class NativeIDBDatabase implements IDBDatabaseLike {
 		}
 
 		return new Promise((resolve, reject) => {
-			const transaction = this.db.transaction(storeName, "readonly");
-			const store = transaction.objectStore(storeName);
-			const request = store.getAll();
-
-			request.onsuccess = () => resolve(request.result as T[]);
-			request.onerror = () => reject(request.error);
+			try {
+				const transaction = this.db.transaction(storeName, "readonly");
+				const store = transaction.objectStore(storeName);
+				const request = store.getAll();
+
+				request.onsuccess = () => resolve(request.result as T[]);
+				request.onerror = () => reject(request.error);
+			} catch (error) {
+				console.error("Error getting all items", error);
+				reject(error);
+			}
 		});
 	}
 
@@ -119,14 +124,19 @@ class NativeIDBDatabase implements IDBDatabaseLike {
 		keyRange?: KeyRangeSpec,
 	): Promise<T[]> {
 		return new Promise((resolve, reject) => {
-			const transaction = this.db.transaction(storeName, "readonly");
-			const store = transaction.objectStore(storeName);
-			const index = store.index(indexName);
-			const range = keyRange ? createKeyRange(keyRange) : undefined;
-			const request = index.getAll(range);
-
-			request.onsuccess = () => resolve(request.result as T[]);
-			request.onerror = () => reject(request.error);
+			try {
+				const transaction = this.db.transaction(storeName, "readonly");
+				const store = transaction.objectStore(storeName);
+				const index = store.index(indexName);
+				const range = keyRange ? createKeyRange(keyRange) : undefined;
+				const request = index.getAll(range);
+
+				request.onsuccess = () => resolve(request.result as T[]);
+				request.onerror = () => reject(request.error);
+			} catch (error) {
+				console.error("Error getting all items by index", error);
+				reject(error);
+			}
 		});
 	}
 
@@ -135,72 +145,98 @@ class NativeIDBDatabase implements IDBDatabaseLike {
 		key: IDBValidKey,
 	): Promise<T | undefined> {
 		return new Promise((resolve, reject) => {
-			const transaction = this.db.transaction(storeName, "readonly");
-			const store = transaction.objectStore(storeName);
-			const request = store.get(key);
-
-			request.onsuccess = () => resolve(request.result as T | undefined);
-			request.onerror = () => reject(request.error);
+			try {
+				const transaction = this.db.transaction(storeName, "readonly");
+				const store = transaction.objectStore(storeName);
+				const request = store.get(key);
+
+				request.onsuccess = () => resolve(request.result as T | undefined);
+				request.onerror = () => reject(request.error);
+			} catch (error) {
+				console.error("Error getting item", error);
+				reject(error);
+			}
 		});
 	}
 
 	async add(storeName: string, items: unknown[]): Promise<void> {
 		return new Promise((resolve, reject) => {
-			const transaction = this.db.transaction(storeName, "readwrite");
-			const store = transaction.objectStore(storeName);
+			try {
+				const transaction = this.db.transaction(storeName, "readwrite");
+				const store = transaction.objectStore(storeName);
 
-			for (const item of items) {
-				store.add(item);
-			}
+				for (const item of items) {
+					store.add(item);
+				}
 
-			transaction.oncomplete = () => resolve();
-			transaction.onerror = () => reject(transaction.error);
-			transaction.onabort = () => reject(new Error("Transaction aborted"));
+				transaction.oncomplete = () => resolve();
+				transaction.onerror = () => reject(transaction.error);
+				transaction.onabort = () => reject(new Error("Transaction aborted"));
+			} catch (error) {
+				console.error("Error adding items", error);
+				reject(error);
+			}
 		});
 	}
 
 	async put(storeName: string, items: unknown[]): Promise<void> {
 		return new Promise((resolve, reject) => {
-			const transaction = this.db.transaction(storeName, "readwrite");
-			const store = transaction.objectStore(storeName);
+			try {
+				const transaction = this.db.transaction(storeName, "readwrite");
+				const store = transaction.objectStore(storeName);
 
-			for (const item of items) {
-				store.put(item);
-			}
+				for (const item of items) {
+					store.put(item);
+				}
 
-			transaction.oncomplete = () => resolve();
-			transaction.onerror = () => reject(transaction.error);
-			transaction.onabort = () => reject(new Error("Transaction aborted"));
+				transaction.oncomplete = () => resolve();
+				transaction.onerror = () => reject(transaction.error);
+				transaction.onabort = () => reject(new Error("Transaction aborted"));
+			} catch (error) {
+				console.error("Error putting items", error);
+				reject(error);
+			}
 		});
 	}
 
 	async delete(storeName: string, keys: IDBValidKey[]): Promise<void> {
 		return new Promise((resolve, reject) => {
-			const transaction = this.db.transaction(storeName, "readwrite");
-			const store = transaction.objectStore(storeName);
+			try {
+				const transaction = this.db.transaction(storeName, "readwrite");
+				const store = transaction.objectStore(storeName);
 
-			for (const key of keys) {
-				store.delete(key);
-			}
+				for (const key of keys) {
+					store.delete(key);
+				}
 
-			transaction.oncomplete = () => resolve();
-			transaction.onerror = () => reject(transaction.error);
-			transaction.onabort = () => reject(new Error("Transaction aborted"));
+				transaction.oncomplete = () => resolve();
+				transaction.onerror = () => reject(transaction.error);
+				transaction.onabort = () => reject(new Error("Transaction aborted"));
+			} catch (error) {
+				console.error("Error deleting items", error);
+				reject(error);
+			}
 		});
 	}
 
 	async clear(storeName: string): Promise<void> {
 		return new Promise((resolve, reject) => {
-			const transaction = this.db.transaction(storeName, "readwrite");
-			const store = transaction.objectStore(storeName);
-			const request = store.clear();
-
-			request.onsuccess = () => resolve();
-			request.onerror = () => reject(request.error);
+			try {
+				const transaction = this.db.transaction(storeName, "readwrite");
+				const store = transaction.objectStore(storeName);
+				const request = store.clear();
+
+				request.onsuccess = () => resolve();
+				request.onerror = () => reject(request.error);
+			} catch (error) {
+				console.error("Error clearing store", error);
+				reject(error);
+			}
 		});
 	}
 
 	close(): void {
+		console.log("Closing database");
 		this.db.close();
 	}
 }
@@ -319,37 +355,42 @@ export const defaultIDBCreator: IDBCreator = (
 	options?: IDBOpenOptions,
 ): Promise<IDBDatabaseLike> => {
 	return new Promise((resolve, reject) => {
-		const request = options?.version
-			? indexedDB.open(name, options.version)
-			: indexedDB.open(name);
-
-		request.onerror = () => reject(request.error);
+		try {
+			const request = options?.version
+				? indexedDB.open(name, options.version)
+				: indexedDB.open(name);
 
-		request.onblocked = () => {
-			setTimeout(() => {
-				reject(new Error("Database upgrade blocked - close other tabs"));
-			}, 3000);
-		};
+			request.onerror = () => reject(request.error);
 
-		request.onupgradeneeded = (event) => {
-			if (options?.onUpgrade) {
-				const db = request.result;
-				const transaction = (event.target as IDBOpenDBRequest).transaction;
-				if (!transaction) {
-					reject(new Error("No transaction during upgrade"));
-					return;
+			request.onblocked = () => {
+				setTimeout(() => {
+					reject(new Error("Database upgrade blocked - close other tabs"));
+				}, 3000);
+			};
+
+			request.onupgradeneeded = (event) => {
+				if (options?.onUpgrade) {
+					const db = request.result;
+					const transaction = (event.target as IDBOpenDBRequest).transaction;
+					if (!transaction) {
+						reject(new Error("No transaction during upgrade"));
+						return;
+					}
+					// Create an upgrade-mode database wrapper
+					const upgradeDb = new UpgradeModeDatabase(db, transaction);
+					try {
+						options.onUpgrade(upgradeDb);
+					} catch (error) {
+						transaction.abort();
+						reject(error);
+					}
 				}
-				// Create an upgrade-mode database wrapper
-				const upgradeDb = new UpgradeModeDatabase(db, transaction);
-				try {
-					options.onUpgrade(upgradeDb);
-				} catch (error) {
-					transaction.abort();
-					reject(error);
-				}
-			}
-		};
+			};
 
-		request.onsuccess = () => resolve(new NativeIDBDatabase(request.result));
+			request.onsuccess = () => resolve(new NativeIDBDatabase(request.result));
+		} catch (error) {
+			console.error("Error creating database", error);
+			reject(error);
+		}
 	});
 };