package.json

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

src/cache.ts

@@ -1,5 +1,5 @@
 import {Table} from './database.ts';
-import {deepCopy, includes, JSONSanitize} from './objects.ts';
+import {deepCopy, JSONSanitize} from './objects.ts';
 
 export type CacheOptions = {
 	/** Delete keys automatically after x amount of seconds */
@@ -34,12 +34,7 @@ export class Cache<K extends string | number | symbol, T> {
 		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) => {
+				(async () => (await options.storage?.getAll()).forEach((v: any) => this.add(v)))()
-					if(v) {
-						try { this.add(v) }
-						catch { }
-					}
-				}))()
 			} else if(options.storageKey) {
 				const stored = options.storage?.getItem(options.storageKey);
 				if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { }
@@ -60,7 +55,6 @@ 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];
 	}
 
@@ -149,16 +143,6 @@ export class Cache<K extends string | number | symbol, T> {
 		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

src/files.ts

@@ -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;
 }
 

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
+ * Escape any regex special characters to avoid misinterpretation during search
- * @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
+ * @param {string} value String which should be escaped
+ * @return {string} New escaped sequence
  */
-export function ipV6ToV4(ip: string) {
+export function escapeRegex(value: string) {
-	if(!ip) return null;
+	return value.replace(/[.*+?^${}()|\[\]\\]/g, '\\$&');
-	const ipv4 = ip.split(':').splice(-1)[0];
-	if(ipv4 == '1') return '127.0.0.1';
-	return ipv4;
 }
 
 /**

src/path-events.ts

@@ -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));
+		const parsedFind = makeArray(filter).map(pe => new PathEvent(pe));
-		return parsedTarget.filter(t => !!parsedFilter.find(f =>
+		return parsedTarget.filter(t => {
-				(t.fullPath == '*' || f.fullPath == '*' || t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) &&
+			if(!t.fullPath && t.all) return true;
-				(f.all || t.all || t.methods.intersection(f.methods).length)));
+			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 =>
+		const parsedTarget = makeArray(target).map(pe => new PathEvent(pe));
-				(r.fullPath == '*' || t.fullPath == '*' || r.fullPath.startsWith(t.fullPath)) &&
+		return !!parsedRequired.find(r => {
-				(r.all || t.all || r.methods.intersection(t.methods).length)
+			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;
+		});
 	}
 
 	/**
@@ -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);

tests/path-events.spec.ts

@@ -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')];
+			const events = [
-			expect(PathEvent.has(events, 'users/sys:r')).toBeTruthy();
+				new PathEvent('users/sys:cr'),
-			expect(PathEvent.has(events, 'users/nope:r')).toBeFalsy();
+			];
+			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', () => {