fix merge

Author: slaveeks

src/utils/merge.ts

@@ -3,16 +3,16 @@ import cloneDeep from 'lodash.clonedeep';
 import { patch } from '@n1ru4l/json-patch-plus';
 
 type HawkEvent = {
-  payload: {
-    [key: string]: any
-  }
+    payload: {
+        [key: string]: any
+    }
 }
 
 type HawkEventRepetition = {
-  payload: {
-    [key: string]: any
-  }
-  delta: string;
+    payload: {
+        [key: string]: any
+    }
+    delta: string;
 }
 
 /**
@@ -27,31 +27,46 @@ type HawkEventRepetition = {
  */
 export function repetitionAssembler(originalEvent: Object, repetition: { [key: string]: any }): any {
     const customizer = (originalParam: any, repetitionParam: any): any => {
-      if (repetitionParam === null) {
-        return originalParam;
-      }
-  
-  
-      if (typeof repetitionParam === 'object' && typeof originalParam === 'object') {
-        /**
-         * If original event has null but repetition has some value, we need to return repetition value
-         */
-        if (originalParam === null) {
-          return repetitionParam;
-          /**
-           * Otherwise, we need to recursively merge original and repetition values
-           */
-        } else {
-          return repetitionAssembler(originalParam, repetitionParam);
+        if (repetitionParam === null) {
+            return originalParam;
         }
-      }
-  
-      return repetitionParam;
+
+
+        if (typeof repetitionParam === 'object' && typeof originalParam === 'object') {
+            /**
+             * If original event has null but repetition has some value, we need to return repetition value
+             */
+            if (originalParam === null) {
+                return repetitionParam;
+                /**
+                 * Otherwise, we need to recursively merge original and repetition values
+                 */
+            } else {
+                return repetitionAssembler(originalParam, repetitionParam);
+            }
+        }
+
+        return repetitionParam;
     };
-  
+
     return mergeWith(cloneDeep(originalEvent), cloneDeep(repetition), customizer);
-  }
-  
+}
+
+function parsePayloadField(payload: any, field: string) {
+    if (payload && payload[field] && typeof payload[field] === 'string') {
+        payload[field] = JSON.parse(payload[field]);
+    }
+
+    return payload;
+}
+
+function stringifyPayloadField(payload: any, field: string) {
+    if (payload && payload[field]) {
+        payload[field] = JSON.stringify(payload[field]);
+    }
+
+    return payload;
+}
 
 /**
  * Helps to merge original event and repetition due to delta format,
@@ -64,43 +79,51 @@ export function repetitionAssembler(originalEvent: Object, repetition: { [key: s
  */
 export function composeFullRepetitionEvent(originalEvent: HawkEvent, repetition: HawkEventRepetition | undefined): HawkEvent {
 
-    console.log('originalEvent', originalEvent);
-    console.log('repetition', repetition);
-
     /**
      * Make a deep copy of the original event, because we need to avoid mutating the original event
      */
     const event = cloneDeep(originalEvent);
-  
+
     if (!repetition) {
-      return event;
+        return event;
     }
-  
+
     /**
      * New delta format (repetition.delta is not null)
      */
     if (repetition.delta) {
-      event.payload = patch({
-        left: event.payload,
-        delta: JSON.parse(repetition.delta)
-      });
-  
-      return event;
+        /**
+         * Parse addons and context fields from string to object before patching
+         */
+        event.payload = parsePayloadField(event.payload, 'addons');
+        event.payload = parsePayloadField(event.payload, 'context');
+
+        event.payload = patch({
+            left: event.payload,
+            delta: JSON.parse(repetition.delta)
+        });
+
+        /**
+         * Stringify addons and context fields from object to string after patching
+         */
+        event.payload = stringifyPayloadField(event.payload, 'addons');
+        event.payload = stringifyPayloadField(event.payload, 'context');
+
+        return event;
     }
-  
+
     /**
      * New delta format (repetition.payload is null) and repetition.delta is null (there is no delta between original and repetition)
      */
     if (!repetition.payload) {
-      return event;
+        return event;
     }
-  
+
     /**
      * Old delta format (repetition.payload is not null)
      * @todo remove after July 5 2025
      */
     event.payload = repetitionAssembler(event.payload, repetition.payload);
-  
+
     return event;
-  }
-  
+}