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

package/lib/cjs/index.cjs

@@ -1442,50 +1442,44 @@ function VLOOKUP(lookup_value, table_array, col_index_num, range_lookup) {
 }
 
 function XLOOKUP(search_key, lookup_range, result_range, missing_value, isCol,match_mode, search_mode) {
-  // Error constants
-  const ERROR_NA = '#N/A';
-  const ERROR_REF = '#REF!';
-  const ERROR_VALUE = '#VALUE!';
-  const ERROR_NUM = '#NUM!';
-
-  console.log('XLOOKUP parameters:', { search_key, lookup_range, result_range, missing_value, match_mode, search_mode, isCol });
+console.log('XLOOKUP parameters:', { search_key, lookup_range, result_range, missing_value, match_mode, search_mode, isCol });
   
   // Validate required parameters
   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')
   }
   
   // Validate and normalize lookup_range (must be singular row or column)
   let 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')
   }
   
   // Validate and normalize result_range
   let result_array = normalizeResultRange(result_range);
   if (!result_array) {
     console.log('Error: Invalid result_range');
-    return ERROR_REF
+    return new Error('Error: Invalid result_range')
   }
   
   // Validate that lookup and result ranges have compatible dimensions
-  // Exception: if result_range is a single row, it can be returned regardless of lookup_range length
-  result_array.length === 1;
-  
-//   if (!isSingleResultRow && lookup_array.length !== result_array.length) {
-//     console.log('Error: lookup_range and result_range must have the same number of rows/entries (unless result_range is a single row)')
-//     return ERROR_REF
-//   }
+  // Exception: if result_range is a single row, it can be returned regardless of lookup_range length  
+result_array.map((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')
+    }
+  });
   
   // Set default parameter values
-  missing_value = missing_value !== undefined ? missing_value : ERROR_NA;
+  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;
@@ -1493,24 +1487,26 @@ function XLOOKUP(search_key, lookup_range, result_range, missing_value, isCol,ma
   // Validate match_mode
   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')
   }
   
   // Validate search_mode
   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')
   }
   
   // Validate binary search requirements
   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, result_array });
   
-  return performLookup(search_key, lookup_array, result_array, missing_value, match_mode, search_mode, isCol)
+  let res = performLookup(search_key, lookup_array, result_array, missing_value, match_mode, search_mode, isCol);
+  res = isCol ? Array.isArray(res)?res.map((item) => [item.toString()]):res : res;
+  return res
 }
 
 function normalizeLookupRange(lookup_range) {
@@ -1558,6 +1554,7 @@ function performLookup(search_key, lookup_array, result_array, missing_value, ma
   console.log('performLookup called with:', { search_key, lookup_array, result_array, missing_value, match_mode, search_mode, isCol });
   
   let foundIndex = -1;
+  const isSingleResultRow = result_array.length === 1;
   
   // Handle different match modes
   switch (match_mode) {
@@ -1576,34 +1573,27 @@ function performLookup(search_key, lookup_array, result_array, missing_value, ma
   }
   
   if (foundIndex === -1) {
-    // No match found
-    if (result_array[0].length > 1) {
-      // Multiple columns
-      const errorArray = new Array(result_array[0].length).fill(missing_value);
-      if (isCol) {
-        // Return as column format: [["error"], ["error"], ...]
-        return errorArray.map(val => [val])
-      } else {
-        // Return as row format: ["error", "error", ...]
-        return errorArray
-      }
-    } else {
-      // Single column - return single missing value (isCol doesn't affect single values)
-      return missing_value
-    }
+        // Return missing_value (single value): "yoo"
+        return missing_value
   }
   
   // Return the result
-  if (result_array[0].length === 1) {
-    // Single column result - isCol doesn't affect single values
-    return result_array[foundIndex][0]
+  if (isSingleResultRow) {
+    // Single result row - return the entire row regardless of where match was found
+    const resultRow = result_array[0];
+    if (isCol) {
+      return resultRow.map(val => [val])
+    } else {
+      return resultRow
+    }
   } else {
-    // Multiple column result
+    // Multiple result rows
     if (isCol) {
-      // Return as column format: [["val1"], ["val2"], ["val3"]]
-      return result_array[foundIndex].map(val => [val])
+      // Return the foundIndex column from all rows: ["e", "r"]
+      const columnValues = result_array.map(row => row[foundIndex]);
+      return columnValues
     } else {
-      // Return as row format: ["val1", "val2", "val3"]
+      // Return the entire matched row: ["e", 3, "s", "hj"]
       return result_array[foundIndex]
     }
   }

package/lib/esm/index.mjs

@@ -1440,50 +1440,44 @@ function VLOOKUP(lookup_value, table_array, col_index_num, range_lookup) {
 }
 
 function XLOOKUP(search_key, lookup_range, result_range, missing_value, isCol,match_mode, search_mode) {
-  // Error constants
-  const ERROR_NA = '#N/A';
-  const ERROR_REF = '#REF!';
-  const ERROR_VALUE = '#VALUE!';
-  const ERROR_NUM = '#NUM!';
-
-  console.log('XLOOKUP parameters:', { search_key, lookup_range, result_range, missing_value, match_mode, search_mode, isCol });
+console.log('XLOOKUP parameters:', { search_key, lookup_range, result_range, missing_value, match_mode, search_mode, isCol });
   
   // Validate required parameters
   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')
   }
   
   // Validate and normalize lookup_range (must be singular row or column)
   let 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')
   }
   
   // Validate and normalize result_range
   let result_array = normalizeResultRange(result_range);
   if (!result_array) {
     console.log('Error: Invalid result_range');
-    return ERROR_REF
+    return new Error('Error: Invalid result_range')
   }
   
   // Validate that lookup and result ranges have compatible dimensions
-  // Exception: if result_range is a single row, it can be returned regardless of lookup_range length
-  result_array.length === 1;
-  
-//   if (!isSingleResultRow && lookup_array.length !== result_array.length) {
-//     console.log('Error: lookup_range and result_range must have the same number of rows/entries (unless result_range is a single row)')
-//     return ERROR_REF
-//   }
+  // Exception: if result_range is a single row, it can be returned regardless of lookup_range length  
+result_array.map((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')
+    }
+  });
   
   // Set default parameter values
-  missing_value = missing_value !== undefined ? missing_value : ERROR_NA;
+  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;
@@ -1491,24 +1485,26 @@ function XLOOKUP(search_key, lookup_range, result_range, missing_value, isCol,ma
   // Validate match_mode
   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')
   }
   
   // Validate search_mode
   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')
   }
   
   // Validate binary search requirements
   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, result_array });
   
-  return performLookup(search_key, lookup_array, result_array, missing_value, match_mode, search_mode, isCol)
+  let res = performLookup(search_key, lookup_array, result_array, missing_value, match_mode, search_mode, isCol);
+  res = isCol ? Array.isArray(res)?res.map((item) => [item.toString()]):res : res;
+  return res
 }
 
 function normalizeLookupRange(lookup_range) {
@@ -1556,6 +1552,7 @@ function performLookup(search_key, lookup_array, result_array, missing_value, ma
   console.log('performLookup called with:', { search_key, lookup_array, result_array, missing_value, match_mode, search_mode, isCol });
   
   let foundIndex = -1;
+  const isSingleResultRow = result_array.length === 1;
   
   // Handle different match modes
   switch (match_mode) {
@@ -1574,34 +1571,27 @@ function performLookup(search_key, lookup_array, result_array, missing_value, ma
   }
   
   if (foundIndex === -1) {
-    // No match found
-    if (result_array[0].length > 1) {
-      // Multiple columns
-      const errorArray = new Array(result_array[0].length).fill(missing_value);
-      if (isCol) {
-        // Return as column format: [["error"], ["error"], ...]
-        return errorArray.map(val => [val])
-      } else {
-        // Return as row format: ["error", "error", ...]
-        return errorArray
-      }
-    } else {
-      // Single column - return single missing value (isCol doesn't affect single values)
-      return missing_value
-    }
+        // Return missing_value (single value): "yoo"
+        return missing_value
   }
   
   // Return the result
-  if (result_array[0].length === 1) {
-    // Single column result - isCol doesn't affect single values
-    return result_array[foundIndex][0]
+  if (isSingleResultRow) {
+    // Single result row - return the entire row regardless of where match was found
+    const resultRow = result_array[0];
+    if (isCol) {
+      return resultRow.map(val => [val])
+    } else {
+      return resultRow
+    }
   } else {
-    // Multiple column result
+    // Multiple result rows
     if (isCol) {
-      // Return as column format: [["val1"], ["val2"], ["val3"]]
-      return result_array[foundIndex].map(val => [val])
+      // Return the foundIndex column from all rows: ["e", "r"]
+      const columnValues = result_array.map(row => row[foundIndex]);
+      return columnValues
     } else {
-      // Return as row format: ["val1", "val2", "val3"]
+      // Return the entire matched row: ["e", 3, "s", "hj"]
       return result_array[foundIndex]
     }
   }

package/package.json

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