@augment-vir/common 13.2.3 → 13.2.4

package/dist/cjs/augments/object/object.js

@@ -2,27 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyThroughJson = exports.areJsonEqual = exports.isObject = void 0;
 const error_1 = require("../error");
-const object_entries_1 = require("./object-entries");
 function isObject(input) {
     return !!input && typeof input === 'object';
 }
 exports.isObject = isObject;
+const areJsonEqualFailureMessage = 'Failed to compare objects using JSON.stringify';
+function baseAreJsonEqual(a, b) {
+    return JSON.stringify(a) === JSON.stringify(b);
+}
 function areJsonEqual(a, b) {
     try {
         if (a === b) {
             return true;
         }
         if (isObject(a) && isObject(b)) {
-            const sortedAEntries = (0, object_entries_1.getEntriesSortedByKey)(a);
-            const sortedBEntries = (0, object_entries_1.getEntriesSortedByKey)(b);
-            return JSON.stringify(sortedAEntries) === JSON.stringify(sortedBEntries);
+            const areKeysEqual = baseAreJsonEqual(Object.keys(a).sort(), Object.keys(b).sort());
+            if (!areKeysEqual) {
+                return false;
+            }
+            return Object.keys(a).every((keyName) => {
+                return areJsonEqual(a[keyName], b[keyName]);
+            });
         }
         else {
-            return JSON.stringify(a) === JSON.stringify(b);
+            return baseAreJsonEqual(a, b);
         }
     }
-    catch (error) {
-        console.error(`Failed to compare objects using JSON.stringify: ${(0, error_1.extractErrorMessage)(error)}`);
+    catch (caught) {
+        const error = (0, error_1.ensureError)(caught);
+        if (error.message.startsWith(areJsonEqualFailureMessage)) {
+            throw error;
+        }
+        error.message = `${areJsonEqualFailureMessage}: ${error.message}`;
         throw error;
     }
 }

package/dist/esm/augments/object/object.js

@@ -1,24 +1,35 @@
-import { extractErrorMessage } from '../error';
-import { getEntriesSortedByKey } from './object-entries';
+import { ensureError } from '../error';
 export function isObject(input) {
     return !!input && typeof input === 'object';
 }
+const areJsonEqualFailureMessage = 'Failed to compare objects using JSON.stringify';
+function baseAreJsonEqual(a, b) {
+    return JSON.stringify(a) === JSON.stringify(b);
+}
 export function areJsonEqual(a, b) {
     try {
         if (a === b) {
             return true;
         }
         if (isObject(a) && isObject(b)) {
-            const sortedAEntries = getEntriesSortedByKey(a);
-            const sortedBEntries = getEntriesSortedByKey(b);
-            return JSON.stringify(sortedAEntries) === JSON.stringify(sortedBEntries);
+            const areKeysEqual = baseAreJsonEqual(Object.keys(a).sort(), Object.keys(b).sort());
+            if (!areKeysEqual) {
+                return false;
+            }
+            return Object.keys(a).every((keyName) => {
+                return areJsonEqual(a[keyName], b[keyName]);
+            });
         }
         else {
-            return JSON.stringify(a) === JSON.stringify(b);
+            return baseAreJsonEqual(a, b);
         }
     }
-    catch (error) {
-        console.error(`Failed to compare objects using JSON.stringify: ${extractErrorMessage(error)}`);
+    catch (caught) {
+        const error = ensureError(caught);
+        if (error.message.startsWith(areJsonEqualFailureMessage)) {
+            throw error;
+        }
+        error.message = `${areJsonEqualFailureMessage}: ${error.message}`;
         throw error;
     }
 }

package/dist/types/augments/function.d.ts

@@ -23,4 +23,4 @@ export type NoInputsFunction<ReturnGeneric = any> = () => ReturnGeneric;
  *     TypedFunction<[string | undefined], number>; // (input1: string|undefined) => number
  */
 export type TypedFunction<Arguments, Return> = Arguments extends readonly any[] ? number extends Arguments['length'] ? (...args: ArrayElement<Arguments>[]) => Return : (...args: Arguments) => Return : void extends Arguments ? () => Return : (arg: Arguments) => Return;
-export declare function isTruthy<T>(input: T): input is NonNullable<T>;
+export declare function isTruthy<T>(input: T): input is Exclude<T, undefined | null | false | 0 | '' | -0 | 0n>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/common",
-    "version": "13.2.3",
+    "version": "13.2.4",
     "homepage": "https://github.com/electrovir/augment-vir/tree/main/packages/common",
     "bugs": {
         "url": "https://github.com/electrovir/augment-vir/issues"
@@ -24,10 +24,10 @@
         "test:types": "tsc --noEmit"
     },
     "dependencies": {
-        "type-fest": "^3.7.2"
+        "type-fest": "^3.8.0"
     },
     "devDependencies": {
-        "typescript": "^5.0.3"
+        "typescript": "^5.0.4"
     },
     "publishConfig": {
         "access": "public"