Revert "fix: forwarded properties during fallback"

This reverts commit d15d51d.

Author: gioboa

src/lib/main/snippet.ts

@@ -1,4 +1,9 @@
-import { debug, emptyObjectValue, resolvePartytownForwardProperty } from '../utils';
+import {
+  debug,
+  emptyObjectValue,
+  getOriginalBehavior,
+  resolvePartytownForwardProperty,
+} from '../utils';
 import type { MainWindow, PartytownConfig } from '../types';
 
 export function snippet(
@@ -13,8 +18,7 @@ export function snippet(
   scripts?: NodeListOf<HTMLScriptElement>,
   sandbox?: HTMLIFrameElement | HTMLScriptElement,
   mainForwardFn: typeof win = win,
-  isReady?: number,
-  forwardPropertyRecords?: [typeof win, string, any, any, boolean][]
+  isReady?: number
 ) {
   // ES5 just so IE11 doesn't choke on arrow fns
   function ready() {
@@ -104,17 +108,10 @@ export function snippet(
 
     // remove any previously patched functions
     if (top == win) {
-      for (i = (forwardPropertyRecords || []).length - 1; i >= 0; i--) {
-        const [thisObject, property, originalValue, forwardValue, hadOwnProperty] =
-          forwardPropertyRecords![i];
-        if (thisObject[property] === forwardValue) {
-          if (hadOwnProperty) {
-            thisObject[property] = originalValue;
-          } else {
-            delete thisObject[property];
-          }
-        }
-      }
+      (config!.forward || []).map(function (forwardProps) {
+        const [property] = resolvePartytownForwardProperty(forwardProps);
+        delete win[property.split('.')[0] as any];
+      });
     }
 
     for (i = 0; i < scripts!.length; i++) {
@@ -148,17 +145,20 @@ export function snippet(
       const [property, { preserveBehavior }] = resolvePartytownForwardProperty(forwardProps);
       mainForwardFn = win;
       property.split('.').map(function (_, i, forwardPropsArr) {
-        const forwardProperty = forwardPropsArr[i];
-        const thisObject = mainForwardFn;
-        const hadOwnProperty = Object.prototype.hasOwnProperty.call(thisObject, forwardProperty);
-        const originalValue = thisObject[forwardProperty];
-        const forwardValue =
+        mainForwardFn = mainForwardFn[forwardPropsArr[i]] =
           i + 1 < forwardPropsArr.length
-            ? originalValue || emptyObjectValue(forwardPropsArr[i + 1])
+            ? mainForwardFn[forwardPropsArr[i]] || emptyObjectValue(forwardPropsArr[i + 1])
             : (() => {
                 let originalFunction: ((...args: any[]) => any) | null = null;
-                if (preserveBehavior && typeof originalValue === 'function') {
-                  originalFunction = (...args: any[]) => originalValue.apply(thisObject, ...args);
+                if (preserveBehavior) {
+                  const { methodOrProperty, thisObject } = getOriginalBehavior(
+                    win,
+                    forwardPropsArr
+                  );
+                  if (typeof methodOrProperty === 'function') {
+                    originalFunction = (...args: any[]) =>
+                      methodOrProperty.apply(thisObject, ...args);
+                  }
                 }
                 return function () {
                   let returnValue: any;
@@ -170,14 +170,6 @@ export function snippet(
                   return returnValue;
                 };
               })();
-        (forwardPropertyRecords = forwardPropertyRecords || []).push([
-          thisObject,
-          forwardProperty,
-          originalValue,
-          forwardValue,
-          hadOwnProperty,
-        ]);
-        mainForwardFn = thisObject[forwardProperty] = forwardValue;
       });
     });
   }

tests/unit/snippet.spec.ts

@@ -55,51 +55,4 @@ test('service worker iframe, defaults', ({ win, document, navigator, top }) => {
   assert.not.equal(iframeUrl.search, '');
 });
 
-test('restores preserved behavior on fallback', ({ win, document, navigator, top }) => {
-  const dataLayer: unknown[] = [];
-  const event = { event: 'before-fallback' };
-  let ready!: () => void;
-
-  win.dataLayer = dataLayer;
-  win.partytown = {
-    forward: [['dataLayer.push', { preserveBehavior: true }]],
-  };
-  Object.defineProperty(document, 'readyState', { value: 'loading' });
-  win.addEventListener = (_: string, callback: () => void) => (ready = callback);
-  delete (navigator as any).serviceWorker;
-
-  snippet(win, document, navigator, top, false);
-  win.dataLayer.push(event);
-  const queuedCalls = win._ptf.length;
-  ready();
-
-  assert.is(win.dataLayer, dataLayer);
-  assert.equal(win.dataLayer, [event]);
-  assert.is(win.dataLayer.push, Array.prototype.push);
-
-  win.dataLayer.push({ event: 'after-fallback' });
-  assert.is(win._ptf.length, queuedCalls);
-});
-
-test('restores mixed forwards sharing a root on fallback', ({ win, document, navigator, top }) => {
-  const preserved = () => 'preserved';
-  const forwarded = () => 'forwarded';
-  const analytics = (win.analytics = { preserved, forwarded });
-  let ready!: () => void;
-
-  win.partytown = {
-    forward: [['analytics.preserved', { preserveBehavior: true }], 'analytics.forwarded'],
-  };
-  Object.defineProperty(document, 'readyState', { value: 'loading' });
-  win.addEventListener = (_: string, callback: () => void) => (ready = callback);
-  delete (navigator as any).serviceWorker;
-
-  snippet(win, document, navigator, top, false);
-  ready();
-
-  assert.is(win.analytics, analytics);
-  assert.is(win.analytics.preserved, preserved);
-  assert.is(win.analytics.forwarded, forwarded);
-});
-
 test.run();