package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.23.22",
+	"version": "0.23.15",
 	"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,7 +34,7 @@
 		"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"

src/csv.ts

@@ -1,59 +1,32 @@
-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[] {
- * Parse a CSV string into an array of objects
+	const row = csv.split('\n');
- *
+	let headers: any = hasHeaders ? row.splice(0, 1)[0] : null;
- * @param csv String with CSV
+	if(headers) headers = headers.match(/(?:[^,"']+|"[^"]*"|'[^']*')+/g);
- * @param hasHeaders First line of CSV contains headers
+	return <T[]>row.map(r => {
- * @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[] = [];
+			const parts = line.split(','), columns: string[] = [];
-		let current = '', inQuotes = false;
+			let quoted = false;
-		for (let i = 0; i < line.length; i++) {
+			for(const p of parts) {
-			const char = line[i];
+				if(quoted) columns[columns.length - 1] = columns.at(-1) + ',' + p;
-			const nextChar = line[i + 1];
+				else columns.push(p);
-			if (char === '"') {
+				if(/[^"]"$/g.test(p)) {
-				if (inQuotes && nextChar === '"') {
+					quoted = false;
-					current += '"'; // Handle escaped quotes
+				} else if(/^"[^"]/g.test(p)) {
-					i++;
+					quoted = true;
-				} 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, '"'));
+			return columns;
 		}
 
-	// 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) => {
+		const h = headers || (Array(props.length).fill(null).map((r, 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;
 		}));
@@ -61,28 +34,23 @@ export function fromCsv<T = any>(csv: string, hasHeaders = true): T[] {
 			dotNotation(acc, h, props[i]);
 			return acc;
 		}, {});
-	});
+	})
 }
 
-
 /**
- * Convert an array of objects to a CSV string
+ * Convert an object 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 t = makeArray(target);
+	const headers = new ASet(target.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
-	const headers = new ASet(t.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
 	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 '';
+			return (typeof value == 'object' && value != null) ? '"' + JSONSanitize(value).replaceAll('"', '""') + '"' : value;
-			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/http.ts

@@ -30,13 +30,7 @@ class HttpResponse<T = any> extends Response {
 	url!: string;
 
 	constructor(resp: Response, stream: ReadableStream) {
-		const body = [204, 205, 304].includes(resp.status) ? null : stream;
+		super(stream, {headers: resp.headers, status: resp.status, statusText: resp.statusText});
-		super(body, {
-			headers: resp.headers,
-			status: resp.status,
-			statusText: resp.statusText,
-		});
-
 		this.ok = resp.ok;
 		this.redirected = resp.redirected;
 		this.type = resp.type;
@@ -76,9 +70,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]}))

src/string.ts

@@ -19,10 +19,12 @@ export const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
 export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST + SYMBOL_LIST;
 
 /**
- * Converts text to camelCase
+ * Converts text to camel case
  */
-export function camelCase(str?: string) {
+export function camelCase(text?: string) {
-	const text = pascalCase(str);
+	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);
 }
 
@@ -72,17 +74,6 @@ 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 +96,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,17 +159,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)
  *