more time utils

Fixed timezone format
2024-11-14 23:29:58 -05:00 · 2024-11-14 22:58:24 -05:00
3 changed files with 32 additions and 46 deletions
--- a/index.html
+++ b/index.html
@ -6,14 +6,10 @@
 	</head>
 	<body>
 		<script type="module">
-			import {fromCsv, toCsv} from './dist/index.mjs';
+			import {adjustTz, formatDate} from './dist/index.mjs';

-			const csv = '' +
-				'_id,any,boolean,date,file,foreignKey,formula,javaScript,number,string,_createdBy,_createdDate,_updatedBy,_updatedDate\n' +
-				'48,"test,test,test",,,,,,,,,system,2024-11-09T19:05:04.932Z,system,2024-11-09T19:05:04.932Z\n' +
-				'49,,,,,,,,,,system,2024-11-09T19:05:04.933Z,system,2024-11-09T19:05:04.933Z';
-
-			console.log(fromCsv(csv, false));
+			console.log(formatDate(new Date(), 'HH:mm:ss z'));
+			console.log(formatDate(adjustTz(new Date(), 0), 'HH:mm:ss z', 'UTC'));
 		</script>
 	</body>
 </html>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.22.6",
+	"version": "0.22.8",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
--- a/src/time.ts
+++ b/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
@ -22,14 +20,21 @@ export function adjustedInterval(cb: Function, ms: number) {
 	}
 }

+export function adjustTz(date: Date, offset: number) {
+	const currentOffset = date.getTimezoneOffset();
+	offset = currentOffset - offset * 60;
+	return new Date(date.getTime() + offset * 60000);
+}
+
 /**
 * 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 tz Override timezone, can be either string or number
 * @return {string} Formated date
 */
-export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:mm '): string {
+export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:mm', tz?: any): string {
 	if(typeof date == 'number' || typeof date == 'string') date = new Date(date);

 	function day(num: number): string {
@ -84,36 +89,9 @@ 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 '';
-		}
+	function timezone(date: Date): string {
+		return new Intl.DateTimeFormat('en-US', {timeZoneName: 'short'})
+			.format(date).split(' ').pop() || '';
 	}

 	return format
@ -146,16 +124,28 @@ export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:
 		.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('SSS', date.getMilliseconds().toString().padEnd(3, '0'))
+		.replaceAll('SS', date.getMilliseconds().toString().slice(0, 1).padEnd(2, '0'))
 		.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()));
+		.replaceAll('ZZ', tzOffset(isNaN(tz) ? date.getTimezoneOffset() : tz).replace(':', ''))
+		.replaceAll('Z', tzOffset(isNaN(tz) ? date.getTimezoneOffset() : tz))
+		.replaceAll('z', typeof tz == 'string' ? tz : timezone(date));
+}
+
+/**
+ * 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);
 }

 /**
Author	SHA1	Message	Date
ztimson	fa66820c76	more time utils All checks were successful Build / Build NPM Project (push) Successful in 38s Details Build / Tag Version (push) Successful in 8s Details Build / Publish Documentation (push) Successful in 2m27s Details	2024-11-14 23:29:58 -05:00
ztimson	49a2df8cd4	Fixed timezone format All checks were successful Build / Build NPM Project (push) Successful in 1m15s Details Build / Tag Version (push) Successful in 13s Details Build / Publish Documentation (push) Successful in 1m57s Details	2024-11-14 22:58:24 -05:00