fix Duration::round bug with relativeTo:ZDT and smallestUnit<day

fullcalendar · Apr 13, 2024 · 9e00104 · 9e00104
1 parent 69ec763
commit 9e00104
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/packages/temporal-polyfill/scripts/test262-config/expected-failures.txt b/packages/temporal-polyfill/scripts/test262-config/expected-failures.txt
@@ -28,11 +28,6 @@
 # "Fix Duration rounding relative to ZonedDateTime"
 # (refactors Duration::round/total to be more DRY with since/until)
 #
-built-ins/Temporal/Duration/prototype/round/dst-rounding-result.js
-built-ins/Temporal/Duration/prototype/round/dst-rounding-result-fullcalendar.js
-# ^see built-ins/Temporal/Duration/prototype/round/dst-rounding-result-fullcalendar.js
-built-ins/Temporal/Duration/prototype/total/dst-rounding-result.js
-# ^see built-ins/Temporal/Duration/prototype/total/dst-rounding-result-fullcalendar.js
 intl402/Temporal/Duration/prototype/round/relativeto-string-datetime.js
 built-ins/Temporal/Duration/prototype/round/timezone-getpossibleinstantsfor-iterable.js
 built-ins/Temporal/Duration/prototype/total/precision-exact-mathematical-values-4.js

diff --git a/packages/temporal-polyfill/src/internal/durationMath.ts b/packages/temporal-polyfill/src/internal/durationMath.ts
@@ -19,6 +19,7 @@ import {
   createMarkerToEpochNano,
   createMoveMarker,
   isUniformUnit,
+  isZonedEpochSlots,
 } from './markerSystem'
 import { Overflow } from './options'
 import {
@@ -115,7 +116,7 @@ export function addDurations<RA, C, T>(
         addDayTimeDurations(
           slots,
           otherSlots,
-          maxUnit as DayTimeUnit,
+          maxUnit as DayTimeUnit, // largestUnit
           doSubtract,
         ),
       ),
@@ -186,7 +187,9 @@ export function roundDuration<RA, C, T>(
 
   const maxUnit = Math.max(durationLargestUnit, largestUnit)
 
-  if (isUniformUnit(maxUnit, relativeToSlots)) {
+  // Don't do nanosecond-only rounding if ZDT because rounding hours/mins/etc
+  // could balance-up to days, which could vary based on time zone
+  if (!isZonedEpochSlots(relativeToSlots) && maxUnit <= Unit.Day) {
     return createDurationSlots(
       checkDurationUnits(
         roundDayTimeDuration(

diff --git a/test262 b/test262
+0 −21		test/annexB/language/eval-code/direct/script-decl-lex-collision-in-sloppy-mode.js
+14 −2		test/annexB/language/eval-code/direct/script-decl-lex-no-collision.js
+1 −1		test/built-ins/Map/groupBy/string.js
+1 −1		test/built-ins/Object/groupBy/string.js
+1 −1		test/built-ins/Temporal/Duration/prototype/round/calendar-dateadd-called-with-options-undefined.js
+0 −116		test/built-ins/Temporal/Duration/prototype/round/dst-rounding-result-fullcalendar.js
+55 −2		test/built-ins/Temporal/Duration/prototype/round/dst-rounding-result.js
+20 −2		test/built-ins/Temporal/Duration/prototype/total/dst-rounding-result.js
+8 −2		test/built-ins/Temporal/ZonedDateTime/prototype/since/roundingincrement-non-integer.js
+8 −2		test/built-ins/Temporal/ZonedDateTime/prototype/until/roundingincrement-non-integer.js
+62 −0		test/intl402/DurationFormat/prototype/format/fractions-of-subsecond-units-en.js
+34 −0		test/intl402/DurationFormat/prototype/format/mixed-short-and-numeric.js
+11 −3		test/intl402/DurationFormat/prototype/format/style-digital-fractionalDigits-undefined-en.js
+0 −26		test/language/expressions/assignment/S11.13.1_A7_T3.js
+40 −0		test/language/expressions/assignment/target-member-computed-reference.js
+47 −0		test/language/expressions/assignment/target-super-computed-reference.js
+0 −30		test/language/global-code/script-decl-lex-var-declared-via-eval-sloppy.js
+14 −2		test/language/global-code/script-decl-lex-var-declared-via-eval.js
+261 −77		test/staging/Intl402/Temporal/old/non-iso-calendars.js