@internationalized/date 3.5.6 → 3.6.0

package/src/DateFormatter.ts

@@ -12,10 +12,6 @@
 
 let formatterCache = new Map<string, Intl.DateTimeFormat>();
 
-interface ResolvedDateTimeFormatOptions extends Intl.ResolvedDateTimeFormatOptions {
-  hourCycle?: Intl.DateTimeFormatOptions['hourCycle']
-}
-
 interface DateRangeFormatPart extends Intl.DateTimeFormatPart {
   source: 'startRange' | 'endRange' | 'shared'
 }
@@ -79,8 +75,8 @@ export class DateFormatter implements Intl.DateTimeFormat {
   }
 
   /** Returns the resolved formatting options based on the values passed to the constructor. */
-  resolvedOptions(): ResolvedDateTimeFormatOptions {
-    let resolvedOptions = this.formatter.resolvedOptions() as ResolvedDateTimeFormatOptions;
+  resolvedOptions(): Intl.ResolvedDateTimeFormatOptions {
+    let resolvedOptions = this.formatter.resolvedOptions();
     if (hasBuggyResolvedHourCycle()) {
       if (!this.resolvedHourCycle) {
         this.resolvedHourCycle = getResolvedHourCycle(resolvedOptions.locale, this.options);
@@ -156,10 +152,10 @@ function hasBuggyHour12Behavior() {
 let _hasBuggyResolvedHourCycle: boolean | null = null;
 function hasBuggyResolvedHourCycle() {
   if (_hasBuggyResolvedHourCycle == null) {
-    _hasBuggyResolvedHourCycle = (new Intl.DateTimeFormat('fr', {
+    _hasBuggyResolvedHourCycle = new Intl.DateTimeFormat('fr', {
       hour: 'numeric',
       hour12: false
-    }).resolvedOptions() as ResolvedDateTimeFormatOptions).hourCycle === 'h12';
+    }).resolvedOptions().hourCycle === 'h12';
   }
 
   return _hasBuggyResolvedHourCycle;

package/src/conversion.ts

@@ -187,7 +187,7 @@ export function fromAbsolute(ms: number, timeZone: string): ZonedDateTime {
   let second = date.getUTCSeconds();
   let millisecond = date.getUTCMilliseconds();
 
-  return new ZonedDateTime(year, month, day, timeZone, offset, hour, minute, second, millisecond);
+  return new ZonedDateTime(year < 1 ? 'BC' : 'AD', year < 1 ? -year + 1 : year, month, day, timeZone, offset, hour, minute, second, millisecond);
 }
 
 /**

package/src/string.ts

@@ -18,10 +18,10 @@ import {GregorianCalendar} from './calendars/GregorianCalendar';
 import {Mutable} from './utils';
 
 const TIME_RE = /^(\d{2})(?::(\d{2}))?(?::(\d{2}))?(\.\d+)?$/;
-const DATE_RE = /^(\d{4})-(\d{2})-(\d{2})$/;
-const DATE_TIME_RE = /^(\d{4})-(\d{2})-(\d{2})(?:T(\d{2}))?(?::(\d{2}))?(?::(\d{2}))?(\.\d+)?$/;
-const ZONED_DATE_TIME_RE = /^(\d{4})-(\d{2})-(\d{2})(?:T(\d{2}))?(?::(\d{2}))?(?::(\d{2}))?(\.\d+)?(?:([+-]\d{2})(?::?(\d{2}))?)?\[(.*?)\]$/;
-const ABSOLUTE_RE = /^(\d{4})-(\d{2})-(\d{2})(?:T(\d{2}))?(?::(\d{2}))?(?::(\d{2}))?(\.\d+)?(?:(?:([+-]\d{2})(?::?(\d{2}))?)|Z)$/;
+const DATE_RE = /^([+-]\d{6}|\d{4})-(\d{2})-(\d{2})$/;
+const DATE_TIME_RE = /^([+-]\d{6}|\d{4})-(\d{2})-(\d{2})(?:T(\d{2}))?(?::(\d{2}))?(?::(\d{2}))?(\.\d+)?$/;
+const ZONED_DATE_TIME_RE = /^([+-]\d{6}|\d{4})-(\d{2})-(\d{2})(?:T(\d{2}))?(?::(\d{2}))?(?::(\d{2}))?(\.\d+)?(?:([+-]\d{2})(?::?(\d{2}))?)?\[(.*?)\]$/;
+const ABSOLUTE_RE = /^([+-]\d{6}|\d{4})-(\d{2})-(\d{2})(?:T(\d{2}))?(?::(\d{2}))?(?::(\d{2}))?(\.\d+)?(?:(?:([+-]\d{2})(?::?(\d{2}))?)|Z)$/;
 const DATE_TIME_DURATION_RE =
     /^((?<negative>-)|\+)?P((?<years>\d*)Y)?((?<months>\d*)M)?((?<weeks>\d*)W)?((?<days>\d*)D)?((?<time>T)((?<hours>\d*[.,]?\d{1,9})H)?((?<minutes>\d*[.,]?\d{1,9})M)?((?<seconds>\d*[.,]?\d{1,9})S)?)?$/;
 const requiredDurationTimeGroups = ['hours', 'minutes', 'seconds'];
@@ -66,8 +66,12 @@ export function parseDateTime(value: string): CalendarDateTime {
     throw new Error('Invalid ISO 8601 date time string: ' + value);
   }
 
+  let year = parseNumber(m[1], -9999, 9999);
+  let era = year < 1 ? 'BC' : 'AD';
+
   let date: Mutable<CalendarDateTime> = new CalendarDateTime(
-    parseNumber(m[1], 1, 9999),
+    era,
+    year < 1 ? -year + 1 : year,
     parseNumber(m[2], 1, 12),
     1,
     m[4] ? parseNumber(m[4], 0, 23) : 0,
@@ -92,8 +96,12 @@ export function parseZonedDateTime(value: string, disambiguation?: Disambiguatio
     throw new Error('Invalid ISO 8601 date time string: ' + value);
   }
 
+  let year = parseNumber(m[1], -9999, 9999);
+  let era = year < 1 ? 'BC' : 'AD';
+
   let date: Mutable<ZonedDateTime> = new ZonedDateTime(
-    parseNumber(m[1], 1, 9999),
+    era,
+    year < 1 ? -year + 1 : year,
     parseNumber(m[2], 1, 12),
     1,
     m[10],
@@ -136,8 +144,12 @@ export function parseAbsolute(value: string, timeZone: string): ZonedDateTime {
     throw new Error('Invalid ISO 8601 date time string: ' + value);
   }
 
+  let year = parseNumber(m[1], -9999, 9999);
+  let era = year < 1 ? 'BC' : 'AD';
+
   let date: Mutable<ZonedDateTime> = new ZonedDateTime(
-    parseNumber(m[1], 1, 9999),
+    era,
+    year < 1 ? -year + 1 : year,
     parseNumber(m[2], 1, 12),
     1,
     timeZone,
@@ -180,7 +192,15 @@ export function timeToString(time: Time): string {
 
 export function dateToString(date: CalendarDate): string {
   let gregorianDate = toCalendar(date, new GregorianCalendar());
-  return `${String(gregorianDate.year).padStart(4, '0')}-${String(gregorianDate.month).padStart(2, '0')}-${String(gregorianDate.day).padStart(2, '0')}`;
+  let year: string;
+  if (gregorianDate.era === 'BC') {
+    year = gregorianDate.year === 1 
+      ? '0000'
+      : '-' + String(Math.abs(1 - gregorianDate.year)).padStart(6, '00');
+  } else {
+    year = String(gregorianDate.year).padStart(4, '0');
+  }
+  return `${year}-${String(gregorianDate.month).padStart(2, '0')}-${String(gregorianDate.day).padStart(2, '0')}`;
 }
 
 export function dateTimeToString(date: AnyDateTime): string {