@tamtamchik/json-deep-sort 1.2.1 → 1.3.0

package/dist/index.js

@@ -23,23 +23,31 @@ __export(src_exports, {
   sort: () => sort
 });
 module.exports = __toCommonJS(src_exports);
-function sort(data, asc = true) {
-  if (!data || typeof data !== "object") {
-    return data;
-  }
-  if (Array.isArray(data)) {
-    return data.map((item) => sort(item, asc));
-  }
-  if (isNonSortableObject(data)) {
-    return data;
+function sort(data, ascending = true) {
+  return sortRecursively(data, ascending);
+}
+function sortRecursively(data, ascending) {
+  if (!isObject(data) || Array.isArray(data) || isNonSortableObject(data)) {
+    return Array.isArray(data) ? data.map((item) => sortRecursively(item, ascending)) : data;
   }
-  const sortedEntries = Object.entries(data).sort(([a], [b]) => asc ? a.localeCompare(b) : b.localeCompare(a));
-  return Object.fromEntries(
-    sortedEntries.map(([key, value]) => [key, sort(value, asc)])
-  );
+  return sortObject(data, ascending);
+}
+function isObject(data) {
+  return typeof data === "object" && data !== null;
+}
+function sortObject(obj, ascending) {
+  const entries = [...Object.entries(obj), ...Object.getOwnPropertySymbols(obj).map((sym) => [sym, obj[sym]])];
+  const sortedEntries = entries.sort(([keyA], [keyB]) => {
+    if (typeof keyA === "symbol" && typeof keyB === "symbol") return 0;
+    if (typeof keyA === "symbol") return 1;
+    if (typeof keyB === "symbol") return -1;
+    return ascending ? keyA.localeCompare(keyB) : keyB.localeCompare(keyA);
+  });
+  return Object.fromEntries(sortedEntries.map(([key, value]) => [key, sortRecursively(value, ascending)]));
 }
 function isNonSortableObject(obj) {
-  return obj instanceof Date || obj instanceof RegExp || obj instanceof Function || obj instanceof Error || obj instanceof Map || obj instanceof Set || obj instanceof WeakMap || obj instanceof WeakSet || obj instanceof Promise || Symbol.iterator in Object(obj);
+  const nonSortableTypes = [Date, RegExp, Function, Error, Map, Set, WeakMap, WeakSet, Promise];
+  return nonSortableTypes.some((type) => obj instanceof type) || Symbol.iterator in Object(obj);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.mjs

@@ -1,21 +1,29 @@
 // src/index.ts
-function sort(data, asc = true) {
-  if (!data || typeof data !== "object") {
-    return data;
-  }
-  if (Array.isArray(data)) {
-    return data.map((item) => sort(item, asc));
-  }
-  if (isNonSortableObject(data)) {
-    return data;
+function sort(data, ascending = true) {
+  return sortRecursively(data, ascending);
+}
+function sortRecursively(data, ascending) {
+  if (!isObject(data) || Array.isArray(data) || isNonSortableObject(data)) {
+    return Array.isArray(data) ? data.map((item) => sortRecursively(item, ascending)) : data;
   }
-  const sortedEntries = Object.entries(data).sort(([a], [b]) => asc ? a.localeCompare(b) : b.localeCompare(a));
-  return Object.fromEntries(
-    sortedEntries.map(([key, value]) => [key, sort(value, asc)])
-  );
+  return sortObject(data, ascending);
+}
+function isObject(data) {
+  return typeof data === "object" && data !== null;
+}
+function sortObject(obj, ascending) {
+  const entries = [...Object.entries(obj), ...Object.getOwnPropertySymbols(obj).map((sym) => [sym, obj[sym]])];
+  const sortedEntries = entries.sort(([keyA], [keyB]) => {
+    if (typeof keyA === "symbol" && typeof keyB === "symbol") return 0;
+    if (typeof keyA === "symbol") return 1;
+    if (typeof keyB === "symbol") return -1;
+    return ascending ? keyA.localeCompare(keyB) : keyB.localeCompare(keyA);
+  });
+  return Object.fromEntries(sortedEntries.map(([key, value]) => [key, sortRecursively(value, ascending)]));
 }
 function isNonSortableObject(obj) {
-  return obj instanceof Date || obj instanceof RegExp || obj instanceof Function || obj instanceof Error || obj instanceof Map || obj instanceof Set || obj instanceof WeakMap || obj instanceof WeakSet || obj instanceof Promise || Symbol.iterator in Object(obj);
+  const nonSortableTypes = [Date, RegExp, Function, Error, Map, Set, WeakMap, WeakSet, Promise];
+  return nonSortableTypes.some((type) => obj instanceof type) || Symbol.iterator in Object(obj);
 }
 export {
   sort

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamtamchik/json-deep-sort",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "A comprehensive utility for sorting JSON objects by keys.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -32,12 +32,12 @@
     "json-tools"
   ],
   "devDependencies": {
-    "@types/jest": "^29.5.12",
-    "@types/node": "^22.3.0",
+    "@types/jest": "^29.5.13",
+    "@types/node": "^22.7.5",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.4",
-    "tsup": "^8.2.4",
-    "typescript": "^5.5.4"
+    "tsup": "^8.3.0",
+    "typescript": "^5.6.3"
   },
   "exports": {
     ".": {

package/src/index.ts

@@ -1,41 +1,43 @@
-/**
- * Function to sort JSON data.
- * @param {unknown} data - The data to be sorted.
- * @param {boolean} [asc=true] - Whether to sort in ascending order.
- * @returns {unknown} The sorted data.
- */
-export function sort(data: unknown, asc: boolean = true): unknown {
-  if (!data || typeof data !== 'object') {
-    return data;
-  }
+// Type definitions for object types and non-sortable types
+type ObjectType = Record<string | symbol, unknown>;
+type SortedEntry = [string | symbol, unknown];
+type NonSortableType = Date | RegExp | Function | Error | Map<unknown, unknown> | Set<unknown> | WeakMap<object, unknown> | WeakSet<object> | Promise<unknown>;
 
-  if (Array.isArray(data)) {
-    return data.map(item => sort(item, asc));
-  }
+// Main sorting function that can handle various data types
+export function sort<T>(data: T, ascending = true): T {
+  return sortRecursively(data, ascending);
+}
 
-  if (isNonSortableObject(data)) {
-    return data;
+// Recursive function to sort nested structures
+function sortRecursively<T>(data: T, ascending: boolean): T {
+  if (!isObject(data) || Array.isArray(data) || isNonSortableObject(data)) {
+    return Array.isArray(data) ? data.map(item => sortRecursively(item, ascending)) as T : data;
   }
 
-  const sortedEntries = Object.entries(data as Record<string, unknown>)
-    .sort(([a], [b]) => asc ? a.localeCompare(b) : b.localeCompare(a));
+  return sortObject(data as ObjectType, ascending) as T;
+}
+
+// Helper function to check if a value is an object
+function isObject(data: unknown): data is ObjectType {
+  return typeof data === 'object' && data !== null;
+}
+
+// Function to sort object properties
+function sortObject(obj: ObjectType, ascending: boolean): ObjectType {
+  const entries = [...Object.entries(obj), ...Object.getOwnPropertySymbols(obj).map(sym => [sym, obj[sym]] as SortedEntry)];
   
-  return Object.fromEntries(
-    sortedEntries.map(([key, value]) => [key, sort(value, asc)])
-  );
+  const sortedEntries = entries.sort(([keyA], [keyB]) => {
+    if (typeof keyA === 'symbol' && typeof keyB === 'symbol') return 0;
+    if (typeof keyA === 'symbol') return 1;
+    if (typeof keyB === 'symbol') return -1;
+    return ascending ? (keyA as string).localeCompare(keyB as string) : (keyB as string).localeCompare(keyA as string);
+  });
+
+  return Object.fromEntries(sortedEntries.map(([key, value]) => [key, sortRecursively(value, ascending)]));
 }
 
-function isNonSortableObject(obj: object): boolean {
-  return (
-    obj instanceof Date ||
-    obj instanceof RegExp ||
-    obj instanceof Function ||
-    obj instanceof Error ||
-    obj instanceof Map ||
-    obj instanceof Set ||
-    obj instanceof WeakMap ||
-    obj instanceof WeakSet ||
-    obj instanceof Promise ||
-    Symbol.iterator in Object(obj)
-  );
+// Helper function to check if an object is of a non-sortable type
+function isNonSortableObject(obj: unknown): obj is NonSortableType {
+  const nonSortableTypes = [Date, RegExp, Function, Error, Map, Set, WeakMap, WeakSet, Promise];
+  return nonSortableTypes.some(type => obj instanceof type) || Symbol.iterator in Object(obj);
 }