@fileverse-dev/formulajs 4.4.20-mod-2 → 4.4.20-mod-4

package/lib/browser/formula.js

@@ -1,4 +1,4 @@
-/* @fileverse-dev/formulajs v4.4.20-mod-2 */
+/* @fileverse-dev/formulajs v4.4.20-mod-4 */
 var _excluded = [ "confirmations", "dataDecoded" ];
 
 function _objectWithoutProperties(e, t) {
@@ -4962,11 +4962,8 @@ function _typeof(o) {
     }
     return result;
   }
-  function XLOOKUP(search_key, lookup_range, result_range, missing_value, isCol, match_mode, search_mode) {
-    var ERROR_NA = "#N/A";
-    var ERROR_REF = "#REF!";
-    var ERROR_VALUE = "#VALUE!";
-    var ERROR_NUM = "#NUM!";
+  function XLOOKUP(search_key, lookup_range, result_range, missing_value, isColV, match_mode, search_mode) {
+    var isCol = isColV === "true" ? true : false;
     console.log("XLOOKUP parameters:", {
       search_key: search_key,
       lookup_range: lookup_range,
@@ -4978,44 +4975,53 @@ function _typeof(o) {
     });
     if (search_key === undefined || search_key === null) {
       console.log("Error: search_key is required");
-      return ERROR_VALUE;
+      return new Error("Error: search_key is required");
     }
     if (!lookup_range || !result_range) {
       console.log("Error: lookup_range and result_range are required");
-      return ERROR_REF;
+      return new Error("Error: lookup_range and result_range are required");
     }
     var lookup_array = normalizeLookupRange(lookup_range);
     if (!lookup_array) {
       console.log("Error: lookup_range must be a singular row or column");
-      return ERROR_REF;
+      return new Error("Error: lookup_range must be a singular row or column");
     }
     var result_array = normalizeResultRange(result_range);
     if (!result_array) {
       console.log("Error: Invalid result_range");
-      return ERROR_REF;
+      return new Error("Error: Invalid result_range");
     }
-    result_array.length === 1;
-    missing_value = missing_value !== undefined ? missing_value : ERROR_NA;
+    result_array.map((function(row) {
+      if (row.length !== lookup_array.length) {
+        console.log("Error: lookup_range and result_range must have the same number of columns");
+        return new Error("Error: lookup_range and result_range must have the same number of columns/rows");
+      }
+    }));
+    missing_value = missing_value !== undefined ? missing_value : new Error("Error: Didn't find value in XLOOKUP evaluation");
     match_mode = match_mode !== undefined ? match_mode : 0;
     search_mode = search_mode !== undefined ? search_mode : 1;
     isCol = isCol !== undefined ? isCol : false;
     if (![ 0, 1, -1, 2 ].includes(match_mode)) {
       console.log("Error: match_mode must be 0, 1, -1, or 2");
-      return ERROR_NUM;
+      return new Error("Error: match_mode must be 0, 1, -1, or 2");
     }
     if (![ 1, -1, 2, -2 ].includes(search_mode)) {
       console.log("Error: search_mode must be 1, -1, 2, or -2");
-      return ERROR_NUM;
+      return new Error("Error: search_mode must be 1, -1, 2, or -2");
     }
     if (Math.abs(search_mode) === 2 && match_mode === 2) {
       console.log("Error: Binary search (search_mode ±2) cannot be used with wildcard matching (match_mode 2)");
-      return ERROR_VALUE;
+      return new Error("Error: Binary search (search_mode ±2) cannot be used with wildcard matching (match_mode 2)");
     }
     console.log("Normalized arrays:", {
       lookup_array: lookup_array,
       result_array: result_array
     });
-    return performLookup(search_key, lookup_array, result_array, missing_value, match_mode, search_mode, isCol);
+    var res = performLookup(search_key, lookup_array, result_array, missing_value, match_mode, search_mode, isCol);
+    res = isCol ? Array.isArray(res) ? res.map((function(item) {
+      return [ item.toString() ];
+    })) : res : res;
+    return res;
   }
   function normalizeLookupRange(lookup_range) {
     if (!Array.isArray(lookup_range)) {
@@ -5058,6 +5064,7 @@ function _typeof(o) {
       isCol: isCol
     });
     var foundIndex = -1;
+    var isSingleResultRow = result_array.length === 1;
     switch (match_mode) {
      case 0:
       foundIndex = findExactMatch(search_key, lookup_array, search_mode);
@@ -5076,26 +5083,23 @@ function _typeof(o) {
       break;
     }
     if (foundIndex === -1) {
-      if (result_array[0].length > 1) {
-        var errorArray = new Array(result_array[0].length).fill(missing_value);
-        if (isCol) {
-          return errorArray.map((function(val) {
-            return [ val ];
-          }));
-        } else {
-          return errorArray;
-        }
+      return missing_value;
+    }
+    if (isSingleResultRow) {
+      var resultRow = result_array[0];
+      if (isCol) {
+        return resultRow.map((function(val) {
+          return [ val ];
+        }));
       } else {
-        return missing_value;
+        return resultRow;
       }
-    }
-    if (result_array[0].length === 1) {
-      return result_array[foundIndex][0];
     } else {
       if (isCol) {
-        return result_array[foundIndex].map((function(val) {
-          return [ val ];
+        var columnValues = result_array.map((function(row) {
+          return row[foundIndex];
         }));
+        return columnValues;
       } else {
         return result_array[foundIndex];
       }