Compare commits

...

8 Commits

Author SHA1 Message Date
91dc17667e Better cache & database integration
All checks were successful
Build / Build NPM Project (push) Successful in 44s
Build / Tag Version (push) Successful in 13s
Build / Publish Documentation (push) Successful in 51s
2025-06-20 19:41:01 -04:00
11cfc67650 Added cache find function
All checks were successful
Build / Build NPM Project (push) Successful in 41s
Build / Tag Version (push) Successful in 8s
Build / Publish Documentation (push) Successful in 35s
2025-06-19 19:46:59 -04:00
4ed23e1502 Fixed path events casing issue
All checks were successful
Build / Build NPM Project (push) Successful in 46s
Build / Tag Version (push) Successful in 13s
Build / Publish Documentation (push) Successful in 52s
2025-06-19 18:44:20 -04:00
e3bbd13ed8 Removed log statement that snuck in
All checks were successful
Build / Build NPM Project (push) Successful in 37s
Build / Tag Version (push) Successful in 8s
Build / Publish Documentation (push) Successful in 37s
2025-06-16 23:37:02 -04:00
1877bac7ce Allow dynamically creating tables
All checks were successful
Build / Build NPM Project (push) Successful in 48s
Build / Tag Version (push) Successful in 7s
Build / Publish Documentation (push) Successful in 42s
2025-06-16 20:56:28 -04:00
c06538a725 Fixed word formatters
All checks were successful
Build / Build NPM Project (push) Successful in 45s
Build / Tag Version (push) Successful in 8s
Build / Publish Documentation (push) Successful in 35s
2025-06-11 18:41:46 -04:00
a08b0c4eea Fixed database init loop
All checks were successful
Build / Build NPM Project (push) Successful in 40s
Build / Tag Version (push) Successful in 8s
Build / Publish Documentation (push) Successful in 34s
2025-05-27 15:42:00 -04:00
1b03ae875b Fixed database includes
All checks were successful
Build / Build NPM Project (push) Successful in 41s
Build / Tag Version (push) Successful in 7s
Build / Publish Documentation (push) Successful in 35s
2025-05-27 15:13:53 -04:00
8 changed files with 169 additions and 42 deletions

View File

@ -1,9 +1,9 @@
<html> <html>
<body> <body>
<script type="module"> <script type="module">
import {Cache, Database} from './dist/index.mjs'; import {PES} from './dist/index.mjs';
const db = new Database('test', []); console.log(PES`storage${'Test/Test'}:d`);
</script> </script>
</body> </body>
</html> </html>

View File

@ -1,6 +1,6 @@
{ {
"name": "@ztimson/utils", "name": "@ztimson/utils",
"version": "0.25.5", "version": "0.25.14",
"description": "Utility library", "description": "Utility library",
"author": "Zak Timson", "author": "Zak Timson",
"license": "MIT", "license": "MIT",

View File

@ -1,5 +1,5 @@
import {Table} from './database.ts'; import {Table} from './database.ts';
import {deepCopy, JSONSanitize} from './objects.ts'; import {deepCopy, includes, JSONSanitize} from './objects.ts';
export type CacheOptions = { export type CacheOptions = {
/** Delete keys automatically after x amount of seconds */ /** Delete keys automatically after x amount of seconds */
@ -35,8 +35,10 @@ export class Cache<K extends string | number | symbol, T> {
if(options.storage) { if(options.storage) {
if(options.storage instanceof Table) { if(options.storage instanceof Table) {
(async () => (await options.storage?.getAll()).forEach((v: any) => { (async () => (await options.storage?.getAll()).forEach((v: any) => {
console.log(v); if(v) {
this.add(v) try { this.add(v) }
catch { }
}
}))() }))()
} else if(options.storageKey) { } else if(options.storageKey) {
const stored = options.storage?.getItem(options.storageKey); const stored = options.storage?.getItem(options.storageKey);
@ -58,6 +60,7 @@ export class Cache<K extends string | number | symbol, T> {
private getKey(value: T): K { private getKey(value: T): K {
if(!this.key) throw new Error('No key defined'); if(!this.key) throw new Error('No key defined');
if(value[this.key] === undefined) throw new Error(`${this.key.toString()} Doesn't exist on ${JSON.stringify(value, null, 2)}`);
return <K>value[this.key]; return <K>value[this.key];
} }
@ -146,6 +149,16 @@ export class Cache<K extends string | number | symbol, T> {
return this; return this;
} }
/**
* Find the first cached item to match a filter
* @param {Partial<T>} filter Partial item to match
* @param {Boolean} expired Include expired items, defaults to false
* @returns {T | undefined} Cached item or undefined if nothing matched
*/
find(filter: Partial<T>, expired?: boolean): T | undefined {
return <T>Object.values(this.store).find((row: any) => (expired || !row._expired) && includes(row, filter));
}
/** /**
* Get item from the cache * Get item from the cache
* @param {K} key Key to lookup * @param {K} key Key to lookup

View File

@ -1,42 +1,85 @@
import {findByProp} from './array.ts';
import {ASet} from './aset.ts'; import {ASet} from './aset.ts';
export type TableOptions = { export type TableOptions = {
name: string; name: string;
key?: string; key?: string;
autoIncrement?: boolean;
}; };
export class Database { export class Database {
connection!: Promise<IDBDatabase>; connection!: Promise<IDBDatabase>;
ready = false;
tables!: TableOptions[];
constructor(public readonly database: string, public readonly tables: (string | TableOptions)[], public version?: number) { constructor(public readonly database: string, tables?: (string | TableOptions)[], public version?: number) {
this.connection = new Promise((resolve, reject) => { this.connection = new Promise((resolve, reject) => {
const req = indexedDB.open(this.database, this.version); const req = indexedDB.open(this.database, this.version);
const tableNames = new ASet(tables.map(t => (typeof t == 'object' ? t.name : t).toString())); this.tables = !tables ? [] : tables.map(t => {
t = typeof t == 'object' ? t : {name: t};
return {...t, name: t.name.toString()};
});
req.onerror = () => reject(req.error); req.onerror = () => reject(req.error);
req.onsuccess = () => { req.onsuccess = () => {
const db = req.result; const db = req.result;
if(tableNames.symmetricDifference(new ASet(Array.from(db.objectStoreNames))).length) { const existing = Array.from(db.objectStoreNames);
if(!tables) this.tables = existing.map(t => {
const tx = db.transaction(t, 'readonly', )
const store = tx.objectStore(t);
return {name: t, key: <string>store.keyPath};
});
const desired = new ASet((tables || []).map(t => typeof t == 'string' ? t : t.name));
if(tables && desired.symmetricDifference(new ASet(existing)).length) {
db.close(); db.close();
Object.assign(this, new Database(this.database, this.tables, db.version + 1)); Object.assign(this, new Database(this.database, this.tables, db.version + 1));
this.connection.then(resolve);
} else { } else {
this.version = db.version; this.version = db.version;
resolve(db); resolve(db);
} }
this.ready = true;
}; };
req.onupgradeneeded = () => { req.onupgradeneeded = () => {
const db = req.result; const db = req.result;
const existingTables = new ASet(Array.from(db.objectStoreNames)); const existingTables = new ASet(Array.from(db.objectStoreNames));
existingTables.difference(tableNames).forEach(name => db.deleteObjectStore(name)); if(tables) {
tableNames.difference(existingTables).forEach(name => db.createObjectStore(name)); const desired = new ASet((tables || []).map(t => typeof t == 'string' ? t : t.name));
existingTables.difference(desired).forEach(name => db.deleteObjectStore(name));
desired.difference(existingTables).forEach(name => {
const t = this.tables.find(findByProp('name', name));
db.createObjectStore(name, {
keyPath: t?.key,
autoIncrement: t?.autoIncrement || !t?.key
});
});
}
}; };
}); });
} }
includes(name: string): boolean { async createTable<K extends IDBValidKey = any, T = any>(table: string | TableOptions): Promise<Table<K, T>> {
return this.tables.some(t => (typeof t === 'string' ? name === t : name === t.name)); if(typeof table == 'string') table = {name: table};
const conn = await this.connection;
if(!this.includes(table.name)) {
conn.close();
Object.assign(this, new Database(this.database, [...this.tables, table], (this.version ?? 0) + 1));
}
return this.table<K, T>(table.name);
}
async deleteTable(table: string | TableOptions): Promise<void> {
if(typeof table == 'string') table = {name: table};
if(!this.includes(table.name)) return;
const conn = await this.connection;
conn.close();
Object.assign(this, new Database(this.database, this.tables.filter(t => t.name != table.name), (this.version ?? 0) + 1));
}
includes(name: any): boolean {
return !!this.tables.find(t => t.name == (typeof name == 'object' ? name.name : name.toString()));
} }
table<K extends IDBValidKey = any, T = any>(name: any): Table<K, T> { table<K extends IDBValidKey = any, T = any>(name: any): Table<K, T> {
@ -45,7 +88,12 @@ export class Database {
} }
export class Table<K extends IDBValidKey = any, T = any> { export class Table<K extends IDBValidKey = any, T = any> {
constructor(private readonly database: Database, public readonly name: string) {} constructor(private readonly database: Database, public readonly name: string, public readonly key: keyof T | string = 'id') {
this.database.connection.then(() => {
const exists = !!this.database.tables.find(findByProp('name', this.name));
if(!exists) this.database.createTable(this.name);
});
}
async tx<R>(table: string, fn: (store: IDBObjectStore) => IDBRequest, readonly = false): Promise<R> { async tx<R>(table: string, fn: (store: IDBObjectStore) => IDBRequest, readonly = false): Promise<R> {
const db = await this.database.connection; const db = await this.database.connection;
@ -62,12 +110,24 @@ export class Table<K extends IDBValidKey = any, T = any> {
return this.tx(this.name, store => store.add(value, key)); return this.tx(this.name, store => store.add(value, key));
} }
all = this.getAll;
clear(): Promise<void> {
return this.tx(this.name, store => store.clear());
}
count(): Promise<number> { count(): Promise<number> {
return this.tx(this.name, store => store.count(), true); return this.tx(this.name, store => store.count(), true);
} }
put(key: K, value: T): Promise<void> { create = this.add;
return this.tx(this.name, store => store.put(value, key));
delete(key: K): Promise<void> {
return this.tx(this.name, store => store.delete(key));
}
get(key: K): Promise<T> {
return this.tx(this.name, store => store.get(key), true);
} }
getAll(): Promise<T[]> { getAll(): Promise<T[]> {
@ -78,15 +138,20 @@ export class Table<K extends IDBValidKey = any, T = any> {
return this.tx(this.name, store => store.getAllKeys(), true); return this.tx(this.name, store => store.getAllKeys(), true);
} }
get(key: K): Promise<T> { put(key: K, value: T): Promise<void> {
return this.tx(this.name, store => store.get(key), true); return this.tx(this.name, store => store.put(value, key));
} }
delete(key: K): Promise<void> { read(): Promise<T[]>;
return this.tx(this.name, store => store.delete(key)); read(key: K): Promise<T>;
read(key?: K): Promise<T | T[]> {
return key ? this.get(key) : this.getAll();
} }
clear(): Promise<void> { set(value: T, key?: K): Promise<void> {
return this.tx(this.name, store => store.clear()); if(!key && !(<any>value)[this.key]) return this.add(value);
return this.put(key || (<any>value)[this.key], value);
} }
update = this.set;
} }

View File

@ -48,7 +48,7 @@ export function PES(str: TemplateStringsArray, ...args: any[]) {
if(str[i]) combined.push(str[i]); if(str[i]) combined.push(str[i]);
if(args[i]) combined.push(args[i]); if(args[i]) combined.push(args[i]);
} }
const [paths, methods] = combined.join('').split(':'); const [paths, methods] = combined.join('/').split(':');
return PathEvent.toString(paths, <any>methods?.split('')); return PathEvent.toString(paths, <any>methods?.split(''));
} }
@ -254,8 +254,8 @@ export class PathEventEmitter implements IPathEventEmitter{
constructor(public readonly prefix: string = '') { } constructor(public readonly prefix: string = '') { }
emit(event: Event, ...args: any[]) { emit(event: Event, ...args: any[]) {
const parsed = new PathEvent(`${this.prefix}/${new PathEvent(event).toString()}`); const parsed = PE`${this.prefix}/${event}`;
this.listeners.filter(l => PathEvent.has(l[0], `${this.prefix}/${event}`)) this.listeners.filter(l => PathEvent.has(l[0], parsed))
.forEach(async l => l[1](parsed, ...args)); .forEach(async l => l[1](parsed, ...args));
}; };

View File

@ -21,11 +21,13 @@ export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST +
/** /**
* Converts text to camelCase * Converts text to camelCase
*/ */
export function camelCase(str?: string) { export function camelCase(str?: string): string {
const text = pascalCase(str); if(!str) return '';
return !text ? '' : text[0].toLowerCase() + text.slice(1); const pascal = pascalCase(str);
return pascal.charAt(0).toLowerCase() + pascal.slice(1);
} }
/** /**
* Convert number of bytes into a human-readable size * 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 * Converts text to kebab-case
*/ */
export function kebabCase(str: string) { export function kebabCase(str?: string): string {
if(!str) return ''; if(!str) return '';
return str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, '') return wordSegments(str).map(w => w.toLowerCase()).join("-");
.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();
} }
/** /**
* Add padding to string * 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 { export function pascalCase(str?: string): string {
if(!str) return ''; if(!str) return '';
return str.match(/[a-zA-Z0-9]+/g) return wordSegments(str)
?.map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()) .map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase())
.join('') ?? ''; .join('');
} }
/** /**
* Generate a random hexadecimal value * Generate a random hexadecimal value
* *
@ -184,14 +185,12 @@ export function randomStringBuilder(length: number, letters = false, numbers = f
/** /**
* Converts text to snake_case * Converts text to snake_case
*/ */
export function snakeCase(str?: string) { export function snakeCase(str?: string): string {
if(!str) return ''; if(!str) return '';
return str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, '') return wordSegments(str).map(w => w.toLowerCase()).join("_");
.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();
} }
/** /**
* Splice a string together (Similar to Array.splice) * 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-_ 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 * Check if email is valid
* *

View File

@ -190,3 +190,35 @@ export async function sleepWhile(fn : () => boolean | Promise<boolean>, checkInt
export function timeUntil(date: Date | number): number { export function timeUntil(date: Date | number): number {
return (date instanceof Date ? date.getTime() : date) - (new Date()).getTime(); return (date instanceof Date ? date.getTime() : date) - (new Date()).getTime();
} }
/**
* Convert a timezone string (e.g., "America/Toronto") to its current UTC offset in minutes.
* @param {string} tz - Timezone string, e.g. "America/Toronto"
* @param {Date} [date=new Date()] - The date for which you want the offset (default is now)
* @returns {number} - Offset in minutes (e.g., -240)
*/
export function timezoneOffset(tz: string, date: Date = new Date()): number {
const dtf = new Intl.DateTimeFormat('en-US', {
timeZone: tz,
hour12: false,
year: 'numeric',
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
});
const parts = dtf.formatToParts(date);
const get = (type: string) => Number(parts.find(v => v.type === type)?.value);
const y = get('year');
const mo = get('month');
const d = get('day');
const h = get('hour');
const m = get('minute');
const s = get('second');
const asUTC = Date.UTC(y, mo - 1, d, h, m, s);
const asLocal = date.getTime();
return Math.round((asLocal - asUTC) / 60000);
}

View File

@ -59,7 +59,8 @@ describe('String Utilities', () => {
describe('kebabCase', () => { describe('kebabCase', () => {
it('converts to kebab-case', () => { 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(''); expect(kebabCase('')).toBe('');
}); });
}); });