From 39419eaa218cf7a011c75f4ff93e5a697941c552 Mon Sep 17 00:00:00 2001
From: Taylor Lodge <taylor.lodge@koordinates.com>
Date: Tue, 22 Aug 2023 09:14:54 +1200
Subject: [PATCH] fix(testing): buildTestRoot difference logging

All changed values were coming through as `null` before, this swaps out the difference function with a simpler one that works properly
---
 src/testingUtilities.tsx |   5 +-
 src/utils.ts             | 109 ++++++---------------------------------
 2 files changed, 17 insertions(+), 97 deletions(-)

diff --git a/src/testingUtilities.tsx b/src/testingUtilities.tsx
index 4b87185..fc9c519 100644
--- a/src/testingUtilities.tsx
+++ b/src/testingUtilities.tsx
@@ -160,10 +160,7 @@ export function buildTestRootComponent<
           recursivelySend(interpreter, event);
         }
         function changeHandler(ctx: TContext, oldCtx: TContext | undefined) {
-          logger(
-            "onChange: ",
-            JSON.stringify(difference(ctx, oldCtx), null, 2)
-          );
+          logger("onChange: ", difference(oldCtx, ctx));
           onChangeEmitter.emit("changed", ctx);
         }
         function onEventHandler(e: any) {
diff --git a/src/utils.ts b/src/utils.ts
index 0e505c0..4dd67e4 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -74,104 +74,27 @@ export function isLikelyPageLoad(): boolean {
   return performance.now() < 5000;
 }
 
-/*
- * @private
- *
- * Find the differences between two objects and push to a new object
- * (c) 2019 Chris Ferdinandi & Jascha Brinkmann, MIT License, https://gomakethings.com & https://twitter.com/jaschaio
- * @param  {Object} obj1 The original object
- * @param  {Object} obj2 The object to compare against it
- * @return {Object}      An object of differences between the two
- */
-export function difference(obj1: any, obj2: any): Record<any, any> {
-  if (!obj2 || Object.prototype.toString.call(obj2) !== "[object Object]") {
-    return obj1;
-  }
-
-  const diffs: Record<any, any> = {};
-  let key;
-
-  /**
-   * Check if two arrays are equal
-   * @param  {Array}   arr1 The first array
-   * @param  {Array}   arr2 The second array
-   * @return {Boolean}      If true, both arrays are equal
-   */
-  const arraysMatch = function arraysMatch(arr1: any[], arr2: any[]) {
-    if (arr1.length !== arr2.length) return false;
-
-    for (let i = 0; i < arr1.length; i++) {
-      if (arr1[i] !== arr2[i]) return false;
-    }
-
-    return true;
-  };
-
-  /**
-   * Compare two items and push non-matches to object
-   * @param  {*}      item1 The first item
-   * @param  {*}      item2 The second item
-   * @param  {String} key   The key in our object
-   */
-  function compare(item1: any, item2: any, key: string) {
-    const type1 = Object.prototype.toString.call(item1);
-    const type2 = Object.prototype.toString.call(item2);
-
-    if (type2 === "[object Undefined]") {
-      diffs[key] = null;
-
-      return;
-    }
-
-    if (type1 !== type2) {
-      diffs[key] = item2;
-
-      return;
-    }
-
-    if (type1 === "[object Object]") {
-      const objDiff = difference(item1, item2);
-      if (Object.keys(objDiff).length > 0) {
-        diffs[key] = objDiff;
-      }
-
-      return;
-    }
-
-    if (type1 === "[object Array]") {
-      if (!arraysMatch(item1, item2)) {
-        diffs[key] = item2;
+export function difference(a: any, b: any) {
+  const result: Record<any, any> = {};
+
+  for (const key in b) {
+    if (!a.hasOwnProperty(key)) {
+      result[key] = b[key];
+    } else if (Array.isArray(b[key]) && Array.isArray(a[key])) {
+      if (JSON.stringify(b[key]) !== JSON.stringify(a[key])) {
+        result[key] = b[key];
       }
-
-      return;
-    }
-
-    if (type1 === "[object Function]") {
-      if (item1.toString() !== item2.toString()) {
-        diffs[key] = item2;
-      }
-    } else {
-      if (item1 !== item2) {
-        diffs[key] = item2;
-      }
-    }
-  }
-
-  for (key in obj1) {
-    if (obj1.hasOwnProperty(key)) {
-      compare(obj1[key], obj2[key], key);
-    }
-  }
-
-  for (key in obj2) {
-    if (obj2.hasOwnProperty(key)) {
-      if (!obj1[key] && obj1[key] !== obj2[key]) {
-        diffs[key] = obj2[key];
+    } else if (typeof b[key] === "object" && typeof a[key] === "object") {
+      const value = difference(a[key], b[key]);
+      if (Object.keys(value).length > 0) {
+        result[key] = value;
       }
+    } else if (b[key] !== a[key]) {
+      result[key] = b[key];
     }
   }
 
-  return diffs;
+  return result;
 }
 
 /*