Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fcae9e107e | |||
| 5bb5067abc | |||
| 2064880673 | |||
| fdefdf354d | |||
| 31998c01d6 | |||
| c5270fbd7e | |||
| bfe9493d23 | |||
| 1b6fe42f78 | |||
| c3d8d75ba3 | |||
| e2d756fe28 | |||
| 52f64f9e78 | |||
| 4caf0e5048 | |||
| 55b871f4c1 | |||
| fb077775b6 |
@ -1,9 +1,11 @@
|
|||||||
<html>
|
<html>
|
||||||
<body>
|
<body>
|
||||||
<script type="module">
|
<script type="module">
|
||||||
import {PE} from './dist/index.mjs';
|
import {formatDate} from './dist/index.mjs';
|
||||||
|
|
||||||
console.log('data/Ts:n', PE`${'data/Ts'}:n`.methods);
|
const dt = new Date('2021-03-03T09:00:00Z');
|
||||||
|
const result = formatDate('Do MMMM dddd', dt, 0);
|
||||||
|
console.log(result);
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ztimson/utils",
|
"name": "@ztimson/utils",
|
||||||
"version": "0.26.18",
|
"version": "0.27.3",
|
||||||
"description": "Utility library",
|
"description": "Utility library",
|
||||||
"author": "Zak Timson",
|
"author": "Zak Timson",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
|||||||
13
src/cache.ts
13
src/cache.ts
@ -22,8 +22,10 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
[key: string | number | symbol]: CachedValue<T> | any;
|
[key: string | number | symbol]: CachedValue<T> | any;
|
||||||
/** Whether cache is complete */
|
/** Whether cache is complete */
|
||||||
complete = false;
|
complete = false;
|
||||||
|
|
||||||
|
private _loading!: Function;
|
||||||
/** Await initial loading */
|
/** Await initial loading */
|
||||||
loading!: Promise<void>;
|
loading = new Promise<void>(r => this._loading = r);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create new cache
|
* Create new cache
|
||||||
@ -31,9 +33,6 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
* @param options
|
* @param options
|
||||||
*/
|
*/
|
||||||
constructor(public readonly key?: keyof T, public readonly options: CacheOptions = {}) {
|
constructor(public readonly key?: keyof T, public readonly options: CacheOptions = {}) {
|
||||||
let done!: Function;
|
|
||||||
this.loading = new Promise(r => done = r);
|
|
||||||
|
|
||||||
// Persistent storage
|
// Persistent storage
|
||||||
if(this.options.persistentStorage != null) {
|
if(this.options.persistentStorage != null) {
|
||||||
if(typeof this.options.persistentStorage == 'string')
|
if(typeof this.options.persistentStorage == 'string')
|
||||||
@ -45,13 +44,15 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
const table: Table<any, any> = await persists.storage.createTable({name: persists.key, key: this.key});
|
const table: Table<any, any> = await persists.storage.createTable({name: persists.key, key: this.key});
|
||||||
const rows = await table.getAll();
|
const rows = await table.getAll();
|
||||||
Object.assign(this.store, rows.reduce((acc, row) => ({...acc, [this.getKey(row)]: row}), {}));
|
Object.assign(this.store, rows.reduce((acc, row) => ({...acc, [this.getKey(row)]: row}), {}));
|
||||||
done();
|
this._loading();
|
||||||
})();
|
})();
|
||||||
} else if((<any>this.options.persistentStorage?.storage)?.getItem != undefined) {
|
} else if((<any>this.options.persistentStorage?.storage)?.getItem != undefined) {
|
||||||
const stored = (<Storage>this.options.persistentStorage.storage).getItem(this.options.persistentStorage.key);
|
const stored = (<Storage>this.options.persistentStorage.storage).getItem(this.options.persistentStorage.key);
|
||||||
if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { }
|
if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { }
|
||||||
done();
|
this._loading();
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
this._loading();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle index lookups
|
// Handle index lookups
|
||||||
|
|||||||
@ -14,8 +14,8 @@ class AsyncLock {
|
|||||||
const res = this.p.then(fn, fn);
|
const res = this.p.then(fn, fn);
|
||||||
this.p = res.then(() => {}, () => {});
|
this.p = res.then(() => {}, () => {});
|
||||||
return res;
|
return res;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export class Database {
|
export class Database {
|
||||||
private schemaLock = new AsyncLock();
|
private schemaLock = new AsyncLock();
|
||||||
@ -28,7 +28,10 @@ export class Database {
|
|||||||
|
|
||||||
constructor(public readonly database: string, tables?: (string | TableOptions)[], public version?: number) {
|
constructor(public readonly database: string, tables?: (string | TableOptions)[], public version?: number) {
|
||||||
this.connection = new Promise((resolve, reject) => {
|
this.connection = new Promise((resolve, reject) => {
|
||||||
const req = indexedDB.open(this.database, this.version);
|
let req: IDBOpenDBRequest;
|
||||||
|
try { req = indexedDB.open(this.database, this.version); }
|
||||||
|
catch (err) { return reject(err); }
|
||||||
|
|
||||||
this.tables = !tables ? [] : tables.map(t => {
|
this.tables = !tables ? [] : tables.map(t => {
|
||||||
t = typeof t == 'object' ? t : {name: t};
|
t = typeof t == 'object' ? t : {name: t};
|
||||||
return {...t, name: t.name.toString()};
|
return {...t, name: t.name.toString()};
|
||||||
@ -37,13 +40,22 @@ export class Database {
|
|||||||
req.onerror = () => reject(req.error);
|
req.onerror = () => reject(req.error);
|
||||||
|
|
||||||
req.onsuccess = () => {
|
req.onsuccess = () => {
|
||||||
const db = req.result;
|
let db: IDBDatabase;
|
||||||
|
try { db = req.result; }
|
||||||
|
catch (err) { return reject(err); }
|
||||||
|
|
||||||
const existing = Array.from(db.objectStoreNames);
|
const existing = Array.from(db.objectStoreNames);
|
||||||
if(!tables) this.tables = existing.map(t => {
|
if(!tables) {
|
||||||
const tx = db.transaction(t, 'readonly');
|
this.tables = existing.map(t => {
|
||||||
const store = tx.objectStore(t);
|
try {
|
||||||
return {name: t, key: <string>store.keyPath};
|
const tx = db.transaction(t, 'readonly');
|
||||||
});
|
const store = tx.objectStore(t);
|
||||||
|
return {name: t, key: <string>store.keyPath};
|
||||||
|
} catch {
|
||||||
|
return {name: t}; // 🛡️ fallback
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
const desired = new ASet((tables || []).map(t => typeof t == 'string' ? t : t.name));
|
const desired = new ASet((tables || []).map(t => typeof t == 'string' ? t : t.name));
|
||||||
if(tables && desired.symmetricDifference(new ASet(existing)).length) {
|
if(tables && desired.symmetricDifference(new ASet(existing)).length) {
|
||||||
db.close();
|
db.close();
|
||||||
@ -58,19 +70,23 @@ export class Database {
|
|||||||
|
|
||||||
req.onupgradeneeded = () => {
|
req.onupgradeneeded = () => {
|
||||||
this.upgrading = true;
|
this.upgrading = true;
|
||||||
const db = req.result;
|
let db: IDBDatabase;
|
||||||
const existingTables = new ASet(Array.from(db.objectStoreNames));
|
try { db = req.result; }
|
||||||
if(tables) {
|
catch { return; }
|
||||||
const desired = new ASet((tables || []).map(t => typeof t == 'string' ? t : t.name));
|
try {
|
||||||
existingTables.difference(desired).forEach(name => db.deleteObjectStore(name));
|
const existingTables = new ASet(Array.from(db.objectStoreNames));
|
||||||
desired.difference(existingTables).forEach(name => {
|
if(tables) {
|
||||||
const t = this.tables.find(findByProp('name', name));
|
const desired = new ASet((tables || []).map(t => typeof t == 'string' ? t : t.name));
|
||||||
db.createObjectStore(name, {
|
existingTables.difference(desired).forEach(name => db.deleteObjectStore(name));
|
||||||
keyPath: t?.key,
|
desired.difference(existingTables).forEach(name => {
|
||||||
autoIncrement: t?.autoIncrement || !t?.key,
|
const t = this.tables.find(findByProp('name', name));
|
||||||
|
db.createObjectStore(name, {
|
||||||
|
keyPath: t?.key,
|
||||||
|
autoIncrement: t?.autoIncrement || !t?.key,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
}
|
||||||
}
|
} catch { }
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -79,30 +95,30 @@ export class Database {
|
|||||||
|
|
||||||
async createTable<K extends IDBValidKey = any, T = any>(table: string | TableOptions): Promise<Table<K, T>> {
|
async createTable<K extends IDBValidKey = any, T = any>(table: string | TableOptions): Promise<Table<K, T>> {
|
||||||
return this.schemaLock.run(async () => {
|
return this.schemaLock.run(async () => {
|
||||||
if (typeof table == 'string') table = { name: table };
|
if(typeof table == 'string') table = { name: table };
|
||||||
const conn = await this.connection;
|
const conn = await this.connection;
|
||||||
if (!this.includes(table.name)) {
|
if(!this.includes(table.name)) {
|
||||||
const newDb = new Database(this.database, [...this.tables, table], (this.version ?? 0) + 1);
|
const newDb = new Database(this.database, [...this.tables, table], (this.version ?? 0) + 1);
|
||||||
conn.close();
|
conn.close();
|
||||||
Object.assign(this, newDb);
|
this.connection = newDb.connection;
|
||||||
await this.connection;
|
await this.connection;
|
||||||
|
Object.assign(this, newDb);
|
||||||
}
|
}
|
||||||
return this.table<K, T>(table.name);
|
return this.table<K, T>(table.name);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async deleteTable(table: string | TableOptions): Promise<void> {
|
async deleteTable(table: string | TableOptions): Promise<void> {
|
||||||
return this.schemaLock.run(async () => {
|
return this.schemaLock.run(async () => {
|
||||||
if (typeof table == 'string') table = { name: table };
|
if(typeof table == 'string') table = { name: table };
|
||||||
if (!this.includes(table.name)) return;
|
if(!this.includes(table.name)) return;
|
||||||
const conn = await this.connection;
|
const conn = await this.connection;
|
||||||
const newDb = new Database(this.database, this.tables.filter(t => t.name != (<TableOptions>table).name), (this.version ?? 0) + 1);
|
const newDb = new Database(this.database, this.tables.filter(t => t.name != (<TableOptions>table).name), (this.version ?? 0) + 1);
|
||||||
conn.close();
|
conn.close();
|
||||||
Object.assign(this, newDb);
|
this.connection = newDb.connection;
|
||||||
await this.connection;
|
await this.connection;
|
||||||
|
Object.assign(this, newDb);
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
includes(name: any): boolean {
|
includes(name: any): boolean {
|
||||||
@ -126,9 +142,8 @@ export class Table<K extends IDBValidKey = any, T = any> {
|
|||||||
await this.database.waitForUpgrade();
|
await this.database.waitForUpgrade();
|
||||||
const db = await this.database.connection;
|
const db = await this.database.connection;
|
||||||
const tx = db.transaction(table, readonly ? 'readonly' : 'readwrite');
|
const tx = db.transaction(table, readonly ? 'readonly' : 'readwrite');
|
||||||
const store = tx.objectStore(table);
|
|
||||||
return new Promise<R>((resolve, reject) => {
|
return new Promise<R>((resolve, reject) => {
|
||||||
const request = fn(store);
|
const request = fn(tx.objectStore(table));
|
||||||
request.onsuccess = () => resolve(request.result as R);
|
request.onsuccess = () => resolve(request.result as R);
|
||||||
request.onerror = () => reject(request.error);
|
request.onerror = () => reject(request.error);
|
||||||
});
|
});
|
||||||
@ -168,7 +183,7 @@ export class Table<K extends IDBValidKey = any, T = any> {
|
|||||||
|
|
||||||
put(value: T, key?: string): Promise<void> {
|
put(value: T, key?: string): Promise<void> {
|
||||||
return this.tx(this.name, store => {
|
return this.tx(this.name, store => {
|
||||||
if (store.keyPath) return store.put(value);
|
if(store.keyPath) return store.put(value);
|
||||||
return store.put(value, key);
|
return store.put(value, key);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
14
src/math.ts
14
src/math.ts
@ -48,3 +48,17 @@ export function fracToDec(frac: string) {
|
|||||||
split = (<string>split.pop()).split('/');
|
split = (<string>split.pop()).split('/');
|
||||||
return whole + (Number(split[0]) / Number(split[1]));
|
return whole + (Number(split[0]) / Number(split[1]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add a suffix to a number:
|
||||||
|
* 1 = 1st
|
||||||
|
* 2 = 2nd
|
||||||
|
* 3 = 3rd
|
||||||
|
* N = Nth
|
||||||
|
* @param {number} n
|
||||||
|
* @returns {string}
|
||||||
|
*/
|
||||||
|
export function numSuffix(n: number): string {
|
||||||
|
const s = ['th', 'st', 'nd', 'rd'], v = n % 100;
|
||||||
|
return `${n}${s[(v - 20) % 10] || s[v] || s[0]}`;
|
||||||
|
}
|
||||||
|
|||||||
14
src/misc.ts
14
src/misc.ts
@ -1,9 +1,21 @@
|
|||||||
import {PathEvent} from './path-events.ts';
|
import {PathEvent} from './path-events.ts';
|
||||||
import {md5} from './string';
|
import {md5} from './string';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Compare version numbers
|
||||||
|
* @param {string} target
|
||||||
|
* @param {string} vs
|
||||||
|
* @return {number} -1 = target is lower, 0 = equal, 1 = higher
|
||||||
|
*/
|
||||||
|
export function compareVersions(target: string, vs: string): -1 | 0 | 1 {
|
||||||
|
const [tMajor, tMinor, tPatch] = target.split('.').map(v => +v.replace(/[^0-9]/g, ''));
|
||||||
|
const [vMajor, vMinor, vPatch] = vs.split('.').map(v => +v.replace(/[^0-9]/g, ''));
|
||||||
|
return (tMajor > vMajor || tMinor > vMinor || tPatch > vPatch) ? 1 :
|
||||||
|
(tMajor < vMajor || tMinor < vMinor || tPatch < vPatch) ? -1 : 0;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Escape any regex special characters to avoid misinterpretation during search
|
* Escape any regex special characters to avoid misinterpretation during search
|
||||||
*
|
|
||||||
* @param {string} value String which should be escaped
|
* @param {string} value String which should be escaped
|
||||||
* @return {string} New escaped sequence
|
* @return {string} New escaped sequence
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,3 +1,53 @@
|
|||||||
|
export type Delta = { [key: string]: any | Delta | null };
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Applies deltas to `target`.
|
||||||
|
* @param base starting point
|
||||||
|
* @param deltas List of deltas to apply
|
||||||
|
* @returns Mutated target
|
||||||
|
*/
|
||||||
|
export function applyDeltas(base: any, ...deltas: any[]): any {
|
||||||
|
function applyDelta(base: any, delta: any): any {
|
||||||
|
if(delta === null) return null;
|
||||||
|
if(typeof base !== 'object' || base === null) return delta === undefined ? base : delta;
|
||||||
|
const result = Array.isArray(base) ? [...base] : { ...base };
|
||||||
|
for(const key in delta) {
|
||||||
|
const val = delta[key];
|
||||||
|
if(val === undefined) delete result[key];
|
||||||
|
else if(typeof val === 'object' && val !== null && !Array.isArray(val)) result[key] = applyDelta(result[key], val);
|
||||||
|
else result[key] = val;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
for(const d of deltas.flat()) base = applyDelta(base, d?.delta ?? d);
|
||||||
|
return base;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a nested delta that reverts `target` back to `old`.
|
||||||
|
* @param old - Original object
|
||||||
|
* @param updated - Modified object
|
||||||
|
* @returns New changes
|
||||||
|
*/
|
||||||
|
export function calcDelta(old: any, updated: any): any {
|
||||||
|
if(updated == null) return null; // full delete
|
||||||
|
const delta: any = {};
|
||||||
|
const isObj = (v: any) => v && typeof v === 'object' && !Array.isArray(v);
|
||||||
|
for (const key of new Set([...(old ? Object.keys(old) : []), ...(updated ? Object.keys(updated) : [])])) {
|
||||||
|
const oldVal = old?.[key];
|
||||||
|
const newVal = updated?.[key];
|
||||||
|
if(isObj(oldVal) && isObj(newVal)) {
|
||||||
|
const nested = calcDelta(oldVal, newVal);
|
||||||
|
if(nested !== null && Object.keys(nested).length > 0) delta[key] = nested;
|
||||||
|
} else if(JSON.stringify(oldVal) !== JSON.stringify(newVal)) {
|
||||||
|
delta[key] = newVal;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Object.keys(delta).length === 0 ? {} : delta;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Removes any null values from an object in-place
|
* Removes any null values from an object in-place
|
||||||
*
|
*
|
||||||
@ -275,8 +325,8 @@ export function JSONSerialize<T1>(obj: T1): T1 | string {
|
|||||||
export function JSONSanitize(obj: any, space?: number): string {
|
export function JSONSanitize(obj: any, space?: number): string {
|
||||||
const cache: any[] = [];
|
const cache: any[] = [];
|
||||||
return JSON.stringify(obj, (key, value) => {
|
return JSON.stringify(obj, (key, value) => {
|
||||||
if (typeof value === 'object' && value !== null) {
|
if(typeof value === 'object' && value !== null) {
|
||||||
if (cache.includes(value)) return '[Circular]';
|
if(cache.includes(value)) return '[Circular]';
|
||||||
cache.push(value);
|
cache.push(value);
|
||||||
}
|
}
|
||||||
return value;
|
return value;
|
||||||
|
|||||||
@ -46,18 +46,19 @@ export function formatBytes(bytes: number, decimals = 2) {
|
|||||||
/**
|
/**
|
||||||
* Convert milliseconds to human-readable duration
|
* Convert milliseconds to human-readable duration
|
||||||
* @param {string} ms milliseconds
|
* @param {string} ms milliseconds
|
||||||
|
* @param {boolean} short Use unit initial instead of word
|
||||||
* @return {string} formated duration
|
* @return {string} formated duration
|
||||||
*/
|
*/
|
||||||
export function formatMs(ms: number): string {
|
export function formatMs(ms: number, short = false): string {
|
||||||
if (isNaN(ms) || ms < 0) return "Invalid input";
|
if (isNaN(ms) || ms < 0) return "Invalid input";
|
||||||
const seconds = ms / 1000;
|
const seconds = ms / 1000;
|
||||||
const minutes = seconds / 60;
|
const minutes = seconds / 60;
|
||||||
const hours = minutes / 60;
|
const hours = minutes / 60;
|
||||||
const days = hours / 24;
|
const days = hours / 24;
|
||||||
if (days >= 1) return `${days.toFixed(1)} days`;
|
if (days >= 1) return `${days.toFixed(1)} ${short ? 'd' : 'days'}`;
|
||||||
else if (hours >= 1) return `${hours.toFixed(1)} hours`;
|
else if (hours >= 1) return `${hours.toFixed(1)} ${short ? 'h' : 'hours'}`;
|
||||||
else if (minutes >= 1) return `${minutes.toFixed(1)} minutes`;
|
else if (minutes >= 1) return `${minutes.toFixed(1)} ${short ? 'm' : 'minutes'}`;
|
||||||
else return `${seconds.toFixed(1)} seconds`;
|
else return `${seconds.toFixed(1)} ${short ? 's' : 'seconds'}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
188
src/time.ts
188
src/time.ts
@ -1,3 +1,5 @@
|
|||||||
|
import {numSuffix} from './math.ts';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Like setInterval but will adjust the timeout value to account for runtime
|
* Like setInterval but will adjust the timeout value to account for runtime
|
||||||
* @param {Function} cb Callback function that will be ran
|
* @param {Function} cb Callback function that will be ran
|
||||||
@ -20,6 +22,15 @@ export function adjustedInterval(cb: Function, ms: number) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function dayOfWeek(d: number): string {
|
||||||
|
return ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][d];
|
||||||
|
}
|
||||||
|
|
||||||
|
export function dayOfYear(date: Date): number {
|
||||||
|
const start = new Date(Date.UTC(date.getUTCFullYear(), 0, 1));
|
||||||
|
return Math.ceil((date.getTime() - start.getTime()) / (1000 * 60 * 60 * 24));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Format date
|
* Format date
|
||||||
*
|
*
|
||||||
@ -28,111 +39,94 @@ export function adjustedInterval(cb: Function, ms: number) {
|
|||||||
* @param tz Set timezone offset
|
* @param tz Set timezone offset
|
||||||
* @return {string} Formated date
|
* @return {string} Formated date
|
||||||
*/
|
*/
|
||||||
export function formatDate(format = 'YYYY-MM-DD H:mm', date: Date | number | string = new Date(), tz?: string | number): string {
|
export function formatDate(format: string = 'YYYY-MM-DD H:mm', date: Date | number | string = new Date(), tz: string | number = 'local'): string {
|
||||||
const timezones = [
|
if (typeof date === 'number' || typeof date === 'string') date = new Date(date);
|
||||||
['IDLW', -12],
|
if (isNaN(date.getTime())) throw new Error('Invalid date input');
|
||||||
['SST', -11],
|
const numericTz = typeof tz === 'number';
|
||||||
['HST', -10],
|
const localTz = tz === 'local' || (!numericTz && tz.toLowerCase?.() === 'local');
|
||||||
['AKST', -9],
|
const tzName = localTz ? Intl.DateTimeFormat().resolvedOptions().timeZone : numericTz ? 'UTC' : tz;
|
||||||
['PST', -8],
|
|
||||||
['MST', -7],
|
|
||||||
['CST', -6],
|
|
||||||
['EST', -5],
|
|
||||||
['AST', -4],
|
|
||||||
['BRT', -3],
|
|
||||||
['MAT', -2],
|
|
||||||
['AZOT', -1],
|
|
||||||
['UTC', 0],
|
|
||||||
['CET', 1],
|
|
||||||
['EET', 2],
|
|
||||||
['MSK', 3],
|
|
||||||
['AST', 4],
|
|
||||||
['PKT', 5],
|
|
||||||
['IST', 5.5],
|
|
||||||
['BST', 6],
|
|
||||||
['ICT', 7],
|
|
||||||
['CST', 8],
|
|
||||||
['JST', 9],
|
|
||||||
['AEST', 10],
|
|
||||||
['SBT', 11],
|
|
||||||
['FJT', 12],
|
|
||||||
['TOT', 13],
|
|
||||||
['LINT', 14]
|
|
||||||
];
|
|
||||||
|
|
||||||
function adjustTz(date: Date, gmt: number) {
|
if (!numericTz && tzName !== 'UTC') {
|
||||||
const currentOffset = date.getTimezoneOffset();
|
try {
|
||||||
const adjustedOffset = gmt * 60;
|
new Intl.DateTimeFormat('en-US', { timeZone: tzName }).format();
|
||||||
return new Date(date.getTime() + (adjustedOffset + currentOffset) * 60000);
|
} catch {
|
||||||
}
|
throw new Error(`Invalid timezone: ${tzName}`);
|
||||||
|
|
||||||
function day(num: number): string {
|
|
||||||
return ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][num] || 'Unknown';
|
|
||||||
}
|
|
||||||
|
|
||||||
function doy(date: Date) {
|
|
||||||
const start = new Date(`${date.getFullYear()}-01-01 0:00:00`);
|
|
||||||
return Math.ceil((date.getTime() - start.getTime()) / (1000 * 60 * 60 * 24));
|
|
||||||
}
|
|
||||||
|
|
||||||
function month(num: number): string {
|
|
||||||
return ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'][num] || 'Unknown';
|
|
||||||
}
|
|
||||||
|
|
||||||
function suffix(num: number) {
|
|
||||||
if (num % 100 >= 11 && num % 100 <= 13) return `${num}th`;
|
|
||||||
switch (num % 10) {
|
|
||||||
case 1: return `${num}st`;
|
|
||||||
case 2: return `${num}nd`;
|
|
||||||
case 3: return `${num}rd`;
|
|
||||||
default: return `${num}th`;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function tzOffset(offset: number) {
|
let zonedDate = new Date(date);
|
||||||
const hours = ~~(offset / 60);
|
if (!numericTz && tzName !== 'UTC') {
|
||||||
const minutes = offset % 60;
|
const parts = new Intl.DateTimeFormat('en-US', {
|
||||||
return (offset > 0 ? '-' : '') + `${hours}:${minutes.toString().padStart(2, '0')}`;
|
timeZone: tzName,
|
||||||
|
year: 'numeric', month: '2-digit', day: '2-digit',
|
||||||
|
hour: '2-digit', minute: '2-digit', second: '2-digit',
|
||||||
|
hour12: false
|
||||||
|
}).formatToParts(date);
|
||||||
|
const get = (type: string) => parts.find(p => p.type === type)?.value;
|
||||||
|
const build = `${get('year')}-${get('month')}-${get('day')}T${get('hour')}:${get('minute')}:${get('second')}Z`;
|
||||||
|
zonedDate = new Date(build);
|
||||||
|
} else if (numericTz || tzName === 'UTC') {
|
||||||
|
const offset = numericTz ? tz as number : 0;
|
||||||
|
zonedDate = new Date(date.getTime() + offset * 60 * 60 * 1000);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(typeof date == 'number' || typeof date == 'string' || date == null) date = new Date(date);
|
const get = (fn: 'FullYear' | 'Month' | 'Date' | 'Day' | 'Hours' | 'Minutes' | 'Seconds' | 'Milliseconds') =>
|
||||||
|
(numericTz || tzName === 'UTC') ? zonedDate[`getUTC${fn}`]() : zonedDate[`get${fn}`]();
|
||||||
|
|
||||||
// Handle timezones
|
function getTZOffset(): string {
|
||||||
let t!: [string, number];
|
if (numericTz) {
|
||||||
if(tz == null) tz = -(date.getTimezoneOffset() / 60);
|
const total = (tz as number) * 60;
|
||||||
t = <any>timezones.find(t => isNaN(<any>tz) ? t[0] == tz : t[1] == tz);
|
const hours = Math.floor(Math.abs(total) / 60);
|
||||||
if(!t) throw new Error(`Unknown timezone: ${tz}`);
|
const mins = Math.abs(total) % 60;
|
||||||
date = adjustTz(date, t[1]);
|
return `${tz >= 0 ? '+' : '-'}${String(hours).padStart(2, '0')}:${String(mins).padStart(2, '0')}`;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const offset = new Intl.DateTimeFormat('en-US', {timeZone: tzName, timeZoneName: 'longOffset', hour: '2-digit', minute: '2-digit',})
|
||||||
|
.formatToParts(<Date>date).find(p => p.type === 'timeZoneName')?.value.match(/([+-]\d{2}:\d{2})/)?.[1];
|
||||||
|
if (offset) return offset;
|
||||||
|
} catch {}
|
||||||
|
return '+00:00';
|
||||||
|
}
|
||||||
|
|
||||||
|
function getTZAbbr(): string {
|
||||||
|
if (numericTz && tz === 0) return 'UTC';
|
||||||
|
try {
|
||||||
|
return new Intl.DateTimeFormat('en-US', { timeZone: tzName, timeZoneName: 'short' })
|
||||||
|
.formatToParts(<Date>date).find(p => p.type === 'timeZoneName')?.value || '';
|
||||||
|
} catch {
|
||||||
|
return tzName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Token mapping
|
|
||||||
const tokens: Record<string, string> = {
|
const tokens: Record<string, string> = {
|
||||||
'YYYY': date.getFullYear().toString(),
|
YYYY: get('FullYear').toString(),
|
||||||
'YY': date.getFullYear().toString().slice(2),
|
YY: get('FullYear').toString().slice(2),
|
||||||
'MMMM': month(date.getMonth()),
|
MMMM: month(get('Month')),
|
||||||
'MMM': month(date.getMonth()).slice(0, 3),
|
MMM: month(get('Month')).slice(0, 3),
|
||||||
'MM': (date.getMonth() + 1).toString().padStart(2, '0'),
|
MM: (get('Month') + 1).toString().padStart(2, '0'),
|
||||||
'M': (date.getMonth() + 1).toString(),
|
M: (get('Month') + 1).toString(),
|
||||||
'DDD': doy(date).toString(),
|
DDD: dayOfYear(zonedDate).toString(),
|
||||||
'DD': date.getDate().toString().padStart(2, '0'),
|
DD: get('Date').toString().padStart(2, '0'),
|
||||||
'Do': suffix(date.getDate()),
|
Do: numSuffix(get('Date')),
|
||||||
'D': date.getDate().toString(),
|
D: get('Date').toString(),
|
||||||
'dddd': day(date.getDay()),
|
dddd: dayOfWeek(get('Day')),
|
||||||
'ddd': day(date.getDay()).slice(0, 3),
|
ddd: dayOfWeek(get('Day')).slice(0, 3),
|
||||||
'HH': date.getHours().toString().padStart(2, '0'),
|
HH: get('Hours').toString().padStart(2, '0'),
|
||||||
'H': date.getHours().toString(),
|
H: get('Hours').toString(),
|
||||||
'hh': (date.getHours() % 12 || 12).toString().padStart(2, '0'),
|
hh: (get('Hours') % 12 || 12).toString().padStart(2, '0'),
|
||||||
'h': (date.getHours() % 12 || 12).toString(),
|
h: (get('Hours') % 12 || 12).toString(),
|
||||||
'mm': date.getMinutes().toString().padStart(2, '0'),
|
mm: get('Minutes').toString().padStart(2, '0'),
|
||||||
'm': date.getMinutes().toString(),
|
m: get('Minutes').toString(),
|
||||||
'ss': date.getSeconds().toString().padStart(2, '0'),
|
ss: get('Seconds').toString().padStart(2, '0'),
|
||||||
's': date.getSeconds().toString(),
|
s: get('Seconds').toString(),
|
||||||
'SSS': date.getMilliseconds().toString().padStart(3, '0'),
|
SSS: get('Milliseconds').toString().padStart(3, '0'),
|
||||||
'A': date.getHours() >= 12 ? 'PM' : 'AM',
|
A: get('Hours') >= 12 ? 'PM' : 'AM',
|
||||||
'a': date.getHours() >= 12 ? 'pm' : 'am',
|
a: get('Hours') >= 12 ? 'pm' : 'am',
|
||||||
'ZZ': tzOffset(t[1] * 60).replace(':', ''),
|
ZZ: getTZOffset().replace(':', ''),
|
||||||
'Z': tzOffset(t[1] * 60),
|
Z: getTZOffset(),
|
||||||
'z': typeof tz == 'string' ? tz : (<any>t)[0]
|
z: getTZAbbr(),
|
||||||
};
|
};
|
||||||
|
|
||||||
return format.replace(/YYYY|YY|MMMM|MMM|MM|M|DDD|DD|Do|D|dddd|ddd|HH|H|hh|h|mm|m|ss|s|SSS|A|a|ZZ|Z|z/g, token => tokens[token]);
|
return format.replace(/YYYY|YY|MMMM|MMM|MM|M|DDD|DD|Do|D|dddd|ddd|HH|H|hh|h|mm|m|ss|s|SSS|A|a|ZZ|Z|z/g, token => tokens[token]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -148,6 +142,10 @@ export function instantInterval(fn: () => any, interval: number) {
|
|||||||
return setInterval(fn, interval);
|
return setInterval(fn, interval);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function month(m: number): string {
|
||||||
|
return ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'][m];
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use in conjunction with `await` to pause an async script
|
* Use in conjunction with `await` to pause an async script
|
||||||
*
|
*
|
||||||
|
|||||||
@ -31,11 +31,11 @@ describe('Time Utilities', () => {
|
|||||||
it('handles formatting for given timestamp', () => {
|
it('handles formatting for given timestamp', () => {
|
||||||
const timestamp = Date.UTC(2023, 1, 1, 18, 5, 5, 123); // Feb 1, 2023 18:05:05.123 UTC
|
const timestamp = Date.UTC(2023, 1, 1, 18, 5, 5, 123); // Feb 1, 2023 18:05:05.123 UTC
|
||||||
const formatted = formatDate('YYYY MM DD HH mm ss SSS A Z', timestamp, 'UTC');
|
const formatted = formatDate('YYYY MM DD HH mm ss SSS A Z', timestamp, 'UTC');
|
||||||
expect(formatted).toMatch(/^2023 02 01 18 05 05 123 PM \+?0:00$/i);
|
expect(formatted).toMatch(/^2023 02 01 18 05 05 123 PM \+00:00/i);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('throws for unknown timezone', () => {
|
it('throws for unknown timezone', () => {
|
||||||
expect(() => formatDate('YYYY', new Date(), '???')).toThrowError(/Unknown timezone/);
|
expect(() => formatDate('YYYY', new Date(), '???')).toThrowError(/Invalid timezone/);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('handles timezone by offset number', () => {
|
it('handles timezone by offset number', () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user