Removed console.log statments

Fixed using numbers as database table name
Added database wrapper
2025-05-27 14:56:24 -04:00 · 2025-05-27 14:51:04 -04:00 · 2025-05-25 23:02:56 -04:00 · 2025-05-15 16:47:35 -04:00 · 2025-05-15 16:06:32 -04:00
5 changed files with 133 additions and 18 deletions
--- a/index.html
+++ b/index.html
@ -0,0 +1,9 @@
 <html>
 	<body>
 		<script type="module">
 			import {Cache, Database} from './dist/index.mjs';
 			const db = new Database('test', []);
 		</script>
 	</body>
 </html>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.25.0",
+	"version": "0.25.5",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
@ -31,6 +31,7 @@
 	},
 	"devDependencies": {
 		"@types/jest": "^29.5.12",
 		"fake-indexeddb": "^6.0.1",
 		"jest": "^29.7.0",
 		"jest-junit": "^16.0.0",
 		"ts-jest": "^29.1.2",
--- a/src/cache.ts
+++ b/src/cache.ts
@ -1,10 +1,11 @@
-import {deepCopy} from './objects.ts';
+import {Table} from './database.ts';
 import {deepCopy, JSONSanitize} from './objects.ts';
 export type CacheOptions = {
 	/** Delete keys automatically after x amount of seconds */
 	ttl?: number;
 	/** Storage to persist cache */
-	storage?: Storage;
+	storage?: Storage | Table<any, any>;
 	/** Key cache will be stored under */
 	storageKey?: string;
 	/** Keep or delete cached items once expired, defaults to delete */
@ -30,13 +31,16 @@ export class Cache<K extends string | number | symbol, T> {
 	 * @param options
 	 */
 	constructor(public readonly key?: keyof T, public readonly options: CacheOptions = {}) {
-		if(options.storageKey && !options.storage && typeof(Storage) !== 'undefined')
+		if(options.storageKey && !options.storage && typeof(Storage) !== 'undefined') options.storage = localStorage;
-			options.storage = localStorage;
+		if(options.storage) {
-		if(options.storageKey && options.storage) {
+			if(options.storage instanceof Table) {
-			const stored = options.storage.getItem(options.storageKey);
+				(async () => (await options.storage?.getAll()).forEach((v: any) => {
-			if(stored) {
+					console.log(v);
-				try { Object.assign(this.store, JSON.parse(stored)); }
+					this.add(v)
-				catch { }
+				}))()
 			} else if(options.storageKey) {
 				const stored = options.storage?.getItem(options.storageKey);
 				if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { }
 			}
 		}
 		return new Proxy(this, {
@ -57,9 +61,14 @@ export class Cache<K extends string | number | symbol, T> {
 		return <K>value[this.key];
 	}
-	private save() {
+	private save(key: K) {
-		if(this.options.storageKey && this.options.storage)
+		if(this.options.storage) {
-			this.options.storage.setItem(this.options.storageKey, JSON.stringify(this.store));
+			if(this.options.storage instanceof Table) {
 				this.options.storage.put(key, this.store[key]);
 			} else if(this.options.storageKey) {
 				this.options.storage.setItem(this.options.storageKey, JSONSanitize(this.store));
 			}
 		}
 	}
 	/**
@ -111,7 +120,7 @@ export class Cache<K extends string | number | symbol, T> {
 	 */
 	delete(key: K): this {
 		delete this.store[key];
-		this.save();
+		this.save(key);
 		return this;
 	}
@ -130,14 +139,17 @@ export class Cache<K extends string | number | symbol, T> {
 	 */
 	expire(key: K): this {
 		this.complete = false;
-		if(this.options.expiryPolicy == 'keep') (<any>this.store[key])._expired = true;
+		if(this.options.expiryPolicy == 'keep') {
-		else this.delete(key);
+			(<any>this.store[key])._expired = true;
 			this.save(key);
 		} else this.delete(key);
 		return this;
 	}
 	/**
 	 * Get item from the cache
 	 * @param {K} key Key to lookup
 	 * @param expired Include expired items
 	 * @return {T} Cached item
 	 */
 	get(key: K, expired?: boolean): CachedValue<T> | null {
@ -177,10 +189,10 @@ export class Cache<K extends string | number | symbol, T> {
 	set(key: K, value: T, ttl = this.options.ttl): this {
 		if(this.options.expiryPolicy == 'keep') delete (<any>value)._expired;
 		this.store[key] = value;
-		this.save();
+		this.save(key);
 		if(ttl) setTimeout(() => {
 			this.expire(key);
-			this.save();
+			this.save(key);
 		}, (ttl || 0) * 1000);
 		return this;
 	}
--- a/src/database.ts
+++ b/src/database.ts
@ -0,0 +1,92 @@
 import {ASet} from './aset.ts';
 export type TableOptions = {
 	name: string;
 	key?: string;
 };
 export class Database {
 	connection!: Promise<IDBDatabase>;
 	constructor(public readonly database: string, public readonly tables: (string | TableOptions)[], public version?: number) {
 		this.connection = new Promise((resolve, reject) => {
 			const req = indexedDB.open(this.database, this.version);
 			const tableNames = new ASet(tables.map(t => (typeof t == 'object' ? t.name : t).toString()));
 			req.onerror = () => reject(req.error);
 			req.onsuccess = () => {
 				const db = req.result;
 				if(tableNames.symmetricDifference(new ASet(Array.from(db.objectStoreNames))).length) {
 					db.close();
 					Object.assign(this, new Database(this.database, this.tables, db.version + 1));
 				} else {
 					this.version = db.version;
 					resolve(db);
 				}
 			};
 			req.onupgradeneeded = () => {
 				const db = req.result;
 				const existingTables = new ASet(Array.from(db.objectStoreNames));
 				existingTables.difference(tableNames).forEach(name => db.deleteObjectStore(name));
 				tableNames.difference(existingTables).forEach(name => db.createObjectStore(name));
 			};
 		});
 	}
 	includes(name: string): boolean {
 		return this.tables.some(t => (typeof t === 'string' ? name === t : name === t.name));
 	}
 	table<K extends IDBValidKey = any, T = any>(name: any): Table<K, T> {
 		return new Table<K, T>(this, name.toString());
 	}
 }
 export class Table<K extends IDBValidKey = any, T = any> {
 	constructor(private readonly database: Database, public readonly name: string) {}
 	async tx<R>(table: string, fn: (store: IDBObjectStore) => IDBRequest, readonly = false): Promise<R> {
 		const db = await this.database.connection;
 		const tx = db.transaction(table, readonly ? 'readonly' : 'readwrite');
 		const store = tx.objectStore(table);
 		return new Promise<R>((resolve, reject) => {
 			const request = fn(store);
 			request.onsuccess = () => resolve(request.result as R); // ✅ explicit cast
 			request.onerror = () => reject(request.error);
 		});
 	}
 	add(value: T, key?: K): Promise<void> {
 		return this.tx(this.name, store => store.add(value, key));
 	}
 	count(): Promise<number> {
 		return this.tx(this.name, store => store.count(), true);
 	}
 	put(key: K, value: T): Promise<void> {
 		return this.tx(this.name, store => store.put(value, key));
 	}
 	getAll(): Promise<T[]> {
 		return this.tx(this.name, store => store.getAll(), true);
 	}
 	getAllKeys(): Promise<K[]> {
 		return this.tx(this.name, store => store.getAllKeys(), true);
 	}
 	get(key: K): Promise<T> {
 		return this.tx(this.name, store => store.get(key), true);
 	}
 	delete(key: K): Promise<void> {
 		return this.tx(this.name, store => store.delete(key));
 	}
 	clear(): Promise<void> {
 		return this.tx(this.name, store => store.clear());
 	}
 }
--- a/src/index.ts
+++ b/src/index.ts
@ -4,6 +4,7 @@ export * from './aset';
 export * from './cache';
 export * from './color';
 export * from './csv';
 export * from './database';
 export * from './files';
 export * from './emitter';
 export * from './errors';
Author	SHA1	Message	Date
ztimson	af1da75a82	Removed console.log statments All checks were successful Build / Build NPM Project (push) Successful in 41s Details Build / Tag Version (push) Successful in 8s Details Build / Publish Documentation (push) Successful in 34s Details	2025-05-27 14:56:24 -04:00
ztimson	e19768688d	Fixed using numbers as database table name All checks were successful Build / Build NPM Project (push) Successful in 1m16s Details Build / Tag Version (push) Successful in 15s Details Build / Publish Documentation (push) Successful in 53s Details	2025-05-27 14:51:04 -04:00
ztimson	6d706d4c15	Added database wrapper All checks were successful Build / Build NPM Project (push) Successful in 1m7s Details Build / Tag Version (push) Successful in 14s Details Build / Publish Documentation (push) Successful in 53s Details	2025-05-25 23:02:56 -04:00
ztimson	97f2bcce2e	removed debugging line All checks were successful Build / Build NPM Project (push) Successful in 43s Details Build / Tag Version (push) Successful in 8s Details Build / Publish Documentation (push) Successful in 36s Details	2025-05-15 16:47:35 -04:00
ztimson	2a7fa18c0e	Added indexdb wrapper & cache support for it All checks were successful Build / Build NPM Project (push) Successful in 1m24s Details Build / Tag Version (push) Successful in 53s Details Build / Publish Documentation (push) Successful in 1m28s Details	2025-05-15 16:06:32 -04:00