Run prettier for easier review of later commits

This commit is contained in:
Justin Grant 2022-12-16 04:54:25 -08:00 committed by Richard Gibson
parent 9821def022
commit f999dea7c0
6 changed files with 319 additions and 251 deletions

View File

@ -1,4 +1,3 @@
// Copyright (C) 2018 Bloomberg LP. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
@ -9,15 +8,14 @@ includes: [deepEqual.js]
features: [Temporal]
---*/
//should return an Array"
// should return an Array
assert(Array.isArray(Intl.DateTimeFormat.supportedLocalesOf()));
var onlyOnce = value => {
var onlyOnce = (value) => {
var obj = {
calls: 0,
toString() {
if (++this.calls > 1)
throw new RangeError("prop read twice");
if (++this.calls > 1) throw new RangeError("prop read twice");
return value;
}
};
@ -28,8 +26,7 @@ var optionsUS = {
calls: 0,
value: "America/New_York",
get timeZone() {
if (++this.calls > 1)
throw new RangeError("prop read twice");
if (++this.calls > 1) throw new RangeError("prop read twice");
return this.value;
},
set timeZone(val) {
@ -616,8 +613,14 @@ assert.deepEqual(at.formatToParts(end), [
]);
// formatRange
// should work for Instant
assert.sameValue(us.formatRange(Temporal.Instant.from(t1), Temporal.Instant.from(t2)), "11/18/1976, 9:23:30 AM \u2013 2/20/2020, 3:44:56 PM");
assert.sameValue(at.formatRange(Temporal.Instant.from(t1), Temporal.Instant.from(t2)), "18.11.1976, 15:23:30 \u2013 20.2.2020, 21:44:56");
assert.sameValue(
us.formatRange(Temporal.Instant.from(t1), Temporal.Instant.from(t2)),
"11/18/1976, 9:23:30 AM \u2013 2/20/2020, 3:44:56 PM"
);
assert.sameValue(
at.formatRange(Temporal.Instant.from(t1), Temporal.Instant.from(t2)),
"18.11.1976, 15:23:30 \u2013 20.2.2020, 21:44:56"
);
// should work for ZonedDateTime
var zdt1 = Temporal.ZonedDateTime.from(t1);
@ -626,28 +629,55 @@ assert.sameValue(us2.formatRange(zdt1, zdt2), "11/18/1976, 2:23:30 PM UTC \u2013
assert.sameValue(at2.formatRange(zdt1, zdt2), "18.11.1976, 14:23:30 UTC \u2013 20.2.2020, 20:44:56 UTC");
// should work for DateTime
assert.sameValue(us.formatRange(Temporal.PlainDateTime.from(t1), Temporal.PlainDateTime.from(t2)), "11/18/1976, 2:23:30 PM \u2013 2/20/2020, 3:44:56 PM");
assert.sameValue(at.formatRange(Temporal.PlainDateTime.from(t1), Temporal.PlainDateTime.from(t2)), "18.11.1976, 14:23:30 \u2013 20.2.2020, 15:44:56");
assert.sameValue(
us.formatRange(Temporal.PlainDateTime.from(t1), Temporal.PlainDateTime.from(t2)),
"11/18/1976, 2:23:30 PM \u2013 2/20/2020, 3:44:56 PM"
);
assert.sameValue(
at.formatRange(Temporal.PlainDateTime.from(t1), Temporal.PlainDateTime.from(t2)),
"18.11.1976, 14:23:30 \u2013 20.2.2020, 15:44:56"
);
// should work for Time
assert.sameValue(us.formatRange(Temporal.PlainTime.from(t1), Temporal.PlainTime.from(t2)), "2:23:30 PM \u2013 3:44:56 PM");
assert.sameValue(
us.formatRange(Temporal.PlainTime.from(t1), Temporal.PlainTime.from(t2)),
"2:23:30 PM \u2013 3:44:56 PM"
);
assert.sameValue(at.formatRange(Temporal.PlainTime.from(t1), Temporal.PlainTime.from(t2)), "14:23:30 \u2013 15:44:56");
// should work for Date
assert.sameValue(us.formatRange(Temporal.PlainDate.from(t1), Temporal.PlainDate.from(t2)), "11/18/1976 \u2013 2/20/2020");
assert.sameValue(at.formatRange(Temporal.PlainDate.from(t1), Temporal.PlainDate.from(t2)), "18.11.1976 \u2013 20.02.2020");
assert.sameValue(
us.formatRange(Temporal.PlainDate.from(t1), Temporal.PlainDate.from(t2)),
"11/18/1976 \u2013 2/20/2020"
);
assert.sameValue(
at.formatRange(Temporal.PlainDate.from(t1), Temporal.PlainDate.from(t2)),
"18.11.1976 \u2013 20.02.2020"
);
// should work for YearMonth
var date1 = Temporal.PlainDate.from(t1);
var date2 = Temporal.PlainDate.from(t2);
assert.sameValue(us.formatRange(date1.withCalendar(usCalendar).toPlainYearMonth(), date2.withCalendar(usCalendar).toPlainYearMonth()), "11/1976 \u2013 2/2020");
assert.sameValue(at.formatRange(date1.withCalendar(atCalendar).toPlainYearMonth(), date2.withCalendar(atCalendar).toPlainYearMonth()), "11.1976 \u2013 02.2020");
assert.sameValue(
us.formatRange(date1.withCalendar(usCalendar).toPlainYearMonth(), date2.withCalendar(usCalendar).toPlainYearMonth()),
"11/1976 \u2013 2/2020"
);
assert.sameValue(
at.formatRange(date1.withCalendar(atCalendar).toPlainYearMonth(), date2.withCalendar(atCalendar).toPlainYearMonth()),
"11.1976 \u2013 02.2020"
);
// should work for MonthDay
var date1 = Temporal.PlainDate.from(t1);
var date2 = Temporal.PlainDate.from(t2);
assert.sameValue(us.formatRange(date2.withCalendar(usCalendar).toPlainMonthDay(), date1.withCalendar(usCalendar).toPlainMonthDay()), "2/20 \u2013 11/18");
assert.sameValue(at.formatRange(date2.withCalendar(atCalendar).toPlainMonthDay(), date1.withCalendar(atCalendar).toPlainMonthDay()), "20.02. \u2013 18.11.");
assert.sameValue(
us.formatRange(date2.withCalendar(usCalendar).toPlainMonthDay(), date1.withCalendar(usCalendar).toPlainMonthDay()),
"2/20 \u2013 11/18"
);
assert.sameValue(
at.formatRange(date2.withCalendar(atCalendar).toPlainMonthDay(), date1.withCalendar(atCalendar).toPlainMonthDay()),
"20.02. \u2013 18.11."
);
// should not break legacy Date
assert.sameValue(us.formatRange(start, end), "12/29/1922 \u2013 12/25/1991");
@ -655,8 +685,12 @@ assert.sameValue(at.formatRange(start, end), "30.12.1922 \u2013 26.12.1991");
// should throw a TypeError when called with dissimilar types", () => assert.throws(TypeError, () => us.formatRange(Temporal.Instant.from(t1), Temporal.PlainDateTime.from(t2))));
// should throw a RangeError when called with different calendars
assert.throws(RangeError, () => us.formatRange(Temporal.PlainDateTime.from(t1), Temporal.PlainDateTime.from(t2).withCalendar("japanese")));
assert.throws(RangeError, () => us.formatRange(Temporal.PlainDate.from(t1), Temporal.PlainDate.from(t2).withCalendar("japanese")));
assert.throws(RangeError, () =>
us.formatRange(Temporal.PlainDateTime.from(t1), Temporal.PlainDateTime.from(t2).withCalendar("japanese"))
);
assert.throws(RangeError, () =>
us.formatRange(Temporal.PlainDate.from(t1), Temporal.PlainDate.from(t2).withCalendar("japanese"))
);
// throws for two ZonedDateTimes with different time zones
assert.throws(RangeError, () => us2.formatRange(Temporal.ZonedDateTime.from(t1), Temporal.ZonedDateTime.from(t2)));
@ -1723,7 +1757,12 @@ assert.deepEqual(at.formatRangeToParts(Temporal.PlainDate.from(t1), Temporal.Pla
// should work for YearMonth
var date1 = Temporal.PlainDate.from(t1);
var date2 = Temporal.PlainDate.from(t2);
assert.deepEqual(us.formatRangeToParts(date1.withCalendar(usCalendar).toPlainYearMonth(), date2.withCalendar(usCalendar).toPlainYearMonth()), [
assert.deepEqual(
us.formatRangeToParts(
date1.withCalendar(usCalendar).toPlainYearMonth(),
date2.withCalendar(usCalendar).toPlainYearMonth()
),
[
{
type: "month",
value: "11",
@ -1759,8 +1798,14 @@ assert.deepEqual(us.formatRangeToParts(date1.withCalendar(usCalendar).toPlainYea
value: "2020",
source: "endRange"
}
]);
assert.deepEqual(at.formatRangeToParts(date1.withCalendar(atCalendar).toPlainYearMonth(), date2.withCalendar(atCalendar).toPlainYearMonth()), [
]
);
assert.deepEqual(
at.formatRangeToParts(
date1.withCalendar(atCalendar).toPlainYearMonth(),
date2.withCalendar(atCalendar).toPlainYearMonth()
),
[
{
type: "month",
value: "11",
@ -1796,11 +1841,17 @@ assert.deepEqual(at.formatRangeToParts(date1.withCalendar(atCalendar).toPlainYea
value: "2020",
source: "endRange"
}
]);
]
);
// should work for MonthDay
var date1 = Temporal.PlainDate.from(t1);
var date2 = Temporal.PlainDate.from(t2);
assert.deepEqual(us.formatRangeToParts(date2.withCalendar(usCalendar).toPlainMonthDay(), date1.withCalendar(usCalendar).toPlainMonthDay()), [
assert.deepEqual(
us.formatRangeToParts(
date2.withCalendar(usCalendar).toPlainMonthDay(),
date1.withCalendar(usCalendar).toPlainMonthDay()
),
[
{
type: "month",
value: "2",
@ -1836,8 +1887,14 @@ assert.deepEqual(us.formatRangeToParts(date2.withCalendar(usCalendar).toPlainMon
value: "18",
source: "endRange"
}
]);
assert.deepEqual(at.formatRangeToParts(date2.withCalendar(atCalendar).toPlainMonthDay(), date1.withCalendar(atCalendar).toPlainMonthDay()), [
]
);
assert.deepEqual(
at.formatRangeToParts(
date2.withCalendar(atCalendar).toPlainMonthDay(),
date1.withCalendar(atCalendar).toPlainMonthDay()
),
[
{
type: "day",
value: "20",
@ -1878,7 +1935,8 @@ assert.deepEqual(at.formatRangeToParts(date2.withCalendar(atCalendar).toPlainMon
value: ".",
source: "shared"
}
]);
]
);
// should not break legacy Date
assert.deepEqual(us.formatRangeToParts(start, end), [
{
@ -1997,7 +2055,13 @@ assert.deepEqual(at.formatRangeToParts(start, end), [
// should throw a TypeError when called with dissimilar types
assert.throws(TypeError, () => at.formatRangeToParts(Temporal.Instant.from(t1), Temporal.PlainDateTime.from(t2)));
// should throw a RangeError when called with different calendars
assert.throws(RangeError, () => at.formatRangeToParts(Temporal.PlainDateTime.from(t1), Temporal.PlainDateTime.from(t2).withCalendar("japanese")));
assert.throws(RangeError, () => at.formatRangeToParts(Temporal.PlainDate.from(t1), Temporal.PlainDate.from(t2).withCalendar("japanese")));
assert.throws(RangeError, () =>
at.formatRangeToParts(Temporal.PlainDateTime.from(t1), Temporal.PlainDateTime.from(t2).withCalendar("japanese"))
);
assert.throws(RangeError, () =>
at.formatRangeToParts(Temporal.PlainDate.from(t1), Temporal.PlainDate.from(t2).withCalendar("japanese"))
);
// throws for two ZonedDateTimes with different time zones
assert.throws(RangeError, () => us2.formatRangeToParts(Temporal.ZonedDateTime.from(t1), Temporal.ZonedDateTime.from(t2)));
assert.throws(RangeError, () =>
us2.formatRangeToParts(Temporal.ZonedDateTime.from(t1), Temporal.ZonedDateTime.from(t2))
);

View File

@ -8,9 +8,9 @@ features: [Temporal]
---*/
function maybeGetWeekdayOnlyFormat() {
const fmt = new Intl.DateTimeFormat('en', { weekday: 'long', timeZone: 'Europe/Vienna' });
const fmt = new Intl.DateTimeFormat("en", { weekday: "long", timeZone: "Europe/Vienna" });
if (
['era', 'year', 'month', 'day', 'hour', 'minute', 'second', 'timeZoneName'].some(
["era", "year", "month", "day", "hour", "minute", "second", "timeZoneName"].some(
(prop) => prop in fmt.resolvedOptions()
)
) {
@ -21,8 +21,8 @@ function maybeGetWeekdayOnlyFormat() {
}
var datetime = Temporal.PlainDateTime.from("1976-11-18T15:23:30");
assert.sameValue(`${ datetime.toLocaleString("en", { timeZone: "America/New_York" }) }`, "11/18/1976, 3:23:30 PM")
assert.sameValue(`${ datetime.toLocaleString("de", { timeZone: "Europe/Vienna" }) }`, "18.11.1976, 15:23:30")
assert.sameValue(`${datetime.toLocaleString("en", { timeZone: "America/New_York" })}`, "11/18/1976, 3:23:30 PM");
assert.sameValue(`${datetime.toLocaleString("de", { timeZone: "Europe/Vienna" })}`, "18.11.1976, 15:23:30");
var fmt = maybeGetWeekdayOnlyFormat();
if (fmt) assert.sameValue(fmt.format(datetime), "Thursday");

View File

@ -8,9 +8,9 @@ features: [Temporal]
---*/
function maybeGetWeekdayOnlyFormat() {
const fmt = new Intl.DateTimeFormat('en', { weekday: 'long', timeZone: 'Europe/Vienna' });
const fmt = new Intl.DateTimeFormat("en", { weekday: "long", timeZone: "Europe/Vienna" });
if (
['era', 'year', 'month', 'day', 'hour', 'minute', 'second', 'timeZoneName'].some(
["era", "year", "month", "day", "hour", "minute", "second", "timeZoneName"].some(
(prop) => prop in fmt.resolvedOptions()
)
) {
@ -21,11 +21,10 @@ function maybeGetWeekdayOnlyFormat() {
}
var instant = Temporal.Instant.from("1976-11-18T14:23:30Z");
assert.sameValue(`${ instant.toLocaleString("en", { timeZone: "America/New_York" }) }`, "11/18/1976, 9:23:30 AM")
assert.sameValue(`${ instant.toLocaleString("de", { timeZone: "Europe/Vienna" }) }`, "18.11.1976, 15:23:30")
assert.sameValue(`${instant.toLocaleString("en", { timeZone: "America/New_York" })}`, "11/18/1976, 9:23:30 AM");
assert.sameValue(`${instant.toLocaleString("de", { timeZone: "Europe/Vienna" })}`, "18.11.1976, 15:23:30");
var fmt = maybeGetWeekdayOnlyFormat();
if (fmt)
assert.sameValue(fmt.format(instant), "Thursday");
if (fmt) assert.sameValue(fmt.format(instant), "Thursday");
// outputs timeZoneName if requested
var str = instant.toLocaleString("en", {

View File

@ -8,8 +8,8 @@ features: [Temporal]
---*/
var time = Temporal.PlainTime.from("1976-11-18T15:23:30");
assert.sameValue(`${ time.toLocaleString("en", { timeZone: "America/New_York" }) }`, "3:23:30 PM")
assert.sameValue(`${ time.toLocaleString("de", { timeZone: "Europe/Vienna" }) }`, "15:23:30")
assert.sameValue(`${time.toLocaleString("en", { timeZone: "America/New_York" })}`, "3:23:30 PM");
assert.sameValue(`${time.toLocaleString("de", { timeZone: "Europe/Vienna" })}`, "15:23:30");
// should ignore units not in the data type
assert.sameValue(time.toLocaleString("en", { timeZoneName: "long" }), "3:23:30 PM");

View File

@ -1,4 +1,3 @@
// Copyright (C) 2018 Bloomberg LP. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
@ -14,11 +13,14 @@ var yearmonth = Temporal.PlainYearMonth.from({
month: 11,
calendar
});
assert.sameValue(`${ yearmonth.toLocaleString("en", { timeZone: "America/New_York" }) }`, "11/1976")
assert.sameValue(`${ yearmonth.toLocaleString("de", {
assert.sameValue(`${yearmonth.toLocaleString("en", { timeZone: "America/New_York" })}`, "11/1976");
assert.sameValue(
`${yearmonth.toLocaleString("de", {
timeZone: "Europe/Vienna",
calendar
}) }`, "11.1976")
})}`,
"11.1976"
);
// should ignore units not in the data type
assert.sameValue(yearmonth.toLocaleString("en", { timeZoneName: "long" }), "11/1976");

View File

@ -8,9 +8,9 @@ features: [Temporal]
---*/
function maybeGetWeekdayOnlyFormat() {
const fmt = new Intl.DateTimeFormat('en', { weekday: 'long', timeZone: 'Europe/Vienna' });
const fmt = new Intl.DateTimeFormat("en", { weekday: "long", timeZone: "Europe/Vienna" });
if (
['era', 'year', 'month', 'day', 'hour', 'minute', 'second', 'timeZoneName'].some(
["era", "year", "month", "day", "hour", "minute", "second", "timeZoneName"].some(
(prop) => prop in fmt.resolvedOptions()
)
) {
@ -21,14 +21,17 @@ function maybeGetWeekdayOnlyFormat() {
}
var zdt = Temporal.ZonedDateTime.from("1976-11-18T15:23:30+01:00[Europe/Vienna]");
assert.sameValue(zdt.toLocaleString("en"), "11/18/1976, 3:23:30 PM GMT+1")
assert.sameValue(zdt.toLocaleString("de"), "18.11.1976, 15:23:30 MEZ")
assert.sameValue(zdt.toLocaleString("en"), "11/18/1976, 3:23:30 PM GMT+1");
assert.sameValue(zdt.toLocaleString("de"), "18.11.1976, 15:23:30 MEZ");
const fmt = maybeGetWeekdayOnlyFormat();
// uses only the options in resolvedOptions
if (fmt) assert.sameValue(fmt.format(zdt), 'Thursday');
if (fmt) assert.sameValue(fmt.format(zdt), "Thursday");
// can override the style of the time zone name
assert.sameValue(zdt.toLocaleString("en", { timeZoneName: "long" }), "11/18/1976, 3:23:30 PM Central European Standard Time");
assert.sameValue(
zdt.toLocaleString("en", { timeZoneName: "long" }),
"11/18/1976, 3:23:30 PM Central European Standard Time"
);
// works if the time zone given in options agrees with the object's time zone
assert.sameValue(zdt.toLocaleString("en", { timeZone: "Europe/Vienna" }), "11/18/1976, 3:23:30 PM GMT+1");