@formatjs/ecma402-abstract - npm Package Compare versions

Comparing version 1.5.0 to 1.5.1

DateTimeFormat/PartitionDateTimeRangePattern.js

@@ -45,24 +45,28 @@ "use strict";
             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 (!_262_1.SameValue(v1, v2)) {
-                    dateFieldsPracticallyEqual = false;
-                }
                 if (rangePattern !== undefined && rp === undefined) {
                     patternContainsLargerDateField = true;
                 }
-                rangePattern = rp;
+                else {
+                    var v1 = tm1[fieldName];
+                    var v2 = tm2[fieldName];
+                    if (!_262_1.SameValue(v1, v2)) {
+                        dateFieldsPracticallyEqual = false;
+                    }
+                    rangePattern = rp;
+                }
             }
@@ -82,5 +86,13 @@ }
         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;
@@ -97,4 +109,4 @@ var z = void 0;
         var partResult = FormatDateTimePattern_1.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;
@@ -101,0 +113,0 @@ }

lib/DateTimeFormat/PartitionDateTimeRangePattern.js

@@ -42,24 +42,28 @@ import { SameValue, TimeClip } from '../262';
             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;
+                }
             }
@@ -79,5 +83,13 @@ }
         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;
@@ -94,4 +106,4 @@ var z = void 0;
         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;
@@ -98,0 +110,0 @@ }

package.json

 {
   "name": "@formatjs/ecma402-abstract",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "A collection of implementation for ECMAScript abstract operations",
@@ -5,0 +5,0 @@ "keywords": [

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

471780

increased by0.21%

Lines of code

9278

increased by0.26%

No dependency changes