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

package/lib/cjs/index.cjs

@@ -1271,6 +1271,7 @@ 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
   }
@@ -1279,37 +1280,104 @@ function SORT(array, sort_index = 1, sort_order = 1, by_col = false) {
     return 0
   }
 
-  sort_index = parseNumber(sort_index);
-  if (!sort_index || sort_index < 1) {
-    return value
+  by_col = parseBool(by_col);
+  if (typeof by_col !== 'boolean') {
+    return name
   }
 
-  sort_order = parseNumber(sort_order);
-  if (sort_order !== 1 && sort_order !== -1) {
+  // 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) {
     return value
   }
 
-  by_col = parseBool(by_col);
-  if (typeof by_col !== 'boolean') {
-    return name
+  const firstOrder = normalizeOrder(sort_order);
+  if (firstOrder === null) {
+    return value
   }
 
-  const sortArray = (arr) =>
-    arr.sort((a, b) => {
-      a = parseString(a[sort_index - 1]);
-      b = parseString(b[sort_index - 1]);
+  sortKeys.push({ index: firstIndex, order: firstOrder });
 
-      return sort_order === 1 ? (a < b ? sort_order * -1 : sort_order) : a > b ? sort_order : sort_order * -1
-    });
+  // 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 result = by_col ? transpose(matrix) : matrix;
+  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
+    }
+  }
+
+  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]);
+
+      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
+  };
+
+  // Sort in-place and return
+  working.sort(comparator);
 
-  return sort_index >= 1 && sort_index <= result[0].length
-    ? by_col
-      ? transpose(sortArray(result))
-      : sortArray(result)
-    : value
+  return by_col ? transpose(working) : working
 }
 
 /**

package/lib/esm/index.mjs

@@ -1269,6 +1269,7 @@ 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
   }
@@ -1277,37 +1278,104 @@ function SORT(array, sort_index = 1, sort_order = 1, by_col = false) {
     return 0
   }
 
-  sort_index = parseNumber(sort_index);
-  if (!sort_index || sort_index < 1) {
-    return value
+  by_col = parseBool(by_col);
+  if (typeof by_col !== 'boolean') {
+    return name
   }
 
-  sort_order = parseNumber(sort_order);
-  if (sort_order !== 1 && sort_order !== -1) {
+  // 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) {
     return value
   }
 
-  by_col = parseBool(by_col);
-  if (typeof by_col !== 'boolean') {
-    return name
+  const firstOrder = normalizeOrder(sort_order);
+  if (firstOrder === null) {
+    return value
   }
 
-  const sortArray = (arr) =>
-    arr.sort((a, b) => {
-      a = parseString(a[sort_index - 1]);
-      b = parseString(b[sort_index - 1]);
+  sortKeys.push({ index: firstIndex, order: firstOrder });
 
-      return sort_order === 1 ? (a < b ? sort_order * -1 : sort_order) : a > b ? sort_order : sort_order * -1
-    });
+  // 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 result = by_col ? transpose(matrix) : matrix;
+  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
+    }
+  }
+
+  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]);
+
+      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
+  };
+
+  // Sort in-place and return
+  working.sort(comparator);
 
-  return sort_index >= 1 && sort_index <= result[0].length
-    ? by_col
-      ? transpose(sortArray(result))
-      : sortArray(result)
-    : value
+  return by_col ? transpose(working) : working
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/formulajs",
-  "version": "4.4.12-mod-3",
+  "version": "4.4.12-mod-3-patch-1",
   "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): any;
+export function SORT(array: any, sort_index?: any, sort_order?: any, by_col?: any, ...args: 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): any;
+export function SORT(array: any, sort_index?: any, sort_order?: any, by_col?: any, ...args: any[]): any;
 /**
  * Returns a positive square root.
  *