@prairielearn/formatter 1.4.8 → 1.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/dist/date.d.ts +3 -2
- package/dist/date.d.ts.map +1 -1
- package/dist/date.js +7 -1
- package/dist/date.js.map +1 -1
- package/dist/interval.test.js +3 -3
- package/dist/interval.test.js.map +1 -1
- package/package.json +5 -5
- package/src/date.ts +11 -3
- package/src/interval.test.ts +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# @prairielearn/formatter
|
|
2
2
|
|
|
3
|
+
## 1.5.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 70a8029: Upgrade all JavaScript dependencies
|
|
8
|
+
|
|
9
|
+
## 1.5.0
|
|
10
|
+
|
|
11
|
+
### Minor Changes
|
|
12
|
+
|
|
13
|
+
- 77f7620: Allow passing `Temporal.PlainDateTime` to `formatDate` and `formatDateFriendly`
|
|
14
|
+
|
|
3
15
|
## 1.4.8
|
|
4
16
|
|
|
5
17
|
### Patch Changes
|
package/dist/date.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Temporal } from '@js-temporal/polyfill';
|
|
1
2
|
type TimePrecision = 'hour' | 'minute' | 'second';
|
|
2
3
|
/**
|
|
3
4
|
* Format a date to a human-readable string like '2020-03-27T12:34:56 (CDT)'.
|
|
@@ -10,7 +11,7 @@ type TimePrecision = 'hour' | 'minute' | 'second';
|
|
|
10
11
|
* @param options.longTz Whether to use the long time zone name (default false).
|
|
11
12
|
* @returns Human-readable string representing the date.
|
|
12
13
|
*/
|
|
13
|
-
export declare function formatDate(date: Date, timeZone: string, { includeTz, longTz, includeMs, }?: {
|
|
14
|
+
export declare function formatDate(date: Date | Temporal.PlainDateTime, timeZone: string, { includeTz, longTz, includeMs, }?: {
|
|
14
15
|
includeTz?: boolean;
|
|
15
16
|
longTz?: boolean;
|
|
16
17
|
includeMs?: boolean;
|
|
@@ -87,7 +88,7 @@ export declare function formatDateWithinRange(date: Date, rangeStart: Date, rang
|
|
|
87
88
|
* @param options.minPrecision The minimum precision to always show for time (default 'hour').
|
|
88
89
|
* @returns Human-readable string representing the date and time.
|
|
89
90
|
*/
|
|
90
|
-
export declare function formatDateFriendly(date: Date, timezone: string, { baseDate, includeTz, timeFirst, dateOnly, timeOnly, maxPrecision, minPrecision, }?: {
|
|
91
|
+
export declare function formatDateFriendly(date: Date | Temporal.PlainDateTime, timezone: string, { baseDate, includeTz, timeFirst, dateOnly, timeOnly, maxPrecision, minPrecision, }?: {
|
|
91
92
|
baseDate?: Date;
|
|
92
93
|
includeTz?: boolean;
|
|
93
94
|
timeFirst?: boolean;
|
package/dist/date.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../src/date.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../src/date.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAqB,MAAM,uBAAuB,CAAC;AAGpE,KAAK,aAAa,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAElD;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,IAAI,GAAG,QAAQ,CAAC,aAAa,EACnC,QAAQ,EAAE,MAAM,EAChB,EACE,SAAgB,EAChB,MAAc,EACd,SAAiB,GAClB,GAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAO,GACrE,MAAM,CA0BR;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAUlE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAYpE;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAQjD;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,EAAE,SAAgB,EAAE,GAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAA;CAAO,GACjD,MAAM,CAeR;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,QAAQ,EAAE,MAAM,GACf,MAAM,CAyDR;AA+ID;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,GAAG,QAAQ,CAAC,aAAa,EACnC,QAAQ,EAAE,MAAM,EAChB,EACE,QAAqB,EACrB,SAAgB,EAChB,SAAiB,EACjB,QAAgB,EAChB,QAAgB,EAChB,YAAuB,EACvB,YAAqB,GACtB,GAAE;IACD,QAAQ,CAAC,EAAE,IAAI,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,YAAY,CAAC,EAAE,aAAa,CAAC;CACzB,GACL,MAAM,CA6BR;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,IAAI,EACX,GAAG,EAAE,IAAI,EACT,QAAQ,EAAE,MAAM,EAChB,EACE,QAAqB,EACrB,SAAgB,EAChB,SAAiB,EACjB,QAAgB,EAChB,YAAuB,EACvB,YAAqB,GACtB,GAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC,CAAM,GAC/C,MAAM,CAyCR"}
|
package/dist/date.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { toTemporalInstant } from '@js-temporal/polyfill';
|
|
1
|
+
import { Temporal, toTemporalInstant } from '@js-temporal/polyfill';
|
|
2
2
|
import keyBy from 'lodash/keyBy.js';
|
|
3
3
|
/**
|
|
4
4
|
* Format a date to a human-readable string like '2020-03-27T12:34:56 (CDT)'.
|
|
@@ -12,6 +12,9 @@ import keyBy from 'lodash/keyBy.js';
|
|
|
12
12
|
* @returns Human-readable string representing the date.
|
|
13
13
|
*/
|
|
14
14
|
export function formatDate(date, timeZone, { includeTz = true, longTz = false, includeMs = false, } = {}) {
|
|
15
|
+
if (date instanceof Temporal.PlainDateTime) {
|
|
16
|
+
date = new Date(date.toZonedDateTime(timeZone).epochMilliseconds);
|
|
17
|
+
}
|
|
15
18
|
const options = {
|
|
16
19
|
timeZone,
|
|
17
20
|
hourCycle: 'h23',
|
|
@@ -307,6 +310,9 @@ function formatDateFriendlyParts(date, timezone, baseDate, maxPrecision = 'secon
|
|
|
307
310
|
* @returns Human-readable string representing the date and time.
|
|
308
311
|
*/
|
|
309
312
|
export function formatDateFriendly(date, timezone, { baseDate = new Date(), includeTz = true, timeFirst = false, dateOnly = false, timeOnly = false, maxPrecision = 'second', minPrecision = 'hour', } = {}) {
|
|
313
|
+
if (date instanceof Temporal.PlainDateTime) {
|
|
314
|
+
date = new Date(date.toZonedDateTime(timezone).epochMilliseconds);
|
|
315
|
+
}
|
|
310
316
|
const { dateFormatted, timeFormatted, timezoneFormatted } = formatDateFriendlyParts(date, timezone, baseDate, maxPrecision, minPrecision);
|
|
311
317
|
let dateTimeFormatted = '';
|
|
312
318
|
if (dateOnly) {
|
package/dist/date.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.js","sourceRoot":"","sources":["../src/date.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,MAAM,iBAAiB,CAAC;AAIpC;;;;;;;;;;GAUG;AACH,MAAM,UAAU,UAAU,CACxB,IAAU,EACV,QAAgB,EAChB,EACE,SAAS,GAAG,IAAI,EAChB,MAAM,GAAG,KAAK,EACd,SAAS,GAAG,KAAK,MACiD,EAAE;IAEtE,MAAM,OAAO,GAA+B;QAC1C,QAAQ;QACR,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,SAAS;QACd,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS;QACjB,sBAAsB,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QACjD,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;KACxC,CAAC;IACF,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAClG,IAAI,aAAa,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAClJ,IAAI,SAAS,EAAE,CAAC;QACd,aAAa,GAAG,GAAG,aAAa,IAAI,KAAK,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;IACrE,CAAC;IACD,IAAI,SAAS,EAAE,CAAC;QACd,aAAa,GAAG,GAAG,aAAa,KAAK,KAAK,CAAC,YAAY,CAAC,KAAK,GAAG,CAAC;IACnE,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAAC,IAAU,EAAE,QAAgB;IACxD,MAAM,OAAO,GAA+B;QAC1C,QAAQ;QACR,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,SAAS;KACf,CAAC;IACF,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAClG,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;AACvE,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,IAAU,EAAE,QAAgB;IAC1D,MAAM,OAAO,GAA+B;QAC1C,QAAQ;QACR,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,SAAS;QACd,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,SAAS;KAClB,CAAC;IACF,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAClG,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;AACjH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,QAAQ,CAAC,QAAgB;IACvC,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACxB,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;QAC7C,QAAQ;QACR,YAAY,EAAE,OAAO;KACtB,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACvB,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC;IACxD,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;AAClC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,aAAa,CAC3B,IAAU,EACV,QAAgB,EAChB,EAAE,SAAS,GAAG,IAAI,KAA8B,EAAE;IAElD,MAAM,OAAO,GAA+B;QAC1C,QAAQ;QACR,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS;QACjB,YAAY,EAAE,OAAO;KACtB,CAAC;IACF,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAClG,IAAI,aAAa,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtF,IAAI,SAAS,EAAE,CAAC;QACd,aAAa,GAAG,GAAG,aAAa,KAAK,KAAK,CAAC,YAAY,CAAC,KAAK,GAAG,CAAC;IACnE,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,qBAAqB,CACnC,IAAU,EACV,UAAgB,EAChB,QAAc,EACd,QAAgB;IAEhB,MAAM,OAAO,GAA+B;QAC1C,QAAQ;QACR,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,SAAS;QACd,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,SAAS;QACjB,YAAY,EAAE,OAAO;KACtB,CAAC;IACF,MAAM,SAAS,GAAG,KAAK,CACrB,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,EAC7D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CACd,CAAC;IACF,MAAM,UAAU,GAAG,KAAK,CACtB,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,EACnE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CACd,CAAC;IACF,MAAM,QAAQ,GAAG,KAAK,CACpB,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,EACjE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CACd,CAAC;IAEF,mCAAmC;IACnC,MAAM,OAAO,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,CAAC,KAAK,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IAC1F,MAAM,QAAQ,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IAC9F,MAAM,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IAEtF,IAAI,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QAC/C,2DAA2D;QAC3D,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAC7D,CAAC;IAED,4CAA4C;IAC5C,MAAM,KAAK,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IACxC,MAAM,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAC1C,MAAM,IAAI,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAEtC,uEAAuE;IACvE,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACvC,MAAM,OAAO,GAA+B;YAC1C,QAAQ;YACR,KAAK,EAAE,OAAO;YACd,GAAG,EAAE,SAAS;YACd,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,SAAS;SAClB,CAAC;QACF,MAAM,SAAS,GAAG,KAAK,CACrB,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,EAC7D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CACd,CAAC;QACF,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAC9G,CAAC;IAED,6BAA6B;IAC7B,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,CAAC,KAAK,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;AACrI,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,SAAS,uBAAuB,CAC9B,IAAU,EACV,QAAgB,EAChB,QAAc,EACd,eAA8B,QAAQ,EACtC,eAA8B,MAAM;IAEpC,gFAAgF;IAEhF,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACxF,MAAM,aAAa,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAEhF,MAAM,aAAa,GAAG,iBAAiB,CAAC,WAAW,EAAE,CAAC;IACtD,MAAM,SAAS,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;IAE9C,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC;IAE/E,wCAAwC;IAExC,MAAM,OAAO,GAA+B;QAC1C,QAAQ,EAAE,QAAQ;QAClB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,OAAO;QACd,GAAG,EAAE,SAAS;QACd,OAAO,EAAE,OAAO;QAChB,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS;QACjB,YAAY,EAAE,OAAO;KACtB,CAAC;IACF,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAElG,yBAAyB;IAEzB,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;QACrB,aAAa,GAAG,OAAO,CAAC;IAC1B,CAAC;SAAM,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;QAC5B,aAAa,GAAG,UAAU,CAAC;IAC7B,CAAC;SAAM,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;QAC7B,aAAa,GAAG,WAAW,CAAC;IAC9B,CAAC;SAAM,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,GAAG,EAAE,CAAC;QACvC,gEAAgE;QAChE,aAAa,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC,KAAK,SAAS,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IACzF,CAAC;SAAM,CAAC;QACN,aAAa,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC,KAAK,SAAS,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAC9G,CAAC;IAED,MAAM,cAAc,GAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACrE,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAEtD;;;;;;;;;;;;;;;;OAgBG;IAEH,6HAA6H;IAC7H,IAAI,QAAQ,GAAG,QAAQ,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAC;IACtF,CAAC;IAED;;;;;;;;;;OAUG;IAEH,IAAI,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;IAErC,MAAM,iBAAiB,GACrB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;QAC3C,CAAC,YAAY,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC;QAC1D,CAAC,YAAY,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC;IAE9F,IAAI,iBAAiB,EAAE,CAAC;QACtB,aAAa,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAC5C,CAAC;IAED,MAAM,iBAAiB,GACrB,YAAY,KAAK,QAAQ,IAAI,CAAC,YAAY,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;IAE1F,IAAI,iBAAiB,EAAE,CAAC;QACtB,aAAa,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAC5C,CAAC;IACD,qBAAqB;IACrB,aAAa,GAAG,GAAG,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;IAEzE,sBAAsB;IAEtB,MAAM,iBAAiB,GAAG,IAAI,KAAK,CAAC,YAAY,CAAC,KAAK,GAAG,CAAC;IAE1D,OAAO;QACL,aAAa;QACb,aAAa;QACb,iBAAiB;KAClB,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,kBAAkB,CAChC,IAAU,EACV,QAAgB,EAChB,EACE,QAAQ,GAAG,IAAI,IAAI,EAAE,EACrB,SAAS,GAAG,IAAI,EAChB,SAAS,GAAG,KAAK,EACjB,QAAQ,GAAG,KAAK,EAChB,QAAQ,GAAG,KAAK,EAChB,YAAY,GAAG,QAAQ,EACvB,YAAY,GAAG,MAAM,MASnB,EAAE;IAEN,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,iBAAiB,EAAE,GAAG,uBAAuB,CACjF,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,YAAY,CACb,CAAC;IAEF,IAAI,iBAAiB,GAAG,EAAE,CAAC;IAC3B,IAAI,QAAQ,EAAE,CAAC;QACb,iBAAiB,GAAG,aAAa,CAAC;IACpC,CAAC;SAAM,IAAI,QAAQ,EAAE,CAAC;QACpB,iBAAiB,GAAG,aAAa,CAAC;IACpC,CAAC;SAAM,CAAC;QACN,IAAI,SAAS,EAAE,CAAC;YACd,iBAAiB,GAAG,GAAG,aAAa,IAAI,aAAa,EAAE,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,iBAAiB,GAAG,GAAG,aAAa,KAAK,aAAa,EAAE,CAAC;QAC3D,CAAC;IACH,CAAC;IACD,IAAI,SAAS,EAAE,CAAC;QACd,iBAAiB,GAAG,GAAG,iBAAiB,IAAI,iBAAiB,EAAE,CAAC;IAClE,CAAC;IACD,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,uBAAuB,CACrC,KAAW,EACX,GAAS,EACT,QAAgB,EAChB,EACE,QAAQ,GAAG,IAAI,IAAI,EAAE,EACrB,SAAS,GAAG,IAAI,EAChB,SAAS,GAAG,KAAK,EACjB,QAAQ,GAAG,KAAK,EAChB,YAAY,GAAG,QAAQ,EACvB,YAAY,GAAG,MAAM,MACuB,EAAE;IAEhD,MAAM,EACJ,aAAa,EAAE,kBAAkB,EACjC,aAAa,EAAE,kBAAkB,EACjC,iBAAiB,GAClB,GAAG,uBAAuB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;IACnF,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,aAAa,EAAE,gBAAgB,EAAE,GACxE,uBAAuB,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;IAE/E,IAAI,MAA0B,CAAC;IAC/B,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,kBAAkB,KAAK,gBAAgB,EAAE,CAAC;YAC5C,MAAM,GAAG,kBAAkB,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,GAAG,kBAAkB,OAAO,gBAAgB,EAAE,CAAC;QAC1D,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,kBAAkB,KAAK,gBAAgB,EAAE,CAAC;YAC5C,IAAI,kBAAsC,CAAC;YAC3C,IAAI,kBAAkB,KAAK,gBAAgB,EAAE,CAAC;gBAC5C,kBAAkB,GAAG,kBAAkB,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACN,kBAAkB,GAAG,GAAG,kBAAkB,OAAO,gBAAgB,EAAE,CAAC;YACtE,CAAC;YACD,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,GAAG,GAAG,kBAAkB,IAAI,kBAAkB,EAAE,CAAC;YACzD,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,GAAG,kBAAkB,KAAK,kBAAkB,EAAE,CAAC;YAC1D,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,GAAG,GAAG,kBAAkB,IAAI,kBAAkB,OAAO,gBAAgB,IAAI,gBAAgB,EAAE,CAAC;YACpG,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,GAAG,kBAAkB,KAAK,kBAAkB,OAAO,gBAAgB,KAAK,gBAAgB,EAAE,CAAC;YACtG,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,GAAG,GAAG,MAAM,IAAI,iBAAiB,EAAE,CAAC;IAC5C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { toTemporalInstant } from '@js-temporal/polyfill';\nimport keyBy from 'lodash/keyBy.js';\n\ntype TimePrecision = 'hour' | 'minute' | 'second';\n\n/**\n * Format a date to a human-readable string like '2020-03-27T12:34:56 (CDT)'.\n *\n * @param date The date to format.\n * @param timeZone The time zone to use for formatting.\n * @param options\n * @param options.includeMs Whether to include milliseconds in the output (default false).\n * @param options.includeTz Whether to include the time zone in the output (default true).\n * @param options.longTz Whether to use the long time zone name (default false).\n * @returns Human-readable string representing the date.\n */\nexport function formatDate(\n date: Date,\n timeZone: string,\n {\n includeTz = true,\n longTz = false,\n includeMs = false,\n }: { includeTz?: boolean; longTz?: boolean; includeMs?: boolean } = {},\n): string {\n const options: Intl.DateTimeFormatOptions = {\n timeZone,\n hourCycle: 'h23',\n year: 'numeric',\n month: '2-digit',\n day: '2-digit',\n hour: '2-digit',\n minute: '2-digit',\n second: '2-digit',\n fractionalSecondDigits: includeMs ? 3 : undefined,\n timeZoneName: longTz ? 'long' : 'short',\n };\n const parts = keyBy(new Intl.DateTimeFormat('en-US', options).formatToParts(date), (x) => x.type);\n let dateFormatted = `${parts.year.value}-${parts.month.value}-${parts.day.value} ${parts.hour.value}:${parts.minute.value}:${parts.second.value}`;\n if (includeMs) {\n dateFormatted = `${dateFormatted}.${parts.fractionalSecond.value}`;\n }\n if (includeTz) {\n dateFormatted = `${dateFormatted} (${parts.timeZoneName.value})`;\n }\n return dateFormatted;\n}\n\n/**\n * Format a date to a human-readable string like '2020-03-27'.\n *\n * @param date The date to format.\n * @param timeZone The time zone to use for formatting.\n * @returns Human-readable string representing the date.\n */\nexport function formatDateYMD(date: Date, timeZone: string): string {\n const options: Intl.DateTimeFormatOptions = {\n timeZone,\n hourCycle: 'h23',\n year: 'numeric',\n month: '2-digit',\n day: '2-digit',\n };\n const parts = keyBy(new Intl.DateTimeFormat('en-US', options).formatToParts(date), (x) => x.type);\n return `${parts.year.value}-${parts.month.value}-${parts.day.value}`;\n}\n\n/**\n * Format a date to a human-readable string like '2020-03-27 14:27'.\n *\n * @param date The date to format.\n * @param timeZone The time zone to use for formatting.\n * @returns Human-readable string representing the date.\n */\nexport function formatDateYMDHM(date: Date, timeZone: string): string {\n const options: Intl.DateTimeFormatOptions = {\n timeZone,\n hourCycle: 'h23',\n year: 'numeric',\n month: '2-digit',\n day: '2-digit',\n hour: '2-digit',\n minute: '2-digit',\n };\n const parts = keyBy(new Intl.DateTimeFormat('en-US', options).formatToParts(date), (x) => x.type);\n return `${parts.year.value}-${parts.month.value}-${parts.day.value} ${parts.hour.value}:${parts.minute.value}`;\n}\n\n/**\n * Format a time zone to a human-readable string like 'CDT'.\n *\n * @param timeZone The time zone to format.\n * @returns Human-readable string representing the time zone.\n */\nexport function formatTz(timeZone: string): string {\n const date = new Date();\n const parts = new Intl.DateTimeFormat('en-US', {\n timeZone,\n timeZoneName: 'short',\n }).formatToParts(date);\n const tz = parts.find((p) => p.type === 'timeZoneName');\n return tz ? tz.value : timeZone;\n}\n\n/**\n * Format a date to a human-readable string like '14:27:00 (CDT)'.\n *\n * @param date The date to format.\n * @param timeZone The time zone to use for formatting.\n * @param options\n * @param options.includeTz Whether to include the time zone in the output (default true).\n * @returns Human-readable string representing the date.\n */\nexport function formatDateHMS(\n date: Date,\n timeZone: string,\n { includeTz = true }: { includeTz?: boolean } = {},\n): string {\n const options: Intl.DateTimeFormatOptions = {\n timeZone,\n hourCycle: 'h23',\n hour: '2-digit',\n minute: '2-digit',\n second: '2-digit',\n timeZoneName: 'short',\n };\n const parts = keyBy(new Intl.DateTimeFormat('en-US', options).formatToParts(date), (x) => x.type);\n let dateFormatted = `${parts.hour.value}:${parts.minute.value}:${parts.second.value}`;\n if (includeTz) {\n dateFormatted = `${dateFormatted} (${parts.timeZoneName.value})`;\n }\n return dateFormatted;\n}\n\n/**\n * Format a date to a human-readable string like '18:23' or 'May 2, 07:12',\n * where the precision is determined by the range.\n *\n * @param date The date to format.\n * @param rangeStart The start of the range.\n * @param rangeEnd The end of the range.\n * @param timeZone The time zone to use for formatting.\n * @returns Human-readable string representing the date.\n */\nexport function formatDateWithinRange(\n date: Date,\n rangeStart: Date,\n rangeEnd: Date,\n timeZone: string,\n): string {\n const options: Intl.DateTimeFormatOptions = {\n timeZone,\n hourCycle: 'h23',\n year: 'numeric',\n month: '2-digit',\n day: '2-digit',\n hour: '2-digit',\n minute: '2-digit',\n timeZoneName: 'short',\n };\n const dateParts = keyBy(\n new Intl.DateTimeFormat('en-US', options).formatToParts(date),\n (x) => x.type,\n );\n const startParts = keyBy(\n new Intl.DateTimeFormat('en-US', options).formatToParts(rangeStart),\n (x) => x.type,\n );\n const endParts = keyBy(\n new Intl.DateTimeFormat('en-US', options).formatToParts(rangeEnd),\n (x) => x.type,\n );\n\n // format the date (not time) parts\n const dateYMD = `${dateParts.year.value}-${dateParts.month.value}-${dateParts.day.value}`;\n const startYMD = `${startParts.year.value}-${startParts.month.value}-${startParts.day.value}`;\n const endYMD = `${endParts.year.value}-${endParts.month.value}-${endParts.day.value}`;\n\n if (dateYMD === startYMD && dateYMD === endYMD) {\n // only show the time if the date is the same for all three\n return `${dateParts.hour.value}:${dateParts.minute.value}`;\n }\n\n // format the year, but not the month or day\n const dateY = `${dateParts.year.value}`;\n const startY = `${startParts.year.value}`;\n const endY = `${endParts.year.value}`;\n\n // if the year is the same for all three, show the month, day, and time\n if (dateY === startY && dateY === endY) {\n const options: Intl.DateTimeFormatOptions = {\n timeZone,\n month: 'short',\n day: 'numeric',\n hour: '2-digit',\n minute: '2-digit',\n };\n const dateParts = keyBy(\n new Intl.DateTimeFormat('en-US', options).formatToParts(date),\n (x) => x.type,\n );\n return `${dateParts.month.value} ${dateParts.day.value}, ${dateParts.hour.value}:${dateParts.minute.value}`;\n }\n\n // fall back to the full date\n return `${dateParts.year.value}-${dateParts.month.value}-${dateParts.day.value} ${dateParts.hour.value}:${dateParts.minute.value}`;\n}\n\n/**\n * Format a Date to date and time strings in the given time zone. The date is\n * formatted like\n * - 'today'\n * - 'Mon, Mar 20' (if within 180 days of the base date)\n * - 'Wed, Jan 1, 2020'\n *\n * The time format leaves off zero minutes and seconds, and uses 12-hour time,\n * giving strings like\n * - '3pm'\n * - '3:34pm'\n * - '3:34:17pm'\n *\n * maxPrecision must be an equal or smaller unit than minPrecision.\n *\n * @param date The date to format.\n * @param timezone The time zone to use for formatting.\n * @param baseDate The base date to use for comparison.\n * @param maxPrecision Only show units as large or larger than the max precision.\n * @param minPrecision Always show that unit and larger, potentially showing smaller units.\n *\n */\nfunction formatDateFriendlyParts(\n date: Date,\n timezone: string,\n baseDate: Date,\n maxPrecision: TimePrecision = 'second',\n minPrecision: TimePrecision = 'hour',\n): { dateFormatted: string; timeFormatted: string; timezoneFormatted: string } {\n // compute the number of days from the base date (0 = today, 1 = tomorrow, etc.)\n\n const baseZonedDateTime = toTemporalInstant.call(baseDate).toZonedDateTimeISO(timezone);\n const zonedDateTime = toTemporalInstant.call(date).toZonedDateTimeISO(timezone);\n\n const basePlainDate = baseZonedDateTime.toPlainDate();\n const plainDate = zonedDateTime.toPlainDate();\n\n const daysOffset = plainDate.since(basePlainDate, { largestUnit: 'day' }).days;\n\n // format the parts of the date and time\n\n const options: Intl.DateTimeFormatOptions = {\n timeZone: timezone,\n year: 'numeric',\n month: 'short',\n day: 'numeric',\n weekday: 'short',\n hourCycle: 'h12',\n hour: 'numeric',\n minute: '2-digit',\n second: '2-digit',\n timeZoneName: 'short',\n };\n const parts = keyBy(new Intl.DateTimeFormat('en-US', options).formatToParts(date), (x) => x.type);\n\n // format the date string\n\n let dateFormatted = '';\n if (daysOffset === 0) {\n dateFormatted = 'today';\n } else if (daysOffset === 1) {\n dateFormatted = 'tomorrow';\n } else if (daysOffset === -1) {\n dateFormatted = 'yesterday';\n } else if (Math.abs(daysOffset) <= 180) {\n // non-breaking-space (\\u00a0) is used between the month and day\n dateFormatted = `${parts.weekday.value}, ${parts.month.value}\\u00a0${parts.day.value}`;\n } else {\n dateFormatted = `${parts.weekday.value}, ${parts.month.value}\\u00a0${parts.day.value}, ${parts.year.value}`;\n }\n\n const precisionOrder: TimePrecision[] = ['second', 'minute', 'hour'];\n const maxIndex = precisionOrder.indexOf(maxPrecision);\n const minIndex = precisionOrder.indexOf(minPrecision);\n\n /**\n * The maximum precision must be a unit smaller than or equal to the minimum precision, otherwise the rules will contradict each other.\n *\n * If max is a larger unit than min, e.g. max = hour, min = minute, then by \"min\"\n * we must display minute and smaller but by \"max\" we can display hour and larger, which is a contradiction.\n *\n * If min is a larger unit than max, e.g. max = minute, min = hour, then by \"min\" we must display\n * hour and smaller and by \"max\" we can display minutes and larger. These do not contradict each other.\n *\n * V min/max > | h | m | s\n * h | X | X | X\n * m | I | X | X\n * s | I | I | X\n *\n * X - valid configuration\n * I - invalid configuration\n */\n\n // A higher index corresponds to a larger unit, so if maxIndex is larger than minIndex, then the rules contradict each other.\n if (maxIndex > minIndex) {\n throw new Error('maxPrecision must be an equal or smaller unit than minPrecision.');\n }\n\n /**\n * Examples:\n * min=h, max=h: 0:00:00AM -> 0AM, 0:00:01AM -> 0AM, 0:01:01AM -> 0AM\n * min=h, max=m: 0:00:00AM -> 0AM, 0:00:01AM -> 0AM, 0:01:01AM -> 0:01AM\n * min=h, max=s: 0:00:00AM -> 0AM, 0:00:01AM -> 0:00:01AM, 0:01:01AM -> 0:01:01AM\n *\n * min=m, max=m: 0:00:00AM -> 0:00AM, 0:00:01AM -> 0:00AM, 0:01:01AM -> 0:00AM\n * min=m, max=s: 0:00:00AM -> 0:00AM, 0:00:01AM -> 0:00AM, 0:01:01AM -> 0:01:01AM\n *\n * min=s, max=s: 0:00:00AM -> 0:00:00AM, 0:00:01AM -> 0:00:01AM, 0:01:01AM -> 0:01:01AM\n */\n\n let timeFormatted = parts.hour.value;\n\n const shouldShowMinutes =\n ['minute', 'second'].includes(minPrecision) ||\n (maxPrecision === 'minute' && parts.minute.value !== '00') ||\n (maxPrecision === 'second' && (parts.minute.value !== '00' || parts.second.value !== '00'));\n\n if (shouldShowMinutes) {\n timeFormatted += `:${parts.minute.value}`;\n }\n\n const shouldShowSeconds =\n minPrecision === 'second' || (maxPrecision === 'second' && parts.second.value !== '00');\n\n if (shouldShowSeconds) {\n timeFormatted += `:${parts.second.value}`;\n }\n // add the am/pm part\n timeFormatted = `${timeFormatted}${parts.dayPeriod.value.toLowerCase()}`;\n\n // format the timezone\n\n const timezoneFormatted = `(${parts.timeZoneName.value})`;\n\n return {\n dateFormatted,\n timeFormatted,\n timezoneFormatted,\n };\n}\n\n/**\n * Format a date to a string like:\n * - 'today, 3pm'\n * - 'tomorrow, 10:30am'\n * - 'yesterday, 11:45pm'\n * - 'Mon, Mar 20, 8:15am' (if within 180 days of the base date)\n * - 'Wed, Jan 1, 2020, 12pm'\n * - `today, 3pm (CDT)` (if `includeTz` is true)\n * - `3pm today` (if `timeFirst` is true)\n * - 'today' (if `dateOnly` is true)\n *\n * If using this within a sentence like `... at ${formatDateFriendlyString()}`,\n * use `timeFirst: true` to improve readability.\n *\n * @param date The date to format.\n * @param timezone The time zone to use for formatting.\n * @param options\n * @param options.baseDate The base date to use for comparison (default is the current date).\n * @param options.includeTz Whether to include the time zone in the output (default true).\n * @param options.timeFirst If true, the time is shown before the date (default false).\n * @param options.dateOnly If true, only the date is shown (default false).\n * @param options.timeOnly If true, only the time is shown (default false).\n * @param options.maxPrecision The maximum precision to show for time (default 'minute').\n * @param options.minPrecision The minimum precision to always show for time (default 'hour').\n * @returns Human-readable string representing the date and time.\n */\nexport function formatDateFriendly(\n date: Date,\n timezone: string,\n {\n baseDate = new Date(),\n includeTz = true,\n timeFirst = false,\n dateOnly = false,\n timeOnly = false,\n maxPrecision = 'second',\n minPrecision = 'hour',\n }: {\n baseDate?: Date;\n includeTz?: boolean;\n timeFirst?: boolean;\n dateOnly?: boolean;\n timeOnly?: boolean;\n maxPrecision?: TimePrecision;\n minPrecision?: TimePrecision;\n } = {},\n): string {\n const { dateFormatted, timeFormatted, timezoneFormatted } = formatDateFriendlyParts(\n date,\n timezone,\n baseDate,\n maxPrecision,\n minPrecision,\n );\n\n let dateTimeFormatted = '';\n if (dateOnly) {\n dateTimeFormatted = dateFormatted;\n } else if (timeOnly) {\n dateTimeFormatted = timeFormatted;\n } else {\n if (timeFirst) {\n dateTimeFormatted = `${timeFormatted} ${dateFormatted}`;\n } else {\n dateTimeFormatted = `${dateFormatted}, ${timeFormatted}`;\n }\n }\n if (includeTz) {\n dateTimeFormatted = `${dateTimeFormatted} ${timezoneFormatted}`;\n }\n return dateTimeFormatted;\n}\n\n/**\n * Format a datetime range to a string like:\n * - 'today, 10am'\n * - 'today, 3pm to 5pm'\n * - 'today, 3pm to tomorrow, 5pm'\n * - 'today, 3pm to 5pm (CDT)' (if `includeTz` is true)\n * - '3pm today to 5pm tomorrow' (if `timeFirst` is true)\n * - 'today to tomorrow' (if `dateOnly` is true)\n *\n * This uses `formatDateFriendlyString()` to format the individual dates and times.\n *\n * @param start The start date and time.\n * @param end The end date and time.\n * @param timezone The time zone to use for formatting.\n * @param options Additional options for formatting the displayed date, taken from `formatDateFriendlyString()`.\n * @param options.baseDate The base date to use for comparison (default is the current date).\n * @param options.includeTz Whether to include the time zone in the output (default true).\n * @param options.timeFirst If true, the time is shown before the date (default false).\n * @param options.dateOnly If true, only the date is shown (default false).\n * @param options.maxPrecision The maximum precision to show for time (default 'minute').\n * @param options.minPrecision The minimum precision to always show for time (default 'hour').\n * @returns Human-readable string representing the datetime range.\n */\nexport function formatDateRangeFriendly(\n start: Date,\n end: Date,\n timezone: string,\n {\n baseDate = new Date(),\n includeTz = true,\n timeFirst = false,\n dateOnly = false,\n maxPrecision = 'second',\n minPrecision = 'hour',\n }: Parameters<typeof formatDateFriendly>[2] = {},\n): string {\n const {\n dateFormatted: startDateFormatted,\n timeFormatted: startTimeFormatted,\n timezoneFormatted,\n } = formatDateFriendlyParts(start, timezone, baseDate, maxPrecision, minPrecision);\n const { dateFormatted: endDateFormatted, timeFormatted: endTimeFormatted } =\n formatDateFriendlyParts(end, timezone, baseDate, maxPrecision, minPrecision);\n\n let result: string | undefined;\n if (dateOnly) {\n if (startDateFormatted === endDateFormatted) {\n result = startDateFormatted;\n } else {\n result = `${startDateFormatted} to ${endDateFormatted}`;\n }\n } else {\n if (startDateFormatted === endDateFormatted) {\n let timeRangeFormatted: string | undefined;\n if (startTimeFormatted === endTimeFormatted) {\n timeRangeFormatted = startTimeFormatted;\n } else {\n timeRangeFormatted = `${startTimeFormatted} to ${endTimeFormatted}`;\n }\n if (timeFirst) {\n result = `${timeRangeFormatted} ${startDateFormatted}`;\n } else {\n result = `${startDateFormatted}, ${timeRangeFormatted}`;\n }\n } else {\n if (timeFirst) {\n result = `${startTimeFormatted} ${startDateFormatted} to ${endTimeFormatted} ${endDateFormatted}`;\n } else {\n result = `${startDateFormatted}, ${startTimeFormatted} to ${endDateFormatted}, ${endTimeFormatted}`;\n }\n }\n }\n if (includeTz) {\n result = `${result} ${timezoneFormatted}`;\n }\n return result;\n}\n"]}
|
|
1
|
+
{"version":3,"file":"date.js","sourceRoot":"","sources":["../src/date.ts"],"names":[],"mappings":"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","sourcesContent":["import { Temporal, toTemporalInstant } from '@js-temporal/polyfill';\nimport keyBy from 'lodash/keyBy.js';\n\ntype TimePrecision = 'hour' | 'minute' | 'second';\n\n/**\n * Format a date to a human-readable string like '2020-03-27T12:34:56 (CDT)'.\n *\n * @param date The date to format.\n * @param timeZone The time zone to use for formatting.\n * @param options\n * @param options.includeMs Whether to include milliseconds in the output (default false).\n * @param options.includeTz Whether to include the time zone in the output (default true).\n * @param options.longTz Whether to use the long time zone name (default false).\n * @returns Human-readable string representing the date.\n */\nexport function formatDate(\n date: Date | Temporal.PlainDateTime,\n timeZone: string,\n {\n includeTz = true,\n longTz = false,\n includeMs = false,\n }: { includeTz?: boolean; longTz?: boolean; includeMs?: boolean } = {},\n): string {\n if (date instanceof Temporal.PlainDateTime) {\n date = new Date(date.toZonedDateTime(timeZone).epochMilliseconds);\n }\n\n const options: Intl.DateTimeFormatOptions = {\n timeZone,\n hourCycle: 'h23',\n year: 'numeric',\n month: '2-digit',\n day: '2-digit',\n hour: '2-digit',\n minute: '2-digit',\n second: '2-digit',\n fractionalSecondDigits: includeMs ? 3 : undefined,\n timeZoneName: longTz ? 'long' : 'short',\n };\n const parts = keyBy(new Intl.DateTimeFormat('en-US', options).formatToParts(date), (x) => x.type);\n let dateFormatted = `${parts.year.value}-${parts.month.value}-${parts.day.value} ${parts.hour.value}:${parts.minute.value}:${parts.second.value}`;\n if (includeMs) {\n dateFormatted = `${dateFormatted}.${parts.fractionalSecond.value}`;\n }\n if (includeTz) {\n dateFormatted = `${dateFormatted} (${parts.timeZoneName.value})`;\n }\n return dateFormatted;\n}\n\n/**\n * Format a date to a human-readable string like '2020-03-27'.\n *\n * @param date The date to format.\n * @param timeZone The time zone to use for formatting.\n * @returns Human-readable string representing the date.\n */\nexport function formatDateYMD(date: Date, timeZone: string): string {\n const options: Intl.DateTimeFormatOptions = {\n timeZone,\n hourCycle: 'h23',\n year: 'numeric',\n month: '2-digit',\n day: '2-digit',\n };\n const parts = keyBy(new Intl.DateTimeFormat('en-US', options).formatToParts(date), (x) => x.type);\n return `${parts.year.value}-${parts.month.value}-${parts.day.value}`;\n}\n\n/**\n * Format a date to a human-readable string like '2020-03-27 14:27'.\n *\n * @param date The date to format.\n * @param timeZone The time zone to use for formatting.\n * @returns Human-readable string representing the date.\n */\nexport function formatDateYMDHM(date: Date, timeZone: string): string {\n const options: Intl.DateTimeFormatOptions = {\n timeZone,\n hourCycle: 'h23',\n year: 'numeric',\n month: '2-digit',\n day: '2-digit',\n hour: '2-digit',\n minute: '2-digit',\n };\n const parts = keyBy(new Intl.DateTimeFormat('en-US', options).formatToParts(date), (x) => x.type);\n return `${parts.year.value}-${parts.month.value}-${parts.day.value} ${parts.hour.value}:${parts.minute.value}`;\n}\n\n/**\n * Format a time zone to a human-readable string like 'CDT'.\n *\n * @param timeZone The time zone to format.\n * @returns Human-readable string representing the time zone.\n */\nexport function formatTz(timeZone: string): string {\n const date = new Date();\n const parts = new Intl.DateTimeFormat('en-US', {\n timeZone,\n timeZoneName: 'short',\n }).formatToParts(date);\n const tz = parts.find((p) => p.type === 'timeZoneName');\n return tz ? tz.value : timeZone;\n}\n\n/**\n * Format a date to a human-readable string like '14:27:00 (CDT)'.\n *\n * @param date The date to format.\n * @param timeZone The time zone to use for formatting.\n * @param options\n * @param options.includeTz Whether to include the time zone in the output (default true).\n * @returns Human-readable string representing the date.\n */\nexport function formatDateHMS(\n date: Date,\n timeZone: string,\n { includeTz = true }: { includeTz?: boolean } = {},\n): string {\n const options: Intl.DateTimeFormatOptions = {\n timeZone,\n hourCycle: 'h23',\n hour: '2-digit',\n minute: '2-digit',\n second: '2-digit',\n timeZoneName: 'short',\n };\n const parts = keyBy(new Intl.DateTimeFormat('en-US', options).formatToParts(date), (x) => x.type);\n let dateFormatted = `${parts.hour.value}:${parts.minute.value}:${parts.second.value}`;\n if (includeTz) {\n dateFormatted = `${dateFormatted} (${parts.timeZoneName.value})`;\n }\n return dateFormatted;\n}\n\n/**\n * Format a date to a human-readable string like '18:23' or 'May 2, 07:12',\n * where the precision is determined by the range.\n *\n * @param date The date to format.\n * @param rangeStart The start of the range.\n * @param rangeEnd The end of the range.\n * @param timeZone The time zone to use for formatting.\n * @returns Human-readable string representing the date.\n */\nexport function formatDateWithinRange(\n date: Date,\n rangeStart: Date,\n rangeEnd: Date,\n timeZone: string,\n): string {\n const options: Intl.DateTimeFormatOptions = {\n timeZone,\n hourCycle: 'h23',\n year: 'numeric',\n month: '2-digit',\n day: '2-digit',\n hour: '2-digit',\n minute: '2-digit',\n timeZoneName: 'short',\n };\n const dateParts = keyBy(\n new Intl.DateTimeFormat('en-US', options).formatToParts(date),\n (x) => x.type,\n );\n const startParts = keyBy(\n new Intl.DateTimeFormat('en-US', options).formatToParts(rangeStart),\n (x) => x.type,\n );\n const endParts = keyBy(\n new Intl.DateTimeFormat('en-US', options).formatToParts(rangeEnd),\n (x) => x.type,\n );\n\n // format the date (not time) parts\n const dateYMD = `${dateParts.year.value}-${dateParts.month.value}-${dateParts.day.value}`;\n const startYMD = `${startParts.year.value}-${startParts.month.value}-${startParts.day.value}`;\n const endYMD = `${endParts.year.value}-${endParts.month.value}-${endParts.day.value}`;\n\n if (dateYMD === startYMD && dateYMD === endYMD) {\n // only show the time if the date is the same for all three\n return `${dateParts.hour.value}:${dateParts.minute.value}`;\n }\n\n // format the year, but not the month or day\n const dateY = `${dateParts.year.value}`;\n const startY = `${startParts.year.value}`;\n const endY = `${endParts.year.value}`;\n\n // if the year is the same for all three, show the month, day, and time\n if (dateY === startY && dateY === endY) {\n const options: Intl.DateTimeFormatOptions = {\n timeZone,\n month: 'short',\n day: 'numeric',\n hour: '2-digit',\n minute: '2-digit',\n };\n const dateParts = keyBy(\n new Intl.DateTimeFormat('en-US', options).formatToParts(date),\n (x) => x.type,\n );\n return `${dateParts.month.value} ${dateParts.day.value}, ${dateParts.hour.value}:${dateParts.minute.value}`;\n }\n\n // fall back to the full date\n return `${dateParts.year.value}-${dateParts.month.value}-${dateParts.day.value} ${dateParts.hour.value}:${dateParts.minute.value}`;\n}\n\n/**\n * Format a Date to date and time strings in the given time zone. The date is\n * formatted like\n * - 'today'\n * - 'Mon, Mar 20' (if within 180 days of the base date)\n * - 'Wed, Jan 1, 2020'\n *\n * The time format leaves off zero minutes and seconds, and uses 12-hour time,\n * giving strings like\n * - '3pm'\n * - '3:34pm'\n * - '3:34:17pm'\n *\n * maxPrecision must be an equal or smaller unit than minPrecision.\n *\n * @param date The date to format.\n * @param timezone The time zone to use for formatting.\n * @param baseDate The base date to use for comparison.\n * @param maxPrecision Only show units as large or larger than the max precision.\n * @param minPrecision Always show that unit and larger, potentially showing smaller units.\n *\n */\nfunction formatDateFriendlyParts(\n date: Date,\n timezone: string,\n baseDate: Date,\n maxPrecision: TimePrecision = 'second',\n minPrecision: TimePrecision = 'hour',\n): { dateFormatted: string; timeFormatted: string; timezoneFormatted: string } {\n // compute the number of days from the base date (0 = today, 1 = tomorrow, etc.)\n\n const baseZonedDateTime = toTemporalInstant.call(baseDate).toZonedDateTimeISO(timezone);\n const zonedDateTime = toTemporalInstant.call(date).toZonedDateTimeISO(timezone);\n\n const basePlainDate = baseZonedDateTime.toPlainDate();\n const plainDate = zonedDateTime.toPlainDate();\n\n const daysOffset = plainDate.since(basePlainDate, { largestUnit: 'day' }).days;\n\n // format the parts of the date and time\n\n const options: Intl.DateTimeFormatOptions = {\n timeZone: timezone,\n year: 'numeric',\n month: 'short',\n day: 'numeric',\n weekday: 'short',\n hourCycle: 'h12',\n hour: 'numeric',\n minute: '2-digit',\n second: '2-digit',\n timeZoneName: 'short',\n };\n const parts = keyBy(new Intl.DateTimeFormat('en-US', options).formatToParts(date), (x) => x.type);\n\n // format the date string\n\n let dateFormatted = '';\n if (daysOffset === 0) {\n dateFormatted = 'today';\n } else if (daysOffset === 1) {\n dateFormatted = 'tomorrow';\n } else if (daysOffset === -1) {\n dateFormatted = 'yesterday';\n } else if (Math.abs(daysOffset) <= 180) {\n // non-breaking-space (\\u00a0) is used between the month and day\n dateFormatted = `${parts.weekday.value}, ${parts.month.value}\\u00a0${parts.day.value}`;\n } else {\n dateFormatted = `${parts.weekday.value}, ${parts.month.value}\\u00a0${parts.day.value}, ${parts.year.value}`;\n }\n\n const precisionOrder: TimePrecision[] = ['second', 'minute', 'hour'];\n const maxIndex = precisionOrder.indexOf(maxPrecision);\n const minIndex = precisionOrder.indexOf(minPrecision);\n\n /**\n * The maximum precision must be a unit smaller than or equal to the minimum precision, otherwise the rules will contradict each other.\n *\n * If max is a larger unit than min, e.g. max = hour, min = minute, then by \"min\"\n * we must display minute and smaller but by \"max\" we can display hour and larger, which is a contradiction.\n *\n * If min is a larger unit than max, e.g. max = minute, min = hour, then by \"min\" we must display\n * hour and smaller and by \"max\" we can display minutes and larger. These do not contradict each other.\n *\n * V min/max > | h | m | s\n * h | X | X | X\n * m | I | X | X\n * s | I | I | X\n *\n * X - valid configuration\n * I - invalid configuration\n */\n\n // A higher index corresponds to a larger unit, so if maxIndex is larger than minIndex, then the rules contradict each other.\n if (maxIndex > minIndex) {\n throw new Error('maxPrecision must be an equal or smaller unit than minPrecision.');\n }\n\n /**\n * Examples:\n * min=h, max=h: 0:00:00AM -> 0AM, 0:00:01AM -> 0AM, 0:01:01AM -> 0AM\n * min=h, max=m: 0:00:00AM -> 0AM, 0:00:01AM -> 0AM, 0:01:01AM -> 0:01AM\n * min=h, max=s: 0:00:00AM -> 0AM, 0:00:01AM -> 0:00:01AM, 0:01:01AM -> 0:01:01AM\n *\n * min=m, max=m: 0:00:00AM -> 0:00AM, 0:00:01AM -> 0:00AM, 0:01:01AM -> 0:00AM\n * min=m, max=s: 0:00:00AM -> 0:00AM, 0:00:01AM -> 0:00AM, 0:01:01AM -> 0:01:01AM\n *\n * min=s, max=s: 0:00:00AM -> 0:00:00AM, 0:00:01AM -> 0:00:01AM, 0:01:01AM -> 0:01:01AM\n */\n\n let timeFormatted = parts.hour.value;\n\n const shouldShowMinutes =\n ['minute', 'second'].includes(minPrecision) ||\n (maxPrecision === 'minute' && parts.minute.value !== '00') ||\n (maxPrecision === 'second' && (parts.minute.value !== '00' || parts.second.value !== '00'));\n\n if (shouldShowMinutes) {\n timeFormatted += `:${parts.minute.value}`;\n }\n\n const shouldShowSeconds =\n minPrecision === 'second' || (maxPrecision === 'second' && parts.second.value !== '00');\n\n if (shouldShowSeconds) {\n timeFormatted += `:${parts.second.value}`;\n }\n // add the am/pm part\n timeFormatted = `${timeFormatted}${parts.dayPeriod.value.toLowerCase()}`;\n\n // format the timezone\n\n const timezoneFormatted = `(${parts.timeZoneName.value})`;\n\n return {\n dateFormatted,\n timeFormatted,\n timezoneFormatted,\n };\n}\n\n/**\n * Format a date to a string like:\n * - 'today, 3pm'\n * - 'tomorrow, 10:30am'\n * - 'yesterday, 11:45pm'\n * - 'Mon, Mar 20, 8:15am' (if within 180 days of the base date)\n * - 'Wed, Jan 1, 2020, 12pm'\n * - `today, 3pm (CDT)` (if `includeTz` is true)\n * - `3pm today` (if `timeFirst` is true)\n * - 'today' (if `dateOnly` is true)\n *\n * If using this within a sentence like `... at ${formatDateFriendlyString()}`,\n * use `timeFirst: true` to improve readability.\n *\n * @param date The date to format.\n * @param timezone The time zone to use for formatting.\n * @param options\n * @param options.baseDate The base date to use for comparison (default is the current date).\n * @param options.includeTz Whether to include the time zone in the output (default true).\n * @param options.timeFirst If true, the time is shown before the date (default false).\n * @param options.dateOnly If true, only the date is shown (default false).\n * @param options.timeOnly If true, only the time is shown (default false).\n * @param options.maxPrecision The maximum precision to show for time (default 'minute').\n * @param options.minPrecision The minimum precision to always show for time (default 'hour').\n * @returns Human-readable string representing the date and time.\n */\nexport function formatDateFriendly(\n date: Date | Temporal.PlainDateTime,\n timezone: string,\n {\n baseDate = new Date(),\n includeTz = true,\n timeFirst = false,\n dateOnly = false,\n timeOnly = false,\n maxPrecision = 'second',\n minPrecision = 'hour',\n }: {\n baseDate?: Date;\n includeTz?: boolean;\n timeFirst?: boolean;\n dateOnly?: boolean;\n timeOnly?: boolean;\n maxPrecision?: TimePrecision;\n minPrecision?: TimePrecision;\n } = {},\n): string {\n if (date instanceof Temporal.PlainDateTime) {\n date = new Date(date.toZonedDateTime(timezone).epochMilliseconds);\n }\n\n const { dateFormatted, timeFormatted, timezoneFormatted } = formatDateFriendlyParts(\n date,\n timezone,\n baseDate,\n maxPrecision,\n minPrecision,\n );\n\n let dateTimeFormatted = '';\n if (dateOnly) {\n dateTimeFormatted = dateFormatted;\n } else if (timeOnly) {\n dateTimeFormatted = timeFormatted;\n } else {\n if (timeFirst) {\n dateTimeFormatted = `${timeFormatted} ${dateFormatted}`;\n } else {\n dateTimeFormatted = `${dateFormatted}, ${timeFormatted}`;\n }\n }\n if (includeTz) {\n dateTimeFormatted = `${dateTimeFormatted} ${timezoneFormatted}`;\n }\n return dateTimeFormatted;\n}\n\n/**\n * Format a datetime range to a string like:\n * - 'today, 10am'\n * - 'today, 3pm to 5pm'\n * - 'today, 3pm to tomorrow, 5pm'\n * - 'today, 3pm to 5pm (CDT)' (if `includeTz` is true)\n * - '3pm today to 5pm tomorrow' (if `timeFirst` is true)\n * - 'today to tomorrow' (if `dateOnly` is true)\n *\n * This uses `formatDateFriendlyString()` to format the individual dates and times.\n *\n * @param start The start date and time.\n * @param end The end date and time.\n * @param timezone The time zone to use for formatting.\n * @param options Additional options for formatting the displayed date, taken from `formatDateFriendlyString()`.\n * @param options.baseDate The base date to use for comparison (default is the current date).\n * @param options.includeTz Whether to include the time zone in the output (default true).\n * @param options.timeFirst If true, the time is shown before the date (default false).\n * @param options.dateOnly If true, only the date is shown (default false).\n * @param options.maxPrecision The maximum precision to show for time (default 'minute').\n * @param options.minPrecision The minimum precision to always show for time (default 'hour').\n * @returns Human-readable string representing the datetime range.\n */\nexport function formatDateRangeFriendly(\n start: Date,\n end: Date,\n timezone: string,\n {\n baseDate = new Date(),\n includeTz = true,\n timeFirst = false,\n dateOnly = false,\n maxPrecision = 'second',\n minPrecision = 'hour',\n }: Parameters<typeof formatDateFriendly>[2] = {},\n): string {\n const {\n dateFormatted: startDateFormatted,\n timeFormatted: startTimeFormatted,\n timezoneFormatted,\n } = formatDateFriendlyParts(start, timezone, baseDate, maxPrecision, minPrecision);\n const { dateFormatted: endDateFormatted, timeFormatted: endTimeFormatted } =\n formatDateFriendlyParts(end, timezone, baseDate, maxPrecision, minPrecision);\n\n let result: string | undefined;\n if (dateOnly) {\n if (startDateFormatted === endDateFormatted) {\n result = startDateFormatted;\n } else {\n result = `${startDateFormatted} to ${endDateFormatted}`;\n }\n } else {\n if (startDateFormatted === endDateFormatted) {\n let timeRangeFormatted: string | undefined;\n if (startTimeFormatted === endTimeFormatted) {\n timeRangeFormatted = startTimeFormatted;\n } else {\n timeRangeFormatted = `${startTimeFormatted} to ${endTimeFormatted}`;\n }\n if (timeFirst) {\n result = `${timeRangeFormatted} ${startDateFormatted}`;\n } else {\n result = `${startDateFormatted}, ${timeRangeFormatted}`;\n }\n } else {\n if (timeFirst) {\n result = `${startTimeFormatted} ${startDateFormatted} to ${endTimeFormatted} ${endDateFormatted}`;\n } else {\n result = `${startDateFormatted}, ${startTimeFormatted} to ${endDateFormatted}, ${endTimeFormatted}`;\n }\n }\n }\n if (includeTz) {\n result = `${result} ${timezoneFormatted}`;\n }\n return result;\n}\n"]}
|
package/dist/interval.test.js
CHANGED
|
@@ -56,13 +56,13 @@ describe('interval formatting', () => {
|
|
|
56
56
|
});
|
|
57
57
|
});
|
|
58
58
|
describe('formatIntervalHM()', () => {
|
|
59
|
-
it('should correctly handle
|
|
59
|
+
it('should correctly handle positive minutes', () => {
|
|
60
60
|
assert.equal(formatIntervalHM(3.2 * 60 * 1000), '00:03');
|
|
61
61
|
});
|
|
62
|
-
it('should correctly handle
|
|
62
|
+
it('should correctly handle positive hours', () => {
|
|
63
63
|
assert.equal(formatIntervalHM((4 * 60 + 17.8) * 60 * 1000), '04:17');
|
|
64
64
|
});
|
|
65
|
-
it('should correctly handle large
|
|
65
|
+
it('should correctly handle large positive hours', () => {
|
|
66
66
|
assert.equal(formatIntervalHM((143 * 60 + 17.8) * 60 * 1000), '143:17');
|
|
67
67
|
});
|
|
68
68
|
it('should correctly handle an explicit sign', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interval.test.js","sourceRoot":"","sources":["../src/interval.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACrB,sBAAsB,EACtB,YAAY,GACb,MAAM,eAAe,CAAC;AAEvB,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;YAC/B,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YAC1C,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;YAC/B,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;YAC7B,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;YAC7B,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;YACzC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,mBAAmB,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;YAC5B,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YAC1C,MAAM,CAAC,KAAK,CACV,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,EAC1D,uBAAuB,CACxB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;QACxC,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YAC1C,MAAM,CAAC,KAAK,CACV,sBAAsB,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,gBAAgB,CAAC,EAC3D,gCAAgC,CACjC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YAC1C,MAAM,CAAC,KAAK,CACV,sBAAsB,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAChE,kCAAkC,CACnC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACtC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,qBAAqB,CAAC,CAAC;QAC3F,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACnC,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YAC1C,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACtC,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YAC3C,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;YACpD,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"interval.test.js","sourceRoot":"","sources":["../src/interval.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { assert, describe, it } from 'vitest';\n\nimport {\n formatInterval,\n formatIntervalHM,\n formatIntervalMinutes,\n formatIntervalRelative,\n makeInterval,\n} from './interval.js';\n\ndescribe('interval formatting', () => {\n describe('formatInterval()', () => {\n it('should handle seconds', () => {\n assert.equal(formatInterval(7000), '7 s');\n });\n it('should handle fractional seconds', () => {\n assert.equal(formatInterval(7321), '7 s');\n });\n it('should handle minutes', () => {\n assert.equal(formatInterval(2 * 60 * 1000), '2 min');\n });\n it('should handle hours', () => {\n assert.equal(formatInterval(3 * 60 * 60 * 1000), '3 h');\n });\n it('should handle hours', () => {\n assert.equal(formatInterval(4 * 24 * 60 * 60 * 1000), '4 d');\n });\n it('should handle complex intervals', () => {\n assert.equal(formatInterval((((4 * 24 + 3) * 60 + 2) * 60 + 7) * 1000), '4 d 3 h 2 min 7 s');\n });\n it('should handle zero', () => {\n assert.equal(formatInterval(0), '0 s');\n });\n it('should handle negative intervals', () => {\n assert.equal(\n formatInterval(-(((4 * 24 + 3) * 60 + 2) * 60 + 7) * 1000),\n '-4 d -3 h -2 min -7 s',\n );\n });\n });\n describe('formatIntervalRelative()', () => {\n it('should handle positive intervals', () => {\n assert.equal(\n formatIntervalRelative(3 * 1000, 'Until', 'the start time'),\n 'Until 3 s after the start time',\n );\n });\n it('should handle negative intervals', () => {\n assert.equal(\n formatIntervalRelative(-7 * 60 * 1000, 'From', 'the start time'),\n 'From 7 min before the start time',\n );\n });\n it('should handle zero intervals', () => {\n assert.equal(formatIntervalRelative(0, 'From', 'the start time'), 'From the start time');\n });\n });\n\n describe('formatIntervalMinutes()', () => {\n it('should correctly round up', () => {\n assert.equal(formatIntervalMinutes(3.2 * 60 * 1000), '4 minutes');\n });\n it('should correctly handle 1 minute', () => {\n assert.equal(formatIntervalMinutes(17 * 1000), '1 minute');\n });\n it('should correctly handle zero', () => {\n assert.equal(formatIntervalMinutes(0), '0 minutes');\n });\n it('should correctly handle -1 minute', () => {\n assert.equal(formatIntervalMinutes(-17 * 1000), '-1 minute');\n });\n it('should correctly handle negative intervals', () => {\n assert.equal(formatIntervalMinutes(-3.2 * 60 * 1000), '-4 minutes');\n });\n });\n\n describe('formatIntervalHM()', () => {\n it('should correctly handle positive minutes', () => {\n assert.equal(formatIntervalHM(3.2 * 60 * 1000), '00:03');\n });\n it('should correctly handle positive hours', () => {\n assert.equal(formatIntervalHM((4 * 60 + 17.8) * 60 * 1000), '04:17');\n });\n it('should correctly handle large positive hours', () => {\n assert.equal(formatIntervalHM((143 * 60 + 17.8) * 60 * 1000), '143:17');\n });\n it('should correctly handle an explicit sign', () => {\n assert.equal(formatIntervalHM((4 * 60 + 17.8) * 60 * 1000, { signed: true }), '+04:17');\n });\n it('should correctly handle negative minutes', () => {\n assert.equal(formatIntervalHM(-3.2 * 60 * 1000), '-00:03');\n });\n it('should correctly handle negative hours', () => {\n assert.equal(formatIntervalHM(-(4 * 60 + 17.8) * 60 * 1000), '-04:17');\n });\n });\n\n describe('makeInterval()', () => {\n it('should handle seconds', () => {\n assert.equal(makeInterval({ seconds: 7 }), 7 * 1000);\n });\n it('should handle minutes', () => {\n assert.equal(makeInterval({ minutes: 2 }), 2 * 60 * 1000);\n });\n it('should handle hours', () => {\n assert.equal(makeInterval({ hours: 3 }), 3 * 60 * 60 * 1000);\n });\n it('should handle days', () => {\n assert.equal(makeInterval({ days: 4 }), 4 * 24 * 60 * 60 * 1000);\n });\n it('should default to zero', () => {\n assert.equal(makeInterval({}), 0);\n });\n });\n});\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prairielearn/formatter",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.5.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -19,10 +19,10 @@
|
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
21
|
"@prairielearn/tsconfig": "^0.0.0",
|
|
22
|
-
"@types/node": "^22.
|
|
23
|
-
"@vitest/coverage-v8": "^4.0.
|
|
24
|
-
"tsx": "^4.
|
|
22
|
+
"@types/node": "^22.19.3",
|
|
23
|
+
"@vitest/coverage-v8": "^4.0.16",
|
|
24
|
+
"tsx": "^4.21.0",
|
|
25
25
|
"typescript": "^5.9.3",
|
|
26
|
-
"vitest": "^4.0.
|
|
26
|
+
"vitest": "^4.0.16"
|
|
27
27
|
}
|
|
28
28
|
}
|
package/src/date.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { toTemporalInstant } from '@js-temporal/polyfill';
|
|
1
|
+
import { Temporal, toTemporalInstant } from '@js-temporal/polyfill';
|
|
2
2
|
import keyBy from 'lodash/keyBy.js';
|
|
3
3
|
|
|
4
4
|
type TimePrecision = 'hour' | 'minute' | 'second';
|
|
@@ -15,7 +15,7 @@ type TimePrecision = 'hour' | 'minute' | 'second';
|
|
|
15
15
|
* @returns Human-readable string representing the date.
|
|
16
16
|
*/
|
|
17
17
|
export function formatDate(
|
|
18
|
-
date: Date,
|
|
18
|
+
date: Date | Temporal.PlainDateTime,
|
|
19
19
|
timeZone: string,
|
|
20
20
|
{
|
|
21
21
|
includeTz = true,
|
|
@@ -23,6 +23,10 @@ export function formatDate(
|
|
|
23
23
|
includeMs = false,
|
|
24
24
|
}: { includeTz?: boolean; longTz?: boolean; includeMs?: boolean } = {},
|
|
25
25
|
): string {
|
|
26
|
+
if (date instanceof Temporal.PlainDateTime) {
|
|
27
|
+
date = new Date(date.toZonedDateTime(timeZone).epochMilliseconds);
|
|
28
|
+
}
|
|
29
|
+
|
|
26
30
|
const options: Intl.DateTimeFormatOptions = {
|
|
27
31
|
timeZone,
|
|
28
32
|
hourCycle: 'h23',
|
|
@@ -374,7 +378,7 @@ function formatDateFriendlyParts(
|
|
|
374
378
|
* @returns Human-readable string representing the date and time.
|
|
375
379
|
*/
|
|
376
380
|
export function formatDateFriendly(
|
|
377
|
-
date: Date,
|
|
381
|
+
date: Date | Temporal.PlainDateTime,
|
|
378
382
|
timezone: string,
|
|
379
383
|
{
|
|
380
384
|
baseDate = new Date(),
|
|
@@ -394,6 +398,10 @@ export function formatDateFriendly(
|
|
|
394
398
|
minPrecision?: TimePrecision;
|
|
395
399
|
} = {},
|
|
396
400
|
): string {
|
|
401
|
+
if (date instanceof Temporal.PlainDateTime) {
|
|
402
|
+
date = new Date(date.toZonedDateTime(timezone).epochMilliseconds);
|
|
403
|
+
}
|
|
404
|
+
|
|
397
405
|
const { dateFormatted, timeFormatted, timezoneFormatted } = formatDateFriendlyParts(
|
|
398
406
|
date,
|
|
399
407
|
timezone,
|
package/src/interval.test.ts
CHANGED
|
@@ -75,13 +75,13 @@ describe('interval formatting', () => {
|
|
|
75
75
|
});
|
|
76
76
|
|
|
77
77
|
describe('formatIntervalHM()', () => {
|
|
78
|
-
it('should correctly handle
|
|
78
|
+
it('should correctly handle positive minutes', () => {
|
|
79
79
|
assert.equal(formatIntervalHM(3.2 * 60 * 1000), '00:03');
|
|
80
80
|
});
|
|
81
|
-
it('should correctly handle
|
|
81
|
+
it('should correctly handle positive hours', () => {
|
|
82
82
|
assert.equal(formatIntervalHM((4 * 60 + 17.8) * 60 * 1000), '04:17');
|
|
83
83
|
});
|
|
84
|
-
it('should correctly handle large
|
|
84
|
+
it('should correctly handle large positive hours', () => {
|
|
85
85
|
assert.equal(formatIntervalHM((143 * 60 + 17.8) * 60 * 1000), '143:17');
|
|
86
86
|
});
|
|
87
87
|
it('should correctly handle an explicit sign', () => {
|