+ Caching manually expire

+ Caching expiry strategies
+ Prefix PathEvents
2025-05-12 20:29:29 -04:00 · 2025-05-12 19:46:23 -04:00 · 2025-05-12 18:00:12 -04:00 · 2025-05-12 16:28:10 -04:00 · 2025-05-11 14:13:01 -04:00 · 2025-05-11 11:55:40 -04:00
21 changed files with 390 additions and 165 deletions
--- a/index.html
+++ b/index.html
@ -1,14 +0,0 @@
 <!Doctype html>
 <html>
 	<head>
 		<title>@ztimson/utils sandbox</title>
 	</head>
 	<body>
 		<script type="module">
 			import {formatDate} from './dist/index.mjs';
 			console.log(formatDate('D MMM, YYYY'));
 		</script>
 	</body>
 </html>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.23.8",
+	"version": "0.24.9",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
@ -14,9 +14,9 @@
 	"types": "./dist/index.d.ts",
 	"exports": {
 		".": {
 			"types": "./dist/index.d.ts",
 			"import": "./dist/index.mjs",
-			"require": "./dist/index.cjs",
+			"require": "./dist/index.cjs"
 			"types": "./dist/index.d.ts"
 		}
 	},
 	"scripts": {
@ -26,6 +26,9 @@
 		"test:coverage": "npx jest --coverage",
 		"watch": "npx vite build --watch"
 	},
 	"dependencies": {
 		"var-persist": "^1.0.1"
 	},
 	"devDependencies": {
 		"@types/jest": "^29.5.12",
 		"jest": "^29.7.0",
@ -34,7 +37,7 @@
 		"typedoc": "^0.26.7",
 		"typescript": "^5.3.3",
 		"vite": "^5.0.12",
-		"vite-plugin-dts": "^3.7.2"
+		"vite-plugin-dts": "^4.5.3"
 	},
 	"files": [
 		"dist"
--- a/src/aset.ts
+++ b/src/aset.ts
@ -29,6 +29,14 @@ export class ASet<T> extends Array {
 		return this;
 	}
 	/**
 	 * Remove all elements
 	 */
 	clear() {
 		this.splice(0, this.length);
 		return this;
 	}
 	/**
 	 * Delete elements from set
 	 * @param items Elements that will be deleted
--- a/src/cache.ts
+++ b/src/cache.ts
@ -1,3 +1,5 @@
 import {deepCopy} from './objects.ts';
 export type CacheOptions = {
 	/** Delete keys automatically after x amount of seconds */
 	ttl?: number;
@ -5,22 +7,25 @@ export type CacheOptions = {
 	storage?: Storage;
 	/** Key cache will be stored under */
 	storageKey?: string;
 	/** Keep or delete cached items once expired, defaults to delete */
 	expiryPolicy?: 'delete' | 'keep';
 }
 export type CachedValue<T> = T | {_expired?: boolean};
 /**
 * Map of data which tracks whether it is a complete collection & offers optional expiry of cached values
 */
 export class Cache<K extends string | number | symbol, T> {
-	private store = <Record<K, T>>{};
+	private store: Record<K, T> = <any>{};
 	/** Support index lookups */
-	[key: string | number | symbol]: T | any;
+	[key: string | number | symbol]: CachedValue<T> | any;
 	/** Whether cache is complete */
 	complete = false;
 	/**
 	 * Create new cache
 	 *
 	 * @param {keyof T} key Default property to use as primary key
 	 * @param options
 	 */
@ -36,12 +41,12 @@ export class Cache<K extends string | number | symbol, T> {
 		}
 		return new Proxy(this, {
 			get: (target: this, prop: string | symbol) => {
-				if (prop in target) return (target as any)[prop];
+				if(prop in target) return (target as any)[prop];
-				return target.store[prop as K];
+				return this.get(prop as K, true);
 			},
 			set: (target: this, prop: string | symbol, value: any) => {
-				if (prop in target) (target as any)[prop] = value;
+				if(prop in target) (target as any)[prop] = value;
-				else target.store[prop as K] = value;
+				else this.set(prop as K, value);
 				return true;
 			}
 		});
@ -52,18 +57,22 @@ export class Cache<K extends string | number | symbol, T> {
 		return <K>value[this.key];
 	}
 	private save() {
 		if(this.options.storageKey && this.options.storage)
 			this.options.storage.setItem(this.options.storageKey, JSON.stringify(this.store));
 	}
 	/**
 	 * Get all cached items
 	 *
 	 * @return {T[]} Array of items
 	 */
-	all(): T[] {
+	all(expired?: boolean): CachedValue<T>[] {
-		return Object.values(this.store);
+		return deepCopy<any>(Object.values(this.store)
 			.filter((v: any) => expired || !v._expired));
 	}
 	/**
 	 * Add a new item to the cache. Like set, but finds key automatically
 	 *
 	 * @param {T} value Item to add to cache
 	 * @param {number | undefined} ttl Override default expiry
 	 * @return {this}
@ -76,12 +85,12 @@ export class Cache<K extends string | number | symbol, T> {
 	/**
 	 * Add several rows to the cache
 	 *
 	 * @param {T[]} rows Several items that will be cached using the default key
 	 * @param complete Mark cache as complete & reliable, defaults to true
 	 * @return {this}
 	 */
 	addAll(rows: T[], complete = true): this {
 		this.clear();
 		rows.forEach(r => this.add(r));
 		this.complete = complete;
 		return this;
@ -91,26 +100,36 @@ export class Cache<K extends string | number | symbol, T> {
 	 * Remove all keys from cache
 	 */
 	clear() {
-		this.store = <Record<K, T>>{};
+		this.complete = false;
 		this.store = <any>{};
 	}
 	/**
 	 * Delete an item from the cache
 	 *
 	 * @param {K} key Item's primary key
 	 */
 	delete(key: K) {
 		delete this.store[key];
-		if(this.options.storageKey && this.options.storage)
+		this.save();
 			this.options.storage.setItem(this.options.storageKey, JSON.stringify(this.store));
 	}
 	/**
 	 * Return cache as an array of key-value pairs
 	 * @return {[K, T][]} Key-value pairs array
 	 */
-	entries(): [K, T][] {
+	entries(expired?: boolean): [K, CachedValue<T>][] {
-		return <[K, T][]>Object.entries(this.store);
+		return deepCopy<any>(Object.entries(this.store)
 			.filter((v: any) => expired || !v._expired));
 	}
 	/**
 	 * Manually expire a cached item
 	 * @param {K} key Key to expire
 	 */
 	expire(key: K) {
 		this.complete = false;
 		if(this.options.expiryPolicy == 'keep') (<any>this.store[key])._expired = true;
 		else this.delete(key);
 	}
 	/**
@ -118,50 +137,53 @@ export class Cache<K extends string | number | symbol, T> {
 	 * @param {K} key Key to lookup
 	 * @return {T} Cached item
 	 */
-	get(key: K): T {
+	get(key: K, expired?: boolean): T | null {
-		return this.store[key];
+		const cached = deepCopy<any>(this.store[key] ?? null);
 		if(expired || !cached._expired) return cached;
 		return null;
 	}
 	/**
 	 * Get a list of cached keys
 	 *
 	 * @return {K[]} Array of keys
 	 */
-	keys(): K[] {
+	keys(expired?: boolean): K[] {
-		return <K[]>Object.keys(this.store);
+		return <K[]>Object.keys(this.store)
 			.filter(k => expired || !(<any>this.store)[k]._expired);
 	}
 	/**
 	 * Get map of cached items
 	 *
 	 * @return {Record<K, T>}
 	 */
-	map(): Record<K, T> {
+	map(expired?: boolean): Record<K, CachedValue<T>> {
-		return structuredClone(this.store);
+		const copy: any = deepCopy(this.store);
 		if(!expired) Object.keys(copy).forEach(k => {
 			if(copy[k]._expired) delete copy[k]
 		});
 		return copy;
 	}
 	/**
 	 * Add an item to the cache manually specifying the key
 	 *
 	 * @param {K} key Key item will be cached under
 	 * @param {T} value Item to cache
 	 * @param {number | undefined} ttl Override default expiry in seconds
 	 * @return {this}
 	 */
 	set(key: K, value: T, ttl = this.options.ttl): this {
 		if(this.options.expiryPolicy == 'keep') delete (<any>this.store[key])._expired;
 		this.store[key] = value;
-		if(this.options.storageKey && this.options.storage)
+		this.save();
 			this.options.storage.setItem(this.options.storageKey, JSON.stringify(this.store));
 		if(ttl) setTimeout(() => {
-			this.complete = false;
+			this.expire(key);
-			this.delete(key);
+			this.save();
 		}, ttl * 1000);
 		return this;
 	}
 	/**
 	 * Get all cached items
 	 *
 	 * @return {T[]} Array of items
 	 */
 	values = this.all();
--- a/src/color.ts
+++ b/src/color.ts
@ -4,7 +4,7 @@
 * @return {"white" | "black"} Color with the most contrast
 */
 export function blackOrWhite(background: string): 'white' | 'black' {
-	const exploded = background.match(background.length >= 6 ? /\w\w/g : /\w/g);
+	const exploded = background?.match(background.length >= 6 ? /\w\w/g : /\w/g);
 	if(!exploded) return 'black';
 	const [r, g, b] = exploded.map(hex => parseInt(hex, 16));
 	const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
--- a/src/csv.ts
+++ b/src/csv.ts
@ -1,32 +1,59 @@
 import {makeArray} from './array.ts';
 import {ASet} from './aset.ts';
 import {dotNotation, flattenObj, JSONSanitize} from './objects.ts';
 import {LETTER_LIST} from './string.ts';
-export function fromCsv<T = any>(csv: string, hasHeaders=true): T[] {
+/**
-	const row = csv.split('\n');
+ * Parse a CSV string into an array of objects
-	let headers: any = hasHeaders ? row.splice(0, 1)[0] : null;
+ *
-	if(headers) headers = headers.match(/(?:[^,"']+|"[^"]*"|'[^']*')+/g);
+ * @param csv String with CSV
-	return <T[]>row.map(r => {
+ * @param hasHeaders First line of CSV contains headers
-		function parseLine(line: string): (string | null)[] {
+ * @return {T[]} Array of parsed objects
-			const parts = line.split(','), columns: string[] = [];
+ */
-			let quoted = false;
+export function fromCsv<T = any>(csv: string, hasHeaders = true): T[] {
-			for(const p of parts) {
+	function parseLine(line: string): (string | null)[] {
-				if(quoted) columns[columns.length - 1] = columns.at(-1) + ',' + p;
+		const columns: string[] = [];
-				else columns.push(p);
+		let current = '', inQuotes = false;
-				if(/[^"]"$/g.test(p)) {
+		for (let i = 0; i < line.length; i++) {
-					quoted = false;
+			const char = line[i];
-				} else if(/^"[^"]/g.test(p)) {
+			const nextChar = line[i + 1];
-					quoted = true;
+			if (char === '"') {
-				}
+				if (inQuotes && nextChar === '"') {
-			}
+					current += '"'; // Handle escaped quotes
-			return columns;
+					i++;
 				} else inQuotes = !inQuotes;
 			} else if (char === ',' && !inQuotes) {
 				columns.push(current.trim()); // Trim column values
 				current = '';
 			} else current += char;
 		}
 		columns.push(current.trim()); // Trim last column value
 		return columns.map(col => col.replace(/^"|"$/g, '').replace(/""/g, '"'));
 	}
 	// Normalize line endings and split rows
 	const rows = [];
 	let currentRow = '', inQuotes = false;
 	for (const char of csv.replace(/\r\n/g, '\n')) { // Normalize \r\n to \n
 		if (char === '"') inQuotes = !inQuotes;
 		if (char === '\n' && !inQuotes) {
 			rows.push(currentRow.trim()); // Trim row
 			currentRow = '';
 		} else currentRow += char;
 	}
 	if (currentRow) rows.push(currentRow.trim()); // Trim last row
 	// Extract headers
 	let headers: any = hasHeaders ? rows.splice(0, 1)[0] : null;
 	if (headers) headers = headers.match(/(?:[^,"']+|"(?:[^"]|"")*"|'(?:[^']|'')*')+/g)?.map((h: any) => h.trim());
 	// Parse rows
 	return <T[]>rows.map(r => {
 		const props = parseLine(r);
-		const h = headers || (Array(props.length).fill(null).map((r, i) => {
+		const h = headers || (Array(props.length).fill(null).map((_, i) => {
 			let letter = '';
 			const first = i / 26;
-			if(first > 1) letter += LETTER_LIST[Math.floor(first - 1)];
+			if (first > 1) letter += LETTER_LIST[Math.floor(first - 1)];
 			letter += LETTER_LIST[i % 26];
 			return letter;
 		}));
@ -34,23 +61,28 @@ export function fromCsv<T = any>(csv: string, hasHeaders=true): T[] {
 			dotNotation(acc, h, props[i]);
 			return acc;
 		}, {});
-	})
+	});
 }
 /**
- * Convert an object to a CSV string
+ * Convert an array of objects to a CSV string
 *
 * @param {any[]} target Array of objects to create CSV from
 * @param {boolean} flatten Should nested object be flattened or treated as values
 * @return {string} CSV string
 */
-export function toCsv(target: any[], flatten=true) {
+export function toCsv(target: any, flatten=true) {
-	const headers = new ASet(target.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
+	const t = makeArray(target);
 	const headers = new ASet(t.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
 	return [
 		headers.join(','),
-		...target.map(row => headers.map((h: string) => {
+		...t.map(row => headers.map((h: string) => {
 			const value = dotNotation<any>(row, h);
-			return (typeof value == 'object' && value != null) ? '"' + JSONSanitize(value).replaceAll('"', '""') + '"' : value;
+			if(value == null) return '';
 			if(typeof value == 'object') return `"${JSONSanitize(value).replaceAll('"', '""')}"`;
 			if(typeof value == 'string' &&  /[\n",]/g.test(value)) return `"${value.replaceAll('"', '""')}"`;
 			return value;
 		}).join(','))
 	].join('\n');
 }
--- a/src/files.ts
+++ b/src/files.ts
@ -1,6 +1,7 @@
 import {makeArray} from './array.ts';
 import {JSONAttemptParse} from './objects.ts';
 import {PromiseProgress} from './promise-progress';
 import {formatDate} from './time.ts';
 /**
 * Download blob as a file
@ -76,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 = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}_${date.getHours().toString().padStart(2, '0')}-${date.getMinutes().toString().padStart(2, '0')}-${date.getSeconds().toString().padStart(2, '0')}`;
+	const timestamp = formatDate('YYYY-MM-DD_HH:mm:ss', date);
 	return name ? name.replace('{{TIMESTAMP}}', timestamp) : timestamp;
 }
--- a/src/http.ts
+++ b/src/http.ts
@ -22,6 +22,28 @@ export type HttpDefaults = {
 	url?: string;
 }
 class HttpResponse<T = any> extends Response {
 	data?: T
 	ok!: boolean;
 	redirected!: boolean;
 	type!: ResponseType;
 	url!: string;
 	constructor(resp: Response, stream: ReadableStream) {
 		const body = [204, 205, 304].includes(resp.status) ? null : stream;
 		super(body, {
 			headers: resp.headers,
 			status: resp.status,
 			statusText: resp.statusText,
 		});
 		this.ok = resp.ok;
 		this.redirected = resp.redirected;
 		this.type = resp.type;
 		this.url = resp.url;
 	}
 }
 export class Http {
 	private static interceptors: {[key: string]: HttpInterceptor} = {};
@ -54,8 +76,9 @@ export class Http {
 	request<T>(opts: HttpRequestOptions = {}): PromiseProgress<DecodedResponse<T>>  {
 		if(!this.url && !opts.url) throw new Error('URL needs to be set');
-		let url = (opts.url?.startsWith('http') ? opts.url : (this.url || '') + (opts.url || '')).replace(/([^:]\/)\/+/g, '$1');
+		let url = opts.url?.startsWith('http') ? opts.url : (this.url || '') + (opts.url || '');
-		if(opts.fragment) url.includes('#') ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : url += '#' + opts.fragment;
+		url = url.replaceAll(/([^:]\/)\/+/g, '$1');
 		if(opts.fragment) url.includes('#') ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : `${url}#${opts.fragment}`;
 		if(opts.query) {
 			const q = Array.isArray(opts.query) ? opts.query :
 				Object.keys(opts.query).map(k => ({key: k, value: (<any>opts.query)[k]}))
@ -101,18 +124,17 @@ export class Http {
 									push();
 								}).catch((error: any) => controller.error(error));
 							}
 							push();
 						}
 					});
-					resp.data = new Response(stream);
+					resp = new HttpResponse<T>(resp, stream);
-					if(opts.decode == null || opts.decode) {
+					if(opts.decode !== false) {
 						const content = resp.headers.get('Content-Type')?.toLowerCase();
-						if(content?.includes('form')) resp.data = <T>await resp.data.formData();
+						if(content?.includes('form')) resp.data = <T>await resp.formData();
-						else if(content?.includes('json')) resp.data = <T>await resp.data.json();
+						else if(content?.includes('json')) resp.data = <T>await resp.json();
-						else if(content?.includes('text')) resp.data = <T>await resp.data.text();
+						else if(content?.includes('text')) resp.data = <T>await resp.text();
-						else if(content?.includes('application')) resp.data = <T>await resp.data.blob();
+						else if(content?.includes('application')) resp.data = <T>await resp.blob();
 					}
 					if(resp.ok) res(resp);
--- a/src/index.ts
+++ b/src/index.ts
@ -19,3 +19,4 @@ export * from './search';
 export * from './string';
 export * from './time';
 export * from './types';
 export * from 'var-persist';
--- a/src/jwt.ts
+++ b/src/jwt.ts
@ -6,7 +6,7 @@ import {JSONAttemptParse} from './objects.ts';
 * @param {string} token JWT to decode
 * @return {unknown} JWT payload
 */
-export function jwtDecode<T>(token: string): T {
+export function decodeJwt<T>(token: string): T {
 	const base64 = token.split('.')[1]
 		.replace(/-/g, '+').replace(/_/g, '/');
 	return <T>JSONAttemptParse(decodeURIComponent(atob(base64).split('').map(function(c) {
--- a/src/misc.ts
+++ b/src/misc.ts
@ -1,6 +1,18 @@
 import {PathEvent} from './path-events.ts';
 import {md5} from './string';
 /**
 * Run a stringified function with arguments asynchronously
 * @param {object} args Map of key/value arguments
 * @param {string} fn Function as string
 * @param {boolean} async Run with async (returns a promise)
 * @return {T | Promise<T>} Function return result
 */
 export function fn<T>(args: object, fn: string, async: boolean = false): T {
 	const keys = Object.keys(args);
 	return new Function(...keys, `return (${async ? 'async ' : ''}(${keys.join(',')}) => { ${fn} })(${keys.join(',')})`)(...keys.map(k => (<any>args)[k]));
 }
 /**
 * Get profile image from Gravatar
 *
--- a/src/objects.ts
+++ b/src/objects.ts
@ -109,7 +109,6 @@ export function encodeQuery(data: any): string {
 	).join('&');
 }
 /**
 * Recursively flatten a nested object, while maintaining key structure
 *
--- a/src/path-events.ts
+++ b/src/path-events.ts
@ -31,7 +31,7 @@ export function PE(str: TemplateStringsArray, ...args: any[]) {
 		if(str[i]) combined.push(str[i]);
 		if(args[i]) combined.push(args[i]);
 	}
-	return new PathEvent(combined.join(''));
+	return new PathEvent(combined.join('/'));
 }
 /**
@ -79,20 +79,20 @@ export class PathEvent {
 	set none(v: boolean) { v ? this.methods = new ASet<Method>(['n']) : this.methods.delete('n'); }
 	/** Create method specified */
 	get create(): boolean { return !this.methods.has('n') && (this.methods.has('*') || this.methods.has('c')) }
-	set create(v: boolean) { v ? this.methods.delete('n').add('c') : this.methods.delete('c'); }
+	set create(v: boolean) { v ? this.methods.delete('n').delete('*').add('c') : this.methods.delete('c'); }
 	/** Read method specified */
 	get read(): boolean { return !this.methods.has('n') && (this.methods.has('*') || this.methods.has('r')) }
-	set read(v: boolean) { v ? this.methods.delete('n').add('r') : this.methods.delete('r'); }
+	set read(v: boolean) { v ? this.methods.delete('n').delete('*').add('r') : this.methods.delete('r'); }
 	/** Update method specified */
 	get update(): boolean { return !this.methods.has('n') && (this.methods.has('*') || this.methods.has('u')) }
-	set update(v: boolean) { v ? this.methods.delete('n').add('u') : this.methods.delete('u'); }
+	set update(v: boolean) { v ? this.methods.delete('n').delete('*').add('u') : this.methods.delete('u'); }
 	/** Delete method specified */
 	get delete(): boolean { return !this.methods.has('n') && (this.methods.has('*') || this.methods.has('d')) }
-	set delete(v: boolean) { v ? this.methods.delete('n').add('d') : this.methods.delete('d'); }
+	set delete(v: boolean) { v ? this.methods.delete('n').delete('*').add('d') : this.methods.delete('d'); }
-	constructor(Event: string | PathEvent) {
+	constructor(e: string | PathEvent) {
-		if(typeof Event == 'object') return Object.assign(this, Event);
+		if(typeof e == 'object') return Object.assign(this, e);
-		let [p, scope, method] = Event.replaceAll(/\/{2,}/g, '/').split(':');
+		let [p, scope, method] = e.replaceAll(/\/{2,}/g, '/').split(':');
 		if(!method) method = scope || '*';
 		if(p == '*' || !p && method == '*') {
 			p = '';
@ -100,14 +100,14 @@ export class PathEvent {
 		}
 		let temp = p.split('/').filter(p => !!p);
 		this.module = temp.splice(0, 1)[0]?.toLowerCase() || '';
 		this.fullPath = p;
 		this.path = temp.join('/');
 		this.fullPath = `${this.module}${this.module && this.path ? '/' : ''}${this.path}`;
 		this.name = temp.pop() || '';
 		this.methods = new ASet(<any>method.split(''));
 	}
 	/**
-	 * Combine multiple  events into one parsed object. Longest path takes precedent, but all subsequent methods are
+	 * Combine multiple events into one parsed object. Longest path takes precedent, but all subsequent methods are
 	 * combined until a "none" is reached
 	 *
 	 * @param {string | PathEvent} paths Events as strings or pre-parsed
@ -142,8 +142,9 @@ export class PathEvent {
 		const parsedFind = makeArray(filter).map(pe => new PathEvent(pe));
 		return parsedTarget.filter(t => {
 			if(!t.fullPath && t.all) return true;
-			return !!parsedFind.find(f => f.fullPath.startsWith(t.fullPath)
+			return !!parsedFind.find(f =>
-				&& (f.all || t.all || t.methods.intersection(f.methods).length));
+				(t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) &&
 				(f.all || t.all || t.methods.intersection(f.methods).length));
 		});
 	}
@ -198,14 +199,14 @@ export class PathEvent {
 	}
 	/**
-	 * Create  event string from its components
+	 * Create event string from its components
 	 *
 	 * @param {string | string[]} path Event path
 	 * @param {Method} methods Event method
 	 * @return {string} String representation of Event
 	 */
 	static toString(path: string | string[], methods: Method | Method[]): string {
-		let p = makeArray(path).filter(p => p != null).join('/');
+		let p = makeArray(path).filter(p => !!p).join('/');
 		p = p?.trim().replaceAll(/\/{2,}/g, '/').replaceAll(/(^\/|\/$)/g, '');
 		if(methods?.length) p += `:${makeArray(methods).map(m => m.toLowerCase()).join('')}`;
 		return p;
@ -222,7 +223,7 @@ export class PathEvent {
 	}
 	/**
-	 * Create  event string from its components
+	 * Create event string from its components
 	 *
 	 * @return {string} String representation of Event
 	 */
@ -234,11 +235,12 @@ export class PathEvent {
 export type PathListener = (event: PathEvent, ...args: any[]) => any;
 export type PathUnsubscribe = () => void;
 export type Event = string | PathEvent;
 export interface IPathEventEmitter {
-	emit(event: string, ...args: any[]): void;
+	emit(event: Event, ...args: any[]): void;
 	off(listener: PathListener): void;
-	on(event: string, listener: PathListener): PathUnsubscribe;
+	on(event: Event | Event[], listener: PathListener): PathUnsubscribe;
-	once(event: string, listener?: PathListener): Promise<any>;
+	once(event: Event | Event[], listener?: PathListener): Promise<any>;
 	relayEvents(emitter: PathEventEmitter): void;
 }
@ -248,8 +250,10 @@ export interface IPathEventEmitter {
 export class PathEventEmitter implements IPathEventEmitter{
 	private listeners: [PathEvent, PathListener][] = [];
-	emit(event: string | PathEvent, ...args: any[]) {
+	constructor(public readonly prefix: string = '') { }
-		const parsed = new PathEvent(event);
+
 	emit(event: Event, ...args: any[]) {
 		const parsed = new PathEvent(`${this.prefix}/${typeof event == 'string' ? event : event.toString()}`);
 		this.listeners.filter(l => PathEvent.has(l[0], event))
 			.forEach(async l => l[1](parsed, ...args));
 	};
@ -258,12 +262,15 @@ export class PathEventEmitter implements IPathEventEmitter{
 		this.listeners = this.listeners.filter(l => l[1] != listener);
 	}
-	on(event: string | string[], listener: PathListener): PathUnsubscribe {
+	on(event: Event | Event[], listener: PathListener): PathUnsubscribe {
-		makeArray(event).forEach(e => this.listeners.push([new PathEvent(e), listener]));
+		makeArray(event).forEach(e => this.listeners.push([
 			new PathEvent(`${this.prefix}/${typeof e == 'string' ? event : event.toString()}`),
 			listener
 		]));
 		return () => this.off(listener);
 	}
-	once(event: string | string[], listener?: PathListener): Promise<any> {
+	once(event: Event | Event[], listener?: PathListener): Promise<any> {
 		return new Promise(res => {
 			const unsubscribe = this.on(event, (event: PathEvent, ...args: any[]) => {
 				res(args.length < 2 ? args[0] : args);
--- a/src/search.ts
+++ b/src/search.ts
@ -1,4 +1,4 @@
-import {dotNotation, JSONAttemptParse} from './objects';
+import {dotNotation, JSONAttemptParse, JSONSerialize} from './objects.ts';
 export function search(rows: any[], search: string, regex?: boolean, transform: Function = (r: any) => r) {
 	if(!rows) return [];
@ -12,27 +12,48 @@ export function search(rows: any[], search: string, regex?: boolean, transform:
 				try { return RegExp(search, 'gm').test(v.toString()); }
 				catch { return false; }
 			}).length
 		} else {
 			return logicTest(r, search);
 		}
-		// Make sure at least one OR passes
+	});
-		const or = search.split('||').map(p => p.trim()).filter(p => !!p);
+}
-		return -1 != or.findIndex(p => {
+
-			// Make sure all ANDs pass
+/**
-			const and = p.split('&&').map(p => p.trim()).filter(p => !!p);
+ * Test an object against a logic condition. By default values are checked
-			return and.filter(p => {
+ * @param {string} condition
-				// Boolean operator
+ * @param {object} target
-				const prop = /(\w+)\s*(==?|!=|>=|>|<=|<)\s*(\w+)/g.exec(p);
+ * @return {boolean}
-				if(prop) {
+ */
-					const a = JSON.stringify(JSONAttemptParse(dotNotation<any>(value, prop[1])));
+export function logicTest(target: object, condition: string): boolean {
-					const operator = prop[2] == '=' ? '==' : prop[2];
+	const evalBoolean = (a: any, op: string, b: any): boolean => {
-					const b = JSON.stringify(JSONAttemptParse(prop[3]));
+		switch(op) {
-					return eval(`${a} ${operator} ${b}`);
+			case '=':
-				}
+			case '==': return a == b;
-				// Case-sensitive
+			case '!=': return a != b;
-				const v = Object.values(value).join('');
+			case '>': return a > b;
-				if(/[A-Z]/g.test(search)) return v.includes(p);
+			case '>=': return a >= b;
-				// Case-insensitive
+			case '<': return a < b;
-				return v.toLowerCase().includes(p);
+			case '<=': return a <= b;
-			}).length == and.length;
+			default: return false;
-		})
+		}
 	}
 	const or = condition.split('||').map(p => p.trim()).filter(p => !!p);
 	return -1 != or.findIndex(p => {
 		// Make sure all ANDs pass
 		const and = p.split('&&').map(p => p.trim()).filter(p => !!p);
 		return and.filter(p => {
 			// Boolean operator
 			const prop = /(\S+)\s*(==?|!=|>=|>|<=|<)\s*(\S+)/g.exec(p);
 			if(prop) {
 				const key = Object.keys(target).find(k => k.toLowerCase() == prop[1].toLowerCase());
 				return evalBoolean(dotNotation<any>(target, key || prop[1]),  prop[2], JSONAttemptParse(prop[3]));
 			}
 			// Case-sensitive
 			const v = Object.values(target).map(JSONSerialize).join('');
 			if(/[A-Z]/g.test(condition)) return v.includes(p);
 			// Case-insensitive
 			return v.toLowerCase().includes(p);
 		}).length == and.length;
 	});
 }
--- a/src/string.ts
+++ b/src/string.ts
@ -18,6 +18,14 @@ export const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
 */
 export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST + SYMBOL_LIST;
 /**
 * Converts text to camelCase
 */
 export function camelCase(str?: string) {
 	const text = pascalCase(str);
 	return text[0].toLowerCase() + text.slice(1);
 }
 /**
 * Convert number of bytes into a human-readable size
 *
@ -64,6 +72,17 @@ export function insertAt(target: string, str: string, index: number): String {
 	return `${target.slice(0, index)}${str}${target.slice(index + 1)}`;
 }
 /**
 * Converts text to kebab-case
 */
 export function kebabCase(str: 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();
 }
 /**
 * Add padding to string
 *
@ -86,6 +105,18 @@ export function pad(text: any, length: number, char: string = ' ', start = true)
 	return text.toString().padEnd(length, char);
 }
 /**
 * Convert text to PascalCase
 * @param {string} str
 * @return {string}
 */
 export function pascalCase(str?: string) {
 	if(!str) return '';
 	const text = str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, '')
 		.replaceAll(/[^a-zA-Z0-9]+(\w?)/g, (...args) => args[1]?.toUpperCase() || '');
 	return text[0].toUpperCase() + text.slice(1);
 }
 /**
 * Generate a random hexadecimal value
 *
@ -149,6 +180,17 @@ export function randomStringBuilder(length: number, letters = false, numbers = f
 	}).join('');
 }
 /**
 * Converts text to snake_case
 */
 export function snakeCase(str?: 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();
 }
 /**
 * Splice a string together (Similar to Array.splice)
 *
--- a/src/time.ts
+++ b/src/time.ts
@ -95,7 +95,7 @@ export function formatDate(format = 'YYYY-MM-DD H:mm', date: Date | number | str
 		return (offset > 0 ? '-' : '') + `${hours}:${minutes.toString().padStart(2, '0')}`;
 	}
-	if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
+	if(typeof date == 'number' || typeof date == 'string' || date == null) date = new Date(date);
 	// Handle timezones
 	let t!: [string, number];
--- a/src/types.ts
+++ b/src/types.ts
@ -18,3 +18,10 @@
 export function typeKeys<T extends object>() {
 	return Object.keys(<T>{}) as Array<keyof T>;
 }
 /**
 * Mark all properties as writable
 */
 export type Writable<T> = {
 	-readonly [P in keyof T]: T[P]
 };
--- a/tests/misc.spec.ts
+++ b/tests/misc.spec.ts
@ -1,36 +1,18 @@
-import {sleep, parseUrl} from '../src';
+import {fn} from '../src';
 describe('Miscellanies Utilities', () => {
-	describe('sleep', () => {
+	describe('fn', () => {
-		test('wait until', async () => {
+		test('async', async () => {
-			const wait = ~~(Math.random() * 500);
+			const test = {a: Math.random()};
-			const time = new Date().getTime();
+			const resp = fn(test, 'return a;', true);
-			await sleep(wait);
+			expect(resp instanceof Promise).toBeTruthy();
-			expect(new Date().getTime()).toBeGreaterThanOrEqual(time + wait);
+			expect(await resp).toEqual(test['a']);
 		});
 	});
 	describe('urlParser', () => {
 		test('localhost w/ port', () => {
 			const parsed = parseUrl('http://localhost:4200/some/path?q1=test1&q2=test2#frag');
 			expect(parsed.protocol).toStrictEqual('http');
 			expect(parsed.host).toStrictEqual('localhost:4200');
 			expect(parsed.domain).toStrictEqual('localhost');
 			expect(parsed.port).toStrictEqual(4200);
 			expect(parsed.path).toStrictEqual('/some/path');
 			expect(parsed.query).toStrictEqual({q1: 'test1', q2: 'test2'});
 			expect(parsed.fragment).toStrictEqual('frag');
 		});
-		test('advanced URL', () => {
+		test('sync', async () => {
-			const parsed = parseUrl('https://sub.domain.example.com/some/path?q1=test1&q2=test2#frag');
+			const test = {a: Math.random()};
-			expect(parsed.protocol).toStrictEqual('https');
+			const resp = fn(test, 'return a;3');
-			expect(parsed.host).toStrictEqual('sub.domain.example.com');
+			expect(resp).toEqual(test['a']);
 			expect(parsed.domain).toStrictEqual('example.com');
 			expect(parsed.subdomain).toStrictEqual('sub.domain');
 			expect(parsed.path).toStrictEqual('/some/path');
 			expect(parsed.query).toStrictEqual({q1: 'test1', q2: 'test2'});
 			expect(parsed.fragment).toStrictEqual('frag');
 		});
 	});
 });
--- a/tests/path-events.spec.ts
+++ b/tests/path-events.spec.ts
@ -0,0 +1,43 @@
 import {PathEvent} from '../src';
 describe('Path Events', () => {
 	describe('malformed', () => {
 		test('starting slash', async () =>
 			expect(new PathEvent('/module').toString()).toEqual('module:*'));
 		test('trailing slash', async () =>
 			expect(new PathEvent('module/').toString()).toEqual('module:*'));
 		test('double slash', async () =>
 			expect(new PathEvent('module////path').toString()).toEqual('module/path:*'));
 	});
 	describe('methods', () => {
 		test('custom', async () => {
 			expect(new PathEvent('module:t').methods.includes('t')).toBeTruthy();
 			expect(new PathEvent('module:t').methods.includes('z')).toBeFalsy();
 		});
 		test('create', async () =>
 			expect(new PathEvent('module:crud').create).toBeTruthy());
 		test('read', async () =>
 			expect(new PathEvent('module:crud').read).toBeTruthy());
 		test('update', async () =>
 			expect(new PathEvent('module:crud').update).toBeTruthy());
 		test('delete', async () =>
 			expect(new PathEvent('module:crud').delete).toBeTruthy());
 		test('none', async () => {
 			const event = new PathEvent('module:n');
 			expect(event.none).toBeTruthy();
 			expect(event.create).toBeFalsy();
 			expect(event.read).toBeFalsy();
 			expect(event.update).toBeFalsy();
 			expect(event.delete).toBeFalsy()
 		});
 		test('wildcard', async () => {
 			const event = new PathEvent('module:*');
 			expect(event.none).toBeFalsy();
 			expect(event.create).toBeTruthy();
 			expect(event.read).toBeTruthy();
 			expect(event.update).toBeTruthy();
 			expect(event.delete).toBeTruthy()
 		});
 	});
 });
--- a/tests/string.spec.ts
+++ b/tests/string.spec.ts
@ -1,4 +1,5 @@
-import {matchAll, randomString, randomStringBuilder} from "../src";
+import {matchAll, parseUrl, randomString, randomStringBuilder} from "../src";
 describe('String Utilities', () => {
 	describe('randomString', () => {
@ -47,4 +48,28 @@ describe('String Utilities', () => {
 		test('using regex', () => expect(matchAll('fooBar fooBar FooBar', /fooBar/g).length).toBe(2));
 		test('using malformed regex', () => expect(() => matchAll('fooBar fooBar FooBar', /fooBar/)).toThrow());
 	});
 	describe('urlParser', () => {
 		test('localhost', () => {
 			const parsed = parseUrl('http://localhost:4200/some/path?q1=test1&q2=test2#frag');
 			expect(parsed.protocol).toStrictEqual('http');
 			expect(parsed.host).toStrictEqual('localhost:4200');
 			expect(parsed.domain).toStrictEqual('localhost');
 			expect(parsed.port).toStrictEqual(4200);
 			expect(parsed.path).toStrictEqual('/some/path');
 			expect(parsed.query).toStrictEqual({q1: 'test1', q2: 'test2'});
 			expect(parsed.fragment).toStrictEqual('frag');
 		});
 		test('subdomains', () => {
 			const parsed = parseUrl('https://sub.domain.example.com/some/path?q1=test1&q2=test2#frag');
 			expect(parsed.protocol).toStrictEqual('https');
 			expect(parsed.host).toStrictEqual('sub.domain.example.com');
 			expect(parsed.domain).toStrictEqual('example.com');
 			expect(parsed.subdomain).toStrictEqual('sub.domain');
 			expect(parsed.path).toStrictEqual('/some/path');
 			expect(parsed.query).toStrictEqual({q1: 'test1', q2: 'test2'});
 			expect(parsed.fragment).toStrictEqual('frag');
 		});
 	});
 });
--- a/tests/time.spec.ts
+++ b/tests/time.spec.ts
@ -0,0 +1,12 @@
 import {sleep} from '../src';
 describe('Time Utilities', () => {
 	describe('sleep', () => {
 		test('wait until', async () => {
 			const wait = ~~(Math.random() * 500);
 			const time = new Date().getTime();
 			await sleep(wait);
 			expect(new Date().getTime()).toBeGreaterThanOrEqual(time + wait);
 		});
 	});
 });
Author	SHA1	Message	Date
ztimson	028b9c0f4c	+ Caching manually expire 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 36s Details	2025-05-12 20:29:29 -04:00
ztimson	d938996a66	+ Caching expiry strategies Some checks failed Build / Build NPM Project (push) Failing after 34s Details Build / Publish Documentation (push) Has been skipped Details Build / Tag Version (push) Has been skipped Details + Prefix PathEvents	2025-05-12 19:46:23 -04:00
ztimson	cdcaeda67c	+ Added writable 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 35s Details	2025-05-12 18:00:12 -04:00
ztimson	482c90b53b	+ Added writable All checks were successful Build / Build NPM Project (push) Successful in 1m13s Details Build / Tag Version (push) Successful in 15s Details Build / Publish Documentation (push) Successful in 49s Details	2025-05-12 16:28:10 -04:00
ztimson	7500ba502f	+ Added clear function to ASet All checks were successful Build / Build NPM Project (push) Successful in 44s Details Build / Tag Version (push) Successful in 8s Details Build / Publish Documentation (push) Successful in 37s Details * fixed pathedEvent fullPath casing	2025-05-11 14:13:01 -04:00
ztimson	edc059d17d	Added var-persist All checks were successful Build / Build NPM Project (push) Successful in 37s Details Build / Tag Version (push) Successful in 8s Details Build / Publish Documentation (push) Successful in 35s Details	2025-05-11 11:55:40 -04:00
ztimson	48cfbee46e	Removed test All checks were successful Build / Build NPM Project (push) Successful in 1m8s Details Build / Tag Version (push) Successful in 14s Details Build / Publish Documentation (push) Successful in 53s Details	2025-05-11 11:50:08 -04:00
ztimson	26cc18ffb3	Fixed path event, renamed testCondition to logicTest & fixed some tests Some checks failed Build / Build NPM Project (push) Failing after 44s Details Build / Publish Documentation (push) Has been skipped Details Build / Tag Version (push) Has been skipped Details	2025-05-11 11:46:03 -04:00
ztimson	3fd5c5ed57	Added sync function runner All checks were successful Build / Build NPM Project (push) Successful in 42s Details Build / Tag Version (push) Successful in 7s Details Build / Publish Documentation (push) Successful in 41s Details	2025-05-06 19:52:32 -04:00
ztimson	2e4559d805	Added async function runner All checks were successful Build / Build NPM Project (push) Successful in 37s Details Build / Tag Version (push) Successful in 8s Details Build / Publish Documentation (push) Successful in 34s Details	2025-05-06 16:09:24 -04:00
ztimson	95f8d5762c	Fixed import error All checks were successful Build / Build NPM Project (push) Successful in 57s Details Build / Tag Version (push) Successful in 13s Details Build / Publish Documentation (push) Successful in 48s Details	2025-05-06 16:01:57 -04:00
ztimson	3bc82fab45	- Fixed cache.addAll() Some checks failed Build / Build NPM Project (push) Failing after 34s Details Build / Publish Documentation (push) Has been skipped Details Build / Tag Version (push) Has been skipped Details - Renamed jwtDecode to decodeJWT to match conventions - Added testCondition to search	2025-05-06 15:59:08 -04:00
ztimson	6b15848896	Fixed defaulting date in date formatter All checks were successful Build / Build NPM Project (push) Successful in 1m15s Details Build / Tag Version (push) Successful in 16s Details Build / Publish Documentation (push) Successful in 49s Details	2025-04-30 11:58:03 -04:00
ztimson	9a0f32323e	Fix HTTP empty responses All checks were successful Build / Build NPM Project (push) Successful in 37s Details Build / Tag Version (push) Successful in 8s Details Build / Publish Documentation (push) Successful in 34s Details	2025-04-13 10:16:50 -04:00
ztimson	f952abc95a	More zelous path fixing in the http client All checks were successful Build / Build NPM Project (push) Successful in 1m13s Details Build / Tag Version (push) Successful in 14s Details Build / Publish Documentation (push) Successful in 51s Details	2025-04-13 09:50:19 -04:00
ztimson	21fc1378b8	Added more naming convention utilities All checks were successful Build / Build NPM Project (push) Successful in 42s Details Build / Tag Version (push) Successful in 7s Details Build / Publish Documentation (push) Successful in 38s Details	2025-04-08 19:02:42 -04:00
ztimson	a03567eba3	toCSV comma fix All checks were successful Build / Build NPM Project (push) Successful in 1m15s Details Build / Tag Version (push) Successful in 13s Details Build / Publish Documentation (push) Successful in 50s Details	2025-04-06 21:37:01 -04:00
ztimson	f9fc4fb7ff	Better CSV handling All checks were successful Build / Build NPM Project (push) Successful in 38s Details Build / Tag Version (push) Successful in 7s Details Build / Publish Documentation (push) Successful in 35s Details	2025-03-24 23:01:57 -04:00
ztimson	ff16f3bf9b	Better CSV handling All checks were successful Build / Build NPM Project (push) Successful in 38s Details Build / Tag Version (push) Successful in 8s Details Build / Publish Documentation (push) Successful in 36s Details	2025-03-24 21:40:03 -04:00
ztimson	e0085ecb6f	Better CSV handling All checks were successful Build / Build NPM Project (push) Successful in 1m15s Details Build / Tag Version (push) Successful in 16s Details Build / Publish Documentation (push) Successful in 53s Details	2025-03-24 21:28:51 -04:00
ztimson	1c2c18b65d	Added camelCase function All checks were successful Build / Build NPM Project (push) Successful in 1m12s Details Build / Tag Version (push) Successful in 12s Details Build / Publish Documentation (push) Successful in 50s Details	2025-03-10 09:50:16 -04:00
ztimson	cd5741d6ab	Simplified timestampedFilename to use formatDate All checks were successful Build / Build NPM Project (push) Successful in 43s Details Build / Tag Version (push) Successful in 7s Details Build / Publish Documentation (push) Successful in 45s Details	2025-03-02 21:37:48 -05:00
ztimson	5b9e0714ce	Cache returns deep copies to prevent deletion mid-use All checks were successful Build / Build NPM Project (push) Successful in 1m13s Details Build / Tag Version (push) Successful in 17s Details Build / Publish Documentation (push) Successful in 54s Details	2025-02-27 08:36:30 -05:00
ztimson	a3b34ef03f	Fixed http no decode 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 40s Details	2025-02-18 16:04:18 -05:00
ztimson	f755d8f5b8	Fixed PathEvents filter All checks were successful Build / Build NPM Project (push) Successful in 38s Details Build / Tag Version (push) Successful in 7s Details Build / Publish Documentation (push) Successful in 35s Details	2025-02-04 22:17:31 -05:00
ztimson	35c471eef4	Fixed PathEvents filter All checks were successful Build / Build NPM Project (push) Successful in 1m12s Details Build / Tag Version (push) Successful in 12s Details Build / Publish Documentation (push) Successful in 47s Details	2025-02-04 21:35:31 -05:00
ztimson	fe9fdb9384	Fixed blackorwhite invalid argument crash All checks were successful Build / Build NPM Project (push) Successful in 38s Details Build / Tag Version (push) Successful in 8s Details Build / Publish Documentation (push) Successful in 40s Details	2025-02-03 14:20:18 -05:00