@fileverse-dev/formulajs 4.4.12-mod-3 → 4.4.12-mod-3-patch-1

package/lib/browser/formula.js

@@ -1,4 +1,4 @@
-/* @fileverse-dev/formulajs v4.4.12-mod-3 */
+/* @fileverse-dev/formulajs v4.4.12-mod-3-patch-1 */
 var _excluded = [ "confirmations", "dataDecoded" ];
 
 function _objectWithoutProperties(e, t) {
@@ -4864,28 +4864,83 @@ function _typeof(o) {
     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) {
-      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 sortKeys = [];
+    var normalizeOrder = function normalizeOrder(o) {
+      var b = parseBool(o);
+      if (typeof b === "boolean") {
+        return b ? 1 : -1;
+      }
+      var n = parseNumber(o);
+      if (n === 1 || n === -1) {
+        return n;
+      }
+      return null;
     };
+    var firstIndex = parseNumber(sort_index);
+    if (!firstIndex || firstIndex < 1) {
+      return value;
+    }
+    var firstOrder = normalizeOrder(sort_order);
+    if (firstOrder === null) {
+      return value;
+    }
+    sortKeys.push({
+      index: firstIndex,
+      order: firstOrder
+    });
+    if (arguments.length > 4) {
+      for (var i = 4; i < arguments.length; i += 2) {
+        var idx = parseNumber(arguments[i]);
+        if (!idx || idx < 1) {
+          return value;
+        }
+        var ordArg = i + 1 < arguments.length ? arguments[i + 1] : 1;
+        var ord = normalizeOrder(ordArg);
+        if (ord === null) {
+          return value;
+        }
+        sortKeys.push({
+          index: idx,
+          order: ord
+        });
+      }
+    }
     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 working = by_col ? transpose(matrix) : matrix;
+    var numCols = working[0] ? working[0].length : 0;
+    for (var _i3 = 0, _sortKeys = sortKeys; _i3 < _sortKeys.length; _i3++) {
+      var k = _sortKeys[_i3];
+      if (k.index < 1 || k.index > numCols) {
+        return value;
+      }
+    }
+    var parseForCompare = function parseForCompare(val) {
+      if (typeof val === "number") return val;
+      var num = parseNumber(val);
+      if (typeof num === "number" && !Number.isNaN(num)) return num;
+      return parseString(val);
+    };
+    var comparator = function comparator(aRow, bRow) {
+      for (var _i4 = 0, _sortKeys2 = sortKeys; _i4 < _sortKeys2.length; _i4++) {
+        var _k = _sortKeys2[_i4];
+        var aVal = parseForCompare(aRow[_k.index - 1]);
+        var bVal = parseForCompare(bRow[_k.index - 1]);
+        if (aVal === bVal) continue;
+        if (typeof aVal === "number" && typeof bVal === "number") {
+          return (aVal < bVal ? -1 : 1) * _k.order;
+        }
+        var aStr = String(aVal).toLowerCase();
+        var bStr = String(bVal).toLowerCase();
+        return aStr.localeCompare(bStr) * _k.order;
+      }
+      return 0;
+    };
+    working.sort(comparator);
+    return by_col ? transpose(working) : working;
   }
   function TRANSPOSE(array) {
     if (!array) {
@@ -5663,9 +5718,9 @@ function _typeof(o) {
     for (var i = 0; i < results.length; i++) {
       results[i] = true;
     }
-    for (var _i3 = 0; _i3 < args.length; _i3 += 2) {
-      var range = flatten(args[_i3]);
-      var criteria = args[_i3 + 1];
+    for (var _i5 = 0; _i5 < args.length; _i5 += 2) {
+      var range = flatten(args[_i5]);
+      var criteria = args[_i5 + 1];
       var isWildcard = criteria === void 0 || criteria === "*";
       if (!isWildcard) {
         var tokenizedCriteria = parse(criteria + "");
@@ -5677,8 +5732,8 @@ function _typeof(o) {
       }
     }
     var result = 0;
-    for (var _i4 = 0; _i4 < results.length; _i4++) {
-      if (results[_i4]) {
+    for (var _i6 = 0; _i6 < results.length; _i6++) {
+      if (results[_i6]) {
         result++;
       }
     }
@@ -6861,9 +6916,9 @@ function _typeof(o) {
     if (Array.isArray(A[0]) && _typeof(A[0][0]) !== "object") {
       var _total = 0;
       var maxRows = Math.max(A.length, B.length);
-      for (var _i5 = 0; _i5 < maxRows; _i5++) {
-        var rowA = A[_i5] || [];
-        var rowB = B[_i5] || [];
+      for (var _i7 = 0; _i7 < maxRows; _i7++) {
+        var rowA = A[_i7] || [];
+        var rowB = B[_i7] || [];
         var maxCols = Math.max(rowA.length, rowB.length);
         for (var j = 0; j < maxCols; j++) {
           var _aVal = j < rowA.length ? toNumberOrThrow(rowA[j]) : 0;
@@ -6876,9 +6931,9 @@ function _typeof(o) {
     if (Array.isArray(A[0][0])) {
       var _total2 = 0;
       var maxX = Math.max(A.length, B.length);
-      for (var _i6 = 0; _i6 < maxX; _i6++) {
-        var matA = A[_i6] || [];
-        var matB = B[_i6] || [];
+      for (var _i8 = 0; _i8 < maxX; _i8++) {
+        var matA = A[_i8] || [];
+        var matB = B[_i8] || [];
         var maxY = Math.max(matA.length, matB.length);
         for (var _j = 0; _j < maxY; _j++) {
           var _rowA = matA[_j] || [];
@@ -8362,17 +8417,17 @@ function _typeof(o) {
     } else if (!(holidays instanceof Array)) {
       holidays = [ holidays ];
     }
-    for (var _i7 = 0; _i7 < holidays.length; _i7++) {
-      var h = parseDate(holidays[_i7]);
+    for (var _i9 = 0; _i9 < holidays.length; _i9++) {
+      var h = parseDate(holidays[_i9]);
       if (h instanceof Error) {
         return h;
       }
-      holidays[_i7] = h;
+      holidays[_i9] = h;
     }
     var days = Math.round((end_date - start_date) / (1e3 * 60 * 60 * 24)) + 1;
     var total = days;
     var day = start_date;
-    for (var _i8 = 0; _i8 < days; _i8++) {
+    for (var _i0 = 0; _i0 < days; _i0++) {
       var d = (new Date).getTimezoneOffset() > 0 ? day.getUTCDay() : day.getDay();
       var dec = isMask ? maskDays.includes(d) : d === weekend[0] || d === weekend[1];
       for (var j = 0; j < holidays.length; j++) {
@@ -9778,9 +9833,9 @@ function _typeof(o) {
       matches[i] = true;
     }
     var maxCriteriaLength = criterias[0].length;
-    for (var _i9 = 1; _i9 < criterias.length; ++_i9) {
-      if (criterias[_i9].length > maxCriteriaLength) {
-        maxCriteriaLength = criterias[_i9].length;
+    for (var _i1 = 1; _i1 < criterias.length; ++_i1) {
+      if (criterias[_i1].length > maxCriteriaLength) {
+        maxCriteriaLength = criterias[_i1].length;
       }
     }
     for (var k = 1; k < database.length; ++k) {
@@ -10429,9 +10484,9 @@ function _typeof(o) {
       var result = cashFlows[0];
       var r = 1 + rate;
       var factor = 1;
-      for (var _i0 = 1; _i0 < cashFlows.length; _i0++) {
+      for (var _i10 = 1; _i10 < cashFlows.length; _i10++) {
         factor *= r;
-        result += cashFlows[_i0] / factor;
+        result += cashFlows[_i10] / factor;
       }
       return result;
     };
@@ -10497,7 +10552,7 @@ function _typeof(o) {
         if (a <= -.99999999) return rate;
       }
       var c;
-      for (var _i1 = 0; _i1 < maxIterations; _i1++) {
+      for (var _i11 = 0; _i11 < maxIterations; _i11++) {
         c = (a + b) / 2;
         var npvC = cachedNpv(c);
         if (Math.abs(npvC) < epsMax || Math.abs(b - a) < epsMax) {
@@ -16679,7 +16734,7 @@ function _typeof(o) {
           _iterator42 = _createForOfIteratorHelper(CHAINS);
           _context16.prev = 34;
           _loop2 = _regeneratorRuntime().mark((function _loop2() {
-            var chain, chainId, _loop3, _ret2, i, sb, eb, _loop4, _ret3, _i10, _ADDRS;
+            var chain, chainId, _loop3, _ret2, i, sb, eb, _loop4, _ret3, _i12, _ADDRS;
             return _regeneratorRuntime().wrap((function _loop2$(_context15) {
               while (1) switch (_context15.prev = _context15.next) {
                case 0:
@@ -16789,7 +16844,7 @@ function _typeof(o) {
                   return _regeneratorRuntime().wrap((function _loop4$(_context14) {
                     while (1) switch (_context14.prev = _context14.next) {
                      case 0:
-                      addr = _ADDRS[_i10];
+                      addr = _ADDRS[_i12];
                       url = "https://api.etherscan.io/v2/api?chainid=".concat(chainId) + "&module=account&action=tokentx&address=".concat(addr) + "&startblock=".concat(sb, "&endblock=").concat(eb) + "&page=".concat(page, "&offset=").concat(offset, "&sort=asc&apikey=").concat(apiKey);
                       _context14.next = 4;
                       return fetchJSON(url);
@@ -16821,10 +16876,10 @@ function _typeof(o) {
                     }
                   }), _loop4);
                 }));
-                _i10 = 0, _ADDRS = ADDRS;
+                _i12 = 0, _ADDRS = ADDRS;
 
                case 29:
-                if (!(_i10 < _ADDRS.length)) {
+                if (!(_i12 < _ADDRS.length)) {
                   _context15.next = 37;
                   break;
                 }
@@ -16839,7 +16894,7 @@ function _typeof(o) {
                 return _context15.abrupt("return", _ret3.v);
 
                case 34:
-                _i10++;
+                _i12++;
                 _context15.next = 29;
                 break;
 
@@ -17257,7 +17312,7 @@ function _typeof(o) {
   }
   function _COINGECKO() {
     _COINGECKO = _asyncToGenerator(_regeneratorRuntime().mark((function _callee17() {
-      var _category$toLowerCase, _argsToArray1, _argsToArray10, category, param1, param2, apiKey, headers, url, vs, map, _category, trend, _category2, _trend, _getUrlAndHeaders5, finalUrl, HEADERS, res, json, _json$status, msg, out, _i11, _Object$entries, _Object$entries$_i, token, prices, _i12, _Object$entries2, _Object$entries2$_i, cur, val, _data, _args20 = arguments;
+      var _category$toLowerCase, _argsToArray1, _argsToArray10, category, param1, param2, apiKey, headers, url, vs, map, _category, trend, _category2, _trend, _getUrlAndHeaders5, finalUrl, HEADERS, res, json, _json$status, msg, out, _i13, _Object$entries, _Object$entries$_i, token, prices, _i14, _Object$entries2, _Object$entries2$_i, cur, val, _data, _args20 = arguments;
       return _regeneratorRuntime().wrap((function _callee17$(_context20) {
         while (1) switch (_context20.prev = _context20.next) {
          case 0:
@@ -17349,11 +17404,11 @@ function _typeof(o) {
             break;
           }
           out = {};
-          for (_i11 = 0, _Object$entries = Object.entries(json); _i11 < _Object$entries.length; _i11++) {
-            _Object$entries$_i = _slicedToArray(_Object$entries[_i11], 2), token = _Object$entries$_i[0], 
+          for (_i13 = 0, _Object$entries = Object.entries(json); _i13 < _Object$entries.length; _i13++) {
+            _Object$entries$_i = _slicedToArray(_Object$entries[_i13], 2), token = _Object$entries$_i[0], 
             prices = _Object$entries$_i[1];
-            for (_i12 = 0, _Object$entries2 = Object.entries(prices); _i12 < _Object$entries2.length; _i12++) {
-              _Object$entries2$_i = _slicedToArray(_Object$entries2[_i12], 2), cur = _Object$entries2$_i[0], 
+            for (_i14 = 0, _Object$entries2 = Object.entries(prices); _i14 < _Object$entries2.length; _i14++) {
+              _Object$entries2$_i = _slicedToArray(_Object$entries2[_i14], 2), cur = _Object$entries2$_i[0], 
               val = _Object$entries2$_i[1];
               out["".concat(token.charAt(0).toUpperCase() + token.slice(1), "_").concat(cur.toUpperCase())] = val;
             }
@@ -17364,8 +17419,8 @@ function _typeof(o) {
           _data = Array.isArray(json) ? json : [ json ];
           return _context20.abrupt("return", _data.map((function(item) {
             var flat = {};
-            for (var _i13 = 0, _Object$entries3 = Object.entries(item); _i13 < _Object$entries3.length; _i13++) {
-              var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i13], 2), key = _Object$entries3$_i[0], _value11 = _Object$entries3$_i[1];
+            for (var _i15 = 0, _Object$entries3 = Object.entries(item); _i15 < _Object$entries3.length; _i15++) {
+              var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i15], 2), key = _Object$entries3$_i[0], _value11 = _Object$entries3$_i[1];
               if (_typeof(_value11) !== "object" || _value11 === null) {
                 flat[key] = _value11;
               }
@@ -17455,8 +17510,8 @@ function _typeof(o) {
          case 23:
           return _context21.abrupt("return", (Array.isArray(json) ? json : [ json ]).map((function(item) {
             var out = {};
-            for (var _i14 = 0, _Object$entries4 = Object.entries(item); _i14 < _Object$entries4.length; _i14++) {
-              var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i14], 2), k = _Object$entries4$_i[0], v = _Object$entries4$_i[1];
+            for (var _i16 = 0, _Object$entries4 = Object.entries(item); _i16 < _Object$entries4.length; _i16++) {
+              var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i16], 2), k = _Object$entries4$_i[0], v = _Object$entries4$_i[1];
               if (v === null || _typeof(v) !== "object") out[k] = v;
             }
             return out;
@@ -17637,8 +17692,8 @@ function _typeof(o) {
          case 22:
           return _context23.abrupt("return", _data2.map((function(item) {
             var flat = {};
-            for (var _i15 = 0, _Object$entries5 = Object.entries(item); _i15 < _Object$entries5.length; _i15++) {
-              var _Object$entries5$_i = _slicedToArray(_Object$entries5[_i15], 2), k = _Object$entries5$_i[0], v = _Object$entries5$_i[1];
+            for (var _i17 = 0, _Object$entries5 = Object.entries(item); _i17 < _Object$entries5.length; _i17++) {
+              var _Object$entries5$_i = _slicedToArray(_Object$entries5[_i17], 2), k = _Object$entries5$_i[0], v = _Object$entries5$_i[1];
               if (v == null || _typeof(v) !== "object") {
                 flat[k] = v;
               }
@@ -17756,8 +17811,8 @@ function _typeof(o) {
          case 21:
           return _context24.abrupt("return", _data3.map((function(item) {
             var flat = {};
-            for (var _i16 = 0, _Object$entries6 = Object.entries(item); _i16 < _Object$entries6.length; _i16++) {
-              var _Object$entries6$_i = _slicedToArray(_Object$entries6[_i16], 2), key = _Object$entries6$_i[0], _value12 = _Object$entries6$_i[1];
+            for (var _i18 = 0, _Object$entries6 = Object.entries(item); _i18 < _Object$entries6.length; _i18++) {
+              var _Object$entries6$_i = _slicedToArray(_Object$entries6[_i18], 2), key = _Object$entries6$_i[0], _value12 = _Object$entries6$_i[1];
               if (_typeof(_value12) !== "object" || _value12 === null) {
                 flat[key] = _value12;
               }
@@ -17909,8 +17964,8 @@ function _typeof(o) {
          case 22:
           return _context26.abrupt("return", _data4.map((function(item) {
             var flat = {};
-            for (var _i17 = 0, _Object$entries7 = Object.entries(item); _i17 < _Object$entries7.length; _i17++) {
-              var _Object$entries7$_i = _slicedToArray(_Object$entries7[_i17], 2), key = _Object$entries7$_i[0], _value13 = _Object$entries7$_i[1];
+            for (var _i19 = 0, _Object$entries7 = Object.entries(item); _i19 < _Object$entries7.length; _i19++) {
+              var _Object$entries7$_i = _slicedToArray(_Object$entries7[_i19], 2), key = _Object$entries7$_i[0], _value13 = _Object$entries7$_i[1];
               if (_value13 == null || _typeof(_value13) !== "object") {
                 flat[key] = _value13;
               }