@formatjs/intl-datetimeformat 7.1.0 → 7.1.2

package/src/abstract/PartitionDateTimeRangePattern.js

@@ -1,164 +1,171 @@
-import { PartitionPattern, RangePatternType, SameValue, TimeClip, } from '@formatjs/ecma402-abstract';
-import { FormatDateTimePattern, } from './FormatDateTimePattern.js';
-import { ToLocalTime } from './ToLocalTime.js';
-var TABLE_2_FIELDS = [
-    'era',
-    'year',
-    'month',
-    'day',
-    'dayPeriod',
-    'ampm',
-    'hour',
-    'minute',
-    'second',
-    'fractionalSecondDigits',
+import { PartitionPattern, RangePatternType, SameValue, TimeClip } from "@formatjs/ecma402-abstract";
+import { FormatDateTimePattern } from "./FormatDateTimePattern.js";
+import { ToLocalTime } from "./ToLocalTime.js";
+const TABLE_2_FIELDS = [
+	"era",
+	"year",
+	"month",
+	"day",
+	"dayPeriod",
+	"ampm",
+	"hour",
+	"minute",
+	"second",
+	"fractionalSecondDigits"
 ];
 export function PartitionDateTimeRangePattern(dtf, x, y, implDetails) {
-    x = TimeClip(x);
-    if (x.isNaN()) {
-        throw new RangeError('Invalid start time');
-    }
-    y = TimeClip(y);
-    if (y.isNaN()) {
-        throw new RangeError('Invalid end time');
-    }
-    /** IMPL START */
-    var getInternalSlots = implDetails.getInternalSlots, tzData = implDetails.tzData, localeData = implDetails.localeData;
-    var internalSlots = getInternalSlots(dtf);
-    var dataLocale = internalSlots.dataLocale;
-    var dataLocaleData = localeData[dataLocale];
-    /** IMPL END */
-    var tm1 = ToLocalTime(x, 
-    // @ts-ignore
-    internalSlots.calendar, internalSlots.timeZone, { tzData: tzData });
-    var tm2 = ToLocalTime(y, 
-    // @ts-ignore
-    internalSlots.calendar, internalSlots.timeZone, { tzData: tzData });
-    var pattern = internalSlots.pattern, rangePatterns = internalSlots.rangePatterns;
-    var rangePattern;
-    var dateFieldsPracticallyEqual = true;
-    var patternContainsLargerDateField = false;
-    for (var _i = 0, TABLE_2_FIELDS_1 = TABLE_2_FIELDS; _i < TABLE_2_FIELDS_1.length; _i++) {
-        var fieldName = TABLE_2_FIELDS_1[_i];
-        if (dateFieldsPracticallyEqual && !patternContainsLargerDateField) {
-            var rp = fieldName in rangePatterns ? rangePatterns[fieldName] : undefined;
-            if (rangePattern !== undefined && rp === undefined) {
-                patternContainsLargerDateField = true;
-            }
-            else {
-                rangePattern = rp;
-                if (fieldName === 'ampm') {
-                    var v1 = tm1.hour;
-                    var v2 = tm2.hour;
-                    if ((v1 > 11 && v2 < 11) || (v1 < 11 && v2 > 11)) {
-                        dateFieldsPracticallyEqual = false;
-                    }
-                }
-                else if (fieldName === 'dayPeriod') {
-                    // TODO
-                }
-                else if (fieldName === 'fractionalSecondDigits') {
-                    var fractionalSecondDigits = internalSlots.fractionalSecondDigits;
-                    if (fractionalSecondDigits === undefined) {
-                        fractionalSecondDigits = 3;
-                    }
-                    var v1 = Math.floor(tm1.millisecond * Math.pow(10, (fractionalSecondDigits - 3)));
-                    var v2 = Math.floor(tm2.millisecond * Math.pow(10, (fractionalSecondDigits - 3)));
-                    if (!SameValue(v1, v2)) {
-                        dateFieldsPracticallyEqual = false;
-                    }
-                }
-                else {
-                    var v1 = tm1[fieldName];
-                    var v2 = tm2[fieldName];
-                    if (!SameValue(v1, v2)) {
-                        dateFieldsPracticallyEqual = false;
-                    }
-                }
-            }
-        }
-    }
-    if (dateFieldsPracticallyEqual) {
-        var result_2 = FormatDateTimePattern(dtf, PartitionPattern(pattern), x, implDetails);
-        for (var _a = 0, result_1 = result_2; _a < result_1.length; _a++) {
-            var r = result_1[_a];
-            r.source = RangePatternType.shared;
-        }
-        return result_2;
-    }
-    var result = [];
-    if (rangePattern === undefined) {
-        rangePattern = rangePatterns.default;
-        /** IMPL DETAILS */
-        // If rangePatterns.default is also undefined (e.g., when using dateStyle/timeStyle),
-        // create a fallback range pattern using the locale's intervalFormatFallback from CLDR
-        //
-        // SPEC COMPLIANCE:
-        // - ECMA-402: https://tc39.es/ecma402/#sec-partitiondatetimerangepattern
-        //   Delegates to CLDR for interval format patterns
-        // - Unicode LDML UTS #35 Part 4: Dates: https://unicode-org.github.io/cldr/ldml/tr35-dates.html#intervalFormats
-        //   Defines intervalFormatFallback pattern (e.g., "{0} – {1}" or "{1} – {0}")
-        //   where {0} is start datetime and {1} is end datetime
-        // - ICU4J DateIntervalFormat: Uses setFallbackIntervalPattern() to set locale-specific fallback
-        // - Firefox SpiderMonkey & WebKit JSC: Both use ICU's UDateIntervalFormat which reads
-        //   intervalFormatFallback from CLDR data internally
-        //
-        // LOCALE EXAMPLES from CLDR:
-        // - English (en): "{0}\u2009–\u2009{1}" (en dash with thin spaces U+2009)
-        // - Japanese (ja): "{0}～{1}" (wave dash U+301C, no spaces)
-        // - German (de): "{0}\u2009–\u2009{1}" (en dash with thin spaces)
-        // - Arabic (ar): "{0}\u2009–\u2009{1}" (en dash with thin spaces)
-        //
-        // See: https://github.com/formatjs/formatjs/issues/4168
-        if (!rangePattern) {
-            var fallback = dataLocaleData.intervalFormatFallback;
-            // Parse the fallback pattern (e.g., "{0} – {1}" for English, "{0}～{1}" for Japanese)
-            // to extract the separator between {0} and {1}
-            var start0 = fallback.indexOf('{0}');
-            var start1 = fallback.indexOf('{1}');
-            var separator = start0 < start1
-                ? fallback.substring(start0 + 3, start1)
-                : fallback.substring(start1 + 3, start0);
-            rangePattern = {
-                patternParts: start0 < start1
-                    ? [
-                        { source: RangePatternType.startRange, pattern: '{0}' },
-                        { source: RangePatternType.shared, pattern: separator },
-                        { source: RangePatternType.endRange, pattern: '{1}' },
-                    ]
-                    : [
-                        { source: RangePatternType.endRange, pattern: '{1}' },
-                        { source: RangePatternType.shared, pattern: separator },
-                        { source: RangePatternType.startRange, pattern: '{0}' },
-                    ],
-            };
-        }
-        // Now we have to replace {0} & {1} with actual pattern
-        for (var _b = 0, _c = rangePattern.patternParts; _b < _c.length; _b++) {
-            var patternPart = _c[_b];
-            if (patternPart.pattern === '{0}' || patternPart.pattern === '{1}') {
-                patternPart.pattern = pattern;
-            }
-        }
-    }
-    for (var _d = 0, _e = rangePattern.patternParts; _d < _e.length; _d++) {
-        var rangePatternPart = _e[_d];
-        var source = rangePatternPart.source, pattern_1 = rangePatternPart.pattern;
-        var z = void 0;
-        if (source === RangePatternType.startRange ||
-            source === RangePatternType.shared) {
-            z = x;
-        }
-        else {
-            z = y;
-        }
-        var patternParts = PartitionPattern(pattern_1);
-        var partResult = FormatDateTimePattern(dtf, patternParts, z, implDetails);
-        for (var _f = 0, partResult_1 = partResult; _f < partResult_1.length; _f++) {
-            var r = partResult_1[_f];
-            r.source = source;
-        }
-        result = result.concat(partResult);
-    }
-    return result;
+	x = TimeClip(x);
+	if (x.isNaN()) {
+		throw new RangeError("Invalid start time");
+	}
+	y = TimeClip(y);
+	if (y.isNaN()) {
+		throw new RangeError("Invalid end time");
+	}
+	/** IMPL START */
+	const { getInternalSlots, tzData, localeData } = implDetails;
+	const internalSlots = getInternalSlots(dtf);
+	const dataLocale = internalSlots.dataLocale;
+	const dataLocaleData = localeData[dataLocale];
+	/** IMPL END */
+	const tm1 = ToLocalTime(
+		x,
+		// @ts-ignore
+		internalSlots.calendar,
+		internalSlots.timeZone,
+		{ tzData }
+	);
+	const tm2 = ToLocalTime(
+		y,
+		// @ts-ignore
+		internalSlots.calendar,
+		internalSlots.timeZone,
+		{ tzData }
+	);
+	const { pattern, rangePatterns } = internalSlots;
+	let rangePattern;
+	let dateFieldsPracticallyEqual = true;
+	let patternContainsLargerDateField = false;
+	for (const fieldName of TABLE_2_FIELDS) {
+		if (dateFieldsPracticallyEqual && !patternContainsLargerDateField) {
+			let rp = fieldName in rangePatterns ? rangePatterns[fieldName] : undefined;
+			if (rangePattern !== undefined && rp === undefined) {
+				patternContainsLargerDateField = true;
+			} else {
+				rangePattern = rp;
+				if (fieldName === "ampm") {
+					let v1 = tm1.hour;
+					let v2 = tm2.hour;
+					if (v1 > 11 && v2 < 11 || v1 < 11 && v2 > 11) {
+						dateFieldsPracticallyEqual = false;
+					}
+				} else if (fieldName === "dayPeriod") {} else if (fieldName === "fractionalSecondDigits") {
+					let fractionalSecondDigits = internalSlots.fractionalSecondDigits;
+					if (fractionalSecondDigits === undefined) {
+						fractionalSecondDigits = 3;
+					}
+					let v1 = Math.floor(tm1.millisecond * 10 ** (fractionalSecondDigits - 3));
+					let v2 = Math.floor(tm2.millisecond * 10 ** (fractionalSecondDigits - 3));
+					if (!SameValue(v1, v2)) {
+						dateFieldsPracticallyEqual = false;
+					}
+				} else {
+					let v1 = tm1[fieldName];
+					let v2 = tm2[fieldName];
+					if (!SameValue(v1, v2)) {
+						dateFieldsPracticallyEqual = false;
+					}
+				}
+			}
+		}
+	}
+	if (dateFieldsPracticallyEqual) {
+		let result = FormatDateTimePattern(dtf, PartitionPattern(pattern), x, implDetails);
+		for (const r of result) {
+			r.source = RangePatternType.shared;
+		}
+		return result;
+	}
+	let result = [];
+	if (rangePattern === undefined) {
+		rangePattern = rangePatterns.default;
+		/** IMPL DETAILS */
+		// If rangePatterns.default is also undefined (e.g., when using dateStyle/timeStyle),
+		// create a fallback range pattern using the locale's intervalFormatFallback from CLDR
+		//
+		// SPEC COMPLIANCE:
+		// - ECMA-402: https://tc39.es/ecma402/#sec-partitiondatetimerangepattern
+		//   Delegates to CLDR for interval format patterns
+		// - Unicode LDML UTS #35 Part 4: Dates: https://unicode-org.github.io/cldr/ldml/tr35-dates.html#intervalFormats
+		//   Defines intervalFormatFallback pattern (e.g., "{0} – {1}" or "{1} – {0}")
+		//   where {0} is start datetime and {1} is end datetime
+		// - ICU4J DateIntervalFormat: Uses setFallbackIntervalPattern() to set locale-specific fallback
+		// - Firefox SpiderMonkey & WebKit JSC: Both use ICU's UDateIntervalFormat which reads
+		//   intervalFormatFallback from CLDR data internally
+		//
+		// LOCALE EXAMPLES from CLDR:
+		// - English (en): "{0}\u2009–\u2009{1}" (en dash with thin spaces U+2009)
+		// - Japanese (ja): "{0}～{1}" (wave dash U+301C, no spaces)
+		// - German (de): "{0}\u2009–\u2009{1}" (en dash with thin spaces)
+		// - Arabic (ar): "{0}\u2009–\u2009{1}" (en dash with thin spaces)
+		//
+		// See: https://github.com/formatjs/formatjs/issues/4168
+		if (!rangePattern) {
+			const fallback = dataLocaleData.intervalFormatFallback;
+			// Parse the fallback pattern (e.g., "{0} – {1}" for English, "{0}～{1}" for Japanese)
+			// to extract the separator between {0} and {1}
+			const start0 = fallback.indexOf("{0}");
+			const start1 = fallback.indexOf("{1}");
+			const separator = start0 < start1 ? fallback.substring(start0 + 3, start1) : fallback.substring(start1 + 3, start0);
+			rangePattern = { patternParts: start0 < start1 ? [
+				{
+					source: RangePatternType.startRange,
+					pattern: "{0}"
+				},
+				{
+					source: RangePatternType.shared,
+					pattern: separator
+				},
+				{
+					source: RangePatternType.endRange,
+					pattern: "{1}"
+				}
+			] : [
+				{
+					source: RangePatternType.endRange,
+					pattern: "{1}"
+				},
+				{
+					source: RangePatternType.shared,
+					pattern: separator
+				},
+				{
+					source: RangePatternType.startRange,
+					pattern: "{0}"
+				}
+			] };
+		}
+		// Now we have to replace {0} & {1} with actual pattern
+		for (const patternPart of rangePattern.patternParts) {
+			if (patternPart.pattern === "{0}" || patternPart.pattern === "{1}") {
+				patternPart.pattern = pattern;
+			}
+		}
+	}
+	for (const rangePatternPart of rangePattern.patternParts) {
+		const { source, pattern } = rangePatternPart;
+		let z;
+		if (source === RangePatternType.startRange || source === RangePatternType.shared) {
+			z = x;
+		} else {
+			z = y;
+		}
+		const patternParts = PartitionPattern(pattern);
+		let partResult = FormatDateTimePattern(dtf, patternParts, z, implDetails);
+		for (const r of partResult) {
+			r.source = source;
+		}
+		result = result.concat(partResult);
+	}
+	return result;
 }

package/src/abstract/ToDateTimeOptions.d.ts

@@ -1,7 +1,7 @@
 /**
- * https://tc39.es/ecma402/#sec-todatetimeoptions
- * @param options
- * @param required
- * @param defaults
- */
+* https://tc39.es/ecma402/#sec-todatetimeoptions
+* @param options
+* @param required
+* @param defaults
+*/
 export declare function ToDateTimeOptions(options?: Intl.DateTimeFormatOptions | null, required?: string, defaults?: string): Intl.DateTimeFormatOptions;

package/src/abstract/ToDateTimeOptions.js

@@ -1,63 +1,71 @@
-import { ToObject } from '@formatjs/ecma402-abstract';
+import { ToObject } from "@formatjs/ecma402-abstract";
 /**
- * https://tc39.es/ecma402/#sec-todatetimeoptions
- * @param options
- * @param required
- * @param defaults
- */
+* https://tc39.es/ecma402/#sec-todatetimeoptions
+* @param options
+* @param required
+* @param defaults
+*/
 export function ToDateTimeOptions(options, required, defaults) {
-    if (options === undefined) {
-        options = null;
-    }
-    else {
-        options = ToObject(options);
-    }
-    options = Object.create(options);
-    var needDefaults = true;
-    if (required === 'date' || required === 'any') {
-        for (var _i = 0, _a = ['weekday', 'year', 'month', 'day']; _i < _a.length; _i++) {
-            var prop = _a[_i];
-            var value = options[prop];
-            if (value !== undefined) {
-                needDefaults = false;
-            }
-        }
-    }
-    if (required === 'time' || required === 'any') {
-        for (var _b = 0, _c = [
-            'dayPeriod',
-            'hour',
-            'minute',
-            'second',
-            'fractionalSecondDigits',
-        ]; _b < _c.length; _b++) {
-            var prop = _c[_b];
-            var value = options[prop];
-            if (value !== undefined) {
-                needDefaults = false;
-            }
-        }
-    }
-    if (options.dateStyle !== undefined || options.timeStyle !== undefined) {
-        needDefaults = false;
-    }
-    if (required === 'date' && options.timeStyle) {
-        throw new TypeError('Intl.DateTimeFormat date was required but timeStyle was included');
-    }
-    if (required === 'time' && options.dateStyle) {
-        throw new TypeError('Intl.DateTimeFormat time was required but dateStyle was included');
-    }
-    if (needDefaults && (defaults === 'date' || defaults === 'all')) {
-        for (var _d = 0, _e = ['year', 'month', 'day']; _d < _e.length; _d++) {
-            var prop = _e[_d];
-            options[prop] = 'numeric';
-        }
-    }
-    if (needDefaults && (defaults === 'time' || defaults === 'all')) {
-        for (var _f = 0, _g = ['hour', 'minute', 'second']; _f < _g.length; _f++) {
-            var prop = _g[_f];
-            options[prop] = 'numeric';
-        }
-    }
-    return options;
+	if (options === undefined) {
+		options = null;
+	} else {
+		options = ToObject(options);
+	}
+	options = Object.create(options);
+	let needDefaults = true;
+	if (required === "date" || required === "any") {
+		for (const prop of [
+			"weekday",
+			"year",
+			"month",
+			"day"
+		]) {
+			const value = options[prop];
+			if (value !== undefined) {
+				needDefaults = false;
+			}
+		}
+	}
+	if (required === "time" || required === "any") {
+		for (const prop of [
+			"dayPeriod",
+			"hour",
+			"minute",
+			"second",
+			"fractionalSecondDigits"
+		]) {
+			const value = options[prop];
+			if (value !== undefined) {
+				needDefaults = false;
+			}
+		}
+	}
+	if (options.dateStyle !== undefined || options.timeStyle !== undefined) {
+		needDefaults = false;
+	}
+	if (required === "date" && options.timeStyle) {
+		throw new TypeError("Intl.DateTimeFormat date was required but timeStyle was included");
+	}
+	if (required === "time" && options.dateStyle) {
+		throw new TypeError("Intl.DateTimeFormat time was required but dateStyle was included");
+	}
+	if (needDefaults && (defaults === "date" || defaults === "all")) {
+		for (const prop of [
+			"year",
+			"month",
+			"day"
+		]) {
+			options[prop] = "numeric";
+		}
+	}
+	if (needDefaults && (defaults === "time" || defaults === "all")) {
+		for (const prop of [
+			"hour",
+			"minute",
+			"second"
+		]) {
+			options[prop] = "numeric";
+		}
+	}
+	return options;
 }

package/src/abstract/ToLocalTime.d.ts

@@ -1,26 +1,26 @@
-import { UnpackedZoneData } from '@formatjs/ecma402-abstract';
-import Decimal from 'decimal.js';
+import { type UnpackedZoneData } from "@formatjs/ecma402-abstract";
+import type Decimal from "decimal.js";
 export interface ToLocalTimeImplDetails {
-    tzData: Record<string, UnpackedZoneData[]>;
+	tzData: Record<string, UnpackedZoneData[]>;
 }
 /**
- * https://tc39.es/ecma402/#sec-tolocaltime
- * @param t
- * @param calendar
- * @param timeZone
- */
+* https://tc39.es/ecma402/#sec-tolocaltime
+* @param t
+* @param calendar
+* @param timeZone
+*/
 export declare function ToLocalTime(t: Decimal, calendar: string, timeZone: string, { tzData }: ToLocalTimeImplDetails): {
-    weekday: number;
-    era: string;
-    year: number;
-    relatedYear: undefined;
-    yearName: undefined;
-    month: number;
-    day: number;
-    hour: number;
-    minute: number;
-    second: number;
-    millisecond: number;
-    inDST: boolean;
-    timeZoneOffset: number;
+	weekday: number;
+	era: string;
+	year: number;
+	relatedYear: undefined;
+	yearName: undefined;
+	month: number;
+	day: number;
+	hour: number;
+	minute: number;
+	second: number;
+	millisecond: number;
+	inDST: boolean;
+	timeZoneOffset: number;
 };