v0.4.3 (#375)

Author: romainmenke

package-lock.json

@@ -10,5 +10,5 @@
   "prettier": {
     "useTabs": true
   },
-  "version": "0.4.2"
+  "version": "0.4.3"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrhenry/babel-plugin-core-web",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "browser feature polyfills as a babel plugin",
   "main": "lib/index.js",
   "author": "Simon Menke <[email protected]>",

packages/babel-plugin-core-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrhenry/core-web-example",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "private": true,
   "scripts": {
     "build": "babel src -d lib"

packages/core-web-example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrhenry/core-web-generator",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "private": true,
   "scripts": {
     "clean": "rm -rf ./lib/",

packages/core-web-generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrhenry/core-web-tests",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "private": true,
   "scripts": {
     "build": "webpack",

packages/core-web-tests/package.json

@@ -1414,7 +1414,7 @@ export const mapping = [
       "Blink": "28 - 70",
       "WebKit": "85 - 603.2.1"
     },
-    "size": 30081,
+    "size": 30211,
     "hasCustomMatcher": false,
     "isAlias": false,
     "providedByCoreWeb": false
@@ -164731,7 +164731,7 @@ export const mapping = [
       "Blink": "28 - 62",
       "WebKit": ">= 85"
     },
-    "size": 358,
+    "size": 428,
     "hasCustomMatcher": false,
     "isAlias": false,
     "providedByCoreWeb": false

packages/core-web/__mapping.js

@@ -1417,7 +1417,7 @@ exports.mapping = [
             "Blink": "28 - 70",
             "WebKit": "85 - 603.2.1"
         },
-        "size": 30081,
+        "size": 30211,
         "hasCustomMatcher": false,
         "isAlias": false,
         "providedByCoreWeb": false
@@ -164734,7 +164734,7 @@ exports.mapping = [
             "Blink": "28 - 62",
             "WebKit": ">= 85"
         },
-        "size": 358,
+        "size": 428,
         "hasCustomMatcher": false,
         "isAlias": false,
         "providedByCoreWeb": false

packages/core-web/lib/__mapping.js

@@ -1283,28 +1283,32 @@ if (!("Intl"in self&&"DateTimeFormat"in self.Intl&&"formatToParts"in self.Intl.D
             var fieldName = TABLE_2_FIELDS_1[_i];
             if (dateFieldsPracticallyEqual && !patternContainsLargerDateField) {
                 if (fieldName === 'ampm') {
-                    var v1 = tm1.hour;
-                    var v2 = tm2.hour;
                     var rp = rangePatterns.ampm;
-                    if ((v1 > 11 && v2 < 11) || (v1 < 11 && v2 > 11)) {
-                        dateFieldsPracticallyEqual = false;
-                    }
                     if (rangePattern !== undefined && rp === undefined) {
                         patternContainsLargerDateField = true;
                     }
-                    rangePattern = rp;
+                    else {
+                        var v1 = tm1.hour;
+                        var v2 = tm2.hour;
+                        if ((v1 > 11 && v2 < 11) || (v1 < 11 && v2 > 11)) {
+                            dateFieldsPracticallyEqual = false;
+                        }
+                        rangePattern = rp;
+                    }
                 }
                 else {
-                    var v1 = tm1[fieldName];
-                    var v2 = tm2[fieldName];
                     var rp = rangePatterns[fieldName];
-                    if (!SameValue(v1, v2)) {
-                        dateFieldsPracticallyEqual = false;
-                    }
                     if (rangePattern !== undefined && rp === undefined) {
                         patternContainsLargerDateField = true;
                     }
-                    rangePattern = rp;
+                    else {
+                        var v1 = tm1[fieldName];
+                        var v2 = tm2[fieldName];
+                        if (!SameValue(v1, v2)) {
+                            dateFieldsPracticallyEqual = false;
+                        }
+                        rangePattern = rp;
+                    }
                 }
             }
         }
@@ -1319,9 +1323,17 @@ if (!("Intl"in self&&"DateTimeFormat"in self.Intl&&"formatToParts"in self.Intl.D
         var result = [];
         if (rangePattern === undefined) {
             rangePattern = rangePatterns.default;
+            /** IMPL DETAILS */
+            // 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 _b = 0, _c = rangePattern.patternParts; _b < _c.length; _b++) {
-            var rangePatternPart = _c[_b];
+        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 === "startRange" /* startRange */ ||
@@ -1333,8 +1345,8 @@ if (!("Intl"in self&&"DateTimeFormat"in self.Intl&&"formatToParts"in self.Intl.D
             }
             var patternParts = PartitionPattern(pattern_1);
             var partResult = FormatDateTimePattern(dtf, patternParts, z, implDetails);
-            for (var _d = 0, partResult_1 = partResult; _d < partResult_1.length; _d++) {
-                var r = partResult_1[_d];
+            for (var _f = 0, partResult_1 = partResult; _f < partResult_1.length; _f++) {
+                var r = partResult_1[_f];
                 r.source = source;
             }
             result = result.concat(partResult);

packages/core-web/modules/Intl.DateTimeFormat.js

@@ -42,7 +42,7 @@ if (!("Intl"in self&&Intl.PluralRules&&Intl.PluralRules.supportedLocalesOf&&func
 // prettier-ignore
 if (Intl.PluralRules && typeof Intl.PluralRules.__addLocaleData === 'function') {
   Intl.PluralRules.__addLocaleData({"data":{"categories":{"cardinal":["one","many","other"],"ordinal":["one","other"]},"fn":function(n, ord) {
-  var s = String(n).split('.'), i = s[0], v0 = !s[1], i1000000 = i.slice(-6);
+  var _n = String(n), se = _n.split(/[ce]/), e = se[1] || 0, c = e, s = String(e ? Number(se[0]) * Math.pow(10, e) : _n).split("."), i = s[0], v0 = !s[1], i1000000 = i.slice(-6);
   if (ord) return n == 1 ? 'one' : 'other';
   return n >= 0 && n < 2 ? 'one'
     : e == 0 && i != 0 && i1000000 == 0 && v0 || (e < 0 || e > 5) ? 'many'