Updated ASet & Path Events

package.json

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

src/aset.ts

@@ -24,6 +24,7 @@ export class ASet<T> extends Array {
 	 */
 	add(...items: T[]) {
 		items.filter(el => !this.has(el)).forEach(el => this.push(el));
+		return this;
 	}
 
 	/**
@@ -35,6 +36,7 @@ export class ASet<T> extends Array {
 			const index = this.indexOf(el);
 			if(index != -1) this.slice(index, 1);
 		})
+		return this;
 	}
 
 	/**

src/cache.ts

@@ -25,7 +25,7 @@ export class Cache<K extends string | number | symbol, T> {
 	 * @param options
 	 */
 	constructor(public readonly key?: keyof T, public readonly options: CacheOptions = {}) {
-		if(options.storageKey && !options.storage)
+		if(options.storageKey && !options.storage && typeof(Storage) !== 'undefined')
 			options.storage = localStorage;
 		if(options.storageKey && options.storage) {
 			const stored = options.storage.getItem(options.storageKey);
@@ -87,6 +87,13 @@ export class Cache<K extends string | number | symbol, T> {
 		return this;
 	}
 
+	/**
+	 * Remove all keys from cache
+	 */
+	clear() {
+		this.store = <Record<K, T>>{};
+	}
+
 	/**
 	 * Delete an item from the cache
 	 *
@@ -95,7 +102,7 @@ export class Cache<K extends string | number | symbol, T> {
 	delete(key: K) {
 		delete this.store[key];
 		if(this.options.storageKey && this.options.storage)
-			this.options.storage.setItem(this.options.storageKey, JSON.stringify(this.cache));
+			this.options.storage.setItem(this.options.storageKey, JSON.stringify(this.store));
 	}
 
 	/**
@@ -144,7 +151,7 @@ export class Cache<K extends string | number | symbol, T> {
 	set(key: K, value: T, ttl = this.options.ttl): this {
 		this.store[key] = value;
 		if(this.options.storageKey && this.options.storage)
-			this.options.storage.setItem(this.options.storageKey, JSON.stringify(this.cache));
+			this.options.storage.setItem(this.options.storageKey, JSON.stringify(this.store));
 		if(ttl) setTimeout(() => {
 			this.complete = false;
 			this.delete(key);

src/http.ts

@@ -75,47 +75,52 @@ export class Http {
 
 		// Send request
 		return new PromiseProgress((res, rej, prog) => {
-			fetch(url, {
-				headers,
-				method: opts.method || (opts.body ? 'POST' : 'GET'),
-				body: opts.body
-			}).then(async (resp: any) => {
-				for(let fn of [...Object.values(Http.interceptors), ...Object.values(this.interceptors)]) {
-					await new Promise<void>(res => fn(resp, () => res()));
-				}
-
-				const contentLength = resp.headers.get('Content-Length');
-				const total = contentLength ? parseInt(contentLength, 10) : 0;
-				let loaded = 0;
-
-				const reader = resp.body?.getReader();
-				const stream = new ReadableStream({
-					start(controller) {
-						function push() {
-							reader?.read().then((event: any) => {
-								if(event.done) return controller.close();
-								loaded += event.value.byteLength;
-								prog(loaded / total);
-								controller.enqueue(event.value);
-								push();
-							}).catch((error: any) => controller.error(error));
-						}
-						push();
+			try {
+				fetch(url, {
+					headers,
+					method: opts.method || (opts.body ? 'POST' : 'GET'),
+					body: opts.body
+				}).then(async (resp: any) => {
+					for(let fn of [...Object.values(Http.interceptors), ...Object.values(this.interceptors)]) {
+						await new Promise<void>(res => fn(resp, () => res()));
 					}
-				});
 
-				resp.data = new Response(stream);
-				if(opts.decode == null || opts.decode) {
-					const content = resp.headers.get('Content-Type')?.toLowerCase();
-					if(content?.includes('form')) resp.data = <T>await resp.data.formData();
-					else if(content?.includes('json')) resp.data = <T>await resp.data.json();
-					else if(content?.includes('text')) resp.data = <T>await resp.data.text();
-					else if(content?.includes('application')) resp.data = <T>await resp.data.blob();
-				}
+					const contentLength = resp.headers.get('Content-Length');
+					const total = contentLength ? parseInt(contentLength, 10) : 0;
+					let loaded = 0;
 
-				if(resp.ok) res(resp);
-				else rej(resp);
-			})
+					const reader = resp.body?.getReader();
+					const stream = new ReadableStream({
+						start(controller) {
+							function push() {
+								reader?.read().then((event: any) => {
+									if(event.done) return controller.close();
+									loaded += event.value.byteLength;
+									prog(loaded / total);
+									controller.enqueue(event.value);
+									push();
+								}).catch((error: any) => controller.error(error));
+							}
+
+							push();
+						}
+					});
+
+					resp.data = new Response(stream);
+					if(opts.decode == null || opts.decode) {
+						const content = resp.headers.get('Content-Type')?.toLowerCase();
+						if(content?.includes('form')) resp.data = <T>await resp.data.formData();
+						else if(content?.includes('json')) resp.data = <T>await resp.data.json();
+						else if(content?.includes('text')) resp.data = <T>await resp.data.text();
+						else if(content?.includes('application')) resp.data = <T>await resp.data.blob();
+					}
+
+					if(resp.ok) res(resp);
+					else rej(resp);
+				}).catch(err => rej(err));
+			} catch(err) {
+				rej(err);
+			}
 		});
 	}
 }

src/logger.ts

@@ -1,4 +1,5 @@
 import {TypedEmitter, TypedEvents} from './emitter';
+import {JSONSanitize} from './objects.ts';
 
 export const CliEffects = {
 	CLEAR: "\x1b[0m",
@@ -64,49 +65,41 @@ export class Logger extends TypedEmitter<LoggerEvents> {
 		super();
 	}
 
-	private pad(text: any, length: number, char: string, end = false) {
-		const t = text.toString();
-		const l = length - t.length;
-		if(l <= 0) return t;
-		const padding = Array(~~(l / char.length)).fill(char).join('');
-		return !end ? padding + t : t + padding;
-	}
-
-	private format(...text: string[]): string {
+	protected format(...text: any[]): string {
 		const now = new Date();
-		const timestamp = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()} ${this.pad(now.getHours().toString(), 2, '0')}:${this.pad(now.getMinutes().toString(), 2, '0')}:${this.pad(now.getSeconds().toString(), 2, '0')}.${this.pad(now.getMilliseconds().toString(), 3, '0', true)}`;
-		return `${timestamp}${this.namespace ? ` [${this.namespace}]` : ''} ${text.join(' ')}`;
+		const timestamp = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()} ${now.getHours().toString().padStart(2, '0')}:${now.getMinutes().toString().padStart(2, '0')}:${now.getSeconds().toString().padStart(2, '0')}.${now.getMilliseconds().toString().padEnd(3, '0')}`;
+		return `${timestamp}${this.namespace ? ` [${this.namespace}]` : ''} ${text.map(t => typeof t == 'string' ? t : JSONSanitize(t, 2)).join(' ')}`;
 	}
 
-	debug(...args: string[]) {
+	debug(...args: any[]) {
 		if(Logger.LOG_LEVEL < LOG_LEVEL.DEBUG) return;
 		const str = this.format(...args);
 		Logger.emit(LOG_LEVEL.DEBUG, str);
 		console.debug(CliForeground.LIGHT_GREY + str + CliEffects.CLEAR);
 	}
 
-	log(...args: string[]) {
+	log(...args: any[]) {
 		if(Logger.LOG_LEVEL < LOG_LEVEL.LOG) return;
 		const str = this.format(...args);
 		Logger.emit(LOG_LEVEL.LOG, str);
 		console.log(CliEffects.CLEAR + str);
 	}
 
-	info(...args: string[]) {
+	info(...args: any[]) {
 		if(Logger.LOG_LEVEL < LOG_LEVEL.INFO) return;
 		const str = this.format(...args);
 		Logger.emit(LOG_LEVEL.INFO, str);
 		console.info(CliForeground.BLUE + str + CliEffects.CLEAR);
 	}
 
-	warn(...args: string[]) {
+	warn(...args: any[]) {
 		if(Logger.LOG_LEVEL < LOG_LEVEL.WARN) return;
 		const str = this.format(...args);
 		Logger.emit(LOG_LEVEL.WARN, str);
 		console.warn(CliForeground.YELLOW + str + CliEffects.CLEAR);
 	}
 
-	error(...args: string[]) {
+	error(...args: any[]) {
 		if(Logger.LOG_LEVEL < LOG_LEVEL.ERROR) return;
 		const str = this.format(...args);
 		Logger.emit(LOG_LEVEL.ERROR, str);

src/path-events.ts

@@ -52,6 +52,8 @@ export function PES(str: TemplateStringsArray, ...args: any[]) {
 	return PathEvent.toString(paths, <any>methods?.split(''));
 }
 
+export class PathError extends Error { }
+
 /**
  * A  event broken down into its core components for easy processing
  * Event Structure: `module/path/name:property:method`
@@ -67,19 +69,26 @@ export class PathEvent {
 	/** Last sagment of path */
 	name!: string;
 	/** List of methods */
-	methods!: Method[];
+	methods!: ASet<Method>;
+
 	/** All/Wildcard specified */
-	all!: boolean;
+	get all(): boolean { return this.methods.has('*') }
+	set all(v: boolean) { v ? new ASet<Method>(['*']) : this.methods.delete('*'); }
 	/** None specified */
-	none!: boolean;
+	get none(): boolean { return this.methods.has('n') }
+	set none(v: boolean) { v ? this.methods = new ASet<Method>(['n']) : this.methods.delete('n'); }
 	/** Create method specified */
-	create!: boolean;
+	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'); }
 	/** Read method specified */
-	read!: boolean;
+	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'); }
 	/** Update method specified */
-	update!: boolean;
+	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'); }
 	/** Delete method specified */
-	delete!: boolean;
+	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'); }
 
 	constructor(Event: string | PathEvent) {
 		if(typeof Event == 'object') return Object.assign(this, Event);
@@ -94,13 +103,7 @@ export class PathEvent {
 		this.fullPath = p;
 		this.path = temp.join('/');
 		this.name = temp.pop() || '';
-		this.methods = <Method[]>method.split('');
-		this.all = method?.includes('*');
-		this.none = method?.includes('n');
-		this.create = !method?.includes('n') && (method?.includes('*') || method?.includes('w') || method?.includes('c'));
-		this.read = !method?.includes('n') && (method?.includes('*') || method?.includes('r'));
-		this.update = !method?.includes('n') && (method?.includes('*') || method?.includes('w') || method?.includes('u'));
-		this.delete = !method?.includes('n') && (method?.includes('*') || method?.includes('w') || method?.includes('d'));
+		this.methods = new ASet(<any>method.split(''));
 	}
 
 	/**
@@ -172,7 +175,7 @@ export class PathEvent {
 	 * @param has Target must have at least one of these path
 	 */
 	static hasFatal(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): void {
-		if(!PathEvent.has(target, ...has)) throw new Error(`Requires one of: ${makeArray(has).join(', ')}`);
+		if(!PathEvent.has(target, ...has)) throw new PathError(`Requires one of: ${makeArray(has).join(', ')}`);
 	}
 
 	/**
@@ -182,7 +185,7 @@ export class PathEvent {
 	 * @param has Target must have all these paths
 	 */
 	static hasAllFatal(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): void {
-		if(!PathEvent.hasAll(target, ...has)) throw new Error(`Requires all: ${makeArray(has).join(', ')}`);
+		if(!PathEvent.hasAll(target, ...has)) throw new PathError(`Requires all: ${makeArray(has).join(', ')}`);
 	}
 
 	/**