tyler.durden/test262
1
0
Fork 0
mirror of https://github.com/tc39/test262.git synced 2025-07-14 01:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Temporal: Remove loops in RoundDuration

Browse Source
This commit is contained in:
Philip Chimento 2023-05-18 09:53:12 -07:00 committed by Philip Chimento
parent e43e20a885
commit bcb409148d
15 changed files with 155 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/built-ins/Temporal/Duration/prototype/round/calendar-dateadd-called-with-options-undefined.js vendored
View File

@ -33,8 +33,7 @@ assert.sameValue(calendar.dateAddCallCount, 3, "rounding with calendar smallestU
// The calls come from these paths: // The calls come from these paths:
// Duration.round() -> // Duration.round() ->
// UnbalanceDurationRelative -> MoveRelativeDate -> calendar.dateAdd() // UnbalanceDurationRelative -> MoveRelativeDate -> calendar.dateAdd()
// RoundDuration -> // RoundDuration -> MoveRelativeDate -> calendar.dateAdd() (2x)
// MoveRelativeDate -> calendar.dateAdd() (5x)
// BalanceDateDurationRelative -> calendar.dateAdd() // BalanceDateDurationRelative -> calendar.dateAdd()
// MoveRelativeZonedDateTime -> AddZonedDateTime -> calendar.dateAdd() // MoveRelativeZonedDateTime -> AddZonedDateTime -> calendar.dateAdd()
@ -42,7 +41,7 @@ calendar.dateAddCallCount = 0;
const instance2 = new Temporal.Duration(0, 1, 1, 1); const instance2 = new Temporal.Duration(0, 1, 1, 1);
instance2.round({ largestUnit: "weeks", smallestUnit: "weeks", relativeTo }); instance2.round({ largestUnit: "weeks", smallestUnit: "weeks", relativeTo });
assert.sameValue(calendar.dateAddCallCount, 8, "rounding with non-default largestUnit and calendar smallestUnit"); assert.sameValue(calendar.dateAddCallCount, 5, "rounding with non-default largestUnit and calendar smallestUnit");
// Rounding with smallestUnit days only. // Rounding with smallestUnit days only.
// The calls come from these paths: // The calls come from these paths:

2
test/built-ins/Temporal/Duration/prototype/round/calendar-dateuntil-called-with-singular-largestunit.js vendored
View File

@ -148,7 +148,7 @@ TemporalHelpers.checkCalendarDateUntilLargestUnitSingular(
}, { }, {
years: ["year"], years: ["year"],
months: ["month"], months: ["month"],
weeks: ["week"], weeks: ["week", "week"],
days: [] days: []
} }
); );

4
test/built-ins/Temporal/Duration/prototype/round/duration-out-of-range-added-to-relativeto.js vendored
View File

@ -16,6 +16,10 @@ info: |
const instance = new Temporal.Duration(0, 0, 0, /* days = */ 500_000_000); const instance = new Temporal.Duration(0, 0, 0, /* days = */ 500_000_000);
const relativeTo = new Temporal.PlainDate(2000, 1, 1); const relativeTo = new Temporal.PlainDate(2000, 1, 1);
assert.throws(RangeError, () => instance.round({relativeTo, smallestUnit: "years"})); assert.throws(RangeError, () => instance.round({relativeTo, smallestUnit: "years"}));
assert.throws(RangeError, () => instance.round({relativeTo, smallestUnit: "months"}));
assert.throws(RangeError, () => instance.round({relativeTo, smallestUnit: "weeks"}));
const negInstance = new Temporal.Duration(0, 0, 0, /* days = */ -500_000_000); const negInstance = new Temporal.Duration(0, 0, 0, /* days = */ -500_000_000);
assert.throws(RangeError, () => negInstance.round({relativeTo, smallestUnit: "years"})); assert.throws(RangeError, () => negInstance.round({relativeTo, smallestUnit: "years"}));
assert.throws(RangeError, () => negInstance.round({relativeTo, smallestUnit: "months"}));
assert.throws(RangeError, () => negInstance.round({relativeTo, smallestUnit: "weeks"}));

42
test/built-ins/Temporal/Duration/prototype/round/order-of-operations.js vendored
View File

@ -133,11 +133,11 @@ actual.splice(0); // clear
// code path through RoundDuration that rounds to the nearest year: // code path through RoundDuration that rounds to the nearest year:
const expectedOpsForYearRounding = expectedOpsForPlainRelativeTo.concat([ const expectedOpsForYearRounding = expectedOpsForPlainRelativeTo.concat([
"call options.relativeTo.calendar.dateAdd", // 7.e "call options.relativeTo.calendar.dateAdd", // 12.d
"call options.relativeTo.calendar.dateAdd", // 7.g "call options.relativeTo.calendar.dateAdd", // 12.f
"call options.relativeTo.calendar.dateUntil", // 7.o "call options.relativeTo.calendar.dateUntil", // 12.n
"call options.relativeTo.calendar.dateAdd", // 7.s MoveRelativeDate "call options.relativeTo.calendar.dateAdd", // 12.r MoveRelativeDate
"call options.relativeTo.calendar.dateAdd", // 7.y MoveRelativeDate "call options.relativeTo.calendar.dateAdd", // 12.x MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call options.relativeTo.calendar.dateAdd", // 9.c "call options.relativeTo.calendar.dateAdd", // 9.c
"call options.relativeTo.calendar.dateUntil", // 9.d "call options.relativeTo.calendar.dateUntil", // 9.d
@ -153,10 +153,11 @@ const expectedOpsForMonthRounding = expectedOpsForPlainRelativeTo.concat([
"call options.relativeTo.calendar.dateAdd", // 3.f "call options.relativeTo.calendar.dateAdd", // 3.f
"call options.relativeTo.calendar.dateUntil", // 3.i "call options.relativeTo.calendar.dateUntil", // 3.i
// RoundDuration // RoundDuration
"call options.relativeTo.calendar.dateAdd", // 10.c "call options.relativeTo.calendar.dateAdd", // 13.c
"call options.relativeTo.calendar.dateAdd", // 10.e "call options.relativeTo.calendar.dateAdd", // 13.e
"call options.relativeTo.calendar.dateAdd", // 10.k MoveRelativeDate "call options.relativeTo.calendar.dateUntil", // 13.m
], Array(2).fill("call options.relativeTo.calendar.dateAdd"), [ // 2× 10.n.iii MoveRelativeDate "call options.relativeTo.calendar.dateAdd", // 13.q MoveRelativeDate
"call options.relativeTo.calendar.dateAdd", // 13.w MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call options.relativeTo.calendar.dateAdd", // 10.d "call options.relativeTo.calendar.dateAdd", // 10.d
"call options.relativeTo.calendar.dateUntil", // 10.e "call options.relativeTo.calendar.dateUntil", // 10.e
@ -171,8 +172,9 @@ const expectedOpsForWeekRounding = expectedOpsForPlainRelativeTo.concat([
// UnbalanceDateDurationRelative // UnbalanceDateDurationRelative
"call options.relativeTo.calendar.dateAdd", // 4.e "call options.relativeTo.calendar.dateAdd", // 4.e
// RoundDuration // RoundDuration
"call options.relativeTo.calendar.dateAdd", // 11.d MoveRelativeDate "call options.relativeTo.calendar.dateUntil", // 14.f
], Array(58).fill("call options.relativeTo.calendar.dateAdd"), [ // 58× 11.g.iii MoveRelativeDate (52 + 4 + 2) "call options.relativeTo.calendar.dateAdd", // 14.j MoveRelativeDate
"call options.relativeTo.calendar.dateAdd", // 14.p MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call options.relativeTo.calendar.dateAdd", // 16 "call options.relativeTo.calendar.dateAdd", // 16
"call options.relativeTo.calendar.dateUntil", // 17 "call options.relativeTo.calendar.dateUntil", // 17
@ -204,9 +206,9 @@ actual.splice(0); // clear
// code path through Duration.prototype.round balancing from months up to years: // code path through Duration.prototype.round balancing from months up to years:
const expectedOpsForMonthToYearBalancing = expectedOpsForPlainRelativeTo.concat([ const expectedOpsForMonthToYearBalancing = expectedOpsForPlainRelativeTo.concat([
// RoundDuration // RoundDuration
"call options.relativeTo.calendar.dateAdd", // 10.c "call options.relativeTo.calendar.dateAdd", // 13.c
"call options.relativeTo.calendar.dateAdd", // 10.e "call options.relativeTo.calendar.dateAdd", // 13.e
"call options.relativeTo.calendar.dateAdd", // 10.k MoveRelativeDate "call options.relativeTo.calendar.dateAdd", // 13.w MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call options.relativeTo.calendar.dateAdd", // 9.c "call options.relativeTo.calendar.dateAdd", // 9.c
"call options.relativeTo.calendar.dateUntil", // 9.d "call options.relativeTo.calendar.dateUntil", // 9.d
@ -387,11 +389,11 @@ const expectedOpsForYearRoundingZoned = expectedOpsForZonedRelativeTo.concat([
"call options.relativeTo.timeZone.getPossibleInstantsFor", "call options.relativeTo.timeZone.getPossibleInstantsFor",
// NanosecondsToDays → AddDaysToZonedDateTime // NanosecondsToDays → AddDaysToZonedDateTime
"call options.relativeTo.timeZone.getPossibleInstantsFor", "call options.relativeTo.timeZone.getPossibleInstantsFor",
"call options.relativeTo.calendar.dateAdd", // 7.e "call options.relativeTo.calendar.dateAdd", // 12.d
"call options.relativeTo.calendar.dateAdd", // 7.g "call options.relativeTo.calendar.dateAdd", // 12.f
"call options.relativeTo.calendar.dateUntil", // 7.o "call options.relativeTo.calendar.dateUntil", // 12.n
"call options.relativeTo.calendar.dateAdd", // 7.s MoveRelativeDate "call options.relativeTo.calendar.dateAdd", // 12.r MoveRelativeDate
"call options.relativeTo.calendar.dateAdd", // 7.y MoveRelativeDate "call options.relativeTo.calendar.dateAdd", // 12.x MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call options.relativeTo.calendar.dateAdd", // 9.c "call options.relativeTo.calendar.dateAdd", // 9.c
"call options.relativeTo.calendar.dateUntil", // 9.d "call options.relativeTo.calendar.dateUntil", // 9.d
@ -417,7 +419,7 @@ const expectedOpsForUnbalanceRoundBalance = expectedOpsForZonedRelativeTo.concat
"call options.relativeTo.calendar.dateAdd", "call options.relativeTo.calendar.dateAdd",
"call options.relativeTo.timeZone.getPossibleInstantsFor", // 13. GetInstantFor "call options.relativeTo.timeZone.getPossibleInstantsFor", // 13. GetInstantFor
// RoundDuration // RoundDuration
"call options.relativeTo.calendar.dateAdd", // 8.g MoveRelativeDate "call options.relativeTo.calendar.dateAdd", // 14.p MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call options.relativeTo.calendar.dateAdd", // 10.d "call options.relativeTo.calendar.dateAdd", // 10.d
"call options.relativeTo.calendar.dateUntil", // 10.e "call options.relativeTo.calendar.dateUntil", // 10.e

28
test/built-ins/Temporal/Duration/prototype/total/calendar-dateuntil-called-with-singular-largestunit.js vendored
View File

@ -39,8 +39,8 @@ includes: [compareArray.js, temporalHelpers.js]
features: [Temporal] features: [Temporal]
---*/ ---*/
// Check the paths that go through NanosecondsToDays: only one call with // Check the paths that go through NanosecondsToDays: only one call in
// largestUnit: "year" in RoundDuration when the unit is "year". The others all // RoundDuration when the unit is a calendar unit. The others all
// have largestUnit: "day" so the difference is taken in ISO calendar space. // have largestUnit: "day" so the difference is taken in ISO calendar space.
const duration = new Temporal.Duration(0, 1, 1, 1, 1, 1, 1, 1, 1, 1); const duration = new Temporal.Duration(0, 1, 1, 1, 1, 1, 1, 1, 1, 1);
@ -50,32 +50,10 @@ TemporalHelpers.checkCalendarDateUntilLargestUnitSingular(
const relativeTo = new Temporal.ZonedDateTime(0n, "UTC", calendar); const relativeTo = new Temporal.ZonedDateTime(0n, "UTC", calendar);
duration.total({ unit, relativeTo }); duration.total({ unit, relativeTo });
}, },
{
years: ["year"],
months: [],
weeks: [],
days: [],
hours: [],
minutes: [],
seconds: [],
milliseconds: [],
microseconds: [],
nanoseconds: []
}
);
// Check the path that converts years to months in UnbalanceDurationRelative.
TemporalHelpers.checkCalendarDateUntilLargestUnitSingular(
(calendar, unit) => {
const duration = new Temporal.Duration(5, 1);
const relativeTo = new Temporal.PlainDateTime(2000, 5, 2, 0, 0, 0, 0, 0, 0, calendar);
duration.total({ unit, relativeTo });
},
{ {
years: ["year"], years: ["year"],
months: ["month"], months: ["month"],
weeks: [], weeks: ["week"],
days: [], days: [],
hours: [], hours: [],
minutes: [], minutes: [],

4
test/built-ins/Temporal/Duration/prototype/total/duration-out-of-range-added-to-relativeto.js vendored
View File

@ -16,6 +16,10 @@ info: |
const instance = new Temporal.Duration(0, 0, 0, /* days = */ 500_000_000); const instance = new Temporal.Duration(0, 0, 0, /* days = */ 500_000_000);
const relativeTo = new Temporal.PlainDate(2000, 1, 1); const relativeTo = new Temporal.PlainDate(2000, 1, 1);
assert.throws(RangeError, () => instance.total({relativeTo, unit: "years"})); assert.throws(RangeError, () => instance.total({relativeTo, unit: "years"}));
assert.throws(RangeError, () => instance.total({relativeTo, unit: "months"}));
assert.throws(RangeError, () => instance.total({relativeTo, unit: "weeks"}));
const negInstance = new Temporal.Duration(0, 0, 0, /* days = */ -500_000_000); const negInstance = new Temporal.Duration(0, 0, 0, /* days = */ -500_000_000);
assert.throws(RangeError, () => negInstance.total({relativeTo, unit: "years"})); assert.throws(RangeError, () => negInstance.total({relativeTo, unit: "years"}));
assert.throws(RangeError, () => negInstance.total({relativeTo, unit: "months"}));
assert.throws(RangeError, () => negInstance.total({relativeTo, unit: "weeks"}));

64
test/built-ins/Temporal/Duration/prototype/total/order-of-operations.js vendored
View File

@ -105,10 +105,10 @@ actual.splice(0); // clear
// code path through RoundDuration that rounds to the nearest year with minimal calendar calls: // code path through RoundDuration that rounds to the nearest year with minimal calendar calls:
const expectedOpsForMinimalYearRounding = expectedOpsForPlainRelativeTo.concat([ const expectedOpsForMinimalYearRounding = expectedOpsForPlainRelativeTo.concat([
// 7.e and 7.g not called because years, months, weeks are 0 // 12.d and 12.f not called because years, months, weeks are 0
"call options.relativeTo.calendar.dateUntil", // 7.o "call options.relativeTo.calendar.dateUntil", // 12.n
// 7.s not called because years, months, weeks are 0 // 12.r not called because years, months, weeks are 0
"call options.relativeTo.calendar.dateAdd", // 7.y MoveRelativeDate "call options.relativeTo.calendar.dateAdd", // 12.x MoveRelativeDate
]); ]);
instance.total(createOptionsObserver({ unit: "years", relativeTo: plainRelativeTo })); instance.total(createOptionsObserver({ unit: "years", relativeTo: plainRelativeTo }));
assert.compareArray(actual, expectedOpsForMinimalYearRounding, "order of operations with years = 0 and unit = years"); assert.compareArray(actual, expectedOpsForMinimalYearRounding, "order of operations with years = 0 and unit = years");
@ -116,11 +116,11 @@ actual.splice(0); // clear
// code path through RoundDuration that rounds to the nearest year: // code path through RoundDuration that rounds to the nearest year:
const expectedOpsForYearRounding = expectedOpsForPlainRelativeTo.concat([ const expectedOpsForYearRounding = expectedOpsForPlainRelativeTo.concat([
"call options.relativeTo.calendar.dateAdd", // 7.d "call options.relativeTo.calendar.dateAdd", // 12.d
"call options.relativeTo.calendar.dateAdd", // 7.f "call options.relativeTo.calendar.dateAdd", // 12.f
"call options.relativeTo.calendar.dateUntil", // 7.n "call options.relativeTo.calendar.dateUntil", // 12.n
"call options.relativeTo.calendar.dateAdd", // 7.s "call options.relativeTo.calendar.dateAdd", // 12.r MoveRelativeDate
"call options.relativeTo.calendar.dateAdd", // 7.x MoveRelativeDate "call options.relativeTo.calendar.dateAdd", // 12.x MoveRelativeDate
]); ]);
const instanceYears = new Temporal.Duration(1, 12, 0, 0, /* hours = */ 2400); const instanceYears = new Temporal.Duration(1, 12, 0, 0, /* hours = */ 2400);
instanceYears.total(createOptionsObserver({ unit: "years", relativeTo: plainRelativeTo })); instanceYears.total(createOptionsObserver({ unit: "years", relativeTo: plainRelativeTo }));
@ -133,10 +133,12 @@ const expectedOpsForMonthRounding = expectedOpsForPlainRelativeTo.concat([
"call options.relativeTo.calendar.dateAdd", // 3.f "call options.relativeTo.calendar.dateAdd", // 3.f
"call options.relativeTo.calendar.dateUntil", // 3.i "call options.relativeTo.calendar.dateUntil", // 3.i
// RoundDuration // RoundDuration
"call options.relativeTo.calendar.dateAdd", // 10.c "call options.relativeTo.calendar.dateAdd", // 13.c
"call options.relativeTo.calendar.dateAdd", // 10.e "call options.relativeTo.calendar.dateAdd", // 13.e
"call options.relativeTo.calendar.dateAdd", // 10.k MoveRelativeDate "call options.relativeTo.calendar.dateUntil", // 13.m
], Array(2).fill("call options.relativeTo.calendar.dateAdd")); // 2× 10.n.iii MoveRelativeDate "call options.relativeTo.calendar.dateAdd", // 13.q MoveRelativeDate
"call options.relativeTo.calendar.dateAdd", // 13.w MoveRelativeDate
]);
const instance2 = new Temporal.Duration(1, 0, 0, 62); const instance2 = new Temporal.Duration(1, 0, 0, 62);
instance2.total(createOptionsObserver({ unit: "months", relativeTo: plainRelativeTo })); instance2.total(createOptionsObserver({ unit: "months", relativeTo: plainRelativeTo }));
assert.compareArray(actual, expectedOpsForMonthRounding, "order of operations with unit = months"); assert.compareArray(actual, expectedOpsForMonthRounding, "order of operations with unit = months");
@ -147,8 +149,10 @@ const expectedOpsForWeekRounding = expectedOpsForPlainRelativeTo.concat([
// UnbalanceDateDurationRelative // UnbalanceDateDurationRelative
"call options.relativeTo.calendar.dateAdd", // 4.e "call options.relativeTo.calendar.dateAdd", // 4.e
// RoundDuration // RoundDuration
"call options.relativeTo.calendar.dateAdd", // 11.d MoveRelativeDate "call options.relativeTo.calendar.dateUntil", // 14.f
], Array(58).fill("call options.relativeTo.calendar.dateAdd")); // 58× 11.g.iii MoveRelativeDate (52 + 4 + 2) "call options.relativeTo.calendar.dateAdd", // 14.j MoveRelativeDate
"call options.relativeTo.calendar.dateAdd", // 14.p MoveRelativeDate
]);
const instance3 = new Temporal.Duration(1, 1, 0, 15); const instance3 = new Temporal.Duration(1, 1, 0, 15);
instance3.total(createOptionsObserver({ unit: "weeks", relativeTo: plainRelativeTo })); instance3.total(createOptionsObserver({ unit: "weeks", relativeTo: plainRelativeTo }));
assert.compareArray(actual, expectedOpsForWeekRounding, "order of operations with unit = weeks"); assert.compareArray(actual, expectedOpsForWeekRounding, "order of operations with unit = weeks");
@ -282,10 +286,10 @@ const expectedOpsForMinimalYearRoundingZoned = expectedOpsForZonedRelativeTo.con
// code path through RoundDuration that rounds to the nearest year: // code path through RoundDuration that rounds to the nearest year:
// MoveRelativeZonedDateTime → AddDaysToZonedDateTime // MoveRelativeZonedDateTime → AddDaysToZonedDateTime
"call options.relativeTo.timeZone.getPossibleInstantsFor", "call options.relativeTo.timeZone.getPossibleInstantsFor",
// 7.e and 7.g not called because years, months, weeks are 0 // 12.d and 12.f not called because years, months, weeks are 0
"call options.relativeTo.calendar.dateUntil", // 7.o "call options.relativeTo.calendar.dateUntil", // 12.n
// 7.s not called because years, months, weeks are 0 // 12.r not called because years, months, weeks are 0
"call options.relativeTo.calendar.dateAdd", // 7.y MoveRelativeDate "call options.relativeTo.calendar.dateAdd", // 12.x MoveRelativeDate
]); ]);
instance.total(createOptionsObserver({ unit: "years", relativeTo: zonedRelativeTo })); instance.total(createOptionsObserver({ unit: "years", relativeTo: zonedRelativeTo }));
assert.compareArray( assert.compareArray(
@ -316,11 +320,11 @@ const expectedOpsForYearRoundingZoned = expectedOpsForZonedRelativeTo.concat([
"call options.relativeTo.calendar.dateAdd", "call options.relativeTo.calendar.dateAdd",
"call options.relativeTo.timeZone.getPossibleInstantsFor", "call options.relativeTo.timeZone.getPossibleInstantsFor",
// RoundDuration // RoundDuration
"call options.relativeTo.calendar.dateAdd", // 7.e "call options.relativeTo.calendar.dateAdd", // 12.d
"call options.relativeTo.calendar.dateAdd", // 7.g "call options.relativeTo.calendar.dateAdd", // 12.f
"call options.relativeTo.calendar.dateUntil", // 7.o "call options.relativeTo.calendar.dateUntil", // 12.n
"call options.relativeTo.calendar.dateAdd", // 7.s MoveRelativeDate "call options.relativeTo.calendar.dateAdd", // 12.r MoveRelativeDate
"call options.relativeTo.calendar.dateAdd", // 7.y MoveRelativeDate "call options.relativeTo.calendar.dateAdd", // 12.x MoveRelativeDate
]); ]);
instanceYears.total(createOptionsObserver({ unit: "years", relativeTo: zonedRelativeTo })); instanceYears.total(createOptionsObserver({ unit: "years", relativeTo: zonedRelativeTo }));
assert.compareArray( assert.compareArray(
@ -345,9 +349,10 @@ const expectedOpsForUnbalanceRound = expectedOpsForZonedRelativeTo.concat([
"call options.relativeTo.calendar.dateAdd", "call options.relativeTo.calendar.dateAdd",
"call options.relativeTo.timeZone.getPossibleInstantsFor", // 13. GetInstantFor "call options.relativeTo.timeZone.getPossibleInstantsFor", // 13. GetInstantFor
// RoundDuration // RoundDuration
"call options.relativeTo.calendar.dateAdd", // 7.f "call options.relativeTo.calendar.dateAdd", // 13.c
"call options.relativeTo.calendar.dateAdd", // 7.h "call options.relativeTo.calendar.dateAdd", // 13.e
"call options.relativeTo.calendar.dateAdd", // 7.n MoveRelativeDate "call options.relativeTo.calendar.dateUntil", // 13.m
"call options.relativeTo.calendar.dateAdd", // 13.w MoveRelativeDate
]); ]);
new Temporal.Duration(0, 1, 1).total(createOptionsObserver({ unit: "months", relativeTo: zonedRelativeTo })); new Temporal.Duration(0, 1, 1).total(createOptionsObserver({ unit: "months", relativeTo: zonedRelativeTo }));
assert.compareArray( assert.compareArray(
@ -375,8 +380,9 @@ const expectedOpsForBalanceRound = expectedOpsForZonedRelativeTo.concat([
// RoundDuration → MoveRelativeZonedDateTime → AddZonedDateTime // RoundDuration → MoveRelativeZonedDateTime → AddZonedDateTime
"call options.relativeTo.timeZone.getPossibleInstantsFor", // 10. GetInstantFor "call options.relativeTo.timeZone.getPossibleInstantsFor", // 10. GetInstantFor
// RoundDuration // RoundDuration
"call options.relativeTo.calendar.dateAdd", // 10.f "call options.relativeTo.calendar.dateUntil", // 14.f
"call options.relativeTo.calendar.dateAdd", // 10.i.iii "call options.relativeTo.calendar.dateAdd", // 14.j MoveRelativeDate
"call options.relativeTo.calendar.dateAdd", // 14.p MoveRelativeDate
]); ]);
new Temporal.Duration(0, 0, 0, 1, 240).total(createOptionsObserver({ unit: "weeks", relativeTo: zonedRelativeTo })); new Temporal.Duration(0, 0, 0, 1, 240).total(createOptionsObserver({ unit: "weeks", relativeTo: zonedRelativeTo }));
assert.compareArray( assert.compareArray(

29
test/built-ins/Temporal/PlainDate/prototype/since/order-of-operations.js vendored
View File

@ -133,11 +133,11 @@ const expectedOpsForYearRounding = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 7.e "call this.calendar.dateAdd", // 12.d
"call this.calendar.dateAdd", // 7.g "call this.calendar.dateAdd", // 12.f
"call this.calendar.dateUntil", // 7.o "call this.calendar.dateUntil", // 12.n
"call this.calendar.dateAdd", // 7.y MoveRelativeDate "call this.calendar.dateAdd", // 12.x MoveRelativeDate
// (7.s not called because other units can't add up to >1 year at this point) // (12.r not called because other units can't add up to >1 year at this point)
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 9.c "call this.calendar.dateAdd", // 9.c
"call this.calendar.dateUntil" // 9.d "call this.calendar.dateUntil" // 9.d
@ -161,10 +161,10 @@ const expectedOpsForYearRoundingSameMonth = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 7.e "call this.calendar.dateAdd", // 12.d
"call this.calendar.dateAdd", // 7.g "call this.calendar.dateAdd", // 12.f
"call this.calendar.dateAdd", // 7.y MoveRelativeDate "call this.calendar.dateAdd", // 12.x MoveRelativeDate
// (7.o not called because months and weeks == 0) // (12.n not called because months and weeks == 0)
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 9.c "call this.calendar.dateAdd", // 9.c
"call this.calendar.dateUntil" // 9.d "call this.calendar.dateUntil" // 9.d
@ -181,10 +181,9 @@ const expectedOpsForMonthRounding = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 10.c "call this.calendar.dateAdd", // 13.c
"call this.calendar.dateAdd", // 10.e "call this.calendar.dateAdd", // 13.e
"call this.calendar.dateAdd", // 10.k MoveRelativeDate "call this.calendar.dateAdd", // 13.w MoveRelativeDate
// (10.n.iii MoveRelativeDate not called because weeks == 0)
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 10.d "call this.calendar.dateAdd", // 10.d
"call this.calendar.dateUntil" // 10.e "call this.calendar.dateUntil" // 10.e
@ -201,8 +200,8 @@ const expectedOpsForWeekRounding = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 11.d MoveRelativeDate "call this.calendar.dateUntil", // 14.f
// (11.g.iii MoveRelativeDate not called because days already balanced) "call this.calendar.dateAdd", // 14.p MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 16 "call this.calendar.dateAdd", // 16
"call this.calendar.dateUntil" // 17 "call this.calendar.dateUntil" // 17

29
test/built-ins/Temporal/PlainDate/prototype/until/order-of-operations.js vendored
View File

@ -134,11 +134,11 @@ const expectedOpsForYearRounding = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 7.e "call this.calendar.dateAdd", // 12.d
"call this.calendar.dateAdd", // 7.g "call this.calendar.dateAdd", // 12.f
"call this.calendar.dateUntil", // 7.o "call this.calendar.dateUntil", // 12.n
"call this.calendar.dateAdd", // 7.y MoveRelativeDate "call this.calendar.dateAdd", // 12.x MoveRelativeDate
// (7.s not called because other units can't add up to >1 year at this point) // (12.r not called because other units can't add up to >1 year at this point)
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 9.c "call this.calendar.dateAdd", // 9.c
"call this.calendar.dateUntil" // 9.d "call this.calendar.dateUntil" // 9.d
@ -162,10 +162,10 @@ const expectedOpsForYearRoundingSameMonth = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 7.e "call this.calendar.dateAdd", // 12.d
"call this.calendar.dateAdd", // 7.g "call this.calendar.dateAdd", // 12.f
"call this.calendar.dateAdd", // 7.y MoveRelativeDate "call this.calendar.dateAdd", // 12.x MoveRelativeDate
// (7.o not called because months and weeks == 0) // (12.n not called because months and weeks == 0)
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 9.c "call this.calendar.dateAdd", // 9.c
"call this.calendar.dateUntil" // 9.d "call this.calendar.dateUntil" // 9.d
@ -182,10 +182,9 @@ const expectedOpsForMonthRounding = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 10.c "call this.calendar.dateAdd", // 13.c
"call this.calendar.dateAdd", // 10.e "call this.calendar.dateAdd", // 13.e
"call this.calendar.dateAdd", // 10.k MoveRelativeDate "call this.calendar.dateAdd", // 13.w MoveRelativeDate
// (10.n.iii MoveRelativeDate not called because weeks == 0)
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 10.d "call this.calendar.dateAdd", // 10.d
"call this.calendar.dateUntil" // 10.e "call this.calendar.dateUntil" // 10.e
@ -202,8 +201,8 @@ const expectedOpsForWeekRounding = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 11.d MoveRelativeDate "call this.calendar.dateUntil", // 14.f
// (11.g.iii MoveRelativeDate not called because days already balanced) "call this.calendar.dateAdd", // 14.p MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 16 "call this.calendar.dateAdd", // 16
"call this.calendar.dateUntil" // 17 "call this.calendar.dateUntil" // 17

30
test/built-ins/Temporal/PlainDateTime/prototype/since/order-of-operations.js vendored
View File

@ -163,11 +163,11 @@ const expectedOpsForYearRounding = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 7.e "call this.calendar.dateAdd", // 12.d
"call this.calendar.dateAdd", // 7.g "call this.calendar.dateAdd", // 12.f
"call this.calendar.dateUntil", // 7.o "call this.calendar.dateUntil", // 12.n
"call this.calendar.dateAdd", // 7.y MoveRelativeDate "call this.calendar.dateAdd", // 12.x MoveRelativeDate
// (7.s not called because other units can't add up to >1 year at this point) // (12.r not called because other units can't add up to >1 year at this point)
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 9.c "call this.calendar.dateAdd", // 9.c
"call this.calendar.dateUntil" // 9.d "call this.calendar.dateUntil" // 9.d
@ -197,10 +197,10 @@ const expectedOpsForYearRoundingSameMonth = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 7.e "call this.calendar.dateAdd", // 12.d
"call this.calendar.dateAdd", // 7.g "call this.calendar.dateAdd", // 12.f
"call this.calendar.dateAdd", // 7.y MoveRelativeDate "call this.calendar.dateAdd", // 12.x MoveRelativeDate
// (7.o not called because months and weeks == 0) // (12.n not called because months and weeks == 0)
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 9.c "call this.calendar.dateAdd", // 9.c
"call this.calendar.dateUntil" // 9.d "call this.calendar.dateUntil" // 9.d
@ -217,10 +217,10 @@ const expectedOpsForMonthRounding = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 10.c "call this.calendar.dateAdd", // 13.c
"call this.calendar.dateAdd", // 10.e "call this.calendar.dateAdd", // 13.e
"call this.calendar.dateAdd", // 10.k MoveRelativeDate "call this.calendar.dateUntil", // 13.m
// (10.n.iii MoveRelativeDate not called because weeks == 0) "call this.calendar.dateAdd", // 13.w MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 10.d "call this.calendar.dateAdd", // 10.d
"call this.calendar.dateUntil", // 10.e "call this.calendar.dateUntil", // 10.e
@ -237,8 +237,8 @@ const expectedOpsForWeekRounding = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 11.d MoveRelativeDate "call this.calendar.dateUntil", // 14.f
// (11.g.iii MoveRelativeDate not called because days already balanced) "call this.calendar.dateAdd", // 14.p MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 16 "call this.calendar.dateAdd", // 16
"call this.calendar.dateUntil", // 17 "call this.calendar.dateUntil", // 17

30
test/built-ins/Temporal/PlainDateTime/prototype/until/order-of-operations.js vendored
View File

@ -163,11 +163,11 @@ const expectedOpsForYearRounding = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 7.e "call this.calendar.dateAdd", // 12.d
"call this.calendar.dateAdd", // 7.g "call this.calendar.dateAdd", // 12.f
"call this.calendar.dateUntil", // 7.o "call this.calendar.dateUntil", // 12.n
"call this.calendar.dateAdd", // 7.y MoveRelativeDate "call this.calendar.dateAdd", // 12.x MoveRelativeDate
// (7.s not called because other units can't add up to >1 year at this point) // (12.r not called because other units can't add up to >1 year at this point)
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 9.c "call this.calendar.dateAdd", // 9.c
"call this.calendar.dateUntil" // 9.d "call this.calendar.dateUntil" // 9.d
@ -197,10 +197,10 @@ const expectedOpsForYearRoundingSameMonth = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 7.e "call this.calendar.dateAdd", // 12.d
"call this.calendar.dateAdd", // 7.g "call this.calendar.dateAdd", // 12.f
"call this.calendar.dateAdd", // 7.y MoveRelativeDate "call this.calendar.dateAdd", // 12.x MoveRelativeDate
// (7.o not called because months and weeks == 0) // (12.n not called because months and weeks == 0)
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 9.c "call this.calendar.dateAdd", // 9.c
"call this.calendar.dateUntil" // 9.d "call this.calendar.dateUntil" // 9.d
@ -217,10 +217,10 @@ const expectedOpsForMonthRounding = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 10.c "call this.calendar.dateAdd", // 13.c
"call this.calendar.dateAdd", // 10.e "call this.calendar.dateAdd", // 13.e
"call this.calendar.dateAdd", // 10.k MoveRelativeDate "call this.calendar.dateUntil", // 13.m
// (10.n.iii MoveRelativeDate not called because weeks == 0) "call this.calendar.dateAdd", // 13.w MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 10.d "call this.calendar.dateAdd", // 10.d
"call this.calendar.dateUntil" // 10.e "call this.calendar.dateUntil" // 10.e
@ -237,8 +237,8 @@ const expectedOpsForWeekRounding = expected.concat([
// CalendarDateUntil // CalendarDateUntil
"call this.calendar.dateUntil", "call this.calendar.dateUntil",
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 11.d MoveRelativeDate "call this.calendar.dateUntil", // 14.f
// (11.g.iii MoveRelativeDate not called because days already balanced) "call this.calendar.dateAdd", // 14.p MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 16 "call this.calendar.dateAdd", // 16
"call this.calendar.dateUntil" // 17 "call this.calendar.dateUntil" // 17

4
test/built-ins/Temporal/ZonedDateTime/prototype/since/calendar-dateuntil-called-with-singular-largestunit.js vendored
View File

@ -101,8 +101,8 @@ TemporalHelpers.checkCalendarDateUntilLargestUnitSingular(
}, },
{ {
years: ["year", "year", "year"], years: ["year", "year", "year"],
months: ["month", "month"], months: ["month", "month", "month"],
weeks: ["week", "week"], weeks: ["week", "week", "week"],
days: [], days: [],
hours: [], hours: [],
minutes: [], minutes: [],

22
test/built-ins/Temporal/ZonedDateTime/prototype/since/order-of-operations.js vendored
View File

@ -359,11 +359,11 @@ actual.splice(0); // clear
// code path through RoundDuration that rounds to the nearest year: // code path through RoundDuration that rounds to the nearest year:
const expectedOpsForYearRounding = expected.concat(expectedOpsForCalendarDifference, expectedOpsForCalendarRounding, [ const expectedOpsForYearRounding = expected.concat(expectedOpsForCalendarDifference, expectedOpsForCalendarRounding, [
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 7.e "call this.calendar.dateAdd", // 12.d
"call this.calendar.dateAdd", // 7.g "call this.calendar.dateAdd", // 12.f
"call this.calendar.dateUntil", // 7.o "call this.calendar.dateUntil", // 12.n
"call this.calendar.dateAdd", // 7.y MoveRelativeDate "call this.calendar.dateAdd", // 12.x MoveRelativeDate
// (7.s not called because other units can't add up to >1 year at this point) // (12.r not called because other units can't add up to >1 year at this point)
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 9.c "call this.calendar.dateAdd", // 9.c
"call this.calendar.dateUntil" // 9.d "call this.calendar.dateUntil" // 9.d
@ -375,10 +375,10 @@ actual.splice(0); // clear
// code path through RoundDuration that rounds to the nearest month: // code path through RoundDuration that rounds to the nearest month:
const expectedOpsForMonthRounding = expected.concat(expectedOpsForCalendarDifference, expectedOpsForCalendarRounding, [ const expectedOpsForMonthRounding = expected.concat(expectedOpsForCalendarDifference, expectedOpsForCalendarRounding, [
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 10.c "call this.calendar.dateAdd", // 13.c
"call this.calendar.dateAdd", // 10.e "call this.calendar.dateAdd", // 13.e
"call this.calendar.dateAdd", // 10.k MoveRelativeDate "call this.calendar.dateUntil", // 13.m
// (10.n.iii MoveRelativeDate not called because weeks == 0) "call this.calendar.dateAdd", // 13.w MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 10.d "call this.calendar.dateAdd", // 10.d
"call this.calendar.dateUntil", // 10.e "call this.calendar.dateUntil", // 10.e
@ -390,8 +390,8 @@ actual.splice(0); // clear
// code path through RoundDuration that rounds to the nearest week: // code path through RoundDuration that rounds to the nearest week:
const expectedOpsForWeekRounding = expected.concat(expectedOpsForCalendarDifference, expectedOpsForCalendarRounding, [ const expectedOpsForWeekRounding = expected.concat(expectedOpsForCalendarDifference, expectedOpsForCalendarRounding, [
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 11.d MoveRelativeDate "call this.calendar.dateUntil", // 14.f
// (11.g.iii MoveRelativeDate not called because days already balanced) "call this.calendar.dateAdd", // 14.p MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 16 "call this.calendar.dateAdd", // 16
"call this.calendar.dateUntil", // 17 "call this.calendar.dateUntil", // 17

4
test/built-ins/Temporal/ZonedDateTime/prototype/until/calendar-dateuntil-called-with-singular-largestunit.js vendored
View File

@ -101,8 +101,8 @@ TemporalHelpers.checkCalendarDateUntilLargestUnitSingular(
}, },
{ {
years: ["year", "year", "year"], years: ["year", "year", "year"],
months: ["month", "month"], months: ["month", "month", "month"],
weeks: ["week", "week"], weeks: ["week", "week", "week"],
days: [], days: [],
hours: [], hours: [],
minutes: [], minutes: [],

22
test/built-ins/Temporal/ZonedDateTime/prototype/until/order-of-operations.js vendored
View File

@ -359,11 +359,11 @@ actual.splice(0); // clear
// code path through RoundDuration that rounds to the nearest year: // code path through RoundDuration that rounds to the nearest year:
const expectedOpsForYearRounding = expected.concat(expectedOpsForCalendarDifference, expectedOpsForCalendarRounding, [ const expectedOpsForYearRounding = expected.concat(expectedOpsForCalendarDifference, expectedOpsForCalendarRounding, [
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 7.e "call this.calendar.dateAdd", // 12.d
"call this.calendar.dateAdd", // 7.g "call this.calendar.dateAdd", // 12.f
"call this.calendar.dateUntil", // 7.o "call this.calendar.dateUntil", // 12.n
"call this.calendar.dateAdd", // 7.y MoveRelativeDate "call this.calendar.dateAdd", // 12.x MoveRelativeDate
// (7.s not called because other units can't add up to >1 year at this point) // (12.r not called because other units can't add up to >1 year at this point)
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 9.c "call this.calendar.dateAdd", // 9.c
"call this.calendar.dateUntil" // 9.d "call this.calendar.dateUntil" // 9.d
@ -375,10 +375,10 @@ actual.splice(0); // clear
// code path through RoundDuration that rounds to the nearest month: // code path through RoundDuration that rounds to the nearest month:
const expectedOpsForMonthRounding = expected.concat(expectedOpsForCalendarDifference, expectedOpsForCalendarRounding, [ const expectedOpsForMonthRounding = expected.concat(expectedOpsForCalendarDifference, expectedOpsForCalendarRounding, [
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 10.c "call this.calendar.dateAdd", // 13.c
"call this.calendar.dateAdd", // 10.e "call this.calendar.dateAdd", // 13.e
"call this.calendar.dateAdd", // 10.k MoveRelativeDate "call this.calendar.dateUntil", // 13.m
// (10.n.iii MoveRelativeDate not called because weeks == 0) "call this.calendar.dateAdd", // 13.w MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 10.d "call this.calendar.dateAdd", // 10.d
"call this.calendar.dateUntil", // 10.e "call this.calendar.dateUntil", // 10.e
@ -390,8 +390,8 @@ actual.splice(0); // clear
// code path through RoundDuration that rounds to the nearest week: // code path through RoundDuration that rounds to the nearest week:
const expectedOpsForWeekRounding = expected.concat(expectedOpsForCalendarDifference, expectedOpsForCalendarRounding, [ const expectedOpsForWeekRounding = expected.concat(expectedOpsForCalendarDifference, expectedOpsForCalendarRounding, [
// RoundDuration // RoundDuration
"call this.calendar.dateAdd", // 11.d MoveRelativeDate "call this.calendar.dateUntil", // 14.f
// (11.g.iii MoveRelativeDate not called because days already balanced) "call this.calendar.dateAdd", // 14.p MoveRelativeDate
// BalanceDateDurationRelative // BalanceDateDurationRelative
"call this.calendar.dateAdd", // 16 "call this.calendar.dateAdd", // 16
"call this.calendar.dateUntil", // 17 "call this.calendar.dateUntil", // 17