Compare commits
No commits in common. "develop" and "0.25.2" have entirely different histories.
10
index.html
10
index.html
@ -1,9 +1,15 @@
|
||||
<html>
|
||||
<body>
|
||||
<script type="module">
|
||||
import {PES} from './dist/index.mjs';
|
||||
import {Cache, Collection} from './dist/index.mjs';
|
||||
|
||||
console.log(PES`storage${'Test/Test'}:d`);
|
||||
const cache = new Cache('id', {
|
||||
ttl: 60,
|
||||
storage: new Collection('test', 'test'),
|
||||
expiryPolicy: 'delete'
|
||||
});
|
||||
|
||||
cache.add({id: 1, name: 'zak', age: 27});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@ztimson/utils",
|
||||
"version": "0.25.18",
|
||||
"version": "0.25.2",
|
||||
"description": "Utility library",
|
||||
"author": "Zak Timson",
|
||||
"license": "MIT",
|
||||
|
||||
37
src/cache.ts
37
src/cache.ts
@ -1,11 +1,11 @@
|
||||
import {Table} from './database.ts';
|
||||
import {deepCopy, includes, JSONSanitize} from './objects.ts';
|
||||
import {Collection} from './collection.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 | Table<any, any>;
|
||||
storage?: Storage | Collection<any, any>;
|
||||
/** Key cache will be stored under */
|
||||
storageKey?: string;
|
||||
/** Keep or delete cached items once expired, defaults to delete */
|
||||
@ -33,13 +33,10 @@ 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 Table) {
|
||||
(async () => (await options.storage?.getAll()).forEach((v: any) => {
|
||||
if(v) {
|
||||
try { this.add(v) }
|
||||
catch { }
|
||||
}
|
||||
}))()
|
||||
if(options.storage instanceof Collection) {
|
||||
(async () => {
|
||||
(await options.storage?.getAll()).forEach((v: any) => 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 { }
|
||||
@ -60,13 +57,12 @@ export class Cache<K extends string | number | symbol, T> {
|
||||
|
||||
private getKey(value: T): K {
|
||||
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];
|
||||
}
|
||||
|
||||
private save(key: K) {
|
||||
if(this.options.storage) {
|
||||
if(this.options.storage instanceof Table) {
|
||||
if(this.options.storage instanceof Collection) {
|
||||
this.options.storage.put(key, this.store[key]);
|
||||
} else if(this.options.storageKey) {
|
||||
this.options.storage.setItem(this.options.storageKey, JSONSanitize(this.store));
|
||||
@ -142,27 +138,14 @@ 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;
|
||||
this.save(key);
|
||||
} else this.delete(key);
|
||||
if(this.options.expiryPolicy == 'keep') (<any>this.store[key])._expired = true;
|
||||
else this.delete(key);
|
||||
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
|
||||
* @param {K} key Key to lookup
|
||||
* @param expired Include expired items
|
||||
* @return {T} Cached item
|
||||
*/
|
||||
get(key: K, expired?: boolean): CachedValue<T> | null {
|
||||
|
||||
59
src/collection.ts
Normal file
59
src/collection.ts
Normal file
@ -0,0 +1,59 @@
|
||||
export class Collection<K extends IDBValidKey, T> {
|
||||
private database: Promise<IDBDatabase>;
|
||||
|
||||
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) => {
|
||||
const db = req.result;
|
||||
if(!db.objectStoreNames.contains(collection)) db.createObjectStore(collection, {keyPath: undefined});
|
||||
if (this.setup) this.setup(db, event as IDBVersionChangeEvent);
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
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) => {
|
||||
const request = fn(store);
|
||||
request.onsuccess = () => resolve(request.result);
|
||||
request.onerror = () => reject(request.error);
|
||||
});
|
||||
}
|
||||
|
||||
add(value: T, key?: K): Promise<void> {
|
||||
return this.tx(this.collection, store => store.add(value, key));
|
||||
}
|
||||
|
||||
count(): Promise<number> {
|
||||
return this.tx(this.collection, store => store.count(), true);
|
||||
}
|
||||
|
||||
put(key: K, value: T): Promise<void> {
|
||||
return this.tx(this.collection, store => store.put(value, key));
|
||||
}
|
||||
|
||||
getAll(): Promise<T[]> {
|
||||
return this.tx(this.collection, store => store.getAll(), true);
|
||||
}
|
||||
|
||||
getAllKeys(): Promise<K[]> {
|
||||
return this.tx(this.collection, store => store.getAllKeys(), true);
|
||||
}
|
||||
|
||||
get(key: K): Promise<T> {
|
||||
return this.tx(this.collection, store => store.get(key), true);
|
||||
}
|
||||
|
||||
delete(key: K): Promise<void> {
|
||||
return this.tx(this.collection, store => store.delete(key));
|
||||
}
|
||||
|
||||
clear(): Promise<void> {
|
||||
return this.tx(this.collection, store => store.clear());
|
||||
}
|
||||
}
|
||||
157
src/database.ts
157
src/database.ts
@ -1,157 +0,0 @@
|
||||
import {findByProp} from './array.ts';
|
||||
import {ASet} from './aset.ts';
|
||||
|
||||
export type TableOptions = {
|
||||
name: string;
|
||||
key?: string;
|
||||
autoIncrement?: boolean;
|
||||
};
|
||||
|
||||
export class Database {
|
||||
connection!: Promise<IDBDatabase>;
|
||||
ready = false;
|
||||
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 ? [] : tables.map(t => {
|
||||
t = typeof t == 'object' ? t : {name: t};
|
||||
return {...t, name: t.name.toString()};
|
||||
});
|
||||
|
||||
req.onerror = () => reject(req.error);
|
||||
|
||||
req.onsuccess = () => {
|
||||
const db = req.result;
|
||||
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();
|
||||
Object.assign(this, new Database(this.database, this.tables, db.version + 1));
|
||||
this.connection.then(resolve);
|
||||
} else {
|
||||
this.version = db.version;
|
||||
resolve(db);
|
||||
}
|
||||
this.ready = true;
|
||||
};
|
||||
|
||||
req.onupgradeneeded = () => {
|
||||
const db = req.result;
|
||||
const existingTables = new ASet(Array.from(db.objectStoreNames));
|
||||
if(tables) {
|
||||
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
|
||||
});
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
async createTable<K extends IDBValidKey = any, T = any>(table: string | TableOptions): Promise<Table<K, T>> {
|
||||
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> {
|
||||
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, 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> {
|
||||
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));
|
||||
}
|
||||
|
||||
all = this.getAll;
|
||||
|
||||
clear(): Promise<void> {
|
||||
return this.tx(this.name, store => store.clear());
|
||||
}
|
||||
|
||||
count(): Promise<number> {
|
||||
return this.tx(this.name, store => store.count(), true);
|
||||
}
|
||||
|
||||
create = this.add;
|
||||
|
||||
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[]> {
|
||||
return this.tx(this.name, store => store.getAll(), true);
|
||||
}
|
||||
|
||||
getAllKeys(): Promise<K[]> {
|
||||
return this.tx(this.name, store => store.getAllKeys(), true);
|
||||
}
|
||||
|
||||
put(key: K, value: T): Promise<void> {
|
||||
return this.tx(this.name, store => store.put(value, key));
|
||||
}
|
||||
|
||||
read(): Promise<T[]>;
|
||||
read(key: K): Promise<T>;
|
||||
read(key?: K): Promise<T | T[]> {
|
||||
return key ? this.get(key) : this.getAll();
|
||||
}
|
||||
|
||||
set(value: T, key?: K): Promise<void> {
|
||||
if(!key && !(<any>value)[this.key]) return this.add(value);
|
||||
return this.put(key || (<any>value)[this.key], value);
|
||||
}
|
||||
|
||||
update = this.set;
|
||||
}
|
||||
@ -77,7 +77,7 @@ export function fileText(file: any): Promise<string | null> {
|
||||
*/
|
||||
export function timestampFilename(name?: string, date: Date | number | string = new Date()) {
|
||||
if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
|
||||
const timestamp = formatDate('YYYY-MM-DD_HH-mm', date);
|
||||
const timestamp = formatDate('YYYY-MM-DD_HH:mm:ss', date);
|
||||
return name ? name.replace('{{TIMESTAMP}}', timestamp) : timestamp;
|
||||
}
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ export * from './aset';
|
||||
export * from './cache';
|
||||
export * from './color';
|
||||
export * from './csv';
|
||||
export * from './database';
|
||||
export * from './collection';
|
||||
export * from './files';
|
||||
export * from './emitter';
|
||||
export * from './errors';
|
||||
|
||||
24
src/misc.ts
24
src/misc.ts
@ -1,16 +1,6 @@
|
||||
import {PathEvent} from './path-events.ts';
|
||||
import {md5} from './string';
|
||||
|
||||
/**
|
||||
* Escape any regex special characters to avoid misinterpretation during search
|
||||
*
|
||||
* @param {string} value String which should be escaped
|
||||
* @return {string} New escaped sequence
|
||||
*/
|
||||
export function escapeRegex(value: string) {
|
||||
return value.replace(/[.*+?^${}()|\[\]\\]/g, '\\$&');
|
||||
}
|
||||
|
||||
/**
|
||||
* Run a stringified function with arguments asynchronously
|
||||
* @param {object} args Map of key/value arguments
|
||||
@ -36,15 +26,13 @@ export function gravatar(email: string, def='mp') {
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert IPv6 to v4 because who uses that, NAT4Life
|
||||
* @param {string} ip IPv6 address, e.g. 2001:0db8:85a3:0000:0000:8a2e:0370:7334
|
||||
* @returns {string | null} IPv4 address, e.g. 172.16.58.3
|
||||
* Escape any regex special characters to avoid misinterpretation during search
|
||||
*
|
||||
* @param {string} value String which should be escaped
|
||||
* @return {string} New escaped sequence
|
||||
*/
|
||||
export function ipV6ToV4(ip: string) {
|
||||
if(!ip) return null;
|
||||
const ipv4 = ip.split(':').splice(-1)[0];
|
||||
if(ipv4 == '1') return '127.0.0.1';
|
||||
return ipv4;
|
||||
export function escapeRegex(value: string) {
|
||||
return value.replace(/[.*+?^${}()|\[\]\\]/g, '\\$&');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -48,7 +48,7 @@ export function PES(str: TemplateStringsArray, ...args: any[]) {
|
||||
if(str[i]) combined.push(str[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(''));
|
||||
}
|
||||
|
||||
@ -99,7 +99,7 @@ export class PathEvent {
|
||||
method = '*';
|
||||
}
|
||||
let temp = p.split('/').filter(p => !!p);
|
||||
this.module = temp.splice(0, 1)[0] || '';
|
||||
this.module = temp.splice(0, 1)[0]?.toLowerCase() || '';
|
||||
this.path = temp.join('/');
|
||||
this.fullPath = `${this.module}${this.module && this.path ? '/' : ''}${this.path}`;
|
||||
this.name = temp.pop() || '';
|
||||
@ -140,10 +140,13 @@ export class PathEvent {
|
||||
*/
|
||||
static filter(target: string | PathEvent | (string | PathEvent)[], ...filter: (string | PathEvent)[]): PathEvent[] {
|
||||
const parsedTarget = makeArray(target).map(pe => new PathEvent(pe));
|
||||
const parsedFilter = makeArray(filter).map(pe => new PathEvent(pe));
|
||||
return parsedTarget.filter(t => !!parsedFilter.find(f =>
|
||||
(t.fullPath == '*' || f.fullPath == '*' || t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) &&
|
||||
(f.all || t.all || t.methods.intersection(f.methods).length)));
|
||||
const parsedFind = makeArray(filter).map(pe => new PathEvent(pe));
|
||||
return parsedTarget.filter(t => {
|
||||
if(!t.fullPath && t.all) return true;
|
||||
return !!parsedFind.find(f =>
|
||||
(t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) &&
|
||||
(f.all || t.all || t.methods.intersection(f.methods).length));
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@ -154,12 +157,15 @@ export class PathEvent {
|
||||
* @return {boolean} Whether there is any overlap
|
||||
*/
|
||||
static has(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): boolean {
|
||||
const parsedTarget = makeArray(target).map(pe => new PathEvent(pe));
|
||||
const parsedRequired = makeArray(has).map(pe => new PathEvent(pe));
|
||||
return !!parsedRequired.find(r => !!parsedTarget.find(t =>
|
||||
(r.fullPath == '*' || t.fullPath == '*' || r.fullPath.startsWith(t.fullPath)) &&
|
||||
(r.all || t.all || r.methods.intersection(t.methods).length)
|
||||
));
|
||||
const parsedTarget = makeArray(target).map(pe => new PathEvent(pe));
|
||||
return !!parsedRequired.find(r => {
|
||||
if(!r.fullPath && r.all) return true;
|
||||
const filtered = parsedTarget.filter(p => r.fullPath.startsWith(p.fullPath));
|
||||
if(!filtered.length) return false;
|
||||
const combined = PathEvent.combine(...filtered);
|
||||
return (!combined.none && (combined.all || r.all)) || combined.methods.intersection(r.methods).length;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@ -248,8 +254,8 @@ export class PathEventEmitter implements IPathEventEmitter{
|
||||
constructor(public readonly prefix: string = '') { }
|
||||
|
||||
emit(event: Event, ...args: any[]) {
|
||||
const parsed = PE`${this.prefix}/${event}`;
|
||||
this.listeners.filter(l => PathEvent.has(l[0], parsed))
|
||||
const parsed = new PathEvent(`${this.prefix}/${new PathEvent(event).toString()}`);
|
||||
this.listeners.filter(l => PathEvent.has(l[0], `${this.prefix}/${event}`))
|
||||
.forEach(async l => l[1](parsed, ...args));
|
||||
};
|
||||
|
||||
@ -259,7 +265,7 @@ export class PathEventEmitter implements IPathEventEmitter{
|
||||
|
||||
on(event: Event | Event[], listener: PathListener): PathUnsubscribe {
|
||||
makeArray(event).forEach(e => this.listeners.push([
|
||||
new PathEvent(`${this.prefix}/${e}`),
|
||||
new PathEvent(`${this.prefix}/${new PathEvent(e).toString()}`),
|
||||
listener
|
||||
]));
|
||||
return () => this.off(listener);
|
||||
|
||||
@ -21,13 +21,11 @@ export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST +
|
||||
/**
|
||||
* Converts text to camelCase
|
||||
*/
|
||||
export function camelCase(str?: string): string {
|
||||
if(!str) return '';
|
||||
const pascal = pascalCase(str);
|
||||
return pascal.charAt(0).toLowerCase() + pascal.slice(1);
|
||||
export function camelCase(str?: string) {
|
||||
const text = pascalCase(str);
|
||||
return !text ? '' : text[0].toLowerCase() + text.slice(1);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Convert number of bytes into a human-readable size
|
||||
*
|
||||
@ -77,12 +75,14 @@ export function insertAt(target: string, str: string, index: number): String {
|
||||
/**
|
||||
* Converts text to kebab-case
|
||||
*/
|
||||
export function kebabCase(str?: string): string {
|
||||
export function kebabCase(str: string) {
|
||||
if(!str) return '';
|
||||
return wordSegments(str).map(w => w.toLowerCase()).join("-");
|
||||
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();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Add padding to string
|
||||
*
|
||||
@ -112,13 +112,12 @@ export function pad(text: any, length: number, char: string = ' ', start = true)
|
||||
*/
|
||||
export function pascalCase(str?: string): string {
|
||||
if(!str) return '';
|
||||
return wordSegments(str)
|
||||
.map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase())
|
||||
.join('');
|
||||
return str.match(/[a-zA-Z0-9]+/g)
|
||||
?.map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
|
||||
.join('') ?? '';
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Generate a random hexadecimal value
|
||||
*
|
||||
@ -185,12 +184,14 @@ export function randomStringBuilder(length: number, letters = false, numbers = f
|
||||
/**
|
||||
* Converts text to snake_case
|
||||
*/
|
||||
export function snakeCase(str?: string): string {
|
||||
export function snakeCase(str?: string) {
|
||||
if(!str) return '';
|
||||
return wordSegments(str).map(w => w.toLowerCase()).join("_");
|
||||
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();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Splice a string together (Similar to Array.splice)
|
||||
*
|
||||
@ -297,23 +298,6 @@ 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
|
||||
*
|
||||
|
||||
32
src/time.ts
32
src/time.ts
@ -190,35 +190,3 @@ export async function sleepWhile(fn : () => boolean | Promise<boolean>, checkInt
|
||||
export function timeUntil(date: Date | number): number {
|
||||
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);
|
||||
}
|
||||
|
||||
65
tests/collection.spec.ts
Normal file
65
tests/collection.spec.ts
Normal file
@ -0,0 +1,65 @@
|
||||
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);
|
||||
});
|
||||
});
|
||||
@ -27,7 +27,7 @@ describe('Path Events', () => {
|
||||
|
||||
describe('PathEvent', () => {
|
||||
it('parses event string', () => {
|
||||
const pe = new PathEvent('users/system:cr');
|
||||
const pe = new PathEvent('Users/system:cr');
|
||||
expect(pe.module).toBe('users');
|
||||
expect(pe.fullPath).toBe('users/system');
|
||||
expect(pe.name).toBe('system');
|
||||
@ -103,9 +103,11 @@ describe('Path Events', () => {
|
||||
});
|
||||
|
||||
it('has returns true for overlapping', () => {
|
||||
const events = [new PathEvent('users/sys:cr')];
|
||||
expect(PathEvent.has(events, 'users/sys:r')).toBeTruthy();
|
||||
expect(PathEvent.has(events, 'users/nope:r')).toBeFalsy();
|
||||
const events = [
|
||||
new PathEvent('users/sys:cr'),
|
||||
];
|
||||
expect(PathEvent.has(events, 'users/sys:r')).toBe(true);
|
||||
expect(PathEvent.has(events, 'users/nope:r')).toBe(false);
|
||||
});
|
||||
|
||||
it('hasAll returns true only if all overlap', () => {
|
||||
|
||||
@ -59,8 +59,7 @@ describe('String Utilities', () => {
|
||||
|
||||
describe('kebabCase', () => {
|
||||
it('converts to kebab-case', () => {
|
||||
expect(kebabCase('hello world')).toBe('hello-world');
|
||||
expect(kebabCase('HelloWorld')).toContain('hello-world');
|
||||
expect(kebabCase('HelloWorldTest')).toContain('-hello');
|
||||
expect(kebabCase('')).toBe('');
|
||||
});
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user