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

package/lib/cjs/index.cjs

@@ -1271,7 +1271,6 @@ function ROWS(array) {
  * @returns
  */
 function SORT(array, sort_index = 1, sort_order = 1, by_col = false) {
-  // Accept multiple sort keys like Google Sheets: SORT(range, sort_column, is_ascending, [sort_column2, is_ascending2, ...])
   if (!array || !Array.isArray(array)) {
     return na
   }
@@ -1280,104 +1279,37 @@ function SORT(array, sort_index = 1, sort_order = 1, by_col = false) {
     return 0
   }
 
-  by_col = parseBool(by_col);
-  if (typeof by_col !== 'boolean') {
-    return name
-  }
-
-  // Collect sort keys (index and order). First key comes from sort_index/sort_order.
-  const sortKeys = [];
-
-  const normalizeOrder = (o) => {
-    // Try boolean first (TRUE -> ascending)
-    const b = parseBool(o);
-    if (typeof b === 'boolean') {
-      return b ? 1 : -1
-    }
-
-    const n = parseNumber(o);
-    if (n === 1 || n === -1) {
-      return n
-    }
-
-    return null
-  };
-
-  const firstIndex = parseNumber(sort_index);
-  if (!firstIndex || firstIndex < 1) {
+  sort_index = parseNumber(sort_index);
+  if (!sort_index || sort_index < 1) {
     return value
   }
 
-  const firstOrder = normalizeOrder(sort_order);
-  if (firstOrder === null) {
+  sort_order = parseNumber(sort_order);
+  if (sort_order !== 1 && sort_order !== -1) {
     return value
   }
 
-  sortKeys.push({ index: firstIndex, order: firstOrder });
-
-  // Additional args may contain more sort_index/sort_order pairs
-  if (arguments.length > 4) {
-    // arguments: 0=array,1=sort_index,2=sort_order,3=by_col,4=nextIndex,5=nextOrder,...
-    for (let i = 4; i < arguments.length; i += 2) {
-      const idx = parseNumber(arguments[i]);
-      if (!idx || idx < 1) {
-        return value
-      }
-
-      const ordArg = i + 1 < arguments.length ? arguments[i + 1] : 1;
-      const ord = normalizeOrder(ordArg);
-      if (ord === null) {
-        return value
-      }
-
-      sortKeys.push({ index: idx, order: ord });
-    }
-  }
-
-  const matrix = fillMatrix(array);
-  const working = by_col ? transpose(matrix) : matrix;
-
-  // Validate that all sort indexes are within column bounds
-  const numCols = working[0] ? working[0].length : 0;
-  for (const k of sortKeys) {
-    if (k.index < 1 || k.index > numCols) {
-      return value
-    }
+  by_col = parseBool(by_col);
+  if (typeof by_col !== 'boolean') {
+    return name
   }
 
-  const parseForCompare = (val) => {
-    // Preserve numbers when possible
-    if (typeof val === 'number') return val
-    const num = parseNumber(val);
-    if (typeof num === 'number' && !Number.isNaN(num)) return num
-    return parseString(val)
-  };
-
-  const comparator = (aRow, bRow) => {
-    for (const k of sortKeys) {
-      const aVal = parseForCompare(aRow[k.index - 1]);
-      const bVal = parseForCompare(bRow[k.index - 1]);
+  const sortArray = (arr) =>
+    arr.sort((a, b) => {
+      a = parseString(a[sort_index - 1]);
+      b = parseString(b[sort_index - 1]);
 
-      if (aVal === bVal) continue
-
-      // Numeric comparison if both are numbers
-      if (typeof aVal === 'number' && typeof bVal === 'number') {
-        return (aVal < bVal ? -1 : 1) * k.order
-      }
-
-      // String comparison
-      const aStr = String(aVal).toLowerCase();
-      const bStr = String(bVal).toLowerCase();
-      return aStr.localeCompare(bStr) * k.order
-    }
-
-    return 0
-  };
+      return sort_order === 1 ? (a < b ? sort_order * -1 : sort_order) : a > b ? sort_order : sort_order * -1
+    });
 
-  // Sort in-place and return
-  working.sort(comparator);
+  const matrix = fillMatrix(array);
+  const result = by_col ? transpose(matrix) : matrix;
 
-  return by_col ? transpose(working) : working
+  return sort_index >= 1 && sort_index <= result[0].length
+    ? by_col
+      ? transpose(sortArray(result))
+      : sortArray(result)
+    : value
 }
 
 /**
@@ -18576,11 +18508,44 @@ async function TALLY() {
   }
 }
 
-const duneSimParamsSchema = objectType({
-  wallet: stringType().nonempty(),
-  type: enumType(['activity']),
+const historicalPrices = stringType()
+  .regex(/^\s*(\d{1,2})(\s*,\s*\d{1,2}){0,2}\s*$/, "Up to 3 comma-separated hour offsets")
+  .refine((s) => s.split(",").map((x) => +x.trim()).every((n) => n >= 1 && n <= 24), {
+    message: "Each offset must be between 1 and 24",
+  });
+
+
+
+const activity = objectType({
+  type: literalType("activity"),
+  input1: stringType().nonempty(), // wallet address / ens name
+  input2: stringType().optional(), // chain id. / name
+  input3: numberType().int().min(1).max(100).optional(), // limit
+});
+
+const tokenHolders = objectType({
+  type: literalType("token_holders"),
+  input1: stringType().nonempty(), // expects token address
+  input2: stringType().nonempty(), // chain id / name
+  input3: numberType().int().min(1).max(500).optional() // limit
 });
 
+
+const price = objectType({
+  type: literalType("price"),
+  input1: stringType().nonempty(), // chain name / id
+  input2: historicalPrices.optional(), // history prices
+  input3: stringType().optional(), // contract address
+  input4: numberType().int().min(1).max(500).optional() // limit
+});
+
+
+const duneSimParamsSchema = discriminatedUnionType("type", [
+  activity,
+  price,
+  tokenHolders
+]);
+
 function flattenObject(obj, parentKey = '', res = {}) {
   for (let key in obj) {
     if (!Object.prototype.hasOwnProperty.call(obj, key)) continue;
@@ -18603,47 +18568,101 @@ function flattenObject(obj, parentKey = '', res = {}) {
   return res;
 }
 
-/* global window */
+const SUPPORTED_TOKEN_NAMES = {
+  "eth": 1,            // Ethereum Mainnet
+  "base": 8453,        // Base
+  "polygon": 137,      // Polygon
+  "arbitrum": 42161,   // Arbitrum One
+  "optimism": 10,      // Optimism
+  "gnosis": 100,       // Gnosis Chain (xDai)
+  "bsc": 56,           // Binance Smart Chain
+  "avalanche": 43114,  // Avalanche C-Chain
+  "fantom": 250,       // Fantom Opera
+  "scroll": 534352,    // Scroll
+  "linea": 59144       // Linea
+};
 
 
 
+async function DUNESIM() {
+  try {
+    const [type, input1, input2, input3, input4] = argsToArray(arguments);
+
+    validateParams(duneSimParamsSchema, { type, input1, input2, input3, input4 });
 
+    let route = "";
 
+    // Helper to assemble query pieces
+    const buildQuery = (pairs) => {
+      const parts = pairs
+        // eslint-disable-next-line no-unused-vars
+        .filter(([_, v]) => v !== undefined && v !== '')
+        .map(([k, v]) => `${k}=${encodeURIComponent(v)}`);
+      return parts.length ? `?${parts.join('&')}` : '';
+    };
 
+    if (type === 'activity') {
+      const address = await fromEnsNameToAddress$1.validateAndGetAddress(input1);
+      const qs = buildQuery([['chain_ids', SUPPORTED_TOKEN_NAMES[input2] || input2], ['limit', input3]]);
+      route = `activity/${address}${qs}`;
+    }
 
-async function DUNESIM() {
-  try {
-    const [type, wallet] = argsToArray(arguments);
+    if (type === 'price') {
+      const chain = SUPPORTED_TOKEN_NAMES[input1] || input2;
+      const qs = buildQuery([
+        ['chain_ids', chain],
+        ['historical_prices', input3],
+        ['limit', input4],
+      ]);
+      route = `token-info/native${qs}`;
+    }
+
+    if (type === 'token_holders') {
+      const qs = buildQuery([['limit', input3]]);
+      const chain = SUPPORTED_TOKEN_NAMES[input2] || input2;
+      route = `token-holders/${chain}/${input1}${qs}`;
+    }
 
-    validateParams(duneSimParamsSchema, { wallet, type });
-    const address = await fromEnsNameToAddress$1.validateAndGetAddress(wallet);
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.DuneSim);
-    const url = `https://api.sim.dune.com/v1/evm/activity/${address}`;
+    const url = `https://api.sim.dune.com/v1/evm/${route}`;
 
     const { URL: finalUrl, HEADERS } = getUrlAndHeaders({
-      url: url, serviceName: 'DuneSim',
-        headers: {
-          'X-Sim-Api-Key': apiKey,
-        }
-      
+      url, serviceName: "DuneSim",
+      headers: { "X-Sim-Api-Key": apiKey },
     });
 
-    const response = await fetch(finalUrl, {
-      method: 'GET',
-      headers: HEADERS,
-    });
-    if (!response.ok) {
-      throw new NetworkError(SERVICES_API_KEY.DuneSim, response.status)
-    }
+    const res = await fetch(finalUrl, { method: "GET", headers: HEADERS });
+    if (!res.ok) throw new NetworkError(SERVICES_API_KEY.DuneSim, res.status);
 
-    const json = await response.json();
-    const activity =  json?.activity || [];
-    return activity.map((item) => flattenObject(item))
+    const json = await res.json();
+    const data =
+      type === "activity" ? json?.activity ?? json ?? [] :
+      type === "token_holders" ? json?.holders ?? json ?? [] :
+      type === "price" ? json?.tokens ?? json ?? [] :
+      json ?? [];
+    const result = data.map((item) => flattenObject(item));
+    console.log({result});
+    return result
   } catch (err) {
-    return errorMessageHandler(err, 'DUNESIM')
+    return errorMessageHandler(err, "DUNESIM");
   }
 }
 
+
+// (async () => {
+//   // Example: activity
+//   // const res1 = await DUNESIM('activity', '0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045', "eth", 5);
+//   // console.log('Activity result:', res1, res1.length);
+
+//   // // Example: price (token-info)
+//   // const res2 = await DUNESIM('price', 'eth', '1,6,24', "", 5);
+//   // console.log('Price result:', res2);
+
+//   // // Example: token holders
+//   const res3 = await DUNESIM('token_holders', '0x63706e401c06ac8513145b7687A14804d17f814b', "8453", 5);
+//   console.log('Holders result:', res3, res3.length);
+// })();
+
 // export {GNOSISPAY} from './gnosispay/gnosispay.js'
 
 

package/lib/esm/index.mjs

@@ -1269,7 +1269,6 @@ function ROWS(array) {
  * @returns
  */
 function SORT(array, sort_index = 1, sort_order = 1, by_col = false) {
-  // Accept multiple sort keys like Google Sheets: SORT(range, sort_column, is_ascending, [sort_column2, is_ascending2, ...])
   if (!array || !Array.isArray(array)) {
     return na
   }
@@ -1278,104 +1277,37 @@ function SORT(array, sort_index = 1, sort_order = 1, by_col = false) {
     return 0
   }
 
-  by_col = parseBool(by_col);
-  if (typeof by_col !== 'boolean') {
-    return name
-  }
-
-  // Collect sort keys (index and order). First key comes from sort_index/sort_order.
-  const sortKeys = [];
-
-  const normalizeOrder = (o) => {
-    // Try boolean first (TRUE -> ascending)
-    const b = parseBool(o);
-    if (typeof b === 'boolean') {
-      return b ? 1 : -1
-    }
-
-    const n = parseNumber(o);
-    if (n === 1 || n === -1) {
-      return n
-    }
-
-    return null
-  };
-
-  const firstIndex = parseNumber(sort_index);
-  if (!firstIndex || firstIndex < 1) {
+  sort_index = parseNumber(sort_index);
+  if (!sort_index || sort_index < 1) {
     return value
   }
 
-  const firstOrder = normalizeOrder(sort_order);
-  if (firstOrder === null) {
+  sort_order = parseNumber(sort_order);
+  if (sort_order !== 1 && sort_order !== -1) {
     return value
   }
 
-  sortKeys.push({ index: firstIndex, order: firstOrder });
-
-  // Additional args may contain more sort_index/sort_order pairs
-  if (arguments.length > 4) {
-    // arguments: 0=array,1=sort_index,2=sort_order,3=by_col,4=nextIndex,5=nextOrder,...
-    for (let i = 4; i < arguments.length; i += 2) {
-      const idx = parseNumber(arguments[i]);
-      if (!idx || idx < 1) {
-        return value
-      }
-
-      const ordArg = i + 1 < arguments.length ? arguments[i + 1] : 1;
-      const ord = normalizeOrder(ordArg);
-      if (ord === null) {
-        return value
-      }
-
-      sortKeys.push({ index: idx, order: ord });
-    }
-  }
-
-  const matrix = fillMatrix(array);
-  const working = by_col ? transpose(matrix) : matrix;
-
-  // Validate that all sort indexes are within column bounds
-  const numCols = working[0] ? working[0].length : 0;
-  for (const k of sortKeys) {
-    if (k.index < 1 || k.index > numCols) {
-      return value
-    }
+  by_col = parseBool(by_col);
+  if (typeof by_col !== 'boolean') {
+    return name
   }
 
-  const parseForCompare = (val) => {
-    // Preserve numbers when possible
-    if (typeof val === 'number') return val
-    const num = parseNumber(val);
-    if (typeof num === 'number' && !Number.isNaN(num)) return num
-    return parseString(val)
-  };
-
-  const comparator = (aRow, bRow) => {
-    for (const k of sortKeys) {
-      const aVal = parseForCompare(aRow[k.index - 1]);
-      const bVal = parseForCompare(bRow[k.index - 1]);
+  const sortArray = (arr) =>
+    arr.sort((a, b) => {
+      a = parseString(a[sort_index - 1]);
+      b = parseString(b[sort_index - 1]);
 
-      if (aVal === bVal) continue
-
-      // Numeric comparison if both are numbers
-      if (typeof aVal === 'number' && typeof bVal === 'number') {
-        return (aVal < bVal ? -1 : 1) * k.order
-      }
-
-      // String comparison
-      const aStr = String(aVal).toLowerCase();
-      const bStr = String(bVal).toLowerCase();
-      return aStr.localeCompare(bStr) * k.order
-    }
-
-    return 0
-  };
+      return sort_order === 1 ? (a < b ? sort_order * -1 : sort_order) : a > b ? sort_order : sort_order * -1
+    });
 
-  // Sort in-place and return
-  working.sort(comparator);
+  const matrix = fillMatrix(array);
+  const result = by_col ? transpose(matrix) : matrix;
 
-  return by_col ? transpose(working) : working
+  return sort_index >= 1 && sort_index <= result[0].length
+    ? by_col
+      ? transpose(sortArray(result))
+      : sortArray(result)
+    : value
 }
 
 /**
@@ -18574,11 +18506,44 @@ async function TALLY() {
   }
 }
 
-const duneSimParamsSchema = objectType({
-  wallet: stringType().nonempty(),
-  type: enumType(['activity']),
+const historicalPrices = stringType()
+  .regex(/^\s*(\d{1,2})(\s*,\s*\d{1,2}){0,2}\s*$/, "Up to 3 comma-separated hour offsets")
+  .refine((s) => s.split(",").map((x) => +x.trim()).every((n) => n >= 1 && n <= 24), {
+    message: "Each offset must be between 1 and 24",
+  });
+
+
+
+const activity = objectType({
+  type: literalType("activity"),
+  input1: stringType().nonempty(), // wallet address / ens name
+  input2: stringType().optional(), // chain id. / name
+  input3: numberType().int().min(1).max(100).optional(), // limit
+});
+
+const tokenHolders = objectType({
+  type: literalType("token_holders"),
+  input1: stringType().nonempty(), // expects token address
+  input2: stringType().nonempty(), // chain id / name
+  input3: numberType().int().min(1).max(500).optional() // limit
 });
 
+
+const price = objectType({
+  type: literalType("price"),
+  input1: stringType().nonempty(), // chain name / id
+  input2: historicalPrices.optional(), // history prices
+  input3: stringType().optional(), // contract address
+  input4: numberType().int().min(1).max(500).optional() // limit
+});
+
+
+const duneSimParamsSchema = discriminatedUnionType("type", [
+  activity,
+  price,
+  tokenHolders
+]);
+
 function flattenObject(obj, parentKey = '', res = {}) {
   for (let key in obj) {
     if (!Object.prototype.hasOwnProperty.call(obj, key)) continue;
@@ -18601,47 +18566,101 @@ function flattenObject(obj, parentKey = '', res = {}) {
   return res;
 }
 
-/* global window */
+const SUPPORTED_TOKEN_NAMES = {
+  "eth": 1,            // Ethereum Mainnet
+  "base": 8453,        // Base
+  "polygon": 137,      // Polygon
+  "arbitrum": 42161,   // Arbitrum One
+  "optimism": 10,      // Optimism
+  "gnosis": 100,       // Gnosis Chain (xDai)
+  "bsc": 56,           // Binance Smart Chain
+  "avalanche": 43114,  // Avalanche C-Chain
+  "fantom": 250,       // Fantom Opera
+  "scroll": 534352,    // Scroll
+  "linea": 59144       // Linea
+};
 
 
 
+async function DUNESIM() {
+  try {
+    const [type, input1, input2, input3, input4] = argsToArray(arguments);
+
+    validateParams(duneSimParamsSchema, { type, input1, input2, input3, input4 });
 
+    let route = "";
 
+    // Helper to assemble query pieces
+    const buildQuery = (pairs) => {
+      const parts = pairs
+        // eslint-disable-next-line no-unused-vars
+        .filter(([_, v]) => v !== undefined && v !== '')
+        .map(([k, v]) => `${k}=${encodeURIComponent(v)}`);
+      return parts.length ? `?${parts.join('&')}` : '';
+    };
 
+    if (type === 'activity') {
+      const address = await fromEnsNameToAddress$1.validateAndGetAddress(input1);
+      const qs = buildQuery([['chain_ids', SUPPORTED_TOKEN_NAMES[input2] || input2], ['limit', input3]]);
+      route = `activity/${address}${qs}`;
+    }
 
-async function DUNESIM() {
-  try {
-    const [type, wallet] = argsToArray(arguments);
+    if (type === 'price') {
+      const chain = SUPPORTED_TOKEN_NAMES[input1] || input2;
+      const qs = buildQuery([
+        ['chain_ids', chain],
+        ['historical_prices', input3],
+        ['limit', input4],
+      ]);
+      route = `token-info/native${qs}`;
+    }
+
+    if (type === 'token_holders') {
+      const qs = buildQuery([['limit', input3]]);
+      const chain = SUPPORTED_TOKEN_NAMES[input2] || input2;
+      route = `token-holders/${chain}/${input1}${qs}`;
+    }
 
-    validateParams(duneSimParamsSchema, { wallet, type });
-    const address = await fromEnsNameToAddress$1.validateAndGetAddress(wallet);
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.DuneSim);
-    const url = `https://api.sim.dune.com/v1/evm/activity/${address}`;
+    const url = `https://api.sim.dune.com/v1/evm/${route}`;
 
     const { URL: finalUrl, HEADERS } = getUrlAndHeaders({
-      url: url, serviceName: 'DuneSim',
-        headers: {
-          'X-Sim-Api-Key': apiKey,
-        }
-      
+      url, serviceName: "DuneSim",
+      headers: { "X-Sim-Api-Key": apiKey },
     });
 
-    const response = await fetch(finalUrl, {
-      method: 'GET',
-      headers: HEADERS,
-    });
-    if (!response.ok) {
-      throw new NetworkError(SERVICES_API_KEY.DuneSim, response.status)
-    }
+    const res = await fetch(finalUrl, { method: "GET", headers: HEADERS });
+    if (!res.ok) throw new NetworkError(SERVICES_API_KEY.DuneSim, res.status);
 
-    const json = await response.json();
-    const activity =  json?.activity || [];
-    return activity.map((item) => flattenObject(item))
+    const json = await res.json();
+    const data =
+      type === "activity" ? json?.activity ?? json ?? [] :
+      type === "token_holders" ? json?.holders ?? json ?? [] :
+      type === "price" ? json?.tokens ?? json ?? [] :
+      json ?? [];
+    const result = data.map((item) => flattenObject(item));
+    console.log({result});
+    return result
   } catch (err) {
-    return errorMessageHandler(err, 'DUNESIM')
+    return errorMessageHandler(err, "DUNESIM");
   }
 }
 
+
+// (async () => {
+//   // Example: activity
+//   // const res1 = await DUNESIM('activity', '0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045', "eth", 5);
+//   // console.log('Activity result:', res1, res1.length);
+
+//   // // Example: price (token-info)
+//   // const res2 = await DUNESIM('price', 'eth', '1,6,24', "", 5);
+//   // console.log('Price result:', res2);
+
+//   // // Example: token holders
+//   const res3 = await DUNESIM('token_holders', '0x63706e401c06ac8513145b7687A14804d17f814b', "8453", 5);
+//   console.log('Holders result:', res3, res3.length);
+// })();
+
 // export {GNOSISPAY} from './gnosispay/gnosispay.js'
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/formulajs",
-  "version": "4.4.12-mod-3-patch-1",
+  "version": "4.4.12-mod-5",
   "description": "JavaScript implementation of most Microsoft Excel formula functions",
   "author": "Formulajs",
   "publishConfig": {

package/types/cjs/index.d.cts

@@ -3788,7 +3788,7 @@ export function SMARTCONTRACT(...args: any[]): Promise<any>;
  * @param {*} by_col Optional. A logical value indicating the desired sort direction; FALSE to sort by row (default), TRUE to sort by column
  * @returns
  */
-export function SORT(array: any, sort_index?: any, sort_order?: any, by_col?: any, ...args: any[]): any;
+export function SORT(array: any, sort_index?: any, sort_order?: any, by_col?: any): any;
 /**
  * Returns a positive square root.
  *

package/types/esm/index.d.mts

@@ -3788,7 +3788,7 @@ export function SMARTCONTRACT(...args: any[]): Promise<any>;
  * @param {*} by_col Optional. A logical value indicating the desired sort direction; FALSE to sort by row (default), TRUE to sort by column
  * @returns
  */
-export function SORT(array: any, sort_index?: any, sort_order?: any, by_col?: any, ...args: any[]): any;
+export function SORT(array: any, sort_index?: any, sort_order?: any, by_col?: any): any;
 /**
  * Returns a positive square root.
  *