Fixed timezone format

index.html

@@ -8,10 +8,10 @@
 		<script type="module">
 			import {fromCsv, toCsv} from './dist/index.mjs';
 
-			const csv = '' +
+			const csv = '_id,any,boolean,date,file,foreignKey,formula,javaScript,number,string,_createdBy,_createdDate,_updatedBy,_updatedDate\n' +
-				'_id,any,boolean,date,file,foreignKey,formula,javaScript,number,string,_createdBy,_createdDate,_updatedBy,_updatedDate\n' +
+				'34,,true,,,,,,,,system,2024-11-09T12:06:50.023Z,system,2024-11-09T17:44:42.512Z\n' +
-				'48,,,,,,,,,,system,2024-11-09T19:05:04.932Z,system,2024-11-09T19:05:04.932Z\n' +
+				'37,,,,,,,,,,system,2024-11-09T18:53:21.793Z,system,2024-11-09T18:53:21.793Z\n' +
-				'49,,,,,,,,,,system,2024-11-09T19:05:04.933Z,system,2024-11-09T19:05:04.933Z';
+				'38,,,,,,,,,,system,2024-11-09T18:53:21.796Z,system,2024-11-09T18:53:21.796Z';
 
 			console.log(fromCsv(csv));
 		</script>

package.json

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

src/csv.ts

@@ -1,20 +1,39 @@
 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');
 	let headers: any = hasHeaders ? row.splice(0, 1)[0] : null;
 	if(headers) headers = headers.match(/(?:[^,"']+|"[^"]*"|'[^']*')+/g);
 	return <T[]>row.map(r => {
-		const props: string[] = <any>r.match(/(?:[^,"']+|"[^"]*"|'[^']*')+/g);
+		function parseLine(line: string): (string | null)[] {
+			const parts = line.split(','), columns: string[] = [];
+			let quoted = false;
+			for(const p of parts) {
+				if(quoted) columns[columns.length - 1] = columns.at(-1) + ',' + p;
+				else columns.push(p);
+				if(/[^"]"$/g.test(p)) {
+					quoted = false;
+				} else if(/^"[^"]/g.test(p)) {
+					quoted = true;
+				}
+			}
+			return columns;
+		}
+
+		const props = parseLine(r);
 		const h = headers || (Array(props.length).fill(null).map((r, i) => {
 			let letter = '';
 			const first = i / 26;
-			if(first > 1) letter += 
+			if(first > 1) letter += LETTER_LIST[Math.floor(first - 1)];
-			i % 26
+			letter += LETTER_LIST[i % 26];
-			i
+			return letter;
 		}));
-		return h.reduce((acc: any, h: any, i: number) => ({...acc, [h]: props[i]}), {})
+		return h.reduce((acc: any, h: any, i: number) => {
+			dotNotation(acc, h, props[i]);
+			return acc;
+		}, {});
 	})
 }
 

src/time.ts

@@ -84,36 +84,10 @@ 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) {
+	function timezone(date: Date): string {
-		const hours = offset / 60;
+		const formatter = new Intl.DateTimeFormat('en-US', {timeZoneName: 'short'});
-		switch (hours) {
+		const formattedDate = formatter.format(date);
-			case -12: return "IDLW";
+		return formattedDate.split(' ').pop() || '';
-			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 '';
-		}
 	}
 
 	return format
@@ -155,7 +129,7 @@ export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:
 		// Timezone
 		.replaceAll('ZZ', tzOffset(date.getTimezoneOffset()).replace(':', ''))
 		.replaceAll('Z', tzOffset(date.getTimezoneOffset()))
-		.replaceAll('z', timezone(date.getTimezoneOffset()));
+		.replaceAll('z', timezone(date));
 }
 
 /**