Port tc39/proposal-temporal/pull/1925. (#94)

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

Author: 12wrigja

lib/ecmascript.ts

@@ -283,21 +283,12 @@ export function RejectObjectWithCalendarOrTimeZone(item: AnyTemporalLikeType) {
     throw new TypeError('with() does not support a timeZone property');
   }
 }
-function TemporalTimeZoneFromString(stringIdent: string) {
+function ParseTemporalTimeZone(stringIdent: string) {
   // TODO: why aren't these three variables destructured to include `undefined` as possible types?
   let { ianaName, offset, z } = ParseTemporalTimeZoneString(stringIdent);
-  let identifier = ianaName;
-  if (!identifier && z) identifier = 'UTC';
-  if (!identifier) identifier = offset;
-  const result = GetCanonicalTimeZoneIdentifier(identifier);
-  if (offset && identifier !== offset) {
-    const ns = ParseTemporalInstant(stringIdent);
-    const offsetNs = GetIANATimeZoneOffsetNanoseconds(ns, result);
-    if (FormatTimeZoneOffsetString(offsetNs) !== offset) {
-      throw new RangeError(`invalid offset ${offset}[${ianaName}]`);
-    }
-  }
-  return result;
+  if (ianaName) return ianaName;
+  if (z) return 'UTC';
+  return offset;
 }
 
 function FormatCalendarAnnotation(id: string, showCalendar: Temporal.ShowCalendarOption['calendarName']) {
@@ -2154,7 +2145,7 @@ export function ToTemporalTimeZone(temporalTimeZoneLikeParam: TimeZoneParams['fr
     }
   }
   const identifier = ToString(temporalTimeZoneLike);
-  const timeZone = TemporalTimeZoneFromString(identifier);
+  const timeZone = ParseTemporalTimeZone(identifier);
   const TemporalTimeZone = GetIntrinsic('%Temporal.TimeZone%');
   return new TemporalTimeZone(timeZone);
 }
@@ -5056,7 +5047,7 @@ export const SystemUTCEpochNanoSeconds: () => bigInt.BigInteger = (() => {
 export function SystemTimeZone() {
   const fmt = new IntlDateTimeFormat('en-us');
   const TemporalTimeZone = GetIntrinsic('%Temporal.TimeZone%');
-  return new TemporalTimeZone(TemporalTimeZoneFromString(fmt.resolvedOptions().timeZone));
+  return new TemporalTimeZone(ParseTemporalTimeZone(fmt.resolvedOptions().timeZone));
 }
 
 export function ComparisonResult(value: number) {

test/expected-failures.txt

@@ -6,3 +6,6 @@
 # Blocked on https://github.com/tc39/test262/pull/3304
 built-ins/Temporal/Instant/prototype/round/options-wrong-type.js
 built-ins/Temporal/Duration/prototype/total/options-wrong-type.js
+
+# https://github.com/tc39/test262/pull/3316
+intl402/Temporal/TimeZone/from/argument-invalid.js

test/regex.mjs

@@ -483,9 +483,10 @@ describe('fromString regex', () => {
       generateTest('1976-11-18T15:23', zoneString, '-04:00')
     );
     // Various numbers of decimal places
-    ['1', '12', '123', '1234', '12345', '123456', '1234567', '12345678'].forEach((decimals) =>
-      test(`1976-11-18T15:23:30.${decimals}Z`, 'UTC')
-    );
+    ['1', '12', '123', '1234', '12345', '123456', '1234567', '12345678'].forEach((decimals) => {
+      test(`1976-11-18T15:23:30.${decimals}Z`, 'UTC');
+      test(`1976-11-18T15:23+01:00[+01:00:00.${decimals}]`, `+01:00:00.${decimals}`);
+    });
     // Lowercase UTC designator
     generateTest('1976-11-18T15:23', 'z', 'UTC');
     // Comma decimal separator

test/timezone.mjs

@@ -157,11 +157,6 @@ describe('TimeZone', () => {
       it(`TimeZone.from(${isoString}) is a time zone`, () => equal(typeof tz, 'object'));
       it(`TimeZone.from(${isoString}) has ID ${id}`, () => equal(tz.id, id));
     }
-    it('offset disagreeing with IANA name throws', () => {
-      throws(() => Temporal.TimeZone.from('1994-11-05T08:15:30-05:00[UTC]'), RangeError);
-      throws(() => Temporal.TimeZone.from('1994-11-05T13:15:30+00:00[America/New_York]'), RangeError);
-      throws(() => Temporal.TimeZone.from('1994-11-05T13:15:30-03[Europe/Brussels]'), RangeError);
-    });
     it('offset out of range throws', () => {
       throws(() => Temporal.TimeZone.from('1994-11-05T08:15:30+25:00'), RangeError);
       throws(() => Temporal.TimeZone.from('1994-11-05T13:15:30-25:00'), RangeError);