Port tc39/proposal-temporal#1872. (#90)

Co-authored-by: Philip Chimento <[email protected]>

Author: 12wrigja

lib/duration.ts

@@ -32,16 +32,16 @@ export class Duration implements Temporal.Duration {
     microsecondsParam: Params['constructor'][8] = 0,
     nanosecondsParam: Params['constructor'][9] = 0
   ) {
-    const years = ES.ToIntegerThrowOnInfinity(yearsParam);
-    const months = ES.ToIntegerThrowOnInfinity(monthsParam);
-    const weeks = ES.ToIntegerThrowOnInfinity(weeksParam);
-    const days = ES.ToIntegerThrowOnInfinity(daysParam);
-    const hours = ES.ToIntegerThrowOnInfinity(hoursParam);
-    const minutes = ES.ToIntegerThrowOnInfinity(minutesParam);
-    const seconds = ES.ToIntegerThrowOnInfinity(secondsParam);
-    const milliseconds = ES.ToIntegerThrowOnInfinity(millisecondsParam);
-    const microseconds = ES.ToIntegerThrowOnInfinity(microsecondsParam);
-    const nanoseconds = ES.ToIntegerThrowOnInfinity(nanosecondsParam);
+    const years = ES.ToIntegerWithoutRounding(yearsParam);
+    const months = ES.ToIntegerWithoutRounding(monthsParam);
+    const weeks = ES.ToIntegerWithoutRounding(weeksParam);
+    const days = ES.ToIntegerWithoutRounding(daysParam);
+    const hours = ES.ToIntegerWithoutRounding(hoursParam);
+    const minutes = ES.ToIntegerWithoutRounding(minutesParam);
+    const seconds = ES.ToIntegerWithoutRounding(secondsParam);
+    const milliseconds = ES.ToIntegerWithoutRounding(millisecondsParam);
+    const microseconds = ES.ToIntegerWithoutRounding(microsecondsParam);
+    const nanoseconds = ES.ToIntegerWithoutRounding(nanosecondsParam);
 
     const sign = ES.DurationSign(
       years,

lib/ecmascript.ts

@@ -140,12 +140,16 @@ export function ToPositiveInteger(valueParam: unknown, property?: string): numbe
   return value;
 }
 
-function ToIntegerNoFraction(valueParam: unknown): number {
+export function ToIntegerWithoutRounding(valueParam: unknown): number {
   const value = ToNumber(valueParam);
+  if (NumberIsNaN(value)) return 0;
+  if (!NumberIsFinite(value)) {
+    throw new RangeError('infinity is out of range');
+  }
   if (!IsInteger(value)) {
     throw new RangeError(`unsupported fractional value ${value}`);
   }
-  return value;
+  return ToInteger(value); // ℝ(value) in spec text; converts -0 to 0
 }
 
 const BUILTIN_CASTS = new Map<PrimitivePropertyNames, (v: unknown) => string | number>([
@@ -159,16 +163,16 @@ const BUILTIN_CASTS = new Map<PrimitivePropertyNames, (v: unknown) => string | n
   ['millisecond', ToIntegerThrowOnInfinity],
   ['microsecond', ToIntegerThrowOnInfinity],
   ['nanosecond', ToIntegerThrowOnInfinity],
-  ['years', ToIntegerNoFraction],
-  ['months', ToIntegerNoFraction],
-  ['weeks', ToIntegerNoFraction],
-  ['days', ToIntegerNoFraction],
-  ['hours', ToIntegerNoFraction],
-  ['minutes', ToIntegerNoFraction],
-  ['seconds', ToIntegerNoFraction],
-  ['milliseconds', ToIntegerNoFraction],
-  ['microseconds', ToIntegerNoFraction],
-  ['nanoseconds', ToIntegerNoFraction],
+  ['years', ToIntegerWithoutRounding],
+  ['months', ToIntegerWithoutRounding],
+  ['weeks', ToIntegerWithoutRounding],
+  ['days', ToIntegerWithoutRounding],
+  ['hours', ToIntegerWithoutRounding],
+  ['minutes', ToIntegerWithoutRounding],
+  ['seconds', ToIntegerWithoutRounding],
+  ['milliseconds', ToIntegerWithoutRounding],
+  ['microseconds', ToIntegerWithoutRounding],
+  ['nanoseconds', ToIntegerWithoutRounding],
   ['era', ToString],
   ['eraYear', ToInteger],
   ['offset', ToString]

test/duration.mjs

@@ -118,6 +118,18 @@ describe('Duration', () => {
       throws(() => new Duration(1, 1, 1, 1, 1, 1, 1, 1, -1, 1), RangeError);
       throws(() => new Duration(1, 1, 1, 1, 1, 1, 1, 1, 1, -1), RangeError);
     });
+    it('fractional values throw', () => {
+      throws(() => new Duration(1.1), RangeError);
+      throws(() => new Duration(0, 1.1), RangeError);
+      throws(() => new Duration(0, 0, 1.1), RangeError);
+      throws(() => new Duration(0, 0, 0, 1.1), RangeError);
+      throws(() => new Duration(0, 0, 0, 0, 1.1), RangeError);
+      throws(() => new Duration(0, 0, 0, 0, 0, 1.1), RangeError);
+      throws(() => new Duration(0, 0, 0, 0, 0, 0, 1.1), RangeError);
+      throws(() => new Duration(0, 0, 0, 0, 0, 0, 0, 1.1), RangeError);
+      throws(() => new Duration(0, 0, 0, 0, 0, 0, 0, 0, 1.1), RangeError);
+      throws(() => new Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, 1.1), RangeError);
+    });
   });
   describe('from()', () => {
     it('Duration.from(P5Y) is not the same object', () => {