@fileverse-dev/formulajs 4.4.18 → 4.4.20-mod-1

package/lib/browser/formula.js

@@ -1,4 +1,4 @@
-/* @fileverse-dev/formulajs v4.4.18 */
+/* @fileverse-dev/formulajs v4.4.20-mod-1 */
 var _excluded = [ "confirmations", "dataDecoded" ];
 
 function _objectWithoutProperties(e, t) {
@@ -4854,65 +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 is_ascending = arguments.length > 2 ? arguments[2] : undefined;
-    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;
-    var idx = parseNumber(sort_index);
-    if (!idx || idx < 1) return value;
-    idx = idx - 1;
-    var sortOrderNumber = is_ascending === "FALSE" ? -1 : 1;
-    var order = parseNumber(sortOrderNumber);
-    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) {
+  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 === null || isAscending === void 0 ? void 0 : 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;
     }
-    var isBlank = function isBlank(v) {
-      return v === "" || v === null || v === undefined;
+    var isBlank = function isBlank(value) {
+      return value === "" || value === null || value === undefined;
     };
-    var cmp = function cmp(a, b) {
+    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 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;
+      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 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;
+      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 decorated = working.map((function(row, i) {
+    var rowsWithOriginalIndex = orientedMatrix.map((function(row, rowIndex) {
       return {
         row: row,
-        i: i
+        rowIndex: rowIndex
       };
     }));
-    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;
+    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 sorted = decorated.map((function(d) {
-      return d.row;
+    var sortedMatrix = rowsWithOriginalIndex.map((function(item) {
+      return item.row;
     }));
-    return byCol ? transpose(sorted) : sorted;
+    return isSortByColumn ? transpose(sortedMatrix) : sortedMatrix;
   }
   function TRANSPOSE(array) {
     if (!array) {
@@ -4962,6 +4962,101 @@ function _typeof(o) {
     }
     return result;
   }
+  function XLOOKUP(lookup_value, lookup_array, return_array, if_not_found, match_mode, search_mode) {
+    var ERROR_NA = "#N/A";
+    var ERROR_REF = "#REF!";
+    console.log("XLOOKUP parameters:", {
+      lookup_value: lookup_value,
+      lookup_array: lookup_array,
+      return_array: return_array,
+      if_not_found: if_not_found,
+      match_mode: match_mode,
+      search_mode: search_mode
+    });
+    console.log("XLOOKUP called with:", {
+      lookup_value: lookup_value,
+      lookup_array: lookup_array,
+      return_array: return_array,
+      if_not_found: if_not_found,
+      match_mode: match_mode,
+      search_mode: search_mode
+    });
+    if (typeof return_array === "number" && Array.isArray(lookup_array) && Array.isArray(lookup_array[0])) {
+      console.log("Detected VLOOKUP-style call");
+      var table_array = lookup_array;
+      var col_index_num = return_array;
+      var range_lookup = !(if_not_found === "false" || if_not_found === false || if_not_found === 0);
+      if (col_index_num < 1 || col_index_num > table_array[0].length) {
+        return ERROR_REF;
+      }
+      var _lookup_col = table_array.map((function(row) {
+        return row[0];
+      }));
+      var _return_col = table_array.map((function(row) {
+        return row[col_index_num - 1];
+      }));
+      return performLookup(lookup_value, _lookup_col, _return_col, ERROR_NA, range_lookup ? -1 : 0);
+    }
+    console.log("Detected standard XLOOKUP call");
+    if (!lookup_array || !return_array) {
+      console.log("Missing lookup_array or return_array");
+      return ERROR_NA;
+    }
+    var lookup_col = lookup_array;
+    var return_col = return_array;
+    if (Array.isArray(lookup_array) && Array.isArray(lookup_array[0])) {
+      lookup_col = lookup_array.map((function(row) {
+        return row[0];
+      }));
+      console.log("Extracted lookup column from 2D array:", lookup_col);
+    }
+    if (Array.isArray(return_array) && Array.isArray(return_array[0])) {
+      return_col = return_array.map((function(row) {
+        return row[0];
+      }));
+      console.log("Extracted return column from 2D array:", return_col);
+    }
+    if (lookup_col.length !== return_col.length) {
+      console.log("Array length mismatch:", lookup_col.length, "vs", return_col.length);
+      return ERROR_NA;
+    }
+    if_not_found = if_not_found !== undefined ? if_not_found : ERROR_NA;
+    match_mode = match_mode || 0;
+    search_mode = search_mode || 1;
+    return performLookup(lookup_value, lookup_col, return_col, if_not_found, match_mode, search_mode);
+  }
+  function performLookup(lookup_value, lookup_array, return_array, if_not_found, match_mode, search_mode) {
+    var isNumberLookup = typeof lookup_value === "number";
+    var lookupValue = typeof lookup_value === "string" ? lookup_value.toLowerCase().trim() : lookup_value;
+    var bestMatchIndex = -1;
+    console.log("XLOOKUP Debug:", {
+      looking_for: lookup_value,
+      processed_lookup: lookupValue,
+      lookup_array: lookup_array,
+      return_array: return_array,
+      match_mode: match_mode
+    });
+    var startIndex = search_mode === -1 ? lookup_array.length - 1 : 0;
+    var endIndex = search_mode === -1 ? -1 : lookup_array.length;
+    var step = search_mode === -1 ? -1 : 1;
+    for (var i = startIndex; i !== endIndex; i += step) {
+      var rawValue = lookup_array[i];
+      var arrayValue = typeof rawValue === "string" ? rawValue.toLowerCase().trim() : rawValue;
+      console.log('Comparing: "'.concat(lookupValue, '" === "').concat(arrayValue, '" (types: ').concat(_typeof(lookupValue), " vs ").concat(_typeof(arrayValue), ")"));
+      if (arrayValue === lookupValue) {
+        console.log("Found match at index ".concat(i, ": ").concat(return_array[i]));
+        return return_array[i];
+      }
+      if (match_mode === -1) {
+        if (isNumberLookup && typeof arrayValue === "number" && arrayValue <= lookup_value || !isNumberLookup && typeof arrayValue === "string" && arrayValue.localeCompare(lookupValue) <= 0) {
+          bestMatchIndex = i;
+          console.log("Approximate match candidate at index ".concat(i, ": ").concat(arrayValue));
+        }
+      }
+    }
+    console.log("No exact match found. Returning: ".concat(bestMatchIndex !== -1 ? return_array[bestMatchIndex] : if_not_found));
+    return bestMatchIndex !== -1 ? return_array[bestMatchIndex] : if_not_found;
+  }
   function CHAR(number) {
     number = parseNumber(number);
     if (number === 0) {
@@ -19206,6 +19301,7 @@ function _typeof(o) {
   exports.WORKDAYINTL = WORKDAYINTL;
   exports.WORKDAY_INTL = WORKDAY_INTL;
   exports.XIRR = XIRR;
+  exports.XLOOKUP = XLOOKUP;
   exports.XNPV = XNPV;
   exports.XOR = XOR;
   exports.YEAR = YEAR;