Fixed word formatters

Fixed database init loop
Fixed database includes
2025-06-11 18:41:46 -04:00 · 2025-05-27 15:42:00 -04:00 · 2025-05-27 15:13:53 -04:00 · 2025-05-27 14:56:24 -04:00 · 2025-05-27 14:51:04 -04:00 · 2025-05-25 23:02:56 -04:00
7 changed files with 112 additions and 124 deletions
--- a/index.html
+++ b/index.html
@ -1,15 +1,10 @@
 <html>
 	<body>
 		<script type="module">
-			import {Cache, Collection} from './dist/index.mjs';
+			import {Cache, Database} from './dist/index.mjs';

-			const cache = new Cache('id', {
-				ttl: 60,
-				storage: new Collection('test', 'test'),
-				expiryPolicy: 'delete'
-			});
-
-			cache.add({id: 1, name: 'zak', age: 27});
+			const db = new Database('test', [123]);
+			window['table'] = db.table(123);
 		</script>
 	</body>
 </html>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.25.1",
+	"version": "0.25.8",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
--- a/src/cache.ts
+++ b/src/cache.ts
@ -1,11 +1,11 @@
-import {Collection} from './database.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 | Collection<any, any>;
+	storage?: Storage | Table<any, any>;
 	/** Key cache will be stored under */
 	storageKey?: string;
 	/** Keep or delete cached items once expired, defaults to delete */
@ -33,10 +33,11 @@ export class Cache<K extends string | number | symbol, T> {
 	constructor(public readonly key?: keyof T, public readonly options: CacheOptions = {}) {
 		if(options.storageKey && !options.storage && typeof(Storage) !== 'undefined') options.storage = localStorage;
 		if(options.storage) {
-			if(options.storage instanceof Collection) {
-				(async () => {
-					(await options.storage?.getAll()).forEach((v: any) => this.add(v));
-				})()
+			if(options.storage instanceof Table) {
+				(async () => (await options.storage?.getAll()).forEach((v: any) => {
+					console.log(v);
+					this.add(v)
+				}))()
 			} else if(options.storageKey) {
 				const stored = options.storage?.getItem(options.storageKey);
 				if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { }
@ -62,7 +63,7 @@ export class Cache<K extends string | number | symbol, T> {

 	private save(key: K) {
 		if(this.options.storage) {
-			if(this.options.storage instanceof Collection) {
+			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));
@ -138,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;
-		else this.delete(key);
+		if(this.options.expiryPolicy == 'keep') {
+			(<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 {
--- a/src/database.ts
+++ b/src/database.ts
@ -1,60 +1,97 @@
-export class Collection<K extends IDBValidKey, T> {
-	private database: Promise<IDBDatabase>;
+import {ASet} from './aset.ts';
+
+export type TableOptions = {
+	name: string;
+	key?: string;
+};
+
+export class Database {
+	connection!: Promise<IDBDatabase>;
+	tables!: TableOptions[];
+
+	constructor(public readonly database: string, tables: (string | TableOptions)[], public version?: number) {
+		this.connection = new Promise((resolve, reject) => {
+			const req = indexedDB.open(this.database, this.version);
+			this.tables = tables.map(t => {
+				t = typeof t == 'object' ? t : {name: t};
+				return {...t, name: t.name.toString()};
+			});
+			const tableNames = new ASet(this.tables.map(t => t.name));

-	constructor(public readonly db: string, public readonly collection: string, public readonly version?: number, private setup?: (db: IDBDatabase, event: IDBVersionChangeEvent) => void) {
-		this.database = new Promise((resolve, reject) => {
-			const req = indexedDB.open(this.db, this.version);
 			req.onerror = () => reject(req.error);
-			req.onsuccess = () => resolve(req.result);
-			req.onupgradeneeded = (event) => {
+
+			req.onsuccess = () => {
 				const db = req.result;
-				if(!db.objectStoreNames.contains(collection)) db.createObjectStore(collection, {keyPath: undefined});
-				if (this.setup) this.setup(db, event as IDBVersionChangeEvent);
+				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));
 			};
 		});
 	}

-	async tx<T>(collection: string, fn: ((store: IDBObjectStore) => IDBRequest), readonly?: boolean): Promise<T> {
-		const db = await this.database;
-		const tx = db.transaction(collection, readonly ? 'readonly' : 'readwrite');
-		const store = tx.objectStore(collection);
-		return new Promise((resolve, reject) => {
+	includes(name: any): boolean {
+		return !!this.tables.find(t => t.name == name.toString());
+	}
+
+	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);
+			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.collection, store => store.add(value, key));
+		return this.tx(this.name, store => store.add(value, key));
 	}

 	count(): Promise<number> {
-		return this.tx(this.collection, store => store.count(), true);
+		return this.tx(this.name, store => store.count(), true);
 	}

 	put(key: K, value: T): Promise<void> {
-		debugger;
-		return this.tx(this.collection, store => store.put(value, key));
+		return this.tx(this.name, store => store.put(value, key));
 	}

 	getAll(): Promise<T[]> {
-		return this.tx(this.collection, store => store.getAll(), true);
+		return this.tx(this.name, store => store.getAll(), true);
 	}

 	getAllKeys(): Promise<K[]> {
-		return this.tx(this.collection, store => store.getAllKeys(), true);
+		return this.tx(this.name, store => store.getAllKeys(), true);
 	}

 	get(key: K): Promise<T> {
-		return this.tx(this.collection, store => store.get(key), true);
+		return this.tx(this.name, store => store.get(key), true);
 	}

 	delete(key: K): Promise<void> {
-		return this.tx(this.collection, store => store.delete(key));
+		return this.tx(this.name, store => store.delete(key));
 	}

 	clear(): Promise<void> {
-		return this.tx(this.collection, store => store.clear());
+		return this.tx(this.name, store => store.clear());
 	}
 }
--- a/src/string.ts
+++ b/src/string.ts
@ -21,11 +21,13 @@ export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST +
 /**
 * Converts text to camelCase
 */
-export function camelCase(str?: string) {
-	const text = pascalCase(str);
-	return !text ? '' : text[0].toLowerCase() + text.slice(1);
+export function camelCase(str?: string): string {
+	if(!str) return '';
+	const pascal = pascalCase(str);
+	return pascal.charAt(0).toLowerCase() + pascal.slice(1);
 }

+
 /**
 * Convert number of bytes into a human-readable size
 *
@ -75,14 +77,12 @@ export function insertAt(target: string, str: string, index: number): String {
 /**
 * Converts text to kebab-case
 */
-export function kebabCase(str: string) {
+export function kebabCase(str?: string): string {
 	if(!str) return '';
-	return str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, '')
-		.replaceAll(/([A-Z]|[0-9]+)/g, (...args) => `-${args[0].toLowerCase()}`)
-		.replaceAll(/([0-9])([a-z])/g, (...args) => `${args[1]}-${args[2]}`)
-		.replaceAll(/[^a-z0-9]+(\w?)/g, (...args) => `-${args[1] ?? ''}`).toLowerCase();
+	return wordSegments(str).map(w => w.toLowerCase()).join("-");
 }

+
 /**
 * Add padding to string
 *
@ -112,12 +112,13 @@ export function pad(text: any, length: number, char: string = ' ', start = true)
 */
 export function pascalCase(str?: string): string {
 	if(!str) return '';
-	return str.match(/[a-zA-Z0-9]+/g)
-		?.map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
-		.join('') ?? '';
+	return wordSegments(str)
+		.map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase())
+		.join('');
 }


+
 /**
 * Generate a random hexadecimal value
 *
@ -184,14 +185,12 @@ export function randomStringBuilder(length: number, letters = false, numbers = f
 /**
 * Converts text to snake_case
 */
-export function snakeCase(str?: string) {
+export function snakeCase(str?: string): string {
 	if(!str) return '';
-	return str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, '')
-		.replaceAll(/([A-Z]|[0-9]+)/g, (...args) => `_${args[0].toLowerCase()}`)
-		.replaceAll(/([0-9])([a-z])/g, (...args) => `${args[1]}_${args[2]}`)
-		.replaceAll(/[^a-z0-9]+(\w?)/g, (...args) => `_${args[1] ?? ''}`).toLowerCase();
+	return wordSegments(str).map(w => w.toLowerCase()).join("_");
 }

+
 /**
 * Splice a string together (Similar to Array.splice)
 *
@ -298,6 +297,23 @@ export function md5(d: string)  {
 	function bit_rol(d:any,_:any){return d<<_|d>>>32-_
 }

+/**
+ * Splits a string into logical word segments
+ */
+export function wordSegments(str?: string): string[] {
+	if (!str) return [];
+	return str
+		.replace(/([a-z])([A-Z])/g, "$1 $2")
+		.replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2")
+		.replace(/([0-9]+)([a-zA-Z])/g, "$1 $2")
+		.replace(/([a-zA-Z])([0-9]+)/g, "$1 $2")
+		.replace(/[_\-\s]+/g, " ")
+		.trim()
+		.split(/\s+/)
+		.filter(Boolean);
+}
+
+
 /**
 * Check if email is valid
 *
--- a/tests/indexed-db.spec.ts
+++ b/tests/indexed-db.spec.ts
@ -1,65 +0,0 @@
-import {Collection} from '../src';
-import 'fake-indexeddb/auto';
-
-describe('IndexedDb and Collection', () => {
-	const data = {id: 1, name: 'Alice', age: 30, email: '<EMAIL>'};
-	const data2 = {id: 2, name: 'Bob', age: 39, email: '<EMAIL>'};
-	let collection = new Collection<number, typeof data>('database', 'collection');
-
-	afterEach(() => collection.clear());
-
-	test('can set and get an item', async () => {
-		await collection.put(data.id, data);
-		const result = await collection.get(data.id);
-		expect(result).toEqual(data);
-	});
-
-	test('can remove an item', async () => {
-		await collection.put(data.id, data);
-		await collection.put(data2.id, data2);
-		await collection.delete(data.id);
-		const result = await collection.get(data.id);
-		const result2 = await collection.get(data2.id);
-		expect(result).toBeUndefined();
-		expect(result2).toEqual(data2);
-	});
-
-	test('can clear all items', async () => {
-		await collection.put(data.id, data);
-		await collection.put(data2.id, data2);
-		await collection.clear();
-		const result = await collection.get(data.id);
-		const result2 = await collection.get(data2.id);
-		expect(result).toBeUndefined();
-		expect(result2).toBeUndefined();
-	});
-
-	test('getItem on missing key returns undefined', async () => {
-		const result = await collection.get(-1);
-		expect(result).toBeUndefined();
-	});
-
-	test('count returns number of items', async () => {
-		expect(await collection.count()).toBe(0);
-		await collection.put(data.id, data);
-		expect(await collection.count()).toBe(1);
-		await collection.delete(data.id);
-		expect(await collection.count()).toBe(0);
-	});
-
-	test('can get all items', async () => {
-		await collection.put(data.id, data);
-		await collection.put(data2.id, data2);
-		const allItems = await collection.getAll();
-		expect(allItems).toEqual(expect.arrayContaining([data, data2]));
-		expect(allItems.length).toBe(2);
-	});
-
-	test('can get all keys', async () => {
-		await collection.put(data.id, data);
-		await collection.put(data2.id, data2);
-		const keys = await collection.getAllKeys();
-		expect(keys).toEqual(expect.arrayContaining([data.id, data2.id]));
-		expect(keys.length).toBe(2);
-	});
-});
--- a/tests/string.spec.ts
+++ b/tests/string.spec.ts
@ -59,7 +59,8 @@ describe('String Utilities', () => {

 	describe('kebabCase', () => {
 		it('converts to kebab-case', () => {
-			expect(kebabCase('HelloWorldTest')).toContain('-hello');
+			expect(kebabCase('hello world')).toBe('hello-world');
+			expect(kebabCase('HelloWorld')).toContain('hello-world');
 			expect(kebabCase('')).toBe('');
 		});
 	});
Author	SHA1	Message	Date
ztimson	c06538a725	Fixed word formatters All checks were successful Build / Build NPM Project (push) Successful in 45s Details Build / Tag Version (push) Successful in 8s Details Build / Publish Documentation (push) Successful in 35s Details	2025-06-11 18:41:46 -04:00
ztimson	a08b0c4eea	Fixed database init loop All checks were successful Build / Build NPM Project (push) Successful in 40s Details Build / Tag Version (push) Successful in 8s Details Build / Publish Documentation (push) Successful in 34s Details	2025-05-27 15:42:00 -04:00
ztimson	1b03ae875b	Fixed database includes All checks were successful Build / Build NPM Project (push) Successful in 41s Details Build / Tag Version (push) Successful in 7s Details Build / Publish Documentation (push) Successful in 35s Details	2025-05-27 15:13:53 -04:00
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