@fileverse-dev/formulajs 4.4.17 → 4.4.18

package/lib/browser/formula.js

@@ -1,4 +1,4 @@
-/* @fileverse-dev/formulajs v4.4.17 */
+/* @fileverse-dev/formulajs v4.4.18 */
 var _excluded = [ "confirmations", "dataDecoded" ];
 
 function _objectWithoutProperties(e, t) {
@@ -4856,36 +4856,63 @@ function _typeof(o) {
   }
   function SORT(array) {
     var sort_index = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-    var sort_order = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+    var is_ascending = arguments.length > 2 ? arguments[2] : undefined;
     var by_col = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-    if (!array || !Array.isArray(array)) {
-      return na;
-    }
-    if (array.length === 0) {
-      return 0;
-    }
-    sort_index = parseNumber(sort_index);
-    if (!sort_index || sort_index < 1) {
-      return value;
-    }
-    sort_order = parseNumber(sort_order);
-    if (sort_order !== 1 && sort_order !== -1) {
+    if (!array || !Array.isArray(array)) return na;
+    if (array.length === 0) return 0;
+    var idx = parseNumber(sort_index);
+    if (!idx || idx < 1) return value;
+    idx = idx - 1;
+    var sortOrderNumber = is_ascending === "FALSE" ? -1 : 1;
+    var order = parseNumber(sortOrderNumber);
+    if (order !== 1 && order !== -1) return value;
+    var byCol = parseBool(by_col);
+    if (typeof byCol !== "boolean") return name;
+    var matrix = fillMatrix(array);
+    var working = byCol ? transpose(matrix) : matrix;
+    if (!working.length || !working[0] || idx >= working[0].length) {
       return value;
     }
-    by_col = parseBool(by_col);
-    if (typeof by_col !== "boolean") {
-      return name;
-    }
-    var sortArray = function sortArray(arr) {
-      return arr.sort((function(a, b) {
-        a = parseString(a[sort_index - 1]);
-        b = parseString(b[sort_index - 1]);
-        return sort_order === 1 ? a < b ? sort_order * -1 : sort_order : a > b ? sort_order : sort_order * -1;
-      }));
+    var isBlank = function isBlank(v) {
+      return v === "" || v === null || v === undefined;
     };
-    var matrix = fillMatrix(array);
-    var result = by_col ? transpose(matrix) : matrix;
-    return sort_index >= 1 && sort_index <= result[0].length ? by_col ? transpose(sortArray(result)) : sortArray(result) : value;
+    var cmp = function cmp(a, b) {
+      var _parseString, _parseString2;
+      var aBlank = isBlank(a);
+      var bBlank = isBlank(b);
+      if (aBlank && bBlank) return 0;
+      if (aBlank) return 1;
+      if (bBlank) return -1;
+      var na = parseNumber(a);
+      var nb = parseNumber(b);
+      var aNum = Number.isFinite(na);
+      var bNum = Number.isFinite(nb);
+      if (aNum && bNum) {
+        if (na < nb) return -1;
+        if (na > nb) return 1;
+        return 0;
+      }
+      var sa = ((_parseString = parseString(a)) !== null && _parseString !== void 0 ? _parseString : "").toString().toLowerCase();
+      var sb = ((_parseString2 = parseString(b)) !== null && _parseString2 !== void 0 ? _parseString2 : "").toString().toLowerCase();
+      if (sa < sb) return -1;
+      if (sa > sb) return 1;
+      return 0;
+    };
+    var decorated = working.map((function(row, i) {
+      return {
+        row: row,
+        i: i
+      };
+    }));
+    decorated.sort((function(A, B) {
+      var base = cmp(A.row[idx], B.row[idx]);
+      if (base !== 0) return base * order;
+      return A.i - B.i;
+    }));
+    var sorted = decorated.map((function(d) {
+      return d.row;
+    }));
+    return byCol ? transpose(sorted) : sorted;
   }
   function TRANSPOSE(array) {
     if (!array) {