@fileverse-dev/formulajs 4.4.16 → 4.4.17-fix-sort-fn-2

package/lib/cjs/index.cjs

@@ -1271,47 +1271,74 @@ function ROWS(array) {
  * @returns
  */
 function SORT(array, sort_index = 1, sort_order = 1, by_col = false) {
-  if (!array || !Array.isArray(array)) {
-    return na
-  }
+  console.log("SORT function called with arguments:", { array, sort_index, sort_order, by_col });
+  if (!array || !Array.isArray(array)) return na;
+  if (array.length === 0) return 0;
 
-  if (array.length === 0) {
-    return 0
-  }
+  let idx = parseNumber(sort_index);
+  if (!idx || idx < 1) return value;
+  idx = idx - 1;
 
-  sort_index = parseNumber(sort_index);
-  if (!sort_index || sort_index < 1) {
-    return value
-  }
+  let order = parseNumber(sort_order);
+  if (order !== 1 && order !== -1) return value;
 
-  sort_order = parseNumber(sort_order);
-  if (sort_order !== 1 && sort_order !== -1) {
-    return value
-  }
+  const byCol = parseBool(by_col);
+  if (typeof byCol !== "boolean") return name;
+
+  // Rectangularize then orient
+  const matrix = fillMatrix(array);
+  const working = byCol ? transpose(matrix) : matrix;
 
-  by_col = parseBool(by_col);
-  if (typeof by_col !== 'boolean') {
-    return name
+  if (!working.length || !working[0] || idx >= working[0].length) {
+    return value; // out of bounds
   }
 
-  const sortArray = (arr) =>
-    arr.sort((a, b) => {
-      a = parseString(a[sort_index - 1]);
-      b = parseString(b[sort_index - 1]);
+  // Helpers (aiming for spreadsheet-ish behavior)
+  const isBlank = (v) => v === "" || v === null || v === undefined;
 
-      return sort_order === 1 ? (a < b ? sort_order * -1 : sort_order) : a > b ? sort_order : sort_order * -1
-    });
+  const cmp = (a, b) => {
+    // Blanks last (ascending); we'll multiply by order later for descending.
+    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;
+    // If both parse as finite numbers, compare numerically
+    const na = parseNumber(a);
+    const nb = parseNumber(b);
+    const aNum = Number.isFinite(na);
+    const bNum = Number.isFinite(nb);
 
-  return sort_index >= 1 && sort_index <= result[0].length
-    ? by_col
-      ? transpose(sortArray(result))
-      : sortArray(result)
-    : value
+    if (aNum && bNum) {
+      if (na < nb) return -1;
+      if (na > nb) return 1;
+      return 0;
+    }
+
+    // Fallback: case-insensitive string compare
+    const sa = (parseString(a) ?? "").toString().toLowerCase();
+    const sb = (parseString(b) ?? "").toString().toLowerCase();
+    if (sa < sb) return -1;
+    if (sa > sb) return 1;
+    return 0;
+  };
+
+  // Stable sort: decorate with original index
+  const decorated = working.map((row, i) => ({ row, i }));
+
+  decorated.sort((A, B) => {
+    const base = cmp(A.row[idx], B.row[idx]);
+    if (base !== 0) return base * order;
+    // stable tiebreaker: original order
+    return A.i - B.i;
+  });
+
+  const sorted = decorated.map((d) => d.row);
+  return byCol ? transpose(sorted) : sorted;
 }
 
+
 /**
  * Returns the transpose of an array.
  *
@@ -18586,17 +18613,22 @@ const SUPPORTED_TOKEN_NAMES = {
 
 
 function formatNumber(raw, decimals) {
-  if(!decimals){
+  try {
+      if(!decimals){
+        return raw
+      }
+      const quorum = BigInt(raw);
+      const divisor = 10 ** decimals;
+      const normalized = Number(quorum) / divisor;
+    
+      return new Intl.NumberFormat("en-US", {
+        notation: "compact",
+        maximumFractionDigits: 2,
+      }).format(normalized);
+  } catch (error) {
+    console.log({error});
     return raw
   }
-  const quorum = BigInt(raw);
-  const divisor = 10 ** decimals;
-  const normalized = Number(quorum) / divisor;
-
-  return new Intl.NumberFormat("en-US", {
-    notation: "compact",
-    maximumFractionDigits: 2,
-  }).format(normalized);
 }
 
 let cachedChains = null;

package/lib/esm/index.mjs

@@ -1269,47 +1269,74 @@ function ROWS(array) {
  * @returns
  */
 function SORT(array, sort_index = 1, sort_order = 1, by_col = false) {
-  if (!array || !Array.isArray(array)) {
-    return na
-  }
+  console.log("SORT function called with arguments:", { array, sort_index, sort_order, by_col });
+  if (!array || !Array.isArray(array)) return na;
+  if (array.length === 0) return 0;
 
-  if (array.length === 0) {
-    return 0
-  }
+  let idx = parseNumber(sort_index);
+  if (!idx || idx < 1) return value;
+  idx = idx - 1;
 
-  sort_index = parseNumber(sort_index);
-  if (!sort_index || sort_index < 1) {
-    return value
-  }
+  let order = parseNumber(sort_order);
+  if (order !== 1 && order !== -1) return value;
 
-  sort_order = parseNumber(sort_order);
-  if (sort_order !== 1 && sort_order !== -1) {
-    return value
-  }
+  const byCol = parseBool(by_col);
+  if (typeof byCol !== "boolean") return name;
+
+  // Rectangularize then orient
+  const matrix = fillMatrix(array);
+  const working = byCol ? transpose(matrix) : matrix;
 
-  by_col = parseBool(by_col);
-  if (typeof by_col !== 'boolean') {
-    return name
+  if (!working.length || !working[0] || idx >= working[0].length) {
+    return value; // out of bounds
   }
 
-  const sortArray = (arr) =>
-    arr.sort((a, b) => {
-      a = parseString(a[sort_index - 1]);
-      b = parseString(b[sort_index - 1]);
+  // Helpers (aiming for spreadsheet-ish behavior)
+  const isBlank = (v) => v === "" || v === null || v === undefined;
 
-      return sort_order === 1 ? (a < b ? sort_order * -1 : sort_order) : a > b ? sort_order : sort_order * -1
-    });
+  const cmp = (a, b) => {
+    // Blanks last (ascending); we'll multiply by order later for descending.
+    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;
+    // If both parse as finite numbers, compare numerically
+    const na = parseNumber(a);
+    const nb = parseNumber(b);
+    const aNum = Number.isFinite(na);
+    const bNum = Number.isFinite(nb);
 
-  return sort_index >= 1 && sort_index <= result[0].length
-    ? by_col
-      ? transpose(sortArray(result))
-      : sortArray(result)
-    : value
+    if (aNum && bNum) {
+      if (na < nb) return -1;
+      if (na > nb) return 1;
+      return 0;
+    }
+
+    // Fallback: case-insensitive string compare
+    const sa = (parseString(a) ?? "").toString().toLowerCase();
+    const sb = (parseString(b) ?? "").toString().toLowerCase();
+    if (sa < sb) return -1;
+    if (sa > sb) return 1;
+    return 0;
+  };
+
+  // Stable sort: decorate with original index
+  const decorated = working.map((row, i) => ({ row, i }));
+
+  decorated.sort((A, B) => {
+    const base = cmp(A.row[idx], B.row[idx]);
+    if (base !== 0) return base * order;
+    // stable tiebreaker: original order
+    return A.i - B.i;
+  });
+
+  const sorted = decorated.map((d) => d.row);
+  return byCol ? transpose(sorted) : sorted;
 }
 
+
 /**
  * Returns the transpose of an array.
  *
@@ -18584,17 +18611,22 @@ const SUPPORTED_TOKEN_NAMES = {
 
 
 function formatNumber(raw, decimals) {
-  if(!decimals){
+  try {
+      if(!decimals){
+        return raw
+      }
+      const quorum = BigInt(raw);
+      const divisor = 10 ** decimals;
+      const normalized = Number(quorum) / divisor;
+    
+      return new Intl.NumberFormat("en-US", {
+        notation: "compact",
+        maximumFractionDigits: 2,
+      }).format(normalized);
+  } catch (error) {
+    console.log({error});
     return raw
   }
-  const quorum = BigInt(raw);
-  const divisor = 10 ** decimals;
-  const normalized = Number(quorum) / divisor;
-
-  return new Intl.NumberFormat("en-US", {
-    notation: "compact",
-    maximumFractionDigits: 2,
-  }).format(normalized);
 }
 
 let cachedChains = null;

package/package.json

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