Fix HTTP empty responses

index.html

@@ -8,7 +8,8 @@
 		<script type="module">
 			import {PathEvent} from './dist/index.mjs';
 
-			console.log(PathEvent.has(['data/Inventory:n', 'logs:c'], `logs/client:n`));
+			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>

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.22.0",
+	"version": "0.23.22",
 	"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",
-			"types": "./dist/index.d.ts"
+			"require": "./dist/index.cjs"
 		}
 	},
 	"scripts": {
@@ -34,7 +34,7 @@
 		"typedoc": "^0.26.7",
 		"typescript": "^5.3.3",
 		"vite": "^5.0.12",
-		"vite-plugin-dts": "^3.7.2"
+		"vite-plugin-dts": "^4.5.3"
 	},
 	"files": [
 		"dist"

src/arg-parser.ts

@@ -0,0 +1,141 @@
+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`;
+	}
+}

src/cache.ts

@@ -1,3 +1,5 @@
+import {deepCopy} from './objects.ts';
+
 export type CacheOptions = {
 	/** Delete keys automatically after x amount of seconds */
 	ttl?: number;
@@ -36,12 +38,12 @@ export class Cache<K extends string | number | symbol, T> {
 		}
 		return new Proxy(this, {
 			get: (target: this, prop: string | symbol) => {
-				if (prop in target) return (target as any)[prop];
-				return target.store[prop as K];
+				if(prop in target) return (target as any)[prop];
+				return deepCopy(target.store[prop as K]);
 			},
 			set: (target: this, prop: string | symbol, value: any) => {
-				if (prop in target) (target as any)[prop] = value;
-				else target.store[prop as K] = value;
+				if(prop in target) (target as any)[prop] = value;
+				else this.set(prop as K, value);
 				return true;
 			}
 		});
@@ -58,7 +60,7 @@ export class Cache<K extends string | number | symbol, T> {
 	 * @return {T[]} Array of items
 	 */
 	all(): T[] {
-		return Object.values(this.store);
+		return deepCopy(Object.values(this.store));
 	}
 
 	/**
@@ -119,7 +121,7 @@ export class Cache<K extends string | number | symbol, T> {
 	 * @return {T} Cached item
 	 */
 	get(key: K): T {
-		return this.store[key];
+		return deepCopy(this.store[key]);
 	}
 
 	/**
@@ -137,7 +139,7 @@ export class Cache<K extends string | number | symbol, T> {
 	 * @return {Record<K, T>}
 	 */
 	map(): Record<K, T> {
-		return structuredClone(this.store);
+		return deepCopy(this.store);
 	}
 
 	/**

src/color.ts

@@ -0,0 +1,12 @@
+/**
+ * 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';
+}

src/csv.ts

@@ -1,25 +1,87 @@
-import {dotNotation, flattenObj} from './objects.ts';
+import {makeArray} from './array.ts';
+import {ASet} from './aset.ts';
+import {dotNotation, flattenObj, JSONSanitize} from './objects.ts';
+import {LETTER_LIST} from './string.ts';
 
 /**
- * Convert an object to a CSV string
+ * Parse a CSV string into an array of objects
+ *
+ * @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 csv(target: any[], flatten=true) {
-	const headers = target.reduce((acc, row) => {
-		Object.keys(flatten ? flattenObj(row) : row)
-			.forEach(key => { if(!acc.includes(key)) acc.push(key); });
-		return acc;
-	}, []);
+export function toCsv(target: any, flatten=true) {
+	const t = makeArray(target);
+	const headers = new ASet(t.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
 	return [
 		headers.join(','),
-		...target.map(row => headers.map((h: string) => {
+		...t.map(row => headers.map((h: string) => {
 			const value = dotNotation<any>(row, h);
-			const type = typeof value;
-			if(type == 'string' && value.includes(',')) return `"${value}"`;
-			if(type == 'object') return `"${JSON.stringify(value)}"`;
+			if(value == null) return '';
+			if(typeof value == 'object') return `"${JSONSanitize(value).replaceAll('"', '""')}"`;
+			if(typeof value == 'string' &&  /[\n",]/g.test(value)) return `"${value.replaceAll('"', '""')}"`;
 			return value;
 		}).join(','))
 	].join('\n');

src/files.ts

@@ -1,6 +1,7 @@
 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
@@ -52,6 +53,21 @@ 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
  *
@@ -61,7 +77,7 @@ export function fileBrowser(options: {accept?: string, multiple?: boolean} = {})
  */
 export function timestampFilename(name?: string, date: Date | number | string = new Date()) {
 	if(typeof date == 'number' || typeof date == 'string') date = new Date(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')}`;
+	const timestamp = formatDate('YYYY-MM-DD_HH:mm:ss', date);
 	return name ? name.replace('{{TIMESTAMP}}', timestamp) : timestamp;
 }
 

src/http.ts

@@ -22,6 +22,28 @@ 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} = {};
 
@@ -54,8 +76,9 @@ 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 || '')).replace(/([^:]\/)\/+/g, '$1');
-		if(opts.fragment) url.includes('#') ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : url += '#' + opts.fragment;
+		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.query) {
 			const q = Array.isArray(opts.query) ? opts.query :
 				Object.keys(opts.query).map(k => ({key: k, value: (<any>opts.query)[k]}))
@@ -101,18 +124,17 @@ export class Http {
 									push();
 								}).catch((error: any) => controller.error(error));
 							}
-
 							push();
 						}
 					});
 
-					resp.data = new Response(stream);
-					if(opts.decode == null || opts.decode) {
+					resp = new HttpResponse<T>(resp, stream);
+					if(opts.decode !== false) {
 						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(content?.includes('form')) resp.data = <T>await resp.formData();
+						else if(content?.includes('json')) resp.data = <T>await resp.json();
+						else if(content?.includes('text')) resp.data = <T>await resp.text();
+						else if(content?.includes('application')) resp.data = <T>await resp.blob();
 					}
 
 					if(resp.ok) res(resp);

src/index.ts

@@ -1,6 +1,8 @@
+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,6 +15,7 @@ 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';

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 {
-	return structuredClone(value);
+	try {return structuredClone(value); }
+	catch { return JSON.parse(JSONSanitize(value)); }
 }
 
 /**
@@ -91,7 +91,6 @@ export function dotNotation<T>(obj: any, prop: string, set?: T): T | undefined {
 	}, obj);
 }
 
-
 /**
  * Convert object into URL encoded query string
  *
@@ -128,8 +127,9 @@ 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;
-			if(typeof obj[key] === 'object') {
+			const propName = parent ? `${parent}.${key}` : key;
+			if(typeof obj[key] === 'object' && obj[key] != null && !Array.isArray(obj[key])) {
+				console.log(propName, );
 				flattenObj(obj[key], propName, result);
 			} else {
 				result[propName] = obj[key];
@@ -216,14 +216,25 @@ export function mixin(target: any, constructors: any[]) {
 /**
  * Parse JSON but return the original string if it fails
  *
- * @param {string} json JSON string to parse
+ * @param {any} json JSON string to parse
  * @return {string | T} Object if successful, original string otherwise
  */
-export function JSONAttemptParse<T>(json: string): T | string {
-	try { return JSON.parse(json); }
+export function JSONAttemptParse<T1, T2>(json: T2): T1 | T2 {
+	try { return JSON.parse(<any>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.
  *
@@ -234,10 +245,8 @@ export function JSONAttemptParse<T>(json: string): T | 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 (cache.includes(value)) return;
-			cache.push(value);
-		}
+		if(typeof value === 'object' && value !== null)
+			if(!cache.includes(value)) cache.push(value);
 		return value;
 	}, space);
 }

src/path-events.ts

@@ -25,7 +25,7 @@ export type Method = '*' | 'n' | 'c' | 'r' | 'u' | 'd' | 'x';
  * @param {string} args
  * @return {PathEvent} Event object
  */
-export function PE(str: TemplateStringsArray, ...args: string[]) {
+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]);
@@ -92,7 +92,7 @@ export class PathEvent {
 
 	constructor(Event: string | PathEvent) {
 		if(typeof Event == 'object') return Object.assign(this, Event);
-		let [p, scope, method] = Event.split(':');
+		let [p, scope, method] = Event.replaceAll(/\/{2,}/g, '/').split(':');
 		if(!method) method = scope || '*';
 		if(p == '*' || !p && method == '*') {
 			p = '';
@@ -142,8 +142,9 @@ export class PathEvent {
 		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.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));
 		});
 	}
 

src/search.ts

@@ -0,0 +1,38 @@
+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;
+		})
+	});
+}

src/string.ts

@@ -1,24 +1,30 @@
-import {dotNotation, flattenObj} from './objects.ts';
-
 /**
  * String of all letters
  */
-const LETTER_LIST = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+export const LETTER_LIST = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
 /**
  * String of all numbers
  */
-const NUMBER_LIST = '0123456789';
+export const NUMBER_LIST = '0123456789';
 
 /**
  * String of all symbols
  */
-const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
+export const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
 
 /**
  * String of all letters, numbers & symbols
  */
-const CHAR_LIST = LETTER_LIST + NUMBER_LIST + SYMBOL_LIST;
+export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + 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
@@ -44,7 +50,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] ?? ''} (${parts[2]}) ${parts[3]}-${parts[4]}`.trim();
+	return `${parts[1] ? '+1' : ''} (${parts[2]}) ${parts[3]}-${parts[4]}`.trim();
 }
 
 /**
@@ -60,11 +66,23 @@ 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
  *
@@ -87,6 +105,18 @@ 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
  *
@@ -150,6 +180,17 @@ 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)
  *
@@ -210,6 +251,7 @@ 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(

src/time.ts

@@ -1,5 +1,3 @@
-import {strSplice} from './string.ts';
-
 /**
  * Like setInterval but will adjust the timeout value to account for runtime
  * @param {Function} cb Callback function that will be ran
@@ -25,24 +23,51 @@ export function adjustedInterval(cb: Function, ms: number) {
 /**
  * Format date
  *
- * @param {Date | number | string} date Date or timestamp to convert to string
  * @param {string} format How date string will be formatted, default: `YYYY-MM-DD H:mm A`
+ * @param {Date | number | string} date Date or timestamp, defaults to now
+ * @param tz Set timezone offset
  * @return {string} Formated date
  */
-export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:mm '): string {
-	if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
+export function formatDate(format = 'YYYY-MM-DD H:mm', date: Date | number | string = new Date(), tz?: string | number): 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 {
-		switch(num) {
-			case(0): return 'Sunday';
-			case(1): return 'Monday';
-			case(2): return 'Tuesday';
-			case(3): return 'Wednesday';
-			case(4): return 'Thursday';
-			case(5): return 'Friday';
-			case(6): return 'Saturday';
-			default: return 'Unknown';
-		}
+		return ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][num] || 'Unknown';
 	}
 
 	function doy(date: Date) {
@@ -51,30 +76,16 @@ export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:
 	}
 
 	function month(num: number): string {
-		switch(num) {
-			case(0): return 'January';
-			case(1): return 'February';
-			case(2): return 'March';
-			case(3): return 'April';
-			case(4): return 'May';
-			case(5): return 'June';
-			case(6): return 'July';
-			case(7): return 'August';
-			case(8): return 'September';
-			case(9): return 'October';
-			case(10): return 'November';
-			case(11): return 'December';
-			default: return 'Unknown';
-		}
+		return ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'][num] || 'Unknown';
 	}
 
 	function suffix(num: number) {
-		let n = num.toString();
-		switch(n.at(-1)) {
-			case('1'): return num + 'st';
-			case('2'): return num + 'nd';
-			case('3'): return num + 'rd';
-			default: return num + 'th';
+		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`;
 		}
 	}
 
@@ -84,78 +95,57 @@ export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:
 		return (offset > 0 ? '-' : '') + `${hours}:${minutes.toString().padStart(2, '0')}`;
 	}
 
-	function timezone(offset: number) {
-		const hours = offset / 60;
-		switch (hours) {
-			case -12: return "IDLW";
-			case -11: return "SST";
-			case -10: return "HST";
-			case -9: return "AKST";
-			case -8: return "PST";
-			case -7: return "MST";
-			case -6: return "CST";
-			case -5: return "EST";
-			case -4: return "AST";
-			case -3: return "ART";
-			case -2: return "FNT";
-			case -1: return "AZOT";
-			case 0: return "UTC";
-			case 1: return "CET";
-			case 2: return "EET";
-			case 3: return "MSK";
-			case 4: return "SAMT";
-			case 5: return "YEKT";
-			case 6: return "OMST";
-			case 7: return "KRAT";
-			case 8: return "CST";
-			case 9: return "JST";
-			case 10: return "AEST";
-			case 11: return "SBT";
-			case 12: return "NZST";
-			default: return '';
-		}
-	}
+	if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
 
-	return format
-		// Year
-		.replaceAll('YYYY', date.getFullYear().toString())
-		.replaceAll('YY', date.getFullYear().toString().slice(2))
-		// Month
-		.replaceAll('MMMM', month(date.getMonth()))
-		.replaceAll('MMM', month(date.getMonth()).slice(0, 2))
-		.replaceAll('MM', (date.getMonth() + 1).toString().padStart(2, '0'))
-		.replaceAll('M', (date.getMonth() + 1).toString())
-		// Day
-		.replaceAll('DDD', doy(date).toString())
-		.replaceAll('DD', date.getDate().toString().padStart(2, '0'))
-		.replaceAll('Do', suffix(date.getDate()))
-		.replaceAll('D', date.getDate().toString())
-		.replaceAll('dddd', day(date.getDay()))
-		.replaceAll('ddd', day(date.getDay()).slice(0, 2))
-		.replaceAll('dd', date.getDate().toString().padStart(2, '0'))
-		.replaceAll('d', date.getDay().toString())
-		// Hour
-		.replaceAll('HH', date.getHours().toString().padStart(2, '0'))
-		.replaceAll('H', date.getHours().toString())
-		.replaceAll('hh', (date.getHours() > 12 ? date.getHours() - 12 : date.getHours()).toString().padStart(2, '0'))
-		.replaceAll('h', (date.getHours() > 12 ? date.getHours() - 12 : date.getHours()).toString())
-		// Minute
-		.replaceAll('mm', date.getMinutes().toString().padStart(2, '0'))
-		.replaceAll('m', date.getMinutes().toString())
-		// Second
-		.replaceAll('ss', date.getSeconds().toString().padStart(2, '0'))
-		.replaceAll('s', date.getSeconds().toString())
-		// Millisecond
-		.replaceAll('SSS', date.getMilliseconds().toString())
-		.replaceAll('SS', date.getMilliseconds().toString().slice(0, 1))
-		.replaceAll('S', date.getMilliseconds().toString()[0])
-		// Period/Meridian (AM/PM)
-		.replaceAll('A', date.getHours() >= 12 ? 'PM' : 'AM')
-		.replaceAll('a', date.getHours() >= 12 ? 'pm' : 'am')
-		// Timezone
-		.replaceAll('ZZ', tzOffset(date.getTimezoneOffset()).replace(':', ''))
-		.replaceAll('Z', tzOffset(date.getTimezoneOffset()))
-		.replaceAll('z', timezone(date.getTimezoneOffset()));
+	// Handle timezones
+	let t!: [string, number];
+	if(tz == null) tz = -(date.getTimezoneOffset() / 60);
+	t = <any>timezones.find(t => isNaN(<any>tz) ? t[0] == tz : t[1] == tz);
+	if(!t) throw new Error(`Unknown timezone: ${tz}`);
+	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);
 }
 
 /**

src/types.ts

@@ -15,6 +15,6 @@
  *
  * @return {Array<keyof T>} Available keys
  */
-export function tyoeKeys<T extends object>() {
+export function typeKeys<T extends object>() {
 	return Object.keys(<T>{}) as Array<keyof T>;
 }