ztimson/utils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

Respect timezones when converting dates
Some checks failed
Build / Build NPM Project (push) Successful in 48s
Details
Build / Publish Documentation (push) Failing after 4s
Details
Build / Tag Version (push) Successful in 8s
Details

Browse Source
This commit is contained in:
Zakary Timson
2025-08-10 21:16:25 -04:00
parent fcae9e107e
commit 5849a97c21
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

39
src/time.ts
View File

@ -55,23 +55,46 @@ export function formatDate(format: string = 'YYYY-MM-DD H:mm', date: Date | numb
} }
let zonedDate = new Date(date); let zonedDate = new Date(date);
let get: (fn: 'FullYear' | 'Month' | 'Date' | 'Day' | 'Hours' | 'Minutes' | 'Seconds' | 'Milliseconds') => number;
const partsMap: Record<string, string> = {};
if (!numericTz && tzName !== 'UTC') { if (!numericTz && tzName !== 'UTC') {
const parts = new Intl.DateTimeFormat('en-US', { const parts = new Intl.DateTimeFormat('en-US', {
timeZone: tzName, timeZone: tzName,
year: 'numeric', month: '2-digit', day: '2-digit', year: 'numeric', month: '2-digit', day: '2-digit', weekday: 'long',
hour: '2-digit', minute: '2-digit', second: '2-digit', hour: '2-digit', minute: '2-digit', second: '2-digit',
hour12: false hour12: false
}).formatToParts(date); }).formatToParts(date);
const get = (type: string) => parts.find(p => p.type === type)?.value; parts.forEach(p => {
const build = `${get('year')}-${get('month')}-${get('day')}T${get('hour')}:${get('minute')}:${get('second')}Z`; partsMap[p.type] = p.value;
zonedDate = new Date(build); });
} else if (numericTz || tzName === 'UTC') {
const monthValue = parseInt(partsMap.month) - 1;
const dayOfWeekValue = new Date(`${partsMap.year}-${partsMap.month}-${partsMap.day}`).getDay();
const hourValue = parseInt(partsMap.hour);
get = (fn: 'FullYear' | 'Month' | 'Date' | 'Day' | 'Hours' | 'Minutes' | 'Seconds' | 'Milliseconds'): number => {
switch (fn) {
case 'FullYear': return parseInt(partsMap.year);
case 'Month': return monthValue;
case 'Date': return parseInt(partsMap.day);
case 'Day': return dayOfWeekValue;
case 'Hours': return hourValue;
case 'Minutes': return parseInt(partsMap.minute);
case 'Seconds': return parseInt(partsMap.second);
default: return 0;
}
};
} else {
const offset = numericTz ? tz as number : 0; const offset = numericTz ? tz as number : 0;
zonedDate = new Date(date.getTime() + offset * 60 * 60 * 1000); zonedDate = new Date(date.getTime() + offset * 60 * 60 * 1000);
get = (fn: 'FullYear' | 'Month' | 'Date' | 'Day' | 'Hours' | 'Minutes' | 'Seconds' | 'Milliseconds'): number => zonedDate[`getUTC${fn}`]();
} }
const get = (fn: 'FullYear' | 'Month' | 'Date' | 'Day' | 'Hours' | 'Minutes' | 'Seconds' | 'Milliseconds') => function numSuffix(n: number): string {
(numericTz || tzName === 'UTC') ? zonedDate[`getUTC${fn}`]() : zonedDate[`get${fn}`](); const s = ["th", "st", "nd", "rd"];
const v = n % 100;
return n + (s[(v - 20) % 10] || s[v] || s[0]);
}
function getTZOffset(): string { function getTZOffset(): string {
if (numericTz) { if (numericTz) {
@ -119,7 +142,7 @@ export function formatDate(format: string = 'YYYY-MM-DD H:mm', date: Date | numb
m: get('Minutes').toString(), m: get('Minutes').toString(),
ss: get('Seconds').toString().padStart(2, '0'), ss: get('Seconds').toString().padStart(2, '0'),
s: get('Seconds').toString(), s: get('Seconds').toString(),
SSS: get('Milliseconds').toString().padStart(3, '0'), SSS: (zonedDate[`getUTC${'Milliseconds'}`]()).toString().padStart(3, '0'),
A: get('Hours') >= 12 ? 'PM' : 'AM', A: get('Hours') >= 12 ? 'PM' : 'AM',
a: get('Hours') >= 12 ? 'pm' : 'am', a: get('Hours') >= 12 ? 'pm' : 'am',
ZZ: getTZOffset().replace(':', ''), ZZ: getTZOffset().replace(':', ''),