@fileverse-dev/formulajs 4.4.17 → 4.4.19

package/lib/browser/formula.js

@@ -1,4 +1,4 @@
-/* @fileverse-dev/formulajs v4.4.17 */
+/* @fileverse-dev/formulajs v4.4.19 */
 var _excluded = [ "confirmations", "dataDecoded" ];
 
 function _objectWithoutProperties(e, t) {
@@ -4854,38 +4854,65 @@ function _typeof(o) {
     }
     return jStat.rows(array);
   }
-  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 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) {
+  function SORT(inputArray) {
+    var sortIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+    var isAscending = arguments.length > 2 ? arguments[2] : undefined;
+    var sortByColumn = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+    if (!inputArray || !Array.isArray(inputArray)) return na;
+    if (inputArray.length === 0) return 0;
+    var sortColumnIndex = parseNumber(sortIndex);
+    if (!sortColumnIndex || sortColumnIndex < 1) return value;
+    sortColumnIndex = sortColumnIndex - 1;
+    var sortDirection = isAscending.toLowerCase() === "false" ? -1 : 1;
+    var parsedSortDirection = parseNumber(sortDirection);
+    if (parsedSortDirection !== 1 && parsedSortDirection !== -1) return value;
+    var isSortByColumn = parseBool(sortByColumn);
+    if (typeof isSortByColumn !== "boolean") return name;
+    var normalizedMatrix = fillMatrix(inputArray);
+    var orientedMatrix = isSortByColumn ? transpose(normalizedMatrix) : normalizedMatrix;
+    if (!orientedMatrix.length || !orientedMatrix[0] || sortColumnIndex >= orientedMatrix[0].length) {
       return value;
     }
-    sort_order = parseNumber(sort_order);
-    if (sort_order !== 1 && sort_order !== -1) {
-      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(value) {
+      return value === "" || value === null || value === 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 compareValues = function compareValues(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 parsedA = parseNumber(a);
+      var parsedB = parseNumber(b);
+      var isANumber = Number.isFinite(parsedA);
+      var isBNumber = Number.isFinite(parsedB);
+      if (isANumber && isBNumber) {
+        if (parsedA < parsedB) return -1;
+        if (parsedA > parsedB) return 1;
+        return 0;
+      }
+      var stringA = ((_parseString = parseString(a)) !== null && _parseString !== void 0 ? _parseString : "").toString().toLowerCase();
+      var stringB = ((_parseString2 = parseString(b)) !== null && _parseString2 !== void 0 ? _parseString2 : "").toString().toLowerCase();
+      if (stringA < stringB) return -1;
+      if (stringA > stringB) return 1;
+      return 0;
+    };
+    var rowsWithOriginalIndex = orientedMatrix.map((function(row, rowIndex) {
+      return {
+        row: row,
+        rowIndex: rowIndex
+      };
+    }));
+    rowsWithOriginalIndex.sort((function(rowA, rowB) {
+      var baseComparison = compareValues(rowA.row[sortColumnIndex], rowB.row[sortColumnIndex]);
+      if (baseComparison !== 0) return baseComparison * parsedSortDirection;
+      return rowA.rowIndex - rowB.rowIndex;
+    }));
+    var sortedMatrix = rowsWithOriginalIndex.map((function(item) {
+      return item.row;
+    }));
+    return isSortByColumn ? transpose(sortedMatrix) : sortedMatrix;
   }
   function TRANSPOSE(array) {
     if (!array) {