+ Added writable

+ Added clear function to ASet
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 · 2025-05-11 11:50:08 -04:00 · 2025-05-11 11:46:03 -04:00
15 changed files with 139 additions and 92 deletions
--- a/index.html
+++ b/index.html
@ -1,15 +0,0 @@
 <!Doctype html>
 <html>
 	<head>
 		<title>@ztimson/utils sandbox</title>
 	</head>
 	<body>
 		<script type="module">
 			import {PathEvent} from './dist/index.mjs';
 			console.log(PathEvent.filter(['payments/ztimson:cr', 'logs/momentum:c', 'data/Testing:r'], 'data'));
 			console.log(PathEvent.filter(['data/Submissions/Test:r'], 'data/Submissions/Test/test.html'));
 		</script>
 	</body>
 </html>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.23.22",
+	"version": "0.24.7",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
@ -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",
--- 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
@ -22,7 +22,6 @@ export class Cache<K extends string | number | symbol, T> {
 	/**
 	 * Create new cache
 	 *
 	 * @param {keyof T} key Default property to use as primary key
 	 * @param options
 	 */
@ -56,7 +55,6 @@ export class Cache<K extends string | number | symbol, T> {
 	/**
 	 * Get all cached items
 	 *
 	 * @return {T[]} Array of items
 	 */
 	all(): T[] {
@ -65,7 +63,6 @@ export class Cache<K extends string | number | symbol, T> {
 	/**
 	 * 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}
@ -78,12 +75,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;
@ -98,7 +95,6 @@ export class Cache<K extends string | number | symbol, T> {
 	/**
 	 * Delete an item from the cache
 	 *
 	 * @param {K} key Item's primary key
 	 */
 	delete(key: K) {
@ -126,7 +122,6 @@ export class Cache<K extends string | number | symbol, T> {
 	/**
 	 * Get a list of cached keys
 	 *
 	 * @return {K[]} Array of keys
 	 */
 	keys(): K[] {
@ -135,7 +130,6 @@ export class Cache<K extends string | number | symbol, T> {
 	/**
 	 * Get map of cached items
 	 *
 	 * @return {Record<K, T>}
 	 */
 	map(): Record<K, T> {
@ -144,7 +138,6 @@ export class Cache<K extends string | number | symbol, T> {
 	/**
 	 * 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
@ -163,7 +156,6 @@ export class Cache<K extends string | number | symbol, T> {
 	/**
 	 * Get all cached items
 	 *
 	 * @return {T[]} Array of items
 	 */
 	values = this.all();
--- 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
@ -199,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;
--- 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/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/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	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