@fileverse-dev/formulajs 4.4.15 → 4.4.17-fix-sort-fn-1

package/lib/browser/formula.js

@@ -1,4 +1,4 @@
-/* @fileverse-dev/formulajs v4.4.15 */
+/* @fileverse-dev/formulajs v4.4.17-fix-sort-fn-1 */
 var _excluded = [ "confirmations", "dataDecoded" ];
 
 function _objectWithoutProperties(e, t) {
@@ -4858,34 +4858,60 @@ function _typeof(o) {
     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) {
-      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 order = parseNumber(sort_order);
+    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) {
@@ -17360,7 +17386,7 @@ function _typeof(o) {
             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], 
               val = _Object$entries2$_i[1];
-              out["".concat(token.charAt(0).toUpperCase() + token.slice(1), "_").concat(cur.toUpperCase())] = val;
+              out["".concat(token.toUpperCase(), "_").concat(cur.toUpperCase())] = val;
             }
           }
           return _context20.abrupt("return", [ out ]);
@@ -18400,16 +18426,23 @@ function _typeof(o) {
     ethereum: 1
   };
   function formatNumber(raw, decimals) {
-    if (!decimals) {
+    try {
+      if (!decimals) {
+        return raw;
+      }
+      var quorum = BigInt(raw);
+      var divisor = Math.pow(10, decimals);
+      var normalized = Number(quorum) / divisor;
+      return new Intl.NumberFormat("en-US", {
+        notation: "compact",
+        maximumFractionDigits: 2
+      }).format(normalized);
+    } catch (error) {
+      console.log({
+        error: error
+      });
       return raw;
     }
-    var quorum = BigInt(raw);
-    var divisor = Math.pow(10, decimals);
-    var normalized = Number(quorum) / divisor;
-    return new Intl.NumberFormat("en-US", {
-      notation: "compact",
-      maximumFractionDigits: 2
-    }).format(normalized);
   }
   var cachedChains = null;
   function getChainName(_x16) {
@@ -18469,7 +18502,7 @@ function _typeof(o) {
   }
   function _DUNE() {
     _DUNE = _asyncToGenerator(_regeneratorRuntime().mark((function _callee30() {
-      var _ref26, _json$activity, _ref27, _json$holders, _ref28, _json$tokens, _argsToArray31, _argsToArray32, type, input1, input2, input3, input4, route, buildQuery, address, qs, chain, _qs, tokenAddress, _qs2, _chain, apiKey, url, _getUrlAndHeaders1, finalUrl, HEADERS, res, json, _data6, result, _final, globalDecimals, _iterator43, _step43, _loop4, _args34 = arguments;
+      var _ref26, _json$activity, _ref27, _json$holders, _ref28, _json$tokens, _argsToArray31, _argsToArray32, type, input1, input2, input3, input4, route, buildQuery, address, qs, chain, _qs, tokenAddress, _qs2, _chain, apiKey, url, _getUrlAndHeaders1, finalUrl, HEADERS, res, _data6, json, _data7, result, _final, globalDecimals, _iterator43, _step43, _loop4, _args34 = arguments;
       return _regeneratorRuntime().wrap((function _callee30$(_context34) {
         while (1) switch (_context34.prev = _context34.next) {
          case 0:
@@ -18537,22 +18570,34 @@ function _typeof(o) {
          case 18:
           res = _context34.sent;
           if (res.ok) {
-            _context34.next = 21;
+            _context34.next = 26;
+            break;
+          }
+          if (!(res.status === 400)) {
+            _context34.next = 25;
             break;
           }
-          throw new NetworkError(SERVICES_API_KEY.DuneSim, res.status);
-
-         case 21:
           _context34.next = 23;
           return res.json();
 
          case 23:
+          _data6 = _context34.sent;
+          throw new ValidationError(_data6.message);
+
+         case 25:
+          throw new NetworkError(SERVICES_API_KEY.DuneSim, res.status);
+
+         case 26:
+          _context34.next = 28;
+          return res.json();
+
+         case 28:
           json = _context34.sent;
-          _data6 = type === "activity" ? (_ref26 = (_json$activity = json === null || json === void 0 ? void 0 : json.activity) !== null && _json$activity !== void 0 ? _json$activity : json) !== null && _ref26 !== void 0 ? _ref26 : [] : type === "token-holders" ? (_ref27 = (_json$holders = json === null || json === void 0 ? void 0 : json.holders) !== null && _json$holders !== void 0 ? _json$holders : json) !== null && _ref27 !== void 0 ? _ref27 : [] : type === "price" ? (_ref28 = (_json$tokens = json === null || json === void 0 ? void 0 : json.tokens) !== null && _json$tokens !== void 0 ? _json$tokens : json) !== null && _ref28 !== void 0 ? _ref28 : [] : json !== null && json !== void 0 ? json : [];
-          result = Array.isArray(_data6) ? _data6 : [ _data6 ];
+          _data7 = type === "activity" ? (_ref26 = (_json$activity = json === null || json === void 0 ? void 0 : json.activity) !== null && _json$activity !== void 0 ? _json$activity : json) !== null && _ref26 !== void 0 ? _ref26 : [] : type === "token-holders" ? (_ref27 = (_json$holders = json === null || json === void 0 ? void 0 : json.holders) !== null && _json$holders !== void 0 ? _json$holders : json) !== null && _ref27 !== void 0 ? _ref27 : [] : type === "price" ? (_ref28 = (_json$tokens = json === null || json === void 0 ? void 0 : json.tokens) !== null && _json$tokens !== void 0 ? _json$tokens : json) !== null && _ref28 !== void 0 ? _ref28 : [] : json !== null && json !== void 0 ? json : [];
+          result = Array.isArray(_data7) ? _data7 : [ _data7 ];
           _final = [];
           _iterator43 = _createForOfIteratorHelper(result);
-          _context34.prev = 28;
+          _context34.prev = 33;
           _loop4 = _regeneratorRuntime().mark((function _loop4() {
             var item, prices, _resData$tokens$, _chain2, _url, _getUrlAndHeaders10, _finalUrl, _HEADERS, _res, resData, decimals;
             return _regeneratorRuntime().wrap((function _loop4$(_context33) {
@@ -18659,44 +18704,44 @@ function _typeof(o) {
           }));
           _iterator43.s();
 
-         case 31:
+         case 36:
           if ((_step43 = _iterator43.n()).done) {
-            _context34.next = 35;
+            _context34.next = 40;
             break;
           }
-          return _context34.delegateYield(_loop4(), "t0", 33);
+          return _context34.delegateYield(_loop4(), "t0", 38);
 
-         case 33:
-          _context34.next = 31;
+         case 38:
+          _context34.next = 36;
           break;
 
-         case 35:
-          _context34.next = 40;
+         case 40:
+          _context34.next = 45;
           break;
 
-         case 37:
-          _context34.prev = 37;
-          _context34.t1 = _context34["catch"](28);
+         case 42:
+          _context34.prev = 42;
+          _context34.t1 = _context34["catch"](33);
           _iterator43.e(_context34.t1);
 
-         case 40:
-          _context34.prev = 40;
+         case 45:
+          _context34.prev = 45;
           _iterator43.f();
-          return _context34.finish(40);
+          return _context34.finish(45);
 
-         case 43:
+         case 48:
           return _context34.abrupt("return", _final);
 
-         case 46:
-          _context34.prev = 46;
+         case 51:
+          _context34.prev = 51;
           _context34.t2 = _context34["catch"](0);
           return _context34.abrupt("return", errorMessageHandler(_context34.t2, "DUNE"));
 
-         case 49:
+         case 54:
          case "end":
           return _context34.stop();
         }
-      }), _callee30, null, [ [ 0, 46 ], [ 28, 37, 40, 43 ] ]);
+      }), _callee30, null, [ [ 0, 51 ], [ 33, 42, 45, 48 ] ]);
     })));
     return _DUNE.apply(this, arguments);
   }