@fileverse-dev/formulajs 4.4.37 → 4.4.38-col-3

package/lib/esm/index.mjs

@@ -8102,20 +8102,32 @@ const WEEKEND_TYPES = [
   [6, 6]
 ];
 
-const datePartition = (date) => {
+const datePartition = (date, utc = false) => {
   const pad = (n) => n.toString().padStart(2, "0");
 
-  const day = pad(date.getUTCDate());
-  const month = pad(date.getUTCMonth() + 1);
-  const year = date.getUTCFullYear();
-  const hours = pad(date.getUTCHours());
-  const minutes = pad(date.getUTCMinutes());
-  const seconds = pad(date.getUTCSeconds());
+  const day = pad(utc ? date.getUTCDate() : date.getDate());
+  const month = pad(
+    (utc ? date.getUTCMonth() : date.getMonth()) + 1
+  );
+  const year = utc
+    ? date.getUTCFullYear()
+    : date.getFullYear();
+
+  const hours = pad(
+    utc ? date.getUTCHours() : date.getHours()
+  );
+  const minutes = pad(
+    utc ? date.getUTCMinutes() : date.getMinutes()
+  );
+  const seconds = pad(
+    utc ? date.getUTCSeconds() : date.getSeconds()
+  );
 
   return { day, month, year, hours, minutes, seconds };
 };
 
 
+
 /**
  * Returns the serial number of a particular date.
  *
@@ -8469,7 +8481,7 @@ function EPOCHTODATE(timestamp, timeUnit = 1) {
 
   const d = new Date(ms);
 
-  const { day, month, year, hours, minutes, seconds } = datePartition(d);
+  const { day, month, year, hours, minutes, seconds } = datePartition(d, true);
 
   return `${day}/${month}/${year} ${hours}:${minutes}:${seconds}`
 }
@@ -17683,15 +17695,16 @@ const aaveParamsSchema = objectType({
   category:  enumType(['tokens','markets']),
   param1:    stringType().nonempty(),
   param2:    stringType().optional(),
+  columnName: stringType().optional(),
 });
 
 async function AAVE() {
   try {
 
-    const [graphType, category, param1, param2] = argsToArray(arguments);
+    const [graphType, category, param1, param2, columnName] = argsToArray(arguments);
 
 
-    validateParams(aaveParamsSchema, { graphType, category, param1, param2 });
+    validateParams(aaveParamsSchema, { graphType, category, param1, param2, columnName });
 
     const baseUrl = 'https://onchain-proxy.fileverse.io/third-party';
     const url =
@@ -17708,16 +17721,25 @@ async function AAVE() {
     }
 
     const json = await res.json();
+    const filterColumnName = columnName?.split(',').map(s => s.trim());
+
     if (Array.isArray(json)) {
       return json.map(item => {
         const flat = {};
         Object.entries(item).forEach(([k, v]) => {
-          if (v === null || typeof v !== 'object') flat[k] = v;
+          if ((columnName && filterColumnName.includes(k)) && (v === null || typeof v !== 'object')) flat[k] = v;
         });
         return flat
       })
     }
-    return json
+    if(columnName && typeof json === 'object') {
+      const data = {};
+      filterColumnName.forEach(k => {
+        data[k] = json[k];
+      });
+      return data
+    }
+    return json;
   } catch (err) {
     return errorMessageHandler(err, 'AAVE')
   }
@@ -17757,6 +17779,7 @@ const baseSchema = objectType({
   endTime:   dateOrTimestamp.optional(),
   page:      numberType().int().nonnegative().default(1),
   offset:    numberType().int().nonnegative().max(MAX_PAGE_LIMIT, {message: `"offset" must be less than or equal to ${MAX_PAGE_LIMIT}`}).default(10),
+  columnName: stringType().optional(),
 });
 
 const eoaParamsSchema = preprocessType(
@@ -17986,9 +18009,9 @@ function toTimestamp(dateStr) {
 
 async function EOA() {
   try {
-    const [addresses, category, chains, startTime, endTime, page = 1, offset = 10] =
+    const [addresses, category, chains, startTime, endTime, page = 1, offset = 10, columnName = null] =
       argsToArray(arguments);
-    validateParams(eoaParamsSchema, { addresses, category, chains, startTime, endTime, page, offset });
+    validateParams(eoaParamsSchema, { addresses, category, chains, startTime, endTime, page, offset, columnName });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Etherscan);
 
@@ -18058,6 +18081,16 @@ async function EOA() {
         }
       }
     }
+    if(columnName){
+      const filterColumnName = columnName.split(',').map(s => s.trim());
+      return out.map(obj =>
+        Object.fromEntries(
+          filterColumnName
+            .filter(key => key in obj)
+            .map(key => [key, obj[key]])
+        )
+      );
+    }
     return out
   } catch (err) {
     return errorMessageHandler(err, 'EOA')
@@ -18070,6 +18103,7 @@ const gasSchema$1 = objectType({
   endDate:   dateOrTimestamp.optional(),
   page:      numberType().int().nonnegative().default(1),
   limit:     numberType().int().nonnegative().max(MAX_PAGE_LIMIT, {message: `"limit" must be less than or equal to ${MAX_PAGE_LIMIT}`}).default(10),
+  columnName: stringType().optional(),
 });
 
 const txnSchema$1 = objectType({
@@ -18079,6 +18113,7 @@ const txnSchema$1 = objectType({
   endDate:   dateOrTimestamp.optional(),
   page:      numberType().int().nonnegative().default(1),
   limit:     numberType().int().nonnegative().max(MAX_PAGE_LIMIT, {message: `"limit" must be less than or equal to ${MAX_PAGE_LIMIT}`}).default(10),
+  columnName: stringType().optional(),
 });
 
 const baseParamsSchema = discriminatedUnionType('type', [gasSchema$1, txnSchema$1]);
@@ -18155,11 +18190,11 @@ async function handleScanRequest({
 
 async function BASE() {
   try {
-    const [type, address, startDate, endDate, page, limit] = argsToArray(arguments);
-    validateParams(baseParamsSchema, { type, address, startDate, endDate, page, limit });
+    const [type, address, startDate, endDate, page, limit, columnName] = argsToArray(arguments);
+    validateParams(baseParamsSchema, { type, address, startDate, endDate, page, limit, columnName });
     const API_KEY = window.localStorage.getItem(SERVICES_API_KEY.Basescan);
 
-    return await handleScanRequest({
+    const out = await handleScanRequest({
       type,
       address,
       startDate,
@@ -18170,7 +18205,18 @@ async function BASE() {
       functionName: 'BASE',
       chainId: CHAIN_ID_MAP.base,
       network: 'base'
-    })
+    });
+    if (columnName) {
+      const filterColumnName = columnName.split(',').map(s => s.trim());
+      return out.map(obj =>
+        Object.fromEntries(
+          filterColumnName
+            .filter(key => key in obj)
+            .map(key => [key, obj[key]])
+        )
+      );
+    }
+    return out
   } catch (error) {
     return errorMessageHandler(error, 'BASE')
   }
@@ -18290,6 +18336,7 @@ const derivativesSchema = objectType({
   category: literalType('derivatives'),
   param1:   stringType().nonempty(),
   param2:   anyType().optional(),
+  columnName: stringType().optional(),
 });
 const coingeckoParamsSchema = discriminatedUnionType('category', [
   priceSchema$1,
@@ -18304,8 +18351,8 @@ const coingeckoParamsSchema = discriminatedUnionType('category', [
 
 async function COINGECKO() {
   try {
-    const [category, param1, param2] = argsToArray(arguments);
-    validateParams(coingeckoParamsSchema, { category, param1, param2 });
+    const [category, param1, param2, columnName = null] = argsToArray(arguments);
+    validateParams(coingeckoParamsSchema, { category, param1, param2, columnName });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Coingecko);
 
@@ -18340,7 +18387,7 @@ async function COINGECKO() {
         break
       }
     }
-    const {URL: finalUrl, HEADERS} = getUrlAndHeaders({url, serviceName: 'Coingecko', headers});
+    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url, serviceName: 'Coingecko', headers });
 
     const res = await fetch(finalUrl + "?refresh=true", { headers: HEADERS });
     const json = await res.json();
@@ -18366,6 +18413,16 @@ async function COINGECKO() {
           flat[key] = value;
         }
       }
+      if (columnName) {
+        const filterData = {};
+        const filterColumnName = columnName.split(',').map(s => s.trim());
+        filterColumnName.forEach(col => {
+          if (flat[col] !== undefined) {
+            filterData[col] = flat[col];
+          }
+        });
+        return filterData;
+      }
       return flat
     })
   } catch (err) {
@@ -18375,7 +18432,8 @@ async function COINGECKO() {
 
 const categories = ['protocols','yields','dex','fees'];
 const defillamaParamsSchema = objectType({
-  category: enumType(categories)
+  category: enumType(categories),
+  columnName: stringType().optional(),
 });
 
 const CATEGORY_URLS = {
@@ -18387,8 +18445,8 @@ const CATEGORY_URLS = {
 
 async function DEFILLAMA() {
   try {
-    const [category] = argsToArray(arguments);
-    validateParams(defillamaParamsSchema, { category });
+    const [category, columnName = null] = argsToArray(arguments);
+    validateParams(defillamaParamsSchema, { category, columnName });
     const url = CATEGORY_URLS[category];
     if (!url) throw new ValidationError(`Invalid category: ${category}`)
     const res = await fetch(url);
@@ -18408,10 +18466,12 @@ async function DEFILLAMA() {
         break
     }
 
+    const filterColumnName = columnName?.split(',').map(s => s.trim());
+
     return (Array.isArray(json) ? json : [json]).map(item => {
       const out = {};
       for (const [k, v] of Object.entries(item)) {
-        if (v === null || typeof v !== 'object') out[k] = v;
+        if ((columnName && filterColumnName.includes(k)) && (v === null || typeof v !== 'object')) out[k] = v;
       }
       return out
     })
@@ -18426,6 +18486,7 @@ const gasSchema = objectType({
   endDate:   dateOrTimestamp.optional(),
   page:      numberType().int().nonnegative().default(1),
   limit:     numberType().int().nonnegative().max(MAX_PAGE_LIMIT, {message: `"limit" must be less than or equal to ${MAX_PAGE_LIMIT}`}).default(10),
+  columnName: stringType().optional(),
 });
 
 const txnSchema = objectType({
@@ -18436,6 +18497,7 @@ const txnSchema = objectType({
     chain:     enumType(['ethereum','base','gnosis']),
   page:      numberType().int().nonnegative().default(1),
   limit:     numberType().int().nonnegative().max(MAX_PAGE_LIMIT, {message: `"limit" must be less than or equal to ${MAX_PAGE_LIMIT}`}).default(10),
+  columnName: stringType().optional(),
 });
 
 const etherscanParamsSchema = discriminatedUnionType('type', [gasSchema, txnSchema]);
@@ -18449,18 +18511,18 @@ const etherscanParamsSchema = discriminatedUnionType('type', [gasSchema, txnSche
 
 async function ETHERSCAN() {
   try {
-    const [type, chain, address, startDate, endDate, page = 1, limit = 10] =
+    const [type, chain, address, startDate, endDate, page = 1, limit = 10, columnName = null] =
       argsToArray(arguments);
 
 
-    validateParams(etherscanParamsSchema, { type, chain, address, startDate, endDate, page, limit });
+    validateParams(etherscanParamsSchema, { type, chain, address, startDate, endDate, page, limit, columnName });
 
     const chainId = CHAIN_ID_MAP[chain];
     if (!chainId) throw new ValidationError(`Invalid chain: ${chain}`)
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Etherscan);
 
-    return await handleScanRequest({
+    const out = await handleScanRequest({
       type,
       address,
       startDate,
@@ -18471,7 +18533,18 @@ async function ETHERSCAN() {
       functionName: 'ETHERSCAN',
       chainId,
       network: chain,
-    })
+    });
+    if (columnName) {
+      const filterColumnName = columnName.split(',').map(s => s.trim());
+      return out.map(obj =>
+        Object.fromEntries(
+          filterColumnName
+            .filter(key => key in obj)
+            .map(key => [key, obj[key]])
+        )
+      );
+    }
+    return out
   } catch (err) {
     return errorMessageHandler(err, 'ETHERSCAN')
   }
@@ -18910,13 +18983,14 @@ const uniswapParamsSchema = objectType({
   category:  enumType(['tokens','markets']),
   param1:    stringType().nonempty(),
   param2:    stringType().optional(),
+  colummnName: stringType().optional(),
 });
 
 async function UNISWAP() {
   try {
-    const [graphType, category, param1, param2] = argsToArray(arguments);
+    const [graphType, category, param1, param2, columnName] = argsToArray(arguments);
 
-    validateParams(uniswapParamsSchema, { graphType, category, param1, param2 });
+    validateParams(uniswapParamsSchema, { graphType, category, param1, param2, columnName });
 
     const baseUrl = 'https://onchain-proxy.fileverse.io/third-party';
     const url =
@@ -18934,16 +19008,24 @@ async function UNISWAP() {
     }
 
     const json = await res.json();
+    const filterColumnName = columnName?.split(',').map(s => s.trim());
     if (Array.isArray(json)) {
       // flatten nested
       return json.map(item => {
         const flat = {};
         Object.entries(item).forEach(([k, v]) => {
-          if (v === null || typeof v !== 'object') flat[k] = v;
+          if ((columnName && filterColumnName.includes(k)) && (v === null || typeof v !== 'object')) flat[k] = v;
         });
         return flat
       })
     }
+    if(columnName && typeof json === 'object') {
+      const data = {};
+      filterColumnName.forEach(k => {
+        data[k] = json[k];
+      });
+      return data
+    }
     return json
   } catch (err) {
     return errorMessageHandler(err, 'UNISWAP')
@@ -18953,6 +19035,7 @@ async function UNISWAP() {
 async function SMARTCONTRACT() {
   try {
     const args = argsToArray(arguments);
+    console.log(args, arguments);
 
     return new Promise((resolve) => {
     resolve( {
@@ -29856,14 +29939,15 @@ class CirclesData {
 const circlesParamsSchema = objectType({
   functionName: enumType(['trust', 'profile', 'transactions', 'balances']),
   address: stringType().nonempty(),
-  entries: numberType().int().nonnegative().default(10)
+  entries: numberType().int().nonnegative().default(10),
+  columnName: stringType().optional(),
 });
 
 async function CIRCLES() {
   try {
-    const [functionName, address, entries] = argsToArray(arguments);
+    const [functionName, address, entries, columnName] = argsToArray(arguments);
 
-    validateParams(circlesParamsSchema, { functionName, address, entries });
+    validateParams(circlesParamsSchema, { functionName, address, entries, columnName });
 
     const resolved = await fromEnsNameToAddress$1.validateAndGetAddress(address);
     const dataClient = new CirclesData('https://rpc.aboutcircles.com');
@@ -29881,10 +29965,34 @@ async function CIRCLES() {
 
     switch (functionName) {
       case 'trust':
-        return await runOnePage(dataClient.getTrustRelations(resolved, limit))
+        const dataTrust = await runOnePage(dataClient.getTrustRelations(resolved, limit));
+        if (columnName) {
+          const filterColumnName = columnName.split(',').map(s => s.trim());
+          return dataTrust.map(obj =>
+            Object.fromEntries(
+              filterColumnName
+                .filter(key => key in obj)
+                .map(key => [key, obj[key]])
+            )
+          );
+        } else {
+          return dataTrust;
+        }
 
       case 'transactions':
-        return await runOnePage(dataClient.getTransactionHistory(resolved, limit))
+        const data = await runOnePage(dataClient.getTransactionHistory(resolved, limit));
+        if (columnName) {
+          const filterColumnName = columnName.split(',').map(s => s.trim());
+          return data.map(obj =>
+            Object.fromEntries(
+              filterColumnName
+                .filter(key => key in obj)
+                .map(key => [key, obj[key]])
+            )
+          );
+        } else {
+          return data;
+        }
 
       case 'profile': {
         const res = await dataClient.getAvatarInfo(resolved);

package/package.json

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