23 changed files with 5891 additions and 995 deletions
--- a/.npmignore
+++ b/.npmignore
@ -1,12 +0,0 @@
 src
 tests
 .editorconfig
 .gitignore
 .gitmodules
 .npmignore
 CODEOWNERS
 Dockerfile
 index.html
 jest.config.js
 tsconfig.json
 vite.config.js
--- 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-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.23.22",
+	"version": "0.17.1",
 	"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": {
@ -34,9 +34,12 @@
 		"typedoc": "^0.26.7",
 		"typescript": "^5.3.3",
 		"vite": "^5.0.12",
-		"vite-plugin-dts": "^4.5.3"
+		"vite-plugin-dts": "^3.7.2"
 	},
 	"files": [
 		"dist"
-	]
+	],
 	"dependencies": {
 		"var-persist": "^1.0.1"
 	}
 }
--- a/src/arg-parser.ts
+++ b/src/arg-parser.ts
@ -1,141 +0,0 @@
 export type Arg<T = any> = {
 	/** Argument/property name */
 	name: string;
 	/** Argument description for help page */
 	desc: string;
 	/** Available shorthands */
 	flags?: string[];
 	/** Argument is not required */
 	optional?: boolean;
 	/** Default value if argument is not used */
 	default?: T;
 	/** Collects any unmatched arguments */
 	extras?: boolean;
 }
 export class ArgParser {
 	commands: ArgParser[] = [];
 	args: Arg[] = [];
 	flags: Arg[] = [];
 	defaults!: {[key: string]: any};
 	/**
 	 * Create a unix-like argument parser to extract flags from the argument list. Can also create help messages.
 	 *
 	 * @param {string} name Script name
 	 * @param {string} desc Help description
 	 * @param {(ArgParser | Arg[]} argList Array of CLI arguments
 	 * @param {string[]} examples Additional examples to display
 	 */
 	constructor(public readonly name: string,
 				public readonly desc: string,
 				public readonly argList: (ArgParser | Arg)[] = [],
 				public readonly examples: string[] = []
 	) {
 		// Arguments
 		this.commands = argList.filter(arg => arg instanceof ArgParser);
 		this.args = <Arg[]>argList.filter(arg => !(arg instanceof ArgParser) && !arg.flags?.length);
 		this.flags = <Arg[]>[...argList.filter(arg => !(arg instanceof ArgParser) && arg.flags && arg.flags.length),
 			{name: 'help', desc: 'Display command\'s help message', flags: ['-h', '--help'], default: false}];
 		this.defaults = argList.reduce((acc, arg: any) => ({...acc, [arg.name]: arg['extras'] ? [] : (arg.default ?? null)}), {});
 		// Examples
 		this.examples = <string[]>[
 			...examples,
 			`[OPTIONS] ${this.args.map(arg => (arg.optional ? `[${arg.name.toUpperCase()}]` : arg.name.toUpperCase()) + (arg.extras ? '...' : '')).join(' ')}`,
 			this.commands.length ? `[OPTIONS] COMMAND` : null,
 			`--help ${this.commands.length ? '[COMMAND]' : ''}`
 		].filter(e => !!e);
 	}
 	/**
 	 * Parse an array into an arguments dictionary using the configuration.
 	 *
 	 * @param {string[]} args Array of arguments to be parsed
 	 * @returns {object} Dictionary of arguments with defaults applied
 	 */
 	parse(args: string[]) {
 		// Parse arguments
 		let extras = [], parsed: any = {...this.defaults, '_error': []}, queue = [...args];
 		while(queue.length) {
 			let arg = queue.splice(0, 1)[0];
 			if(arg[0] == '-') { // Flags
 				// Check for combined shorthand
 				if(arg[1] != '-' && arg.length > 2) {
 					queue = [...arg.substring(2).split('').map(a => `-${a}`), ...queue];
 					arg = `-${arg[1]}`;
 				}
 				// Find & add flag
 				const combined = arg.split('=');
 				const argDef = this.flags.find(flag => flag.flags?.includes(combined[0] || arg));
 				if(argDef == null) { // Not found, add to extras
 					extras.push(arg);
 					continue;
 				}
 				const value = argDef.default === false ? true :
 							  argDef.default === true ? false :
 							  queue.splice(queue.findIndex(q => q[0] != '-'), 1)[0] ||
 							  argDef.default;
 				if(value == null) parsed['_error'].push(`Option missing value: ${argDef.name || combined[0]}`);
 				parsed[argDef.name] = value;
 			} else { // Command
 				const c = this.commands.find(command => command.name == arg);
 				if(!!c) {
 					const parsedCommand = c.parse(queue.splice(0, queue.length));
 					Object.keys(parsedCommand).forEach(key => {
 						if(parsed[key] != parsedCommand[key] && parsedCommand[key] == c.defaults[key])
 							delete parsedCommand[key];
 					});
 					parsed = {
 						...parsed,
 						...parsedCommand,
 						_command: c.name
 					};
 				} else extras.push(arg); // Not found, add to extras
 			}
 		}
 		// Arguments
 		this.args.filter(arg => !arg.extras).forEach(arg => {
 			if(!arg.optional && !extras.length) parsed['_error'].push(`Argument missing: ${arg.name.toUpperCase()}`);
 			if(extras.length) parsed[arg.name] = extras.splice(0, 1)[0];
 		});
 		// Extras
 		const extraKey = this.args.find(arg => arg.extras)?.name || '_extra';
 		parsed[extraKey] = extras;
 		return parsed;
 	}
 	/**
 	 * Create help message from the provided description & argument list.
 	 *
 	 * @returns {string} Help message
 	 * @param opts Help options: command - display a commands help, message - override help description
 	 */
 	help(opts: {command?: string, message?: string} = {}): string {
 		const spacer = (text: string) => Array(24 - text.length || 1).fill(' ').join('');
 		// Help with specific command
 		if(opts.command) {
 			const argParser = this.commands.find(parser => parser.name == opts.command);
 			if(!argParser) throw new Error(`${opts.command.toUpperCase()} is not a command`)
 			return argParser.help({...opts, command: undefined});
 		}
 		// Description
 		let msg = `\n\n${opts.message || this.desc}`;
 		// Examples
 		msg += '\n\nUsage:\t' + this.examples.map(ex => `${this.name} ${ex}`).join('\n\t');
 		// Arguments
 		if(this.args.length) msg += '\n\n\t' + this.args.map(arg =>
 			`${arg.name.toUpperCase()}${spacer(arg.name)}${arg.desc}`).join('\n\t');
 		// Flags
 		msg += '\n\nOptions:\n\t' + this.flags.map(flag => {
 			const flags = flag.flags?.join(', ') || '';
 			return `${flags}${spacer(flags)}${flag.desc}`;
 		}).join('\n\t');
 		// Commands
 		if(this.commands.length) msg += '\n\nCommands:\n\t' + this.commands.map(command =>
 			`${command.name}${spacer(command.name)}${command.desc}`).join('\n\t');
 		return `${msg}\n\n`;
 	}
 }
--- a/src/aset.ts
+++ b/src/aset.ts
@ -1,5 +1,3 @@
 import {isEqual} from './objects.ts';
 /**
 * An array which functions as a set. It guarantees unique elements
 * and provides set functions for comparisons
@ -21,24 +19,20 @@ export class ASet<T> extends Array {
 	}
 	/**
-	 * Add elements to set if unique
+	 * Add single element to set if unique
-	 * @param items
+	 * @param {T} el Element to add
 	 */
-	add(...items: T[]) {
+	add(el: T) {
-		items.filter(el => !this.has(el)).forEach(el => this.push(el));
+		if(!this.has(el)) this.push(el);
 		return this;
 	}
 	/**
-	 * Delete elements from set
+	 * Delete element from set
-	 * @param items Elements that will be deleted
+	 * @param {T} el Element that will be deleted
 	 */
-	delete(...items: T[]) {
+	delete(el: T) {
 		items.forEach(el => {
 		const index = this.indexOf(el);
-			if(index != -1) this.splice(index, 1);
+		if(index != -1) this.slice(index, 1);
 		})
 		return this;
 	}
 	/**
@ -59,17 +53,6 @@ export class ASet<T> extends Array {
 		return this.indexOf(el) != -1;
 	}
 	/**
 	 * Find index number of element, or -1 if it doesn't exist. Matches by equality not reference
 	 *
 	 * @param {T} search Element to find
 	 * @param {number} fromIndex Starting index position
 	 * @return {number} Element index number or -1 if missing
 	 */
 	indexOf(search: T, fromIndex?: number): number {
 		return super.findIndex((el: T) => isEqual(el, search), fromIndex);
 	}
 	/**
 	 * Create list of elements this set has in common with the comparison set
 	 * @param {ASet<T>} set Set to compare against
--- a/src/cache.ts
+++ b/src/cache.ts
@ -1,14 +1,3 @@
 import {deepCopy} from './objects.ts';
 export type CacheOptions = {
 	/** Delete keys automatically after x amount of seconds */
 	ttl?: number;
 	/** Storage to persist cache */
 	storage?: Storage;
 	/** Key cache will be stored under */
 	storageKey?: string;
 }
 /**
 * Map of data which tracks whether it is a complete collection & offers optional expiry of cached values
 */
@ -24,26 +13,17 @@ 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
+	 * @param {number} ttl Default expiry in milliseconds
 	 */
-	constructor(public readonly key?: keyof T, public readonly options: CacheOptions = {}) {
+	constructor(public readonly key?: keyof T, public ttl?: number) {
 		if(options.storageKey && !options.storage && typeof(Storage) !== 'undefined')
 			options.storage = localStorage;
 		if(options.storageKey && options.storage) {
 			const stored = options.storage.getItem(options.storageKey);
 			if(stored) {
 				try { Object.assign(this.store, JSON.parse(stored)); }
 				catch { }
 			}
 		}
 		return new Proxy(this, {
 			get: (target: this, prop: string | symbol) => {
 				if (prop in target) return (target as any)[prop];
-				return deepCopy(target.store[prop as K]);
+				return target.store[prop as K];
 			},
 			set: (target: this, prop: string | symbol, value: any) => {
 				if (prop in target) (target as any)[prop] = value;
-				else this.set(prop as K, value);
+				else target.store[prop as K] = value;
 				return true;
 			}
 		});
@ -60,7 +40,7 @@ export class Cache<K extends string | number | symbol, T> {
 	 * @return {T[]} Array of items
 	 */
 	all(): T[] {
-		return deepCopy(Object.values(this.store));
+		return Object.values(this.store);
 	}
 	/**
@ -89,13 +69,6 @@ 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
 	 *
@ -103,8 +76,6 @@ 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.store));
 	}
 	/**
@ -121,7 +92,7 @@ export class Cache<K extends string | number | symbol, T> {
 	 * @return {T} Cached item
 	 */
 	get(key: K): T {
-		return deepCopy(this.store[key]);
+		return this.store[key];
 	}
 	/**
@ -139,7 +110,7 @@ export class Cache<K extends string | number | symbol, T> {
 	 * @return {Record<K, T>}
 	 */
 	map(): Record<K, T> {
-		return deepCopy(this.store);
+		return structuredClone(this.store);
 	}
 	/**
@ -147,17 +118,15 @@ export class Cache<K extends string | number | symbol, T> {
 	 *
 	 * @param {K} key Key item will be cached under
 	 * @param {T} value Item to cache
-	 * @param {number | undefined} ttl Override default expiry in seconds
+	 * @param {number | undefined} ttl Override default expiry
 	 * @return {this}
 	 */
-	set(key: K, value: T, ttl = this.options.ttl): this {
+	set(key: K, value: T, ttl = this.ttl): this {
 		this.store[key] = value;
 		if(this.options.storageKey && this.options.storage)
 			this.options.storage.setItem(this.options.storageKey, JSON.stringify(this.store));
 		if(ttl) setTimeout(() => {
 			this.complete = false;
 			this.delete(key);
-		}, ttl * 1000);
+		}, ttl);
 		return this;
 	}
--- a/src/color.ts
+++ b/src/color.ts
@ -1,12 +0,0 @@
 /**
 * Determine if either black or white provides more contrast to the provided color
 * @param {string} background Color to compare against
 * @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);
 	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;
 	return luminance > 0.5 ? 'black' : 'white';
 }
--- a/src/csv.ts
+++ b/src/csv.ts
@ -1,87 +1,25 @@
-import {makeArray} from './array.ts';
+import {dotNotation, flattenObj} from './objects.ts';
 import {ASet} from './aset.ts';
 import {dotNotation, flattenObj, JSONSanitize} from './objects.ts';
 import {LETTER_LIST} from './string.ts';
 /**
- * Parse a CSV string into an array of objects
+ * Convert an object to a CSV string
 *
 * @param csv String with CSV
 * @param hasHeaders First line of CSV contains headers
 * @return {T[]} Array of parsed objects
 */
 export function fromCsv<T = any>(csv: string, hasHeaders = true): T[] {
 	function parseLine(line: string): (string | null)[] {
 		const columns: string[] = [];
 		let current = '', inQuotes = false;
 		for (let i = 0; i < line.length; i++) {
 			const char = line[i];
 			const nextChar = line[i + 1];
 			if (char === '"') {
 				if (inQuotes && nextChar === '"') {
 					current += '"'; // Handle escaped quotes
 					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((_, i) => {
 			let letter = '';
 			const first = i / 26;
 			if (first > 1) letter += LETTER_LIST[Math.floor(first - 1)];
 			letter += LETTER_LIST[i % 26];
 			return letter;
 		}));
 		return h.reduce((acc: any, h: any, i: number) => {
 			dotNotation(acc, h, props[i]);
 			return acc;
 		}, {});
 	});
 }
 /**
 * 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 csv(target: any[], flatten=true) {
-	const t = makeArray(target);
+	const headers = target.reduce((acc, row) => {
-	const headers = new ASet(t.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
+		Object.keys(flatten ? flattenObj(row) : row)
 			.forEach(key => { if(!acc.includes(key)) acc.push(key); });
 		return acc;
 	}, []);
 	return [
 		headers.join(','),
-		...t.map(row => headers.map((h: string) => {
+		...target.map(row => headers.map((h: string) => {
 			const value = dotNotation<any>(row, h);
-			if(value == null) return '';
+			const type = typeof value;
-			if(typeof value == 'object') return `"${JSONSanitize(value).replaceAll('"', '""')}"`;
+			if(type == 'string' && value.includes(',')) return `"${value}"`;
-			if(typeof value == 'string' &&  /[\n",]/g.test(value)) return `"${value.replaceAll('"', '""')}"`;
+			if(type == 'object') return `"${JSON.stringify(value)}"`;
 			return value;
 		}).join(','))
 	].join('\n');
--- a/src/emitter.ts
+++ b/src/emitter.ts
@ -1,33 +1,33 @@
-export type TypedListener = (...args: any[]) => any;
+export type Listener = (...args: any[]) => any;
-export type TypedEvents = {[k in string | symbol]: TypedListener} & {'*': (event: string, ...args: any[]) => any};
+export type TypedEvents = {[k in string | symbol]: Listener} & {'*': (event: string, ...args: any[]) => any};
 export type NamespaceEvents<Namespace extends string, Events extends TypedEvents> = {
 	[K in keyof Events as `${Namespace}:${Extract<K, string>}`]: Events[K];
 };
 export class TypedEmitter<T extends TypedEvents = TypedEvents> {
-	private static listeners: {[key: string]: TypedListener[]} = {};
+	private static listeners: {[key: string]: Listener[]} = {};
-	private listeners: { [key in keyof T]?: TypedListener[] } = {};
+	private listeners: { [key in keyof T]?: Listener[] } = {};
 	static emit(event: any, ...args: any[]) {
 		(this.listeners['*'] || []).forEach(l => l(event, ...args));
 		(this.listeners[event.toString()] || []).forEach(l => l(...args));
 	};
-	static off(event: any, listener: TypedListener) {
+	static off(event: any, listener: Listener) {
 		const e = event.toString();
 		this.listeners[e] = (this.listeners[e] || []).filter(l => l === listener);
 	}
-	static on(event: any, listener: TypedListener) {
+	static on(event: any, listener: Listener) {
 		const e = event.toString();
 		if(!this.listeners[e]) this.listeners[e] = [];
 		this.listeners[e]?.push(listener);
 		return () => this.off(event, listener);
 	}
-	static once(event: any, listener?: TypedListener): Promise<any> {
+	static once(event: any, listener?: Listener): Promise<any> {
 		return new Promise(res => {
 			const unsubscribe = this.on(event, <any>((...args: any) => {
 				res(args.length == 1 ? args[0] : args);
--- a/src/errors.ts
+++ b/src/errors.ts
@ -180,6 +180,7 @@ export class GatewayTimeoutError extends CustomError {
 * @return {CustomError} The proper error type
 */
 export function errorFromCode(code: number, message?: string) {
 	if(code >= 200 && code < 300) return null;
 	switch(code) {
 		case 400:
 			return new BadRequestError(message);
--- a/src/files.ts
+++ b/src/files.ts
@ -1,7 +1,6 @@
 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
@ -53,21 +52,6 @@ export function fileBrowser(options: {accept?: string, multiple?: boolean} = {})
 	});
 }
 /**
 * Extract text from a file
 *
 * @param file File to extract text from
 * @return {Promise<string | null>} File contents
 */
 export function fileText(file: any): Promise<string | null> {
 	return new Promise((resolve, reject) => {
 		const reader = new FileReader();
 		reader.onload = () => resolve(<string>reader.result);
 		reader.onerror = () => reject(reader.error);
 		reader.readAsText(file);
 	});
 }
 /**
 * Create timestamp intended for filenames from a date
 *
@ -77,7 +61,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:ss', 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')}`;
 	return name ? name.replace('{{TIMESTAMP}}', timestamp) : timestamp;
 }
--- a/src/http.ts
+++ b/src/http.ts
@ -22,28 +22,6 @@ 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} = {};
@ -76,9 +54,8 @@ 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 || '');
+		let url = (opts.url?.startsWith('http') ? opts.url : (this.url || '') + (opts.url || '')).replace(/([^:]\/)\/+/g, '$1');
-		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]}))
@ -98,7 +75,6 @@ export class Http {
 		// Send request
 		return new PromiseProgress((res, rej, prog) => {
 			try {
 			fetch(url, {
 				headers,
 				method: opts.method || (opts.body ? 'POST' : 'GET'),
@ -128,21 +104,18 @@ export class Http {
 					}
 				});
-					resp = new HttpResponse<T>(resp, stream);
+				resp.data = new Response(stream);
-					if(opts.decode !== false) {
+				if(opts.decode == null || opts.decode) {
 					const content = resp.headers.get('Content-Type')?.toLowerCase();
-						if(content?.includes('form')) resp.data = <T>await resp.formData();
+					if(content?.includes('form')) resp.data = <T>await resp.data.formData();
-						else if(content?.includes('json')) resp.data = <T>await resp.json();
+					else if(content?.includes('json')) resp.data = <T>await resp.data.json();
-						else if(content?.includes('text')) resp.data = <T>await resp.text();
+					else if(content?.includes('text')) resp.data = <T>await resp.data.text();
-						else if(content?.includes('application')) resp.data = <T>await resp.blob();
+					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);
 			}
 		});
 	}
 }
--- a/src/index.ts
+++ b/src/index.ts
@ -1,8 +1,6 @@
 export * from './arg-parser';
 export * from './array';
 export * from './aset';
 export * from './cache';
 export * from './color';
 export * from './csv';
 export * from './files';
 export * from './emitter';
@ -13,9 +11,8 @@ export * from './logger';
 export * from './math';
 export * from './misc';
 export * from './objects';
 export * from './path-events';
 export * from './promise-progress';
 export * from './search';
 export * from './string';
 export * from './time';
 export * from './types';
 export * from 'var-persist';
--- a/src/logger.ts
+++ b/src/logger.ts
@ -1,5 +1,4 @@
 import {TypedEmitter, TypedEvents} from './emitter';
 import {JSONSanitize} from './objects.ts';
 export const CliEffects = {
 	CLEAR: "\x1b[0m",
@ -65,41 +64,49 @@ export class Logger extends TypedEmitter<LoggerEvents> {
 		super();
 	}
-	protected format(...text: any[]): string {
+	private pad(text: any, length: number, char: string, end = false) {
-		const now = new Date();
+		const t = text.toString();
-		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')}`;
+		const l = length - t.length;
-		return `${timestamp}${this.namespace ? ` [${this.namespace}]` : ''} ${text.map(t => typeof t == 'string' ? t : JSONSanitize(t, 2)).join(' ')}`;
+		if(l <= 0) return t;
 		const padding = Array(~~(l / char.length)).fill(char).join('');
 		return !end ? padding + t : t + padding;
 	}
-	debug(...args: any[]) {
+	private format(...text: string[]): 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(' ')}`;
 	}
 	debug(...args: string[]) {
 		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: any[]) {
+	log(...args: string[]) {
 		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: any[]) {
+	info(...args: string[]) {
 		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: any[]) {
+	warn(...args: string[]) {
 		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: any[]) {
+	error(...args: string[]) {
 		if(Logger.LOG_LEVEL < LOG_LEVEL.ERROR) return;
 		const str = this.format(...args);
 		Logger.emit(LOG_LEVEL.ERROR, str);
--- a/src/misc.ts
+++ b/src/misc.ts
@ -1,4 +1,3 @@
 import {PathEvent} from './path-events.ts';
 import {md5} from './string';
 /**
@ -12,16 +11,3 @@ export function gravatar(email: string, def='mp') {
 	if(!email) return '';
 	return `https://www.gravatar.com/avatar/${md5(email)}?d=${def}`;
 }
 /**
 * 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, '\\$&');
 }
 export type Listener = (event: PathEvent, ...args: any[]) => any;
 export type Unsubscribe = () => void;
--- a/src/objects.ts
+++ b/src/objects.ts
@ -29,10 +29,10 @@ export function clean<T>(obj: T, undefinedOnly = false): Partial<T> {
 * Should be replaced by `structuredClone` once released.
 * @param {T} value Object to copy
 * @returns {T} Type
 * @deprecated Please use `structuredClone`
 */
 export function deepCopy<T>(value: T): T {
-	try {return structuredClone(value); }
+	return structuredClone(value);
 	catch { return JSON.parse(JSONSanitize(value)); }
 }
 /**
@ -91,6 +91,7 @@ export function dotNotation<T>(obj: any, prop: string, set?: T): T | undefined {
 	}, obj);
 }
 /**
 * Convert object into URL encoded query string
 *
@ -127,9 +128,8 @@ export function encodeQuery(data: any): string {
 export function flattenObj(obj: any, parent?: any, result: any = {}) {
 	if(typeof obj === "object" && !Array.isArray(obj)) {
 		for(const key of Object.keys(obj)) {
-			const propName = parent ? `${parent}.${key}` : key;
+			const propName = parent ? parent + '.' + key : key;
-			if(typeof obj[key] === 'object' && obj[key] != null && !Array.isArray(obj[key])) {
+			if(typeof obj[key] === 'object') {
 				console.log(propName, );
 				flattenObj(obj[key], propName, result);
 			} else {
 				result[propName] = obj[key];
@ -216,25 +216,14 @@ export function mixin(target: any, constructors: any[]) {
 /**
 * Parse JSON but return the original string if it fails
 *
- * @param {any} json JSON string to parse
+ * @param {string} json JSON string to parse
 * @return {string | T} Object if successful, original string otherwise
 */
-export function JSONAttemptParse<T1, T2>(json: T2): T1 | T2 {
+export function JSONAttemptParse<T>(json: string): T | string {
-	try { return JSON.parse(<any>json); }
+	try { return JSON.parse(json); }
 	catch { return json; }
 }
 /**
 * Stringifies objects & skips primitives
 *
 * @param {any} obj Object to convert to serializable value
 * @return {string | T} Serialized value
 */
 export function JSONSerialize<T1>(obj: T1): T1 | string {
 	if(typeof obj == 'object' && obj != null) return JSONSanitize(obj);
 	return obj;
 }
 /**
 * Convert an object to a JSON string avoiding any circular references.
 *
@ -245,8 +234,10 @@ export function JSONSerialize<T1>(obj: T1): T1 | string {
 export function JSONSanitize(obj: any, space?: number): string {
 	let cache: any[] = [];
 	return JSON.stringify(obj, (key, value) => {
-		if(typeof value === 'object' && value !== null)
+		if (typeof value === 'object' && value !== null) {
-			if(!cache.includes(value)) cache.push(value);
+			if (cache.includes(value)) return;
 			cache.push(value);
 		}
 		return value;
 	}, space);
 }
--- a/src/path-events.ts
+++ b/src/path-events.ts
@ -1,280 +0,0 @@
 import {makeArray} from './array.ts';
 import {ASet} from './aset.ts';
 /**
 * Available methods:
 * * - All/Wildcard
 * n - None
 * c - Create
 * r - Read
 * u - Update
 * d - Delete
 * x - Execute
 */
 export type Method = '*' | 'n' | 'c' | 'r' | 'u' | 'd' | 'x';
 /**
 * Shorthand for creating Event from a string
 *
 * @example
 * ```ts
 * const event: Event = PE`users/system:*`;
 * ```
 *
 * @param {TemplateStringsArray} str String that will be parsed into Event
 * @param {string} args
 * @return {PathEvent} Event object
 */
 export function PE(str: TemplateStringsArray, ...args: any[]) {
 	const combined = [];
 	for(let i = 0; i < str.length || i < args.length; i++) {
 		if(str[i]) combined.push(str[i]);
 		if(args[i]) combined.push(args[i]);
 	}
 	return new PathEvent(combined.join(''));
 }
 /**
 * Shorthand for creating Event strings, ensures paths are correct
 *
 * @param {TemplateStringsArray} str
 * @param {string} args
 * @return {string}
 * @constructor
 */
 export function PES(str: TemplateStringsArray, ...args: any[]) {
 	let combined = [];
 	for(let i = 0; i < str.length || i < args.length; i++) {
 		if(str[i]) combined.push(str[i]);
 		if(args[i]) combined.push(args[i]);
 	}
 	const [paths, methods] = combined.join('').split(':');
 	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`
 * Example: `users/system:crud` or `storage/some/path/file.txt:r`
 */
 export class PathEvent {
 	/** First directory in path */
 	module!: string;
 	/** Entire path, including the module & name */
 	fullPath!: string;
 	/** Path including the name, excluding the module */
 	path!: string;
 	/** Last sagment of path */
 	name!: string;
 	/** List of methods */
 	methods!: ASet<Method>;
 	/** All/Wildcard specified */
 	get all(): boolean { return this.methods.has('*') }
 	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'); }
 	/** 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'); }
 	/** 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'); }
 	/** 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'); }
 	/** 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'); }
 	constructor(Event: string | PathEvent) {
 		if(typeof Event == 'object') return Object.assign(this, Event);
 		let [p, scope, method] = Event.replaceAll(/\/{2,}/g, '/').split(':');
 		if(!method) method = scope || '*';
 		if(p == '*' || !p && method == '*') {
 			p = '';
 			method = '*';
 		}
 		let temp = p.split('/').filter(p => !!p);
 		this.module = temp.splice(0, 1)[0]?.toLowerCase() || '';
 		this.fullPath = p;
 		this.path = temp.join('/');
 		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
 	 * combined until a "none" is reached
 	 *
 	 * @param {string | PathEvent} paths Events as strings or pre-parsed
 	 * @return {PathEvent} Final combined permission
 	 */
 	static combine(...paths: (string | PathEvent)[]): PathEvent {
 		let hitNone = false;
 		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);
 			}).reduce((acc, p) => {
 				if(p.none) hitNone = true;
 				if(!acc) return p;
 				if(hitNone) return acc;
 				acc.methods = [...acc.methods, ...p.methods];
 				return acc;
 			}, <any>null);
 		combined.methods = new ASet<Method>(combined.methods);
 		return combined;
 	}
 	/**
 	 * Filter a set of paths based on the target
 	 *
 	 * @param {string | PathEvent | (string | PathEvent)[]} target Array of events that will filtered
 	 * @param filter {...PathEvent} Must container one of
 	 * @return {boolean} Whether there is any overlap
 	 */
 	static filter(target: string | PathEvent | (string | PathEvent)[], ...filter: (string | PathEvent)[]): PathEvent[] {
 		const parsedTarget = makeArray(target).map(pe => new PathEvent(pe));
 		const parsedFind = makeArray(filter).map(pe => new PathEvent(pe));
 		return parsedTarget.filter(t => {
 			if(!t.fullPath && t.all) return true;
 			return !!parsedFind.find(f =>
 				(t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) &&
 				(f.all || t.all || t.methods.intersection(f.methods).length));
 		});
 	}
 	/**
 	 * Squash 2 sets of paths & return true if any overlap is found
 	 *
 	 * @param {string | PathEvent | (string | PathEvent)[]} target Array of Events as strings or pre-parsed
 	 * @param has Target must have at least one of these path
 	 * @return {boolean} Whether there is any overlap
 	 */
 	static has(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): boolean {
 		const parsedRequired = makeArray(has).map(pe => new PathEvent(pe));
 		const parsedTarget = makeArray(target).map(pe => new PathEvent(pe));
 		return !!parsedRequired.find(r => {
 			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;
 		});
 	}
 	/**
 	 * Squash 2 sets of paths & return true if the target has all paths
 	 *
 	 * @param {string | PathEvent | (string | PathEvent)[]} target Array of Events as strings or pre-parsed
 	 * @param has Target must have all these paths
 	 * @return {boolean} Whether there is any overlap
 	 */
 	static hasAll(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): boolean {
 		return has.filter(h => PathEvent.has(target, h)).length == has.length;
 	}
 	/**
 	 * Same as `has` but raises an error if there is no overlap
 	 *
 	 * @param {string | string[]} target Array of Events as strings or pre-parsed
 	 * @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 PathError(`Requires one of: ${makeArray(has).join(', ')}`);
 	}
 	/**
 	 * Same as `hasAll` but raises an error if the target is missing any paths
 	 *
 	 * @param {string | string[]} target Array of Events as strings or pre-parsed
 	 * @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 PathError(`Requires all: ${makeArray(has).join(', ')}`);
 	}
 	/**
 	 * 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('/');
 		p = p?.trim().replaceAll(/\/{2,}/g, '/').replaceAll(/(^\/|\/$)/g, '');
 		if(methods?.length) p += `:${makeArray(methods).map(m => m.toLowerCase()).join('')}`;
 		return p;
 	}
 	/**
 	 * Filter a set of paths based on this event
 	 *
 	 * @param {string | PathEvent | (string | PathEvent)[]} target Array of events that will filtered
 	 * @return {boolean} Whether there is any overlap
 	 */
 	filter(target: string | PathEvent | (string | PathEvent)[]): PathEvent[] {
 		return PathEvent.filter(target, this);
 	}
 	/**
 	 * Create  event string from its components
 	 *
 	 * @return {string} String representation of Event
 	 */
 	toString() {
 		return PathEvent.toString(this.fullPath, this.methods);
 	}
 }
 export type PathListener = (event: PathEvent, ...args: any[]) => any;
 export type PathUnsubscribe = () => void;
 export interface IPathEventEmitter {
 	emit(event: string, ...args: any[]): void;
 	off(listener: PathListener): void;
 	on(event: string, listener: PathListener): PathUnsubscribe;
 	once(event: string, listener?: PathListener): Promise<any>;
 	relayEvents(emitter: PathEventEmitter): void;
 }
 /**
 * Event emitter that uses paths allowing listeners to listen to different combinations of modules, paths & methods
 */
 export class PathEventEmitter implements IPathEventEmitter{
 	private listeners: [PathEvent, PathListener][] = [];
 	emit(event: string | PathEvent, ...args: any[]) {
 		const parsed = new PathEvent(event);
 		this.listeners.filter(l => PathEvent.has(l[0], event))
 			.forEach(async l => l[1](parsed, ...args));
 	};
 	off(listener: PathListener) {
 		this.listeners = this.listeners.filter(l => l[1] != listener);
 	}
 	on(event: string | string[], listener: PathListener): PathUnsubscribe {
 		makeArray(event).forEach(e => this.listeners.push([new PathEvent(e), listener]));
 		return () => this.off(listener);
 	}
 	once(event: string | string[], listener?: PathListener): Promise<any> {
 		return new Promise(res => {
 			const unsubscribe = this.on(event, (event: PathEvent, ...args: any[]) => {
 				res(args.length < 2 ? args[0] : args);
 				if(listener) listener(event, ...args);
 				unsubscribe();
 			});
 		});
 	}
 	relayEvents(emitter: IPathEventEmitter) {
 		emitter.on('*', (event, ...args) => this.emit(event, ...args));
 	}
 }
--- a/src/search.ts
+++ b/src/search.ts
@ -1,38 +0,0 @@
 import {dotNotation, JSONAttemptParse} from './objects';
 export function search(rows: any[], search: string, regex?: boolean, transform: Function = (r: any) => r) {
 	if(!rows) return [];
 	return rows.filter(r => {
 		// Empty search
 		const value = transform(r);
 		if(!search) return true;
 		// Regex search
 		if(regex) {
 			return !!Object.values(value).filter((v: any) => {
 				try { return RegExp(search, 'gm').test(v.toString()); }
 				catch { return false; }
 			}).length
 		}
 		// 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);
 			return and.filter(p => {
 				// Boolean operator
 				const prop = /(\w+)\s*(==?|!=|>=|>|<=|<)\s*(\w+)/g.exec(p);
 				if(prop) {
 					const a = JSON.stringify(JSONAttemptParse(dotNotation<any>(value, prop[1])));
 					const operator = prop[2] == '=' ? '==' : prop[2];
 					const b = JSON.stringify(JSONAttemptParse(prop[3]));
 					return eval(`${a} ${operator} ${b}`);
 				}
 				// Case-sensitive
 				const v = Object.values(value).join('');
 				if(/[A-Z]/g.test(search)) return v.includes(p);
 				// Case-insensitive
 				return v.toLowerCase().includes(p);
 			}).length == and.length;
 		})
 	});
 }
--- a/src/string.ts
+++ b/src/string.ts
@ -1,30 +1,24 @@
 import {dotNotation, flattenObj} from './objects.ts';
 /**
 * String of all letters
 */
-export const LETTER_LIST = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+const LETTER_LIST = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 /**
 * String of all numbers
 */
-export const NUMBER_LIST = '0123456789';
+const NUMBER_LIST = '0123456789';
 /**
 * String of all symbols
 */
-export const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
+const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
 /**
 * String of all letters, numbers & symbols
 */
-export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST + SYMBOL_LIST;
+const CHAR_LIST = LETTER_LIST + 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
@ -50,7 +44,7 @@ export function formatBytes(bytes: number, decimals = 2) {
 export function formatPhoneNumber(number: string) {
 	const parts = /(\+?1)?.*?(\d{3}).*?(\d{3}).*?(\d{4})/g.exec(number);
 	if(!parts) throw new Error(`Number cannot be parsed: ${number}`);
-	return `${parts[1] ? '+1' : ''} (${parts[2]}) ${parts[3]}-${parts[4]}`.trim();
+	return `${parts[1] ?? ''} (${parts[2]}) ${parts[3]}-${parts[4]}`.trim();
 }
 /**
@ -66,23 +60,11 @@ export function formatPhoneNumber(number: string) {
 * @param {string} str - Value that will be injected to parent
 * @param {number} index - Position to inject string at
 * @returns {string} - New string
 * @deprecated use `strSplice()`
 */
 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
 *
@ -105,18 +87,6 @@ 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
 *
@ -180,32 +150,6 @@ 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)
 *
 * @param {string} str String that will be modified
 * @param {number} start Start index of splice
 * @param {number} deleteCount Number of characters to remove in splice
 * @param {string} insert Insert new string into splice
 * @return {string} Returned spliced string
 */
 export function strSplice(str: string, start: number, deleteCount: number, insert = '') {
 	const before = str.slice(0, start);
 	const after = str.slice(start + deleteCount);
 	return before + insert + after;
 }
 /**
 * Find all substrings that match a given pattern.
 *
@ -251,7 +195,6 @@ export type ParsedUrl = {
 *
 * @param {string} url URL string that will be parsed
 * @returns {RegExpExecArray} Parts of URL
 * @deprecated Use built-in URL object: `new URL('...')`;
 */
 export function parseUrl(url: string): ParsedUrl {
 	const processed = new RegExp(
--- a/src/time.ts
+++ b/src/time.ts
@ -1,151 +1,17 @@
 /**
- * Like setInterval but will adjust the timeout value to account for runtime
+ * Return date formated highest to lowest: YYYY-MM-DD H:mm AM
 * @param {Function} cb Callback function that will be ran
 * @param {number} ms Run function ever x seconds
 * @return {() => void}
 */
 export function adjustedInterval(cb: Function, ms: number) {
 	let cancel = false, timeout: any = null;
 	const p = async () => {
 		if (cancel) return;
 		const start = new Date().getTime();
 		await cb();
 		const end = new Date().getTime();
 		timeout = setTimeout(() => p(), ms - (end - start) || 1);
 	};
 	p();
 	return () => {
 		cancel = true;
 		if(timeout) clearTimeout(timeout);
 	}
 }
 /**
 * Format date
 *
- * @param {string} format How date string will be formatted, default: `YYYY-MM-DD H:mm A`
+ * @param {Date | number | string} date Date or timestamp to convert to string
 * @param {Date | number | string} date Date or timestamp, defaults to now
 * @param tz Set timezone offset
 * @return {string} Formated date
 */
-export function formatDate(format = 'YYYY-MM-DD H:mm', date: Date | number | string = new Date(), tz?: string | number): string {
+export function formatDate(date: Date | number | string): string {
 	const timezones = [
 		['IDLW', -12],
 		['SST', -11],
 		['HST', -10],
 		['AKST', -9],
 		['PST', -8],
 		['MST', -7],
 		['CST', -6],
 		['EST', -5],
 		['AST', -4],
 		['BRT', -3],
 		['MAT', -2],
 		['AZOT', -1],
 		['UTC', 0],
 		['CET', 1],
 		['EET', 2],
 		['MSK', 3],
 		['AST', 4],
 		['PKT', 5],
 		['IST', 5.5],
 		['BST', 6],
 		['ICT', 7],
 		['CST', 8],
 		['JST', 9],
 		['AEST', 10],
 		['SBT', 11],
 		['FJT', 12],
 		['TOT', 13],
 		['LINT', 14]
 	];
 	function adjustTz(date: Date, gmt: number) {
 		const currentOffset = date.getTimezoneOffset();
 		const adjustedOffset = gmt * 60;
 		return new Date(date.getTime() + (adjustedOffset + currentOffset) * 60000);
 	}
 	function day(num: number): string {
 		return ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][num] || 'Unknown';
 	}
 	function doy(date: Date) {
 		const start = new Date(`${date.getFullYear()}-01-01 0:00:00`);
 		return Math.ceil((date.getTime() - start.getTime()) / (1000 * 60 * 60 * 24));
 	}
 	function month(num: number): string {
 		return ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'][num] || 'Unknown';
 	}
 	function suffix(num: number) {
 		if (num % 100 >= 11 && num % 100 <= 13) return `${num}th`;
 		switch (num % 10) {
 			case 1: return `${num}st`;
 			case 2: return `${num}nd`;
 			case 3: return `${num}rd`;
 			default: return `${num}th`;
 		}
 	}
 	function tzOffset(offset: number) {
 		const hours = ~~(offset / 60);
 		const minutes = offset % 60;
 		return (offset > 0 ? '-' : '') + `${hours}:${minutes.toString().padStart(2, '0')}`;
 	}
 	if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
-
+	let hours = date.getHours(), postfix = 'AM';
-	// Handle timezones
+	if(hours >= 12) {
-	let t!: [string, number];
+		if(hours > 12) hours -= 12;
-	if(tz == null) tz = -(date.getTimezoneOffset() / 60);
+		postfix = 'PM';
-	t = <any>timezones.find(t => isNaN(<any>tz) ? t[0] == tz : t[1] == tz);
+	} else if(hours == 0) hours = 12;
-	if(!t) throw new Error(`Unknown timezone: ${tz}`);
+	return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}, ${hours}:${date.getMinutes().toString().padStart(2, '0')} ${postfix}`;
 	date = adjustTz(date, t[1]);
 	// Token mapping
 	const tokens: Record<string, string> = {
 		'YYYY': date.getFullYear().toString(),
 		'YY': date.getFullYear().toString().slice(2),
 		'MMMM': month(date.getMonth()),
 		'MMM': month(date.getMonth()).slice(0, 3),
 		'MM': (date.getMonth() + 1).toString().padStart(2, '0'),
 		'M': (date.getMonth() + 1).toString(),
 		'DDD': doy(date).toString(),
 		'DD': date.getDate().toString().padStart(2, '0'),
 		'Do': suffix(date.getDate()),
 		'D': date.getDate().toString(),
 		'dddd': day(date.getDay()),
 		'ddd': day(date.getDay()).slice(0, 3),
 		'HH': date.getHours().toString().padStart(2, '0'),
 		'H': date.getHours().toString(),
 		'hh': (date.getHours() % 12 || 12).toString().padStart(2, '0'),
 		'h': (date.getHours() % 12 || 12).toString(),
 		'mm': date.getMinutes().toString().padStart(2, '0'),
 		'm': date.getMinutes().toString(),
 		'ss': date.getSeconds().toString().padStart(2, '0'),
 		's': date.getSeconds().toString(),
 		'SSS': date.getMilliseconds().toString().padStart(3, '0'),
 		'A': date.getHours() >= 12 ? 'PM' : 'AM',
 		'a': date.getHours() >= 12 ? 'pm' : 'am',
 		'ZZ': tzOffset(t[1] * 60).replace(':', ''),
 		'Z': tzOffset(t[1] * 60),
 		'z': typeof tz == 'string' ? tz : (<any>t)[0]
 	};
 	return format.replace(/YYYY|YY|MMMM|MMM|MM|M|DDD|DD|Do|D|dddd|ddd|HH|H|hh|h|mm|m|ss|s|SSS|A|a|ZZ|Z|z/g, token => tokens[token]);
 }
 /**
 * Run a function immediately & repeat every x ms
 *
 * @param {() => any} fn Callback function
 * @param {number} interval Repeat in ms
 * @return {number} Clear Interval ID
 */
 export function instantInterval(fn: () => any, interval: number) {
 	fn();
 	return setInterval(fn, interval);
 }
 /**
@ -170,14 +36,14 @@ export function sleep(ms: number): Promise<void> {
 * ```js
 * let loading = true;
 * setTimeout(() => wait = false, 1000);
- * await sleepWhile(() => loading); // Won't continue until loading flag is false
+ * await sleepUntil(() => loading); // Won't continue until loading flag is false
 * ```
 *
 * @param {() => boolean | Promise<boolean>} fn Return true to continue
 * @param {number} checkInterval Run function ever x milliseconds
 * @return {Promise<void>} Callback when sleep is over
 */
-export async function sleepWhile(fn : () => boolean | Promise<boolean>, checkInterval = 100): Promise<void> {
+export async function sleepUntil(fn : () => boolean | Promise<boolean>, checkInterval = 100): Promise<void> {
 	while(await fn()) await sleep(checkInterval);
 }
--- a/src/types.ts
+++ b/src/types.ts
@ -15,6 +15,6 @@
 *
 * @return {Array<keyof T>} Available keys
 */
-export function typeKeys<T extends object>() {
+export function tyoeKeys<T extends object>() {
 	return Object.keys(<T>{}) as Array<keyof T>;
 }
--- a/vite.config.ts
+++ b/vite.config.ts
@ -13,7 +13,7 @@ export default defineConfig({
 			}
 		},
 		emptyOutDir: true,
-		minify: false,
+		minify: true,
 		sourcemap: true
 	},
 	plugins: [dts()],