Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Duration normalization, part 1 of 3 #2722

Merged
merged 5 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions polyfill/lib/duration.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ export class Duration {
weeks,
days,
largestUnit,
smallestUnit,
plainRelativeTo,
calendarRec
));
Expand Down
380 changes: 163 additions & 217 deletions polyfill/lib/ecmascript.mjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion polyfill/test262
Submodule test262 updated 85 files
+1 −0 features.txt
+0 −19 harness/temporalHelpers.js
+27 −0 test/built-ins/Set/prototype/union/add-not-called.js
+34 −0 test/built-ins/Set/prototype/union/allows-set-like-class.js
+30 −0 test/built-ins/Set/prototype/union/allows-set-like-object.js
+30 −0 test/built-ins/Set/prototype/union/appends-new-values.js
+17 −0 test/built-ins/Set/prototype/union/array-throws.js
+25 −0 test/built-ins/Set/prototype/union/builtins.js
+66 −0 test/built-ins/Set/prototype/union/called-with-object.js
+19 −0 test/built-ins/Set/prototype/union/combines-Map.js
+32 −0 test/built-ins/Set/prototype/union/combines-empty-sets.js
+15 −0 test/built-ins/Set/prototype/union/combines-itself.js
+16 −0 test/built-ins/Set/prototype/union/combines-same-sets.js
+16 −0 test/built-ins/Set/prototype/union/combines-sets.js
+35 −0 test/built-ins/Set/prototype/union/converts-negative-zero.js
+36 −0 test/built-ins/Set/prototype/union/has-is-callable.js
+33 −0 test/built-ins/Set/prototype/union/keys-is-callable.js
+18 −0 test/built-ins/Set/prototype/union/length.js
+18 −0 test/built-ins/Set/prototype/union/name.js
+22 −0 test/built-ins/Set/prototype/union/not-a-constructor.js
+44 −0 test/built-ins/Set/prototype/union/receiver-not-set.js
+25 −0 test/built-ins/Set/prototype/union/require-internal-slot.js
+24 −0 test/built-ins/Set/prototype/union/set-like-array.js
+47 −0 test/built-ins/Set/prototype/union/set-like-class-mutation.js
+83 −0 test/built-ins/Set/prototype/union/set-like-class-order.js
+72 −0 test/built-ins/Set/prototype/union/size-is-a-number.js
+45 −0 test/built-ins/Set/prototype/union/subclass-receiver-methods.js
+29 −0 test/built-ins/Set/prototype/union/subclass-symbol-species.js
+23 −0 test/built-ins/Set/prototype/union/subclass.js
+20 −0 test/built-ins/Set/prototype/union/union-properties.js
+2 −8 test/built-ins/Temporal/Duration/compare/order-of-operations.js
+0 −68 test/built-ins/Temporal/Duration/compare/precision-exact-mathematical-values-1.js
+0 −69 test/built-ins/Temporal/Duration/compare/precision-exact-mathematical-values-2.js
+7 −13 test/built-ins/Temporal/Duration/prototype/round/calendar-dateadd-called-with-options-undefined.js
+16 −21 test/built-ins/Temporal/Duration/prototype/round/calendar-dateuntil-called-with-singular-largestunit.js
+2 −2 test/built-ins/Temporal/Duration/prototype/round/calendar-possibly-required.js
+24 −31 test/built-ins/Temporal/Duration/prototype/round/dateuntil-field.js
+4 −0 test/built-ins/Temporal/Duration/prototype/round/duration-out-of-range-added-to-relativeto.js
+2 −2 test/built-ins/Temporal/Duration/prototype/round/february-leap-year.js
+74 −64 test/built-ins/Temporal/Duration/prototype/round/order-of-operations.js
+0 −52 test/built-ins/Temporal/Duration/prototype/round/precision-exact-in-balance-duration-relative-months.js
+0 −52 test/built-ins/Temporal/Duration/prototype/round/precision-exact-in-balance-duration-relative-weeks.js
+0 −52 test/built-ins/Temporal/Duration/prototype/round/precision-exact-in-balance-duration-relative-years-days.js
+0 −52 test/built-ins/Temporal/Duration/prototype/round/precision-exact-in-balance-duration-relative-years-months.js
+0 −53 ...t-ins/Temporal/Duration/prototype/round/precision-exact-in-balance-duration-relative-years-with-calendar.js
+4 −4 test/built-ins/Temporal/Duration/prototype/round/roundingincrement-non-integer.js
+14 −10 test/built-ins/Temporal/Duration/prototype/round/roundingmode-ceil.js
+14 −10 test/built-ins/Temporal/Duration/prototype/round/roundingmode-expand.js
+14 −10 test/built-ins/Temporal/Duration/prototype/round/roundingmode-floor.js
+14 −10 test/built-ins/Temporal/Duration/prototype/round/roundingmode-halfCeil.js
+14 −10 test/built-ins/Temporal/Duration/prototype/round/roundingmode-halfEven.js
+14 −10 test/built-ins/Temporal/Duration/prototype/round/roundingmode-halfExpand.js
+14 −10 test/built-ins/Temporal/Duration/prototype/round/roundingmode-halfFloor.js
+14 −10 test/built-ins/Temporal/Duration/prototype/round/roundingmode-halfTrunc.js
+14 −10 test/built-ins/Temporal/Duration/prototype/round/roundingmode-trunc.js
+3 −1 test/built-ins/Temporal/Duration/prototype/round/throws-in-unbalance-duration-relative-when-sign-mismatched.js
+31 −0 test/built-ins/Temporal/Duration/prototype/round/zero-year-month-week-length.js
+4 −7 test/built-ins/Temporal/Duration/prototype/total/calendar-dateadd-called-with-options-undefined.js
+10 −37 test/built-ins/Temporal/Duration/prototype/total/calendar-dateuntil-called-with-singular-largestunit.js
+13 −7 test/built-ins/Temporal/Duration/prototype/total/dateuntil-field.js
+4 −0 test/built-ins/Temporal/Duration/prototype/total/duration-out-of-range-added-to-relativeto.js
+42 −39 test/built-ins/Temporal/Duration/prototype/total/order-of-operations.js
+31 −0 test/built-ins/Temporal/Duration/prototype/total/zero-year-month-week-length.js
+26 −29 test/built-ins/Temporal/PlainDate/prototype/since/order-of-operations.js
+31 −0 test/built-ins/Temporal/PlainDate/prototype/since/rounding-zero-year-month-week-length.js
+26 −29 test/built-ins/Temporal/PlainDate/prototype/until/order-of-operations.js
+31 −0 test/built-ins/Temporal/PlainDate/prototype/until/rounding-zero-year-month-week-length.js
+27 −29 test/built-ins/Temporal/PlainDateTime/prototype/since/order-of-operations.js
+31 −0 test/built-ins/Temporal/PlainDateTime/prototype/since/rounding-zero-year-month-week-length.js
+27 −29 test/built-ins/Temporal/PlainDateTime/prototype/until/order-of-operations.js
+31 −0 test/built-ins/Temporal/PlainDateTime/prototype/until/rounding-zero-year-month-week-length.js
+9 −15 test/built-ins/Temporal/PlainYearMonth/prototype/since/order-of-operations.js
+30 −0 test/built-ins/Temporal/PlainYearMonth/prototype/since/rounding-zero-year-month-length.js
+3 −2 test/built-ins/Temporal/PlainYearMonth/prototype/since/roundingincrement-non-integer.js
+9 −15 test/built-ins/Temporal/PlainYearMonth/prototype/until/order-of-operations.js
+30 −0 test/built-ins/Temporal/PlainYearMonth/prototype/until/rounding-zero-year-month-length.js
+3 −2 test/built-ins/Temporal/PlainYearMonth/prototype/until/roundingincrement-non-integer.js
+6 −6 test/built-ins/Temporal/ZonedDateTime/prototype/since/calendar-dateuntil-called-with-singular-largestunit.js
+20 −20 test/built-ins/Temporal/ZonedDateTime/prototype/since/order-of-operations.js
+31 −0 test/built-ins/Temporal/ZonedDateTime/prototype/since/rounding-zero-year-month-week-length.js
+6 −6 test/built-ins/Temporal/ZonedDateTime/prototype/until/calendar-dateuntil-called-with-singular-largestunit.js
+20 −20 test/built-ins/Temporal/ZonedDateTime/prototype/until/order-of-operations.js
+31 −0 test/built-ins/Temporal/ZonedDateTime/prototype/until/rounding-zero-year-month-week-length.js
+21 −21 test/staging/Temporal/Duration/old/round.js
+39 −2 tools/packaging/parseTestRecord.py
215 changes: 81 additions & 134 deletions spec/duration.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion spec/plaindate.html
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@ <h1>
1. If _roundingGranularityIsNoop_ is *false*, then
1. Let _roundRecord_ be ? RoundDuration(_result_.[[Years]], _result_.[[Months]], _result_.[[Weeks]], _result_.[[Days]], 0, 0, 0, 0, 0, 0, _settings_.[[RoundingIncrement]], _settings_.[[SmallestUnit]], _settings_.[[RoundingMode]], _temporalDate_, _calendarRec_).
1. Let _roundResult_ be _roundRecord_.[[DurationRecord]].
1. Set _result_ to ? BalanceDateDurationRelative(_roundResult_.[[Years]], _roundResult_.[[Months]], _roundResult_.[[Weeks]], _roundResult_.[[Days]], _settings_.[[LargestUnit]], _temporalDate_, _calendarRec_).
1. Set _result_ to ? BalanceDateDurationRelative(_roundResult_.[[Years]], _roundResult_.[[Months]], _roundResult_.[[Weeks]], _roundResult_.[[Days]], _settings_.[[LargestUnit]], _settings_.[[SmallestUnit]], _temporalDate_, _calendarRec_).
1. Return ! CreateTemporalDuration(_sign_ &times; _result_.[[Years]], _sign_ &times; _result_.[[Months]], _sign_ &times; _result_.[[Weeks]], _sign_ &times; _result_.[[Days]], 0, 0, 0, 0, 0, 0).
</emu-alg>
</emu-clause>
Expand Down
2 changes: 1 addition & 1 deletion spec/plaindatetime.html
Original file line number Diff line number Diff line change
Expand Up @@ -1312,7 +1312,7 @@ <h1>
1. Let _roundRecord_ be ? RoundDuration(_diff_.[[Years]], _diff_.[[Months]], _diff_.[[Weeks]], _diff_.[[Days]], _diff_.[[Hours]], _diff_.[[Minutes]], _diff_.[[Seconds]], _diff_.[[Milliseconds]], _diff_.[[Microseconds]], _diff_.[[Nanoseconds]], _settings_.[[RoundingIncrement]], _settings_.[[SmallestUnit]], _settings_.[[RoundingMode]], _relativeTo_, _calendarRec_).
1. Let _roundResult_ be _roundRecord_.[[DurationRecord]].
1. Let _result_ be ? BalanceTimeDuration(_roundResult_.[[Days]], _roundResult_.[[Hours]], _roundResult_.[[Minutes]], _roundResult_.[[Seconds]], _roundResult_.[[Milliseconds]], _roundResult_.[[Microseconds]], _roundResult_.[[Nanoseconds]], _settings_.[[LargestUnit]]).
1. Let _balanceResult_ be ? BalanceDateDurationRelative(_roundResult_.[[Years]], _roundResult_.[[Months]], _roundResult_.[[Weeks]], _result_.[[Days]], _settings_.[[LargestUnit]], _relativeTo_, _calendarRec_).
1. Let _balanceResult_ be ? BalanceDateDurationRelative(_roundResult_.[[Years]], _roundResult_.[[Months]], _roundResult_.[[Weeks]], _result_.[[Days]], _settings_.[[LargestUnit]], _settings_.[[SmallestUnit]], _relativeTo_, _calendarRec_).
1. Return ! CreateTemporalDuration(_sign_ &times; _balanceResult_.[[Years]], _sign_ &times; _balanceResult_.[[Months]], _sign_ &times; _balanceResult_.[[Weeks]], _sign_ &times; _balanceResult_.[[Days]], _sign_ &times; _result_.[[Hours]], _sign_ &times; _result_.[[Minutes]], _sign_ &times; _result_.[[Seconds]], _sign_ &times; _result_.[[Milliseconds]], _sign_ &times; _result_.[[Microseconds]], _sign_ &times; _result_.[[Nanoseconds]]).
</emu-alg>
</emu-clause>
Expand Down
2 changes: 1 addition & 1 deletion spec/plainyearmonth.html
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ <h1>
1. If _settings_.[[SmallestUnit]] is not *"month"* or _settings_.[[RoundingIncrement]] &ne; 1, then
1. Let _roundRecord_ be ? RoundDuration(_result_.[[Years]], _result_.[[Months]], 0, 0, 0, 0, 0, 0, 0, 0, _settings_.[[RoundingIncrement]], _settings_.[[SmallestUnit]], _settings_.[[RoundingMode]], _thisDate_, _calendarRec_).
1. Let _roundResult_ be _roundRecord_.[[DurationRecord]].
1. Set _result_ to ? BalanceDateDurationRelative(_roundResult_.[[Years]], _roundResult_.[[Months]], 0, 0, _settings_.[[LargestUnit]], _thisDate_, _calendarRec_).
1. Set _result_ to ? BalanceDateDurationRelative(_roundResult_.[[Years]], _roundResult_.[[Months]], 0, 0, _settings_.[[LargestUnit]], _settings_.[[SmallestUnit]], _thisDate_, _calendarRec_).
1. Return ! CreateTemporalDuration(_sign_ &times; _result_.[[Years]], _sign_ &times; _result_.[[Months]], 0, 0, 0, 0, 0, 0, 0, 0).
</emu-alg>
</emu-clause>
Expand Down
2 changes: 1 addition & 1 deletion spec/zoneddatetime.html
Original file line number Diff line number Diff line change
Expand Up @@ -1521,7 +1521,7 @@ <h1>
1. Let _roundRecord_ be ? RoundDuration(_difference_.[[Years]], _difference_.[[Months]], _difference_.[[Weeks]], _difference_.[[Days]], _difference_.[[Hours]], _difference_.[[Minutes]], _difference_.[[Seconds]], _difference_.[[Milliseconds]], _difference_.[[Microseconds]], _difference_.[[Nanoseconds]], _settings_.[[RoundingIncrement]], _settings_.[[SmallestUnit]], _settings_.[[RoundingMode]], _plainRelativeTo_, _calendarRec_, _zonedDateTime_, _timeZoneRec_, _precalculatedPlainDateTime_).
1. Let _roundResult_ be _roundRecord_.[[DurationRecord]].
1. Let _adjustResult_ be ? AdjustRoundedDurationDays(_roundResult_.[[Years]], _roundResult_.[[Months]], _roundResult_.[[Weeks]], _roundResult_.[[Days]], _roundResult_.[[Hours]], _roundResult_.[[Minutes]], _roundResult_.[[Seconds]], _roundResult_.[[Milliseconds]], _roundResult_.[[Microseconds]], _roundResult_.[[Nanoseconds]], _settings_.[[RoundingIncrement]], _settings_.[[SmallestUnit]], _settings_.[[RoundingMode]], _zonedDateTime_, _calendarRec_, _timeZoneRec_, _precalculatedPlainDateTime_).
1. Let _result_ be ? BalanceDateDurationRelative(_adjustResult_.[[Years]], _adjustResult_.[[Months]], _adjustResult_.[[Weeks]], _adjustResult_.[[Days]], _settings_.[[LargestUnit]], _plainRelativeTo_, _calendarRec_).
1. Let _result_ be ? BalanceDateDurationRelative(_adjustResult_.[[Years]], _adjustResult_.[[Months]], _adjustResult_.[[Weeks]], _adjustResult_.[[Days]], _settings_.[[LargestUnit]], _settings_.[[SmallestUnit]], _plainRelativeTo_, _calendarRec_).
1. Return ! CreateTemporalDuration(_sign_ &times; _result_.[[Years]], _sign_ &times; _result_.[[Months]], _sign_ &times; _result_.[[Weeks]], _sign_ &times; _result_.[[Days]], _sign_ &times; _adjustResult_.[[Hours]], _sign_ &times; _adjustResult_.[[Minutes]], _sign_ &times; _adjustResult_.[[Seconds]], _sign_ &times; _adjustResult_.[[Milliseconds]], _sign_ &times; _adjustResult_.[[Microseconds]], _sign_ &times; _adjustResult_.[[Nanoseconds]]).
</emu-alg>
</emu-clause>
Expand Down