Optimizations

Revert "Optimizations"
This reverts commit 59bce9d28d.
2025-07-07 14:33:44 -04:00 · 2025-07-07 14:32:21 -04:00
13 changed files with 76 additions and 262 deletions
--- a/index.html
+++ b/index.html
@ -1,9 +1,9 @@
 <html>
 	<body>
 		<script type="module">
-			import {PE} from './dist/index.mjs';
+			import {PES} from './dist/index.mjs';
-			console.log('data/Ts:n', PE`${'data/Ts'}:n`.methods);
+			console.log(PES`storage${'Test/Test'}:d`);
 		</script>
 	</body>
 </html>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.26.21",
+	"version": "0.26.1",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
--- a/src/cache.ts
+++ b/src/cache.ts
@ -22,10 +22,8 @@ export class Cache<K extends string | number | symbol, T> {
 	[key: string | number | symbol]: CachedValue<T> | any;
 	/** Whether cache is complete */
 	complete = false;
 	private _loading!: Function;
 	/** Await initial loading */
-	loading = new Promise<void>(r => this._loading = r);
+	loading!: Promise<void>;
 	/**
 	 * Create new cache
@ -33,26 +31,27 @@ export class Cache<K extends string | number | symbol, T> {
 	 * @param options
 	 */
 	constructor(public readonly key?: keyof T, public readonly options: CacheOptions = {}) {
 		let done!: Function;
 		this.loading = new Promise(r => done = r);
 		// Persistent storage
 		if(this.options.persistentStorage != null) {
 			if(typeof this.options.persistentStorage == 'string')
 				this.options.persistentStorage = {storage: localStorage, key: this.options.persistentStorage};
-			if(this.options.persistentStorage?.storage?.database != undefined) {
+			if(this.options.persistentStorage?.storage?.constructor.name == 'Database') {
 				(async () => {
 					const persists: any = this.options.persistentStorage;
 					const table: Table<any, any> = await persists.storage.createTable({name: persists.key, key: this.key});
 					const rows = await table.getAll();
 					Object.assign(this.store, rows.reduce((acc, row) => ({...acc, [this.getKey(row)]: row}), {}));
-					this._loading();
+					done();
 				})();
-			} else if((<any>this.options.persistentStorage?.storage)?.getItem != undefined) {
+			} else if(this.options.persistentStorage?.storage?.constructor.name == 'Storage') {
 				const stored = (<Storage>this.options.persistentStorage.storage).getItem(this.options.persistentStorage.key);
 				if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { }
-				this._loading();
+				done();
 			}
 		} else {
 			this._loading();
 		}
 		// Handle index lookups
@ -78,18 +77,16 @@ export class Cache<K extends string | number | symbol, T> {
 	private save(key?: K) {
 		const persists: {storage: any, key: string} = <any>this.options.persistentStorage;
 		if(!!persists?.storage) {
-			if(persists.storage?.database != undefined) {
+			if(persists.storage?.constructor.name == 'Database') {
 				(<Database>persists.storage).createTable({name: persists.key, key: <string>this.key}).then(table => {
 					if(key) {
-						const value = this.get(key);
+						table.set(key, this.get(key));
 						if(value != null) table.set(value, key);
 						else table.delete(key);
 					} else {
 						table.clear();
 						this.all().forEach(row => table.add(row));
 					}
 				});
-			} else if(persists.storage?.setItem != undefined) {
+			} else if(persists.storage?.constructor.name == 'Storage') {
 				persists.storage.setItem(persists.storage.key, JSONSanitize(this.all(true)));
 			}
 		}
--- a/src/csv.ts
+++ b/src/csv.ts
@ -64,7 +64,6 @@ export function fromCsv<T = any>(csv: string, hasHeaders = true): T[] {
 	});
 }
 /**
 * Convert an array of objects to a CSV string
 *
--- a/src/database.ts
+++ b/src/database.ts
@ -14,8 +14,8 @@ class AsyncLock {
 		const res = this.p.then(fn, fn);
 		this.p = res.then(() => {}, () => {});
 		return res;
 	}
 }
 	}
 export class Database {
 	private schemaLock = new AsyncLock();
@ -28,10 +28,7 @@ export class Database {
 	constructor(public readonly database: string, tables?: (string | TableOptions)[], public version?: number) {
 		this.connection = new Promise((resolve, reject) => {
-			let req: IDBOpenDBRequest;
+			const req = indexedDB.open(this.database, this.version);
 			try { req = indexedDB.open(this.database, this.version); }
 			catch (err) { return reject(err); }
 			this.tables = !tables ? [] : tables.map(t => {
 				t = typeof t == 'object' ? t : {name: t};
 				return {...t, name: t.name.toString()};
@ -40,22 +37,13 @@ export class Database {
 			req.onerror = () => reject(req.error);
 			req.onsuccess = () => {
-				let db: IDBDatabase;
+				const db = req.result;
 				try { db = req.result; }
 				catch (err) { return reject(err); }
 				const existing = Array.from(db.objectStoreNames);
-				if(!tables) {
+				if(!tables) this.tables = existing.map(t => {
-					this.tables = existing.map(t => {
+					const tx = db.transaction(t, 'readonly');
-						try {
+					const store = tx.objectStore(t);
-							const tx = db.transaction(t, 'readonly');
+					return {name: t, key: <string>store.keyPath};
-							const store = tx.objectStore(t);
+				});
 							return {name: t, key: <string>store.keyPath};
 						} catch {
 							return {name: t}; // 🛡️ fallback
 						}
 					});
 				}
 				const desired = new ASet((tables || []).map(t => typeof t == 'string' ? t : t.name));
 				if(tables && desired.symmetricDifference(new ASet(existing)).length) {
 					db.close();
@ -70,23 +58,19 @@ export class Database {
 			req.onupgradeneeded = () => {
 				this.upgrading = true;
-				let db: IDBDatabase;
+				const db = req.result;
-				try { db = req.result; }
+				const existingTables = new ASet(Array.from(db.objectStoreNames));
-				catch { return; }
+				if(tables) {
-				try {
+					const desired = new ASet((tables || []).map(t => typeof t == 'string' ? t : t.name));
-					const existingTables = new ASet(Array.from(db.objectStoreNames));
+					existingTables.difference(desired).forEach(name => db.deleteObjectStore(name));
-					if(tables) {
+					desired.difference(existingTables).forEach(name => {
-						const desired = new ASet((tables || []).map(t => typeof t == 'string' ? t : t.name));
+						const t = this.tables.find(findByProp('name', name));
-						existingTables.difference(desired).forEach(name => db.deleteObjectStore(name));
+						db.createObjectStore(name, {
-						desired.difference(existingTables).forEach(name => {
+							keyPath: t?.key,
-							const t = this.tables.find(findByProp('name', name));
+							autoIncrement: t?.autoIncrement || !t?.key,
 							db.createObjectStore(name, {
 								keyPath: t?.key,
 								autoIncrement: t?.autoIncrement || !t?.key,
 							});
 						});
-					}
+					});
-				} catch { }
+				}
 			};
 		});
 	}
@ -95,12 +79,11 @@ export class Database {
 	async createTable<K extends IDBValidKey = any, T = any>(table: string | TableOptions): Promise<Table<K, T>> {
 		return this.schemaLock.run(async () => {
-			if(typeof table == 'string') table = { name: table };
+			if (typeof table == 'string') table = { name: table };
 			const conn = await this.connection;
-			if(!this.includes(table.name)) {
+			if (!this.includes(table.name)) {
 				const newDb = new Database(this.database, [...this.tables, table], (this.version ?? 0) + 1);
 				conn.close();
 				await newDb.connection;
 				Object.assign(this, newDb);
 				await this.connection;
 			}
@ -108,17 +91,18 @@ export class Database {
 		});
 	}
 	async deleteTable(table: string | TableOptions): Promise<void> {
 		return this.schemaLock.run(async () => {
-			if(typeof table == 'string') table = { name: table };
+			if (typeof table == 'string') table = { name: table };
-			if(!this.includes(table.name)) return;
+			if (!this.includes(table.name)) return;
 			const conn = await this.connection;
 			const newDb = new Database(this.database, this.tables.filter(t => t.name != (<TableOptions>table).name), (this.version ?? 0) + 1);
 			conn.close();
 			await newDb.connection;
 			Object.assign(this, newDb);
 			await this.connection;
 		});
 	}
 	includes(name: any): boolean {
@ -142,8 +126,9 @@ export class Table<K extends IDBValidKey = any, T = any> {
 		await this.database.waitForUpgrade();
 		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(tx.objectStore(table));
+			const request = fn(store);
 			request.onsuccess = () => resolve(request.result as R);
 			request.onerror = () => reject(request.error);
 		});
@ -181,11 +166,8 @@ export class Table<K extends IDBValidKey = any, T = any> {
 		return this.tx(this.name, store => store.getAllKeys(), true);
 	}
-	put(value: T, key?: string): Promise<void> {
+	put(key: K, value: T): Promise<void> {
-		return this.tx(this.name, store => {
+		return this.tx(this.name, store => store.put(value, key));
 			if(store.keyPath) return store.put(value);
 			return store.put(value, key);
 		});
 	}
 	read(): Promise<T[]>;
@ -195,9 +177,8 @@ export class Table<K extends IDBValidKey = any, T = any> {
 	}
 	set(value: T, key?: K): Promise<void> {
-		if(key) (<any>value)[this.key] = key;
+		if(!key && !(<any>value)[this.key]) return this.add(value);
-		if(!(<any>value)[this.key]) return this.add(value);
+		return this.put(key || (<any>value)[this.key], value);
 		return this.put(value);
 	}
 	update = this.set;
--- a/src/http.ts
+++ b/src/http.ts
@ -78,7 +78,7 @@ export class Http {
 		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 || '');
 		url = url.replaceAll(/([^:]\/)\/+/g, '$1');
-		if(opts.fragment) url.includes('#') ? url.replace(/#.*([?\n])/g, (match, arg1) => `#${opts.fragment}${arg1}`) : `${url}#${opts.fragment}`;
+		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]}))
--- a/src/misc.ts
+++ b/src/misc.ts
@ -47,17 +47,6 @@ export function ipV6ToV4(ip: string) {
 	return ipv4;
 }
 /**
 * Check if IP is reserved, e.g. localhost, private IPs, etc.
 * @param {string} ip
 * @returns {boolean}
 */
 export function reservedIp(ip: string): boolean {
 	if(ip == 'localhost' || ip == '127.0.0.1') return true;
 	return /\b(10\.(?:[0-9]{1,3}\.){2}[0-9]{1,3})\b|\b(172\.(?:1[6-9]|2[0-9]|3[0-1])\.(?:[0-9]{1,3}\.)[0-9]{1,3})\b|\b(192\.168\.(?:[0-9]{1,3}\.)[0-9]{1,3})\b/.test(ip);
 }
 /**
 * Represents a function that listens for events and handles them accordingly.
 *
--- a/src/objects.ts
+++ b/src/objects.ts
@ -177,51 +177,19 @@ export function includes(target: any, values: any, allowMissing = false): boolea
 }
 /**
- * Deep check if two items are equal.
+ * Deep check if two objects are equal
 * Handles primitives, objects, arrays, functions, Date, RegExp, and circular references.
 *
 * @param {any} a - first item to compare
 * @param {any} b - second item to compare
 * @param {WeakMap<object, object>} [seen] - Internal parameter to track circular references
 * @returns {boolean} True if they match
 */
-export function isEqual(a: any, b: any, seen = new WeakMap<object, object>()): boolean {
+export function isEqual(a: any, b: any): boolean {
-	// Simple cases
+	const ta = typeof a, tb = typeof b;
-	if(a === b) return true;
+	if((ta != 'object' || a == null) || (tb != 'object' || b == null))
-	if(a instanceof Date && b instanceof Date) return a.getTime() === b.getTime();
+		return ta == 'function' && tb == 'function' ? a.toString() == b.toString() : a === b;
-	if(a instanceof RegExp && b instanceof RegExp) return a.source === b.source && a.flags === b.flags;
+	const keys = Object.keys(a);
-
+	if(keys.length != Object.keys(b).length) return false;
-	// Null checks
+	return Object.keys(a).every(key => isEqual(a[key], b[key]));
 	if(typeof a !== 'object' || a === null || typeof b !== 'object' || b === null) {
 		if(Number.isNaN(a) && Number.isNaN(b)) return true;
 		if(typeof a === 'function' && typeof b === 'function') return a.toString() === b.toString()
 		return false;
 	}
 	// Circular references
 	if(seen.has(a)) return seen.get(a) === b;
 	seen.set(a, b);
 	const isArrayA = Array.isArray(a);
 	const isArrayB = Array.isArray(b);
 	// Array checks
 	if(isArrayA && isArrayB) {
 		if(a.length !== b.length) return false;
 		for(let i = 0; i < a.length; i++) {
 			if(!isEqual(a[i], b[i], seen)) return false;
 		}
 		return true;
 	}
 	if(isArrayA !== isArrayB) return false;
 	// Key & value deep comparison
 	const keysA = Object.keys(a);
 	const keysB = Object.keys(b);
 	if(keysA.length !== keysB.length) return false;
 	for(const key of keysA) {
 		if(!Object.prototype.hasOwnProperty.call(b, key) || !isEqual(a[key], b[key], seen)) return false;
 	}
 	return true;
 }
 /**
--- a/src/path-events.ts
+++ b/src/path-events.ts
@ -71,12 +71,9 @@ export class PathEvent {
 	/** List of methods */
 	methods!: ASet<Method>;
 	/** Internal cache for PathEvent instances to avoid redundant parsing */
 	private static pathEventCache: Map<string, PathEvent> = new Map();
 	/** All/Wildcard specified */
 	get all(): boolean { return this.methods.has('*') }
-	set all(v: boolean) { v ? this.methods = new ASet<Method>(['*']) : this.methods.delete('*'); }
+	set all(v: boolean) { v ? new ASet<Method>(['*']) : this.methods.delete('*'); }
 	/** None specified */
 	get none(): boolean { return this.methods.has('n') }
 	set none(v: boolean) { v ? this.methods = new ASet<Method>(['n']) : this.methods.delete('n'); }
@ -94,20 +91,10 @@ export class PathEvent {
 	set delete(v: boolean) { v ? this.methods.delete('n').delete('*').add('d') : this.methods.delete('d'); }
 	constructor(e: string | PathEvent) {
-		if(typeof e == 'object') {
+		if(typeof e == 'object') return Object.assign(this, e);
 			Object.assign(this, e);
 			return;
 		}
 		// Check cache first
 		if (PathEvent.pathEventCache.has(e)) {
 			Object.assign(this, PathEvent.pathEventCache.get(e)!);
 			return;
 		}
 		let [p, scope, method] = e.replaceAll(/\/{2,}/g, '/').split(':');
 		if(!method) method = scope || '*';
-		if(p == '*' || (!p && method == '*')) {
+		if(p == '*' || !p && method == '*') {
 			p = '';
 			method = '*';
 		}
@ -117,14 +104,6 @@ export class PathEvent {
 		this.fullPath = `${this.module}${this.module && this.path ? '/' : ''}${this.path}`;
 		this.name = temp.pop() || '';
 		this.methods = new ASet(<any>method.split(''));
 		// Store in cache
 		PathEvent.pathEventCache.set(e, this);
 	}
 	/** Clear the cache of all PathEvents */
 	static clearCache(): void {
 		PathEvent.pathEventCache.clear();
 	}
 	/**
@ -136,7 +115,7 @@ export class PathEvent {
 	 */
 	static combine(...paths: (string | PathEvent)[]): PathEvent {
 		let hitNone = false;
-		const combined = paths.map(p => p instanceof PathEvent ? p : new PathEvent(p))
+		const combined = paths.map(p => new PathEvent(p))
 			.toSorted((p1, p2) => {
 				const l1 = p1.fullPath.length, l2 = p2.fullPath.length;
 				return l1 < l2 ? 1 : (l1 > l2 ? -1 : 0);
@ -145,9 +124,10 @@ export class PathEvent {
 				if(p.none) hitNone = true;
 				if(!acc) return p;
 				if(hitNone) return acc;
-				acc.methods = new ASet([...acc.methods, ...p.methods]);
+				acc.methods = [...acc.methods, ...p.methods];
 				return acc;
 			}, <any>null);
 		combined.methods = new ASet<Method>(combined.methods);
 		return combined;
 	}
@ -159,12 +139,11 @@ export class PathEvent {
 	 * @return {boolean} Whether there is any overlap
 	 */
 	static filter(target: string | PathEvent | (string | PathEvent)[], ...filter: (string | PathEvent)[]): PathEvent[] {
-		const parsedTarget = makeArray(target).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
+		const parsedTarget = makeArray(target).map(pe => new PathEvent(pe));
-		const parsedFilter = makeArray(filter).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
+		const parsedFilter = makeArray(filter).map(pe => new PathEvent(pe));
 		return parsedTarget.filter(t => !!parsedFilter.find(r => {
 			const wildcard = r.fullPath == '*' || t.fullPath == '*';
-			const p1 = r.fullPath.includes('*') ? r.fullPath.slice(0, r.fullPath.indexOf('*')) : r.fullPath;
+			const p1 = r.fullPath.slice(0, r.fullPath.indexOf('*')), p2 = t.fullPath.slice(0, t.fullPath.indexOf('*'))
 			const p2 = t.fullPath.includes('*') ? t.fullPath.slice(0, t.fullPath.indexOf('*')) : t.fullPath;
 			const scope = p1.startsWith(p2) || p2.startsWith(p1);
 			const methods = r.all || t.all || r.methods.intersection(t.methods).length;
 			return (wildcard || scope) && methods;
@ -179,13 +158,12 @@ 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 => pe instanceof PathEvent ? pe : new PathEvent(pe));
+		const parsedTarget = makeArray(target).map(pe => new PathEvent(pe));
-		const parsedRequired = makeArray(has).map(pe => pe instanceof PathEvent ? pe : new PathEvent(pe));
+		const parsedRequired = makeArray(has).map(pe => new PathEvent(pe));
 		return !!parsedRequired.find(r => !!parsedTarget.find(t => {
 			const wildcard = r.fullPath == '*' || t.fullPath == '*';
-			const p1 = r.fullPath.includes('*') ? r.fullPath.slice(0, r.fullPath.indexOf('*')) : r.fullPath;
+			const p1 = r.fullPath.slice(0, r.fullPath.indexOf('*')), p2 = t.fullPath.slice(0, t.fullPath.indexOf('*'))
-			const p2 = t.fullPath.includes('*') ? t.fullPath.slice(0, t.fullPath.indexOf('*')) : t.fullPath;
+			const scope = p1.startsWith(p2);
 			const scope = p1.startsWith(p2); // Note: Original had || p2.startsWith(p1) here, but has implies target has required.
 			const methods = r.all || t.all || r.methods.intersection(t.methods).length;
 			return (wildcard || scope) && methods;
 		}));
@ -315,7 +293,7 @@ export class PathEventEmitter implements IPathEventEmitter{
 	constructor(public readonly prefix: string = '') { }
 	emit(event: Event, ...args: any[]) {
-		const parsed = event instanceof PathEvent ? event : new PathEvent(`${this.prefix}/${event}`);
+		const parsed = PE`${this.prefix}/${event}`;
 		this.listeners.filter(l => PathEvent.has(l[0], parsed))
 			.forEach(async l => l[1](parsed, ...args));
 	};
@ -325,13 +303,10 @@ export class PathEventEmitter implements IPathEventEmitter{
 	}
 	on(event: Event | Event[], listener: PathListener): PathUnsubscribe {
-		makeArray(event).forEach(e => {
+		makeArray(event).forEach(e => this.listeners.push([
-			if(typeof e == 'string' && e[0] == '*' && this.prefix) e = e.slice(1);
+			new PathEvent(`${this.prefix}/${e}`),
-			this.listeners.push([
+			listener
-				e instanceof PathEvent ? e : new PathEvent(`${this.prefix}/${e}`),
+		]));
 				listener
 			])
 		});
 		return () => this.off(listener);
 	}
--- a/src/search.ts
+++ b/src/search.ts
@ -13,8 +13,8 @@ export function search(rows: any[], search: string, regex?: boolean, transform:
 	if(!rows) return [];
 	return rows.filter(r => {
 		// Empty search
 		if(!search) return true;
 		const value = transform(r);
 		if(!search) return true;
 		// Regex search
 		if(regex) {
 			return !!Object.values(value).filter((v: any) => {
@ -22,7 +22,7 @@ export function search(rows: any[], search: string, regex?: boolean, transform:
 				catch { return false; }
 			}).length
 		} else {
-			return logicTest(value, search);
+			return logicTest(r, search);
 		}
 	});
 }
@ -39,8 +39,6 @@ export function logicTest(target: object, condition: string): boolean {
 			case '=':
 			case '==': return a == b;
 			case '!=': return a != b;
 			case '+=': return a?.toString().includes(b);
 			case '-=': return !a?.toString().includes(b);
 			case '>': return a > b;
 			case '>=': return a >= b;
 			case '<': return a < b;
@ -55,7 +53,7 @@ export function logicTest(target: object, condition: string): boolean {
 		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);
+			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]));
--- a/src/string.ts
+++ b/src/string.ts
@ -43,24 +43,6 @@ export function formatBytes(bytes: number, decimals = 2) {
 	return parseFloat((bytes / Math.pow(k, i)).toFixed(decimals)) + ' ' + sizes[i];
 }
 /**
 * Convert milliseconds to human-readable duration
 * @param {string} ms milliseconds
 * @param {boolean} short Use unit initial instead of word
 * @return {string} formated duration
 */
 export function formatMs(ms: number, short = false): string {
 	if (isNaN(ms) || ms < 0) return "Invalid input";
 	const seconds = ms / 1000;
 	const minutes = seconds / 60;
 	const hours = minutes / 60;
 	const days = hours / 24;
 	if (days >= 1) return `${days.toFixed(1)} ${short ? 'd' : 'days'}`;
 	else if (hours >= 1) return `${hours.toFixed(1)} ${short ? 'h' : 'hours'}`;
 	else if (minutes >= 1) return `${minutes.toFixed(1)} ${short ? 'm' : 'minutes'}`;
 	else return `${seconds.toFixed(1)} ${short ? 's' : 'seconds'}`;
 }
 /**
 * Extract numbers from a string & create a formated phone number: +1 (123) 456-7890
 *
--- a/tests/path-events.spec.ts
+++ b/tests/path-events.spec.ts
@ -1,10 +1,6 @@
 import {PathError, PathEvent, PathEventEmitter, PE, PES} from '../src';
 describe('Path Events', () => {
 	beforeEach(() => {
 		PathEvent.clearCache();
 	});
 	describe('PE', () => {
 		it('creates PathEvent from template string', () => {
 			const e = PE`users/system:cr`;
--- a/tests/search.spec.ts
+++ b/tests/search.spec.ts
@ -4,7 +4,6 @@ const rows = [
 	{id: 1, name: 'Alice', age: 30},
 	{id: 2, name: 'Bob', age: 24},
 	{id: 3, name: 'Carol', age: 30},
 	{id: 4, name: 'David', age: 35},
 ];
 describe('Search Utilities', () => {
@ -38,35 +37,6 @@ describe('Search Utilities', () => {
 		it('returns all if search is falsy and regex enabled', () => {
 			expect(search(rows, '', true)).toEqual(rows);
 		});
 		it('handles regex search with special characters', () => {
 			expect(search(rows, '^[AC]', true)).toEqual([rows[0], rows[2]]);
 		});
 		it('ignores case when regex is applied', () => {
 			expect(search(rows, 'ALICE', true)).toEqual([]);
 		});
 		it('performs partial matches for properties when regex=false', () => {
 			expect(search(rows, 'Da')).toEqual([rows[3]]);
 		});
 		it('handles empty array input gracefully', () => {
 			expect(search([], 'test')).toEqual([]);
 		});
 		it('handles numeric values with comparison logic in strings', () => {
 			expect(search(rows, 'age < 31')).toEqual([rows[0], rows[1], rows[2]]);
 		});
 		// New test cases for `+` and `-` operators
 		it('filters rows using the + operator', () => {
 			expect(search(rows, 'name += Al')).toEqual([rows[0]]);
 		});
 		it('filters rows using the - operator', () => {
 			expect(search(rows, 'name -= Al')).toEqual([rows[1], rows[2], rows[3]]);
 		});
 	});
 	describe('logicTest', () => {
@ -97,46 +67,5 @@ describe('Search Utilities', () => {
 		it('returns false for unsupported operators', () => {
 			expect(logicTest(obj, 'x === 10')).toBe(false);
 		});
 		it('handles invalid condition strings gracefully', () => {
 			expect(logicTest(obj, 'invalid condition')).toBe(false);
 		});
 		it('supports numeric operations with ranges', () => {
 			expect(logicTest(obj, 'x > 5 && x < 15')).toBe(true);
 			expect(logicTest(obj, 'x > 15')).toBe(false);
 		});
 		it('handles mixed case keys gracefully', () => {
 			const mixedCaseObj = {TestKey: 123};
 			expect(logicTest(mixedCaseObj, 'TestKey == 123')).toBe(true);
 			expect(logicTest(mixedCaseObj, 'testkey == 123')).toBe(true);
 		});
 		it('returns false if condition operators are missing', () => {
 			expect(logicTest(obj, 'x 10')).toBe(false);
 		});
 		// New test cases for `+` and `-` operators
 		it('handles the + operator for inclusion', () => {
 			expect(logicTest(obj, 'name += Alpha')).toBe(true);
 			expect(logicTest(obj, 'name += Alp')).toBe(true);
 			expect(logicTest(obj, 'name += Bet')).toBe(false);
 		});
 		it('handles the - operator for exclusion', () => {
 			expect(logicTest(obj, 'name -= Alpha')).toBe(false);
 			expect(logicTest(obj, 'name -= Alp')).toBe(false);
 			expect(logicTest(obj, 'name -= Bet')).toBe(true);
 		});
 		it('includes partial matches correctly with +', () => {
 			expect(logicTest(obj, 'name += lph')).toBe(true);
 		});
 		it('excludes partial matches correctly with -', () => {
 			expect(logicTest(obj, 'name -= lph')).toBe(false);
 			expect(logicTest(obj, 'name -= xyz')).toBe(true);
 		});
 	});
 });
Author	SHA1	Message	Date
ztimson	2352dd25db	Optimizations Some checks failed Build / Build NPM Project (push) Successful in 41s Details Build / Publish Documentation (push) Failing after 5s Details Build / Tag Version (push) Successful in 8s Details	2025-07-07 14:33:44 -04:00
ztimson	80307b363b	Revert "Optimizations" This reverts commit `59bce9d28d`.	2025-07-07 14:32:21 -04:00