toCSV comma fix

index.html

@@ -9,6 +9,7 @@
 			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>

package.json

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

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];
+				if(prop in target) return (target as any)[prop];
-				return target.store[prop as K];
+				return deepCopy(target.store[prop as K]);
 			},
 			set: (target: this, prop: string | symbol, value: any) => {
-				if (prop in target) (target as any)[prop] = value;
+				if(prop in target) (target as any)[prop] = value;
-				else target.store[prop as K] = 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/csv.ts

@@ -1,32 +1,59 @@
+import {makeArray} from './array.ts';
 import {ASet} from './aset.ts';
 import {dotNotation, flattenObj, JSONSanitize} from './objects.ts';
 import {LETTER_LIST} from './string.ts';
 
-export function fromCsv<T = any>(csv: string, hasHeaders=true): T[] {
+/**
-	const row = csv.split('\n');
+ * Parse a CSV string into an array of objects
-	let headers: any = hasHeaders ? row.splice(0, 1)[0] : null;
+ *
-	if(headers) headers = headers.match(/(?:[^,"']+|"[^"]*"|'[^']*')+/g);
+ * @param csv String with CSV
-	return <T[]>row.map(r => {
+ * @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 parts = line.split(','), columns: string[] = [];
+		const columns: string[] = [];
-			let quoted = false;
+		let current = '', inQuotes = false;
-			for(const p of parts) {
+		for (let i = 0; i < line.length; i++) {
-				if(quoted) columns[columns.length - 1] = columns.at(-1) + ',' + p;
+			const char = line[i];
-				else columns.push(p);
+			const nextChar = line[i + 1];
-				if(/[^"]"$/g.test(p)) {
+			if (char === '"') {
-					quoted = false;
+				if (inQuotes && nextChar === '"') {
-				} else if(/^"[^"]/g.test(p)) {
+					current += '"'; // Handle escaped quotes
-					quoted = true;
+					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;
+		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((r, i) => {
+		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)];
+			if (first > 1) letter += LETTER_LIST[Math.floor(first - 1)];
 			letter += LETTER_LIST[i % 26];
 			return letter;
 		}));
@@ -34,23 +61,28 @@ export function fromCsv<T = any>(csv: string, hasHeaders=true): T[] {
 			dotNotation(acc, h, props[i]);
 			return acc;
 		}, {});
-	})
+	});
 }
 
+
 /**
- * Convert an object to a CSV string
+ * 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 toCsv(target: any, flatten=true) {
-	const headers = new ASet(target.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
+	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);
-			return (typeof value == 'object' && value != null) ? '"' + JSONSanitize(value).replaceAll('"', '""') + '"' : 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
@@ -76,7 +77,7 @@ export function fileText(file: any): Promise<string | null> {
  */
 export function timestampFilename(name?: string, date: Date | number | string = new Date()) {
 	if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
-	const timestamp = `${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,22 @@ 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) {
+		super(stream, {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} = {};
 
@@ -101,18 +117,17 @@ export class Http {
 									push();
 								}).catch((error: any) => controller.error(error));
 							}
-
 							push();
 						}
 					});
 
-					resp.data = new Response(stream);
+					resp = new HttpResponse<T>(resp, stream);
-					if(opts.decode == null || opts.decode) {
+					if(opts.decode !== false) {
 						const content = resp.headers.get('Content-Type')?.toLowerCase();
-						if(content?.includes('form')) resp.data = <T>await resp.data.formData();
+						if(content?.includes('form')) resp.data = <T>await resp.formData();
-						else if(content?.includes('json')) resp.data = <T>await resp.data.json();
+						else if(content?.includes('json')) resp.data = <T>await resp.json();
-						else if(content?.includes('text')) resp.data = <T>await resp.data.text();
+						else if(content?.includes('text')) resp.data = <T>await resp.text();
-						else if(content?.includes('application')) resp.data = <T>await resp.data.blob();
+						else if(content?.includes('application')) resp.data = <T>await resp.blob();
 					}
 
 					if(resp.ok) res(resp);

src/path-events.ts

@@ -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)
+			return !!parsedFind.find(f =>
-				&& (f.all || t.all || t.methods.intersection(f.methods).length));
+				(t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) &&
+				(f.all || t.all || t.methods.intersection(f.methods).length));
 		});
 	}
 

src/string.ts

@@ -18,6 +18,16 @@ export const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
  */
 export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST + SYMBOL_LIST;
 
+/**
+ * Converts text to camel case
+ */
+export function camelCase(text?: string) {
+	if(!text) return '';
+	text = text.replaceAll(/^[0-9]+/g, '')
+		.replaceAll(/[^a-zA-Z0-9]+(\w?)/g, (...args) => args[1]?.toUpperCase() || '');
+	return text[0].toLowerCase() + text.slice(1);
+}
+
 /**
  * Convert number of bytes into a human-readable size
  *