@fileverse-dev/formulajs 4.4.17 → 4.4.19

package/lib/cjs/index.cjs

@@ -1270,48 +1270,79 @@ function ROWS(array) {
  * @param {*} by_col Optional. A logical value indicating the desired sort direction; FALSE to sort by row (default), TRUE to sort by column
  * @returns
  */
-function SORT(array, sort_index = 1, sort_order = 1, by_col = false) {
-  if (!array || !Array.isArray(array)) {
-    return na
-  }
+function SORT(inputArray, sortIndex = 1, isAscending, sortByColumn = false) {
+  if (!inputArray || !Array.isArray(inputArray)) return na;
+  if (inputArray.length === 0) return 0;
 
-  if (array.length === 0) {
-    return 0
-  }
+  let sortColumnIndex = parseNumber(sortIndex);
+  if (!sortColumnIndex || sortColumnIndex < 1) return value;
+  sortColumnIndex = sortColumnIndex - 1;
 
-  sort_index = parseNumber(sort_index);
-  if (!sort_index || sort_index < 1) {
-    return value
-  }
+  const sortDirection = isAscending.toLowerCase() === 'false' ? -1 : 1;
+  const parsedSortDirection = parseNumber(sortDirection);
+  if (parsedSortDirection !== 1 && parsedSortDirection !== -1) return value;
 
-  sort_order = parseNumber(sort_order);
-  if (sort_order !== 1 && sort_order !== -1) {
-    return value
-  }
 
-  by_col = parseBool(by_col);
-  if (typeof by_col !== 'boolean') {
-    return name
+  const isSortByColumn = parseBool(sortByColumn);
+  if (typeof isSortByColumn !== "boolean") return name;
+
+
+  const normalizedMatrix = fillMatrix(inputArray);
+  const orientedMatrix = isSortByColumn
+    ? transpose(normalizedMatrix)
+    : normalizedMatrix;
+
+  if (!orientedMatrix.length || !orientedMatrix[0] || sortColumnIndex >= orientedMatrix[0].length) {
+    return value;
   }
 
-  const sortArray = (arr) =>
-    arr.sort((a, b) => {
-      a = parseString(a[sort_index - 1]);
-      b = parseString(b[sort_index - 1]);
+  const isBlank = (value) => value === "" || value === null || value === undefined;
 
-      return sort_order === 1 ? (a < b ? sort_order * -1 : sort_order) : a > b ? sort_order : sort_order * -1
-    });
+  // Comparator for sorting values
+  const compareValues = (a, b) => {
+    const aBlank = isBlank(a);
+    const bBlank = isBlank(b);
+    if (aBlank && bBlank) return 0;
+    if (aBlank) return 1;
+    if (bBlank) return -1;
 
-  const matrix = fillMatrix(array);
-  const result = by_col ? transpose(matrix) : matrix;
+    // Numeric comparison if possible
+    const parsedA = parseNumber(a);
+    const parsedB = parseNumber(b);
+    const isANumber = Number.isFinite(parsedA);
+    const isBNumber = Number.isFinite(parsedB);
+
+    if (isANumber && isBNumber) {
+      if (parsedA < parsedB) return -1;
+      if (parsedA > parsedB) return 1;
+      return 0;
+    }
+
+    // Fallback: case-insensitive string comparison
+    const stringA = (parseString(a) ?? "").toString().toLowerCase();
+    const stringB = (parseString(b) ?? "").toString().toLowerCase();
+    if (stringA < stringB) return -1;
+    if (stringA > stringB) return 1;
+    return 0;
+  };
 
-  return sort_index >= 1 && sort_index <= result[0].length
-    ? by_col
-      ? transpose(sortArray(result))
-      : sortArray(result)
-    : value
+  const rowsWithOriginalIndex = orientedMatrix.map((row, rowIndex) => ({ row, rowIndex }));
+
+  rowsWithOriginalIndex.sort((rowA, rowB) => {
+    const baseComparison = compareValues(rowA.row[sortColumnIndex], rowB.row[sortColumnIndex]);
+    if (baseComparison !== 0) return baseComparison * parsedSortDirection;
+    return rowA.rowIndex - rowB.rowIndex;
+  });
+
+  // Extract sorted rows
+  const sortedMatrix = rowsWithOriginalIndex.map((item) => item.row);
+
+  // Return rows or columns depending on orientation
+  return isSortByColumn ? transpose(sortedMatrix) : sortedMatrix;
 }
 
+
+
 /**
  * Returns the transpose of an array.
  *

package/lib/esm/index.mjs

@@ -1268,48 +1268,79 @@ function ROWS(array) {
  * @param {*} by_col Optional. A logical value indicating the desired sort direction; FALSE to sort by row (default), TRUE to sort by column
  * @returns
  */
-function SORT(array, sort_index = 1, sort_order = 1, by_col = false) {
-  if (!array || !Array.isArray(array)) {
-    return na
-  }
+function SORT(inputArray, sortIndex = 1, isAscending, sortByColumn = false) {
+  if (!inputArray || !Array.isArray(inputArray)) return na;
+  if (inputArray.length === 0) return 0;
 
-  if (array.length === 0) {
-    return 0
-  }
+  let sortColumnIndex = parseNumber(sortIndex);
+  if (!sortColumnIndex || sortColumnIndex < 1) return value;
+  sortColumnIndex = sortColumnIndex - 1;
 
-  sort_index = parseNumber(sort_index);
-  if (!sort_index || sort_index < 1) {
-    return value
-  }
+  const sortDirection = isAscending.toLowerCase() === 'false' ? -1 : 1;
+  const parsedSortDirection = parseNumber(sortDirection);
+  if (parsedSortDirection !== 1 && parsedSortDirection !== -1) return value;
 
-  sort_order = parseNumber(sort_order);
-  if (sort_order !== 1 && sort_order !== -1) {
-    return value
-  }
 
-  by_col = parseBool(by_col);
-  if (typeof by_col !== 'boolean') {
-    return name
+  const isSortByColumn = parseBool(sortByColumn);
+  if (typeof isSortByColumn !== "boolean") return name;
+
+
+  const normalizedMatrix = fillMatrix(inputArray);
+  const orientedMatrix = isSortByColumn
+    ? transpose(normalizedMatrix)
+    : normalizedMatrix;
+
+  if (!orientedMatrix.length || !orientedMatrix[0] || sortColumnIndex >= orientedMatrix[0].length) {
+    return value;
   }
 
-  const sortArray = (arr) =>
-    arr.sort((a, b) => {
-      a = parseString(a[sort_index - 1]);
-      b = parseString(b[sort_index - 1]);
+  const isBlank = (value) => value === "" || value === null || value === undefined;
 
-      return sort_order === 1 ? (a < b ? sort_order * -1 : sort_order) : a > b ? sort_order : sort_order * -1
-    });
+  // Comparator for sorting values
+  const compareValues = (a, b) => {
+    const aBlank = isBlank(a);
+    const bBlank = isBlank(b);
+    if (aBlank && bBlank) return 0;
+    if (aBlank) return 1;
+    if (bBlank) return -1;
 
-  const matrix = fillMatrix(array);
-  const result = by_col ? transpose(matrix) : matrix;
+    // Numeric comparison if possible
+    const parsedA = parseNumber(a);
+    const parsedB = parseNumber(b);
+    const isANumber = Number.isFinite(parsedA);
+    const isBNumber = Number.isFinite(parsedB);
+
+    if (isANumber && isBNumber) {
+      if (parsedA < parsedB) return -1;
+      if (parsedA > parsedB) return 1;
+      return 0;
+    }
+
+    // Fallback: case-insensitive string comparison
+    const stringA = (parseString(a) ?? "").toString().toLowerCase();
+    const stringB = (parseString(b) ?? "").toString().toLowerCase();
+    if (stringA < stringB) return -1;
+    if (stringA > stringB) return 1;
+    return 0;
+  };
 
-  return sort_index >= 1 && sort_index <= result[0].length
-    ? by_col
-      ? transpose(sortArray(result))
-      : sortArray(result)
-    : value
+  const rowsWithOriginalIndex = orientedMatrix.map((row, rowIndex) => ({ row, rowIndex }));
+
+  rowsWithOriginalIndex.sort((rowA, rowB) => {
+    const baseComparison = compareValues(rowA.row[sortColumnIndex], rowB.row[sortColumnIndex]);
+    if (baseComparison !== 0) return baseComparison * parsedSortDirection;
+    return rowA.rowIndex - rowB.rowIndex;
+  });
+
+  // Extract sorted rows
+  const sortedMatrix = rowsWithOriginalIndex.map((item) => item.row);
+
+  // Return rows or columns depending on orientation
+  return isSortByColumn ? transpose(sortedMatrix) : sortedMatrix;
 }
 
+
+
 /**
  * Returns the transpose of an array.
  *

package/package.json

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

package/types/cjs/index.d.cts

@@ -3806,7 +3806,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(inputArray: any, sortIndex: number, isAscending: any, sortByColumn?: boolean): any;
 /**
  * Returns a positive square root.
  *

package/types/esm/index.d.mts

@@ -3806,7 +3806,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(inputArray: any, sortIndex: number, isAscending: any, sortByColumn?: boolean): any;
 /**
  * Returns a positive square root.
  *