@formatjs/intl-datetimeformat 6.1.1 → 6.3.0

package/lib/src/abstract/BasicFormatMatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BasicFormatMatcher.d.ts","sourceRoot":"","sources":["../../../src/abstract/BasicFormatMatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAY,MAAM,4BAA4B,CAAA;AAW7D;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,qBAAqB,EACnC,OAAO,EAAE,OAAO,EAAE,GACjB,OAAO,CA2CT"}
+{"version":3,"file":"BasicFormatMatcher.d.ts","sourceRoot":"","sources":["../../../src/abstract/BasicFormatMatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAY,MAAM,4BAA4B,CAAA;AAY7D;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,qBAAqB,EACnC,OAAO,EAAE,OAAO,EAAE,GACjB,OAAO,CAuFT"}

package/lib/src/abstract/BasicFormatMatcher.js

@@ -1,6 +1,6 @@
 import { __assign } from "tslib";
 import { invariant } from '@formatjs/ecma402-abstract';
-import { DATE_TIME_PROPS, additionPenalty, removalPenalty, longMorePenalty, shortMorePenalty, shortLessPenalty, longLessPenalty, } from './utils';
+import { DATE_TIME_PROPS, additionPenalty, removalPenalty, longMorePenalty, shortMorePenalty, shortLessPenalty, longLessPenalty, offsetPenalty, } from './utils';
 /**
  * https://tc39.es/ecma402/#sec-basicformatmatcher
  * @param options
@@ -23,6 +23,55 @@ export function BasicFormatMatcher(options, formats) {
             else if (optionsProp !== undefined && formatProp === undefined) {
                 score -= removalPenalty;
             }
+            else if (prop === 'timeZoneName') {
+                if (optionsProp === 'short' || optionsProp === 'shortGeneric') {
+                    if (formatProp === 'shortOffset') {
+                        score -= offsetPenalty;
+                    }
+                    else if (formatProp === 'longOffset') {
+                        score -= offsetPenalty + shortMorePenalty;
+                    }
+                    else if (optionsProp === 'short' && formatProp === 'long') {
+                        score -= shortMorePenalty;
+                    }
+                    else if (optionsProp === 'shortGeneric' &&
+                        formatProp === 'longGeneric') {
+                        score -= shortMorePenalty;
+                    }
+                    else if (optionsProp !== formatProp) {
+                        score -= removalPenalty;
+                    }
+                }
+                else if (optionsProp === 'shortOffset' &&
+                    formatProp === 'longOffset') {
+                    score -= shortMorePenalty;
+                }
+                else if (optionsProp === 'long' || optionsProp === 'longGeneric') {
+                    if (formatProp === 'longOffset') {
+                        score -= offsetPenalty;
+                    }
+                    else if (formatProp === 'shortOffset') {
+                        score -= offsetPenalty + longLessPenalty;
+                    }
+                    else if (optionsProp === 'long' && formatProp === 'short') {
+                        score -= longLessPenalty;
+                    }
+                    else if (optionsProp === 'longGeneric' &&
+                        formatProp === 'shortGeneric') {
+                        score -= longLessPenalty;
+                    }
+                    else if (optionsProp !== formatProp) {
+                        score -= removalPenalty;
+                    }
+                }
+                else if (optionsProp === 'longOffset' &&
+                    formatProp === 'shortOffset') {
+                    score -= longLessPenalty;
+                }
+                else if (optionsProp !== formatProp) {
+                    score -= removalPenalty;
+                }
+            }
             else if (optionsProp !== formatProp) {
                 var values = void 0;
                 if (prop === 'fractionalSecondDigits') {

package/lib/src/abstract/FormatDateTimePattern.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FormatDateTimePattern.d.ts","sourceRoot":"","sources":["../../../src/abstract/FormatDateTimePattern.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,gCAAgC,EAChC,sBAAsB,EAEvB,MAAM,4BAA4B,CAAA;AAGnC,OAAO,EAAc,sBAAsB,EAAC,MAAM,eAAe,CAAA;AAsCjE,MAAM,WAAW,gCAAgC;IAC/C,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,GAAG,0BAA0B,CAAA;IACtE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAA;IAC5D,kBAAkB,IAAI,MAAM,CAAA;CAC7B;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,YAAY,EAAE,sBAAsB,EAAE,EACtC,CAAC,EAAE,MAAM,EACT,EACE,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EAClB,MAAM,GACP,EAAE,gCAAgC,GAAG,sBAAsB,GAC3D,sBAAsB,EAAE,CAoJ1B"}
+{"version":3,"file":"FormatDateTimePattern.d.ts","sourceRoot":"","sources":["../../../src/abstract/FormatDateTimePattern.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,gCAAgC,EAChC,sBAAsB,EAEvB,MAAM,4BAA4B,CAAA;AAGnC,OAAO,EAAc,sBAAsB,EAAC,MAAM,eAAe,CAAA;AAsCjE,MAAM,WAAW,gCAAgC;IAC/C,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,GAAG,0BAA0B,CAAA;IACtE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAA;IAC5D,kBAAkB,IAAI,MAAM,CAAA;CAC7B;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,YAAY,EAAE,sBAAsB,EAAE,EACtC,CAAC,EAAE,MAAM,EACT,EACE,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EAClB,MAAM,GACP,EAAE,gCAAgC,GAAG,sBAAsB,GAC3D,sBAAsB,EAAE,CA0J1B"}

package/lib/src/abstract/FormatDateTimePattern.js

@@ -80,7 +80,25 @@ export function FormatDateTimePattern(dtf, patternParts, x, _a) {
             });
         }
         else if (p === 'dayPeriod') {
-            // TODO
+            var f = internalSlots.dayPeriod;
+            // @ts-ignore
+            var fv = tm[f];
+            result.push({ type: p, value: fv });
+        }
+        else if (p === 'timeZoneName') {
+            var f = internalSlots.timeZoneName;
+            var fv = void 0;
+            var timeZoneName = dataLocaleData.timeZoneName, gmtFormat = dataLocaleData.gmtFormat, hourFormat = dataLocaleData.hourFormat;
+            var timeZone = internalSlots.timeZone || getDefaultTimeZone();
+            var timeZoneData = timeZoneName[timeZone];
+            if (timeZoneData && timeZoneData[f]) {
+                fv = timeZoneData[f][+tm.inDST];
+            }
+            else {
+                // Fallback to gmtFormat
+                fv = offsetToGmtString(gmtFormat, hourFormat, tm.timeZoneOffset, f);
+            }
+            result.push({ type: p, value: fv });
         }
         else if (DATE_TIME_PROPS.indexOf(p) > -1) {
             var fv = '';
@@ -118,18 +136,6 @@ export function FormatDateTimePattern(dtf, patternParts, x, _a) {
                 if (p === 'era') {
                     fv = dataLocaleData[p][f][v];
                 }
-                else if (p === 'timeZoneName') {
-                    var timeZoneName = dataLocaleData.timeZoneName, gmtFormat = dataLocaleData.gmtFormat, hourFormat = dataLocaleData.hourFormat;
-                    var timeZone = internalSlots.timeZone || getDefaultTimeZone();
-                    var timeZoneData = timeZoneName[timeZone];
-                    if (timeZoneData && timeZoneData[f]) {
-                        fv = timeZoneData[f][+tm.inDST];
-                    }
-                    else {
-                        // Fallback to gmtFormat
-                        fv = offsetToGmtString(gmtFormat, hourFormat, tm.timeZoneOffset, f);
-                    }
-                }
                 else if (p === 'month') {
                     fv = dataLocaleData.month[f][v - 1];
                 }

package/lib/src/abstract/InitializeDateTimeFormat.d.ts

@@ -1,12 +1,12 @@
-import { IntlDateTimeFormatInternal, DateTimeFormatLocaleInternalData } from '@formatjs/ecma402-abstract';
+import { IntlDateTimeFormatInternal, DateTimeFormatLocaleInternalData, DateTimeFormat as DateTimeFormat } from '@formatjs/ecma402-abstract';
 /**
  * https://tc39.es/ecma402/#sec-initializedatetimeformat
  * @param dtf DateTimeFormat
  * @param locales locales
  * @param opts options
  */
-export declare function InitializeDateTimeFormat(dtf: Intl.DateTimeFormat, locales: string | string[] | undefined, opts: Intl.DateTimeFormatOptions | undefined, { getInternalSlots, availableLocales, localeData, getDefaultLocale, getDefaultTimeZone, relevantExtensionKeys, tzData, uppercaseLinks, }: {
-    getInternalSlots(dtf: Intl.DateTimeFormat): IntlDateTimeFormatInternal;
+export declare function InitializeDateTimeFormat(dtf: DateTimeFormat, locales: string | string[] | undefined, opts: Intl.DateTimeFormatOptions | undefined, { getInternalSlots, availableLocales, localeData, getDefaultLocale, getDefaultTimeZone, relevantExtensionKeys, tzData, uppercaseLinks, }: {
+    getInternalSlots(dtf: DateTimeFormat): IntlDateTimeFormatInternal;
     availableLocales: Set<string>;
     getDefaultLocale(): string;
     getDefaultTimeZone(): string;

package/lib/src/abstract/InitializeDateTimeFormat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InitializeDateTimeFormat.d.ts","sourceRoot":"","sources":["../../../src/abstract/InitializeDateTimeFormat.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,0BAA0B,EAC1B,gCAAgC,EAOjC,MAAM,4BAA4B,CAAA;AAkDnC;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,EACtC,IAAI,EAAE,IAAI,CAAC,qBAAqB,GAAG,SAAS,EAC5C,EACE,gBAAgB,EAChB,gBAAgB,EAChB,UAAU,EACV,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACrB,MAAM,EACN,cAAc,GACf,EAAE;IACD,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,GAAG,0BAA0B,CAAA;IACtE,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC7B,gBAAgB,IAAI,MAAM,CAAA;IAC1B,kBAAkB,IAAI,MAAM,CAAA;IAC5B,qBAAqB,EAAE,MAAM,EAAE,CAAA;IAC/B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gCAAgC,GAAG,SAAS,CAAC,CAAA;IACxE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACvC,GACA,IAAI,CAAC,cAAc,CAoPrB"}
+{"version":3,"file":"InitializeDateTimeFormat.d.ts","sourceRoot":"","sources":["../../../src/abstract/InitializeDateTimeFormat.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,0BAA0B,EAC1B,gCAAgC,EAOhC,cAAc,IAAI,cAAc,EACjC,MAAM,4BAA4B,CAAA;AAkDnC;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,EACtC,IAAI,EAAE,IAAI,CAAC,qBAAqB,GAAG,SAAS,EAC5C,EACE,gBAAgB,EAChB,gBAAgB,EAChB,UAAU,EACV,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACrB,MAAM,EACN,cAAc,GACf,EAAE;IACD,gBAAgB,CAAC,GAAG,EAAE,cAAc,GAAG,0BAA0B,CAAA;IACjE,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC7B,gBAAgB,IAAI,MAAM,CAAA;IAC1B,kBAAkB,IAAI,MAAM,CAAA;IAC5B,qBAAqB,EAAE,MAAM,EAAE,CAAA;IAC/B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gCAAgC,GAAG,SAAS,CAAC,CAAA;IACxE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACvC,GACA,IAAI,CAAC,cAAc,CA2PrB"}

package/lib/src/abstract/InitializeDateTimeFormat.js

@@ -102,7 +102,14 @@ export function InitializeDateTimeFormat(dtf, locales, opts, _a) {
     opt.hour = GetOption(options, 'hour', 'string', ['2-digit', 'numeric'], undefined);
     opt.minute = GetOption(options, 'minute', 'string', ['2-digit', 'numeric'], undefined);
     opt.second = GetOption(options, 'second', 'string', ['2-digit', 'numeric'], undefined);
-    opt.timeZoneName = GetOption(options, 'timeZoneName', 'string', ['short', 'long'], undefined);
+    opt.timeZoneName = GetOption(options, 'timeZoneName', 'string', [
+        'long',
+        'short',
+        'longOffset',
+        'shortOffset',
+        'longGeneric',
+        'shortGeneric',
+    ], undefined);
     opt.fractionalSecondDigits = GetNumberOption(options, 'fractionalSecondDigits', 1, 3, 
     // @ts-expect-error
     undefined);
@@ -175,5 +182,5 @@ export function InitializeDateTimeFormat(dtf, locales, opts, _a) {
     }
     internalSlots.pattern = pattern;
     internalSlots.rangePatterns = rangePatterns;
-    return dtf;
+    return dtf; // TODO: remove this when https://github.com/microsoft/TypeScript/pull/50402 is merged
 }

package/lib/src/abstract/utils.d.ts

@@ -7,4 +7,5 @@ export declare const longLessPenalty = 8;
 export declare const longMorePenalty = 6;
 export declare const shortLessPenalty = 6;
 export declare const shortMorePenalty = 3;
+export declare const offsetPenalty = 1;
 //# sourceMappingURL=utils.d.ts.map

package/lib/src/abstract/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/abstract/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,0BAA0B,EAAE,OAAO,EAAC,MAAM,4BAA4B,CAAA;AAE9E,eAAO,MAAM,eAAe,EAAE,KAAK,CACjC,MAAM,IAAI,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAWhD,CAAA;AAED,eAAO,MAAM,cAAc,MAAM,CAAA;AACjC,eAAO,MAAM,eAAe,KAAK,CAAA;AACjC,eAAO,MAAM,2BAA2B,KAAK,CAAA;AAC7C,eAAO,MAAM,eAAe,IAAI,CAAA;AAChC,eAAO,MAAM,eAAe,IAAI,CAAA;AAChC,eAAO,MAAM,gBAAgB,IAAI,CAAA;AACjC,eAAO,MAAM,gBAAgB,IAAI,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/abstract/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,0BAA0B,EAAE,OAAO,EAAC,MAAM,4BAA4B,CAAA;AAE9E,eAAO,MAAM,eAAe,EAAE,KAAK,CACjC,MAAM,IAAI,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAahD,CAAA;AAED,eAAO,MAAM,cAAc,MAAM,CAAA;AACjC,eAAO,MAAM,eAAe,KAAK,CAAA;AACjC,eAAO,MAAM,2BAA2B,KAAK,CAAA;AAC7C,eAAO,MAAM,eAAe,IAAI,CAAA;AAChC,eAAO,MAAM,eAAe,IAAI,CAAA;AAChC,eAAO,MAAM,gBAAgB,IAAI,CAAA;AACjC,eAAO,MAAM,gBAAgB,IAAI,CAAA;AACjC,eAAO,MAAM,aAAa,IAAI,CAAA"}

package/lib/src/abstract/utils.js

@@ -4,9 +4,11 @@ export var DATE_TIME_PROPS = [
     'year',
     'month',
     'day',
+    'dayPeriod',
     'hour',
     'minute',
     'second',
+    'fractionalSecondDigits',
     'timeZoneName',
 ];
 export var removalPenalty = 120;
@@ -16,3 +18,4 @@ export var longLessPenalty = 8;
 export var longMorePenalty = 6;
 export var shortLessPenalty = 6;
 export var shortMorePenalty = 3;
+export var offsetPenalty = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/intl-datetimeformat",
-  "version": "6.1.1",
+  "version": "6.3.0",
   "description": "Intl.DateTimeFormat polyfill",
   "main": "index.js",
   "types": "index.d.ts",
@@ -22,12 +22,12 @@
   },
   "homepage": "https://github.com/formatjs/formatjs#readme",
   "dependencies": {
-    "@formatjs/ecma402-abstract": "1.11.10",
-    "@formatjs/intl-localematcher": "0.2.30",
+    "@formatjs/ecma402-abstract": "1.13.0",
+    "@formatjs/intl-localematcher": "0.2.31",
     "tslib": "2.4.0"
   },
   "devDependencies": {
     "@formatjs/intl-getcanonicallocales": "2.0.4",
-    "@formatjs/intl-locale": "3.0.5"
+    "@formatjs/intl-locale": "3.0.7"
   }
 }

package/polyfill.iife.js

@@ -920,9 +920,11 @@
     "year",
     "month",
     "day",
+    "dayPeriod",
     "hour",
     "minute",
     "second",
+    "fractionalSecondDigits",
     "timeZoneName"
   ];
   var removalPenalty = 120;
@@ -932,6 +934,7 @@
   var longMorePenalty = 6;
   var shortLessPenalty = 6;
   var shortMorePenalty = 3;
+  var offsetPenalty = 1;
 
   // ../../../../../../../../execroot/formatjs/bazel-out/darwin-fastbuild/bin/packages/intl-datetimeformat/lib/src/abstract/ToLocalTime.js
   function getApplicableZoneData(t, timeZone, tzData) {
@@ -1044,6 +1047,21 @@
           value: nf3.format(v)
         });
       } else if (p === "dayPeriod") {
+        var f = internalSlots.dayPeriod;
+        var fv = tm[f];
+        result.push({ type: p, value: fv });
+      } else if (p === "timeZoneName") {
+        var f = internalSlots.timeZoneName;
+        var fv = void 0;
+        var timeZoneName = dataLocaleData.timeZoneName, gmtFormat = dataLocaleData.gmtFormat, hourFormat = dataLocaleData.hourFormat;
+        var timeZone = internalSlots.timeZone || getDefaultTimeZone();
+        var timeZoneData = timeZoneName[timeZone];
+        if (timeZoneData && timeZoneData[f]) {
+          fv = timeZoneData[f][+tm.inDST];
+        } else {
+          fv = offsetToGmtString(gmtFormat, hourFormat, tm.timeZoneOffset, f);
+        }
+        result.push({ type: p, value: fv });
       } else if (DATE_TIME_PROPS.indexOf(p) > -1) {
         var fv = "";
         var f = internalSlots[p];
@@ -1076,15 +1094,6 @@
         } else if (f === "narrow" || f === "short" || f === "long") {
           if (p === "era") {
             fv = dataLocaleData[p][f][v];
-          } else if (p === "timeZoneName") {
-            var timeZoneName = dataLocaleData.timeZoneName, gmtFormat = dataLocaleData.gmtFormat, hourFormat = dataLocaleData.hourFormat;
-            var timeZone = internalSlots.timeZone || getDefaultTimeZone();
-            var timeZoneData = timeZoneName[timeZone];
-            if (timeZoneData && timeZoneData[f]) {
-              fv = timeZoneData[f][+tm.inDST];
-            } else {
-              fv = offsetToGmtString(gmtFormat, hourFormat, tm.timeZoneOffset, f);
-            }
           } else if (p === "month") {
             fv = dataLocaleData.month[f][v - 1];
           } else {
@@ -1165,6 +1174,38 @@
           score -= additionPenalty;
         } else if (optionsProp !== void 0 && formatProp === void 0) {
           score -= removalPenalty;
+        } else if (prop === "timeZoneName") {
+          if (optionsProp === "short" || optionsProp === "shortGeneric") {
+            if (formatProp === "shortOffset") {
+              score -= offsetPenalty;
+            } else if (formatProp === "longOffset") {
+              score -= offsetPenalty + shortMorePenalty;
+            } else if (optionsProp === "short" && formatProp === "long") {
+              score -= shortMorePenalty;
+            } else if (optionsProp === "shortGeneric" && formatProp === "longGeneric") {
+              score -= shortMorePenalty;
+            } else if (optionsProp !== formatProp) {
+              score -= removalPenalty;
+            }
+          } else if (optionsProp === "shortOffset" && formatProp === "longOffset") {
+            score -= shortMorePenalty;
+          } else if (optionsProp === "long" || optionsProp === "longGeneric") {
+            if (formatProp === "longOffset") {
+              score -= offsetPenalty;
+            } else if (formatProp === "shortOffset") {
+              score -= offsetPenalty + longLessPenalty;
+            } else if (optionsProp === "long" && formatProp === "short") {
+              score -= longLessPenalty;
+            } else if (optionsProp === "longGeneric" && formatProp === "shortGeneric") {
+              score -= longLessPenalty;
+            } else if (optionsProp !== formatProp) {
+              score -= removalPenalty;
+            }
+          } else if (optionsProp === "longOffset" && formatProp === "shortOffset") {
+            score -= longLessPenalty;
+          } else if (optionsProp !== formatProp) {
+            score -= removalPenalty;
+          }
         } else if (optionsProp !== formatProp) {
           var values = void 0;
           if (prop === "fractionalSecondDigits") {
@@ -1711,7 +1752,14 @@
     opt.hour = GetOption(options, "hour", "string", ["2-digit", "numeric"], void 0);
     opt.minute = GetOption(options, "minute", "string", ["2-digit", "numeric"], void 0);
     opt.second = GetOption(options, "second", "string", ["2-digit", "numeric"], void 0);
-    opt.timeZoneName = GetOption(options, "timeZoneName", "string", ["short", "long"], void 0);
+    opt.timeZoneName = GetOption(options, "timeZoneName", "string", [
+      "long",
+      "short",
+      "longOffset",
+      "shortOffset",
+      "longGeneric",
+      "shortGeneric"
+    ], void 0);
     opt.fractionalSecondDigits = GetNumberOption(
       options,
       "fractionalSecondDigits",

package/src/abstract/BasicFormatMatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BasicFormatMatcher.d.ts","sourceRoot":"","sources":["BasicFormatMatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAY,MAAM,4BAA4B,CAAA;AAW7D;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,qBAAqB,EACnC,OAAO,EAAE,OAAO,EAAE,GACjB,OAAO,CA2CT"}
+{"version":3,"file":"BasicFormatMatcher.d.ts","sourceRoot":"","sources":["BasicFormatMatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAY,MAAM,4BAA4B,CAAA;AAY7D;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,qBAAqB,EACnC,OAAO,EAAE,OAAO,EAAE,GACjB,OAAO,CAuFT"}

package/src/abstract/BasicFormatMatcher.js

@@ -26,6 +26,55 @@ function BasicFormatMatcher(options, formats) {
             else if (optionsProp !== undefined && formatProp === undefined) {
                 score -= utils_1.removalPenalty;
             }
+            else if (prop === 'timeZoneName') {
+                if (optionsProp === 'short' || optionsProp === 'shortGeneric') {
+                    if (formatProp === 'shortOffset') {
+                        score -= utils_1.offsetPenalty;
+                    }
+                    else if (formatProp === 'longOffset') {
+                        score -= utils_1.offsetPenalty + utils_1.shortMorePenalty;
+                    }
+                    else if (optionsProp === 'short' && formatProp === 'long') {
+                        score -= utils_1.shortMorePenalty;
+                    }
+                    else if (optionsProp === 'shortGeneric' &&
+                        formatProp === 'longGeneric') {
+                        score -= utils_1.shortMorePenalty;
+                    }
+                    else if (optionsProp !== formatProp) {
+                        score -= utils_1.removalPenalty;
+                    }
+                }
+                else if (optionsProp === 'shortOffset' &&
+                    formatProp === 'longOffset') {
+                    score -= utils_1.shortMorePenalty;
+                }
+                else if (optionsProp === 'long' || optionsProp === 'longGeneric') {
+                    if (formatProp === 'longOffset') {
+                        score -= utils_1.offsetPenalty;
+                    }
+                    else if (formatProp === 'shortOffset') {
+                        score -= utils_1.offsetPenalty + utils_1.longLessPenalty;
+                    }
+                    else if (optionsProp === 'long' && formatProp === 'short') {
+                        score -= utils_1.longLessPenalty;
+                    }
+                    else if (optionsProp === 'longGeneric' &&
+                        formatProp === 'shortGeneric') {
+                        score -= utils_1.longLessPenalty;
+                    }
+                    else if (optionsProp !== formatProp) {
+                        score -= utils_1.removalPenalty;
+                    }
+                }
+                else if (optionsProp === 'longOffset' &&
+                    formatProp === 'shortOffset') {
+                    score -= utils_1.longLessPenalty;
+                }
+                else if (optionsProp !== formatProp) {
+                    score -= utils_1.removalPenalty;
+                }
+            }
             else if (optionsProp !== formatProp) {
                 var values = void 0;
                 if (prop === 'fractionalSecondDigits') {

package/src/abstract/FormatDateTimePattern.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FormatDateTimePattern.d.ts","sourceRoot":"","sources":["FormatDateTimePattern.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,gCAAgC,EAChC,sBAAsB,EAEvB,MAAM,4BAA4B,CAAA;AAGnC,OAAO,EAAc,sBAAsB,EAAC,MAAM,eAAe,CAAA;AAsCjE,MAAM,WAAW,gCAAgC;IAC/C,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,GAAG,0BAA0B,CAAA;IACtE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAA;IAC5D,kBAAkB,IAAI,MAAM,CAAA;CAC7B;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,YAAY,EAAE,sBAAsB,EAAE,EACtC,CAAC,EAAE,MAAM,EACT,EACE,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EAClB,MAAM,GACP,EAAE,gCAAgC,GAAG,sBAAsB,GAC3D,sBAAsB,EAAE,CAoJ1B"}
+{"version":3,"file":"FormatDateTimePattern.d.ts","sourceRoot":"","sources":["FormatDateTimePattern.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,gCAAgC,EAChC,sBAAsB,EAEvB,MAAM,4BAA4B,CAAA;AAGnC,OAAO,EAAc,sBAAsB,EAAC,MAAM,eAAe,CAAA;AAsCjE,MAAM,WAAW,gCAAgC;IAC/C,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,GAAG,0BAA0B,CAAA;IACtE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAA;IAC5D,kBAAkB,IAAI,MAAM,CAAA;CAC7B;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,YAAY,EAAE,sBAAsB,EAAE,EACtC,CAAC,EAAE,MAAM,EACT,EACE,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EAClB,MAAM,GACP,EAAE,gCAAgC,GAAG,sBAAsB,GAC3D,sBAAsB,EAAE,CA0J1B"}

package/src/abstract/FormatDateTimePattern.js

@@ -83,7 +83,25 @@ function FormatDateTimePattern(dtf, patternParts, x, _a) {
             });
         }
         else if (p === 'dayPeriod') {
-            // TODO
+            var f = internalSlots.dayPeriod;
+            // @ts-ignore
+            var fv = tm[f];
+            result.push({ type: p, value: fv });
+        }
+        else if (p === 'timeZoneName') {
+            var f = internalSlots.timeZoneName;
+            var fv = void 0;
+            var timeZoneName = dataLocaleData.timeZoneName, gmtFormat = dataLocaleData.gmtFormat, hourFormat = dataLocaleData.hourFormat;
+            var timeZone = internalSlots.timeZone || getDefaultTimeZone();
+            var timeZoneData = timeZoneName[timeZone];
+            if (timeZoneData && timeZoneData[f]) {
+                fv = timeZoneData[f][+tm.inDST];
+            }
+            else {
+                // Fallback to gmtFormat
+                fv = offsetToGmtString(gmtFormat, hourFormat, tm.timeZoneOffset, f);
+            }
+            result.push({ type: p, value: fv });
         }
         else if (utils_1.DATE_TIME_PROPS.indexOf(p) > -1) {
             var fv = '';
@@ -121,18 +139,6 @@ function FormatDateTimePattern(dtf, patternParts, x, _a) {
                 if (p === 'era') {
                     fv = dataLocaleData[p][f][v];
                 }
-                else if (p === 'timeZoneName') {
-                    var timeZoneName = dataLocaleData.timeZoneName, gmtFormat = dataLocaleData.gmtFormat, hourFormat = dataLocaleData.hourFormat;
-                    var timeZone = internalSlots.timeZone || getDefaultTimeZone();
-                    var timeZoneData = timeZoneName[timeZone];
-                    if (timeZoneData && timeZoneData[f]) {
-                        fv = timeZoneData[f][+tm.inDST];
-                    }
-                    else {
-                        // Fallback to gmtFormat
-                        fv = offsetToGmtString(gmtFormat, hourFormat, tm.timeZoneOffset, f);
-                    }
-                }
                 else if (p === 'month') {
                     fv = dataLocaleData.month[f][v - 1];
                 }

package/src/abstract/InitializeDateTimeFormat.d.ts

@@ -1,12 +1,12 @@
-import { IntlDateTimeFormatInternal, DateTimeFormatLocaleInternalData } from '@formatjs/ecma402-abstract';
+import { IntlDateTimeFormatInternal, DateTimeFormatLocaleInternalData, DateTimeFormat as DateTimeFormat } from '@formatjs/ecma402-abstract';
 /**
  * https://tc39.es/ecma402/#sec-initializedatetimeformat
  * @param dtf DateTimeFormat
  * @param locales locales
  * @param opts options
  */
-export declare function InitializeDateTimeFormat(dtf: Intl.DateTimeFormat, locales: string | string[] | undefined, opts: Intl.DateTimeFormatOptions | undefined, { getInternalSlots, availableLocales, localeData, getDefaultLocale, getDefaultTimeZone, relevantExtensionKeys, tzData, uppercaseLinks, }: {
-    getInternalSlots(dtf: Intl.DateTimeFormat): IntlDateTimeFormatInternal;
+export declare function InitializeDateTimeFormat(dtf: DateTimeFormat, locales: string | string[] | undefined, opts: Intl.DateTimeFormatOptions | undefined, { getInternalSlots, availableLocales, localeData, getDefaultLocale, getDefaultTimeZone, relevantExtensionKeys, tzData, uppercaseLinks, }: {
+    getInternalSlots(dtf: DateTimeFormat): IntlDateTimeFormatInternal;
     availableLocales: Set<string>;
     getDefaultLocale(): string;
     getDefaultTimeZone(): string;

package/src/abstract/InitializeDateTimeFormat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InitializeDateTimeFormat.d.ts","sourceRoot":"","sources":["InitializeDateTimeFormat.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,0BAA0B,EAC1B,gCAAgC,EAOjC,MAAM,4BAA4B,CAAA;AAkDnC;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,EACtC,IAAI,EAAE,IAAI,CAAC,qBAAqB,GAAG,SAAS,EAC5C,EACE,gBAAgB,EAChB,gBAAgB,EAChB,UAAU,EACV,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACrB,MAAM,EACN,cAAc,GACf,EAAE;IACD,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,GAAG,0BAA0B,CAAA;IACtE,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC7B,gBAAgB,IAAI,MAAM,CAAA;IAC1B,kBAAkB,IAAI,MAAM,CAAA;IAC5B,qBAAqB,EAAE,MAAM,EAAE,CAAA;IAC/B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gCAAgC,GAAG,SAAS,CAAC,CAAA;IACxE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACvC,GACA,IAAI,CAAC,cAAc,CAoPrB"}
+{"version":3,"file":"InitializeDateTimeFormat.d.ts","sourceRoot":"","sources":["InitializeDateTimeFormat.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,0BAA0B,EAC1B,gCAAgC,EAOhC,cAAc,IAAI,cAAc,EACjC,MAAM,4BAA4B,CAAA;AAkDnC;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,EACtC,IAAI,EAAE,IAAI,CAAC,qBAAqB,GAAG,SAAS,EAC5C,EACE,gBAAgB,EAChB,gBAAgB,EAChB,UAAU,EACV,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACrB,MAAM,EACN,cAAc,GACf,EAAE;IACD,gBAAgB,CAAC,GAAG,EAAE,cAAc,GAAG,0BAA0B,CAAA;IACjE,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC7B,gBAAgB,IAAI,MAAM,CAAA;IAC1B,kBAAkB,IAAI,MAAM,CAAA;IAC5B,qBAAqB,EAAE,MAAM,EAAE,CAAA;IAC/B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gCAAgC,GAAG,SAAS,CAAC,CAAA;IACxE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACvC,GACA,IAAI,CAAC,cAAc,CA2PrB"}

package/src/abstract/InitializeDateTimeFormat.js

@@ -105,7 +105,14 @@ function InitializeDateTimeFormat(dtf, locales, opts, _a) {
     opt.hour = (0, ecma402_abstract_1.GetOption)(options, 'hour', 'string', ['2-digit', 'numeric'], undefined);
     opt.minute = (0, ecma402_abstract_1.GetOption)(options, 'minute', 'string', ['2-digit', 'numeric'], undefined);
     opt.second = (0, ecma402_abstract_1.GetOption)(options, 'second', 'string', ['2-digit', 'numeric'], undefined);
-    opt.timeZoneName = (0, ecma402_abstract_1.GetOption)(options, 'timeZoneName', 'string', ['short', 'long'], undefined);
+    opt.timeZoneName = (0, ecma402_abstract_1.GetOption)(options, 'timeZoneName', 'string', [
+        'long',
+        'short',
+        'longOffset',
+        'shortOffset',
+        'longGeneric',
+        'shortGeneric',
+    ], undefined);
     opt.fractionalSecondDigits = (0, ecma402_abstract_1.GetNumberOption)(options, 'fractionalSecondDigits', 1, 3, 
     // @ts-expect-error
     undefined);
@@ -178,6 +185,6 @@ function InitializeDateTimeFormat(dtf, locales, opts, _a) {
     }
     internalSlots.pattern = pattern;
     internalSlots.rangePatterns = rangePatterns;
-    return dtf;
+    return dtf; // TODO: remove this when https://github.com/microsoft/TypeScript/pull/50402 is merged
 }
 exports.InitializeDateTimeFormat = InitializeDateTimeFormat;

package/src/abstract/utils.d.ts

@@ -7,4 +7,5 @@ export declare const longLessPenalty = 8;
 export declare const longMorePenalty = 6;
 export declare const shortLessPenalty = 6;
 export declare const shortMorePenalty = 3;
+export declare const offsetPenalty = 1;
 //# sourceMappingURL=utils.d.ts.map

package/src/abstract/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,0BAA0B,EAAE,OAAO,EAAC,MAAM,4BAA4B,CAAA;AAE9E,eAAO,MAAM,eAAe,EAAE,KAAK,CACjC,MAAM,IAAI,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAWhD,CAAA;AAED,eAAO,MAAM,cAAc,MAAM,CAAA;AACjC,eAAO,MAAM,eAAe,KAAK,CAAA;AACjC,eAAO,MAAM,2BAA2B,KAAK,CAAA;AAC7C,eAAO,MAAM,eAAe,IAAI,CAAA;AAChC,eAAO,MAAM,eAAe,IAAI,CAAA;AAChC,eAAO,MAAM,gBAAgB,IAAI,CAAA;AACjC,eAAO,MAAM,gBAAgB,IAAI,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,0BAA0B,EAAE,OAAO,EAAC,MAAM,4BAA4B,CAAA;AAE9E,eAAO,MAAM,eAAe,EAAE,KAAK,CACjC,MAAM,IAAI,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAahD,CAAA;AAED,eAAO,MAAM,cAAc,MAAM,CAAA;AACjC,eAAO,MAAM,eAAe,KAAK,CAAA;AACjC,eAAO,MAAM,2BAA2B,KAAK,CAAA;AAC7C,eAAO,MAAM,eAAe,IAAI,CAAA;AAChC,eAAO,MAAM,eAAe,IAAI,CAAA;AAChC,eAAO,MAAM,gBAAgB,IAAI,CAAA;AACjC,eAAO,MAAM,gBAAgB,IAAI,CAAA;AACjC,eAAO,MAAM,aAAa,IAAI,CAAA"}

package/src/abstract/utils.js

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shortMorePenalty = exports.shortLessPenalty = exports.longMorePenalty = exports.longLessPenalty = exports.differentNumericTypePenalty = exports.additionPenalty = exports.removalPenalty = exports.DATE_TIME_PROPS = void 0;
+exports.offsetPenalty = exports.shortMorePenalty = exports.shortLessPenalty = exports.longMorePenalty = exports.longLessPenalty = exports.differentNumericTypePenalty = exports.additionPenalty = exports.removalPenalty = exports.DATE_TIME_PROPS = void 0;
 exports.DATE_TIME_PROPS = [
     'weekday',
     'era',
     'year',
     'month',
     'day',
+    'dayPeriod',
     'hour',
     'minute',
     'second',
+    'fractionalSecondDigits',
     'timeZoneName',
 ];
 exports.removalPenalty = 120;
@@ -19,3 +21,4 @@ exports.longLessPenalty = 8;
 exports.longMorePenalty = 6;
 exports.shortLessPenalty = 6;
 exports.shortMorePenalty = 3;
+exports.offsetPenalty = 1;