@lowentry/utils 1.16.1 → 1.17.1

package/index.js

@@ -1341,7 +1341,7 @@ var LeUtils = {
    */
   flattenToArray: function () {
     var _flattenToArrayRecursive = function flattenToArrayRecursive(result, elements, optionalSkipHasOwnPropertyCheck) {
-      if (!LeUtils.supportsEach(elements)) {
+      if (!LeUtils.supportsEach(elements) || typeof elements === 'string') {
         result.push(elements);
         return;
       }
@@ -1351,7 +1351,7 @@ var LeUtils = {
     };
     return function (elements) {
       var optionalSkipHasOwnPropertyCheck = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-      if (!LeUtils.supportsEach(elements)) {
+      if (!LeUtils.supportsEach(elements) || typeof elements === 'string') {
         return [elements];
       }
       var result = [];
@@ -1406,6 +1406,40 @@ var LeUtils = {
     }
     return 0;
   },
+  /**
+   * Compares two strings in a natural way, meaning that it will compare numbers in the strings as actual numbers.
+   *
+   * This will correctly sort numeric parts so that "file5.txt" comes before "file10.txt", as well as that "file/5/test.txt" comes before "file/10/test.txt".
+   *
+   * @param {string} a
+   * @param {string} b
+   * @returns {number}
+   */
+  compareNaturalStrings: function compareNaturalStrings(a, b) {
+    var _a$match, _b$match;
+    var re = /(\d+|\D+)/g; // split into runs of digits or non-digits
+    var aTokens = (_a$match = a.match(re)) !== null && _a$match !== void 0 ? _a$match : [];
+    var bTokens = (_b$match = b.match(re)) !== null && _b$match !== void 0 ? _b$match : [];
+    var len = Math.min(aTokens.length, bTokens.length);
+    for (var i = 0; i < len; i++) {
+      var x = aTokens[i];
+      var y = bTokens[i];
+      if (x === y) {
+        continue;
+      }
+
+      // if both are numbers, compare as numbers
+      var nx = parseInt(x, 10);
+      var ny = parseInt(y, 10);
+      if (!isNaN(nx) && !isNaN(ny)) {
+        return nx - ny;
+      }
+
+      // otherwise compare lexically
+      return x < y ? -1 : 1;
+    }
+    return aTokens.length - bTokens.length;
+  },
   /**
    * Compares two strings generated by LeUtils.timestamp(). Primarily used for sorting.
    *