🔥 Remove deprecated interation wrappers

cowboyd · cowboyd · commit 92a6a928b59f · 2024-12-05T14:41:38.000-06:00
diff --git a/packages/globals/src/globals.ts b/packages/globals/src/globals.ts
@@ -15,12 +15,6 @@ type Interaction<T = any> = Operation<T> & {
 
 interface Globals {
   readonly document: Document;
-  /**
-   * @deprecated Use `wrapInteraction` instead
-   */
-  readonly wrapAction: <T>(description: string, perform: () => Promise<T>, type: InteractionType) => Operation<T>;
-  readonly wrapInteraction: InteractionWrapper;
-  readonly interactionWrappers: Set<InteractionWrapper>;
   readonly interactorTimeout: number;
   readonly reset: () => void;
   readonly keyboardLayout: KeyboardLayout;
@@ -52,16 +46,6 @@ declare global {
 }
 
 if (!globalThis.__interactors) {
-  let wrapInteraction = <T>(perform: () => Promise<T>, interaction: Interaction<T>): Operation<T> => {
-    return (scope) => {
-      let current = perform;
-      for (let wrapper of getGlobals().interactionWrappers) {
-        let operation = wrapper(current, interaction);
-        current = () => scope.run(operation);
-      }
-      return current;
-    };
-  };
   Object.defineProperty(globalThis, "__interactors", {
     value: Object.defineProperties(
       {},
@@ -76,17 +60,6 @@ if (!globalThis.__interactors) {
           enumerable: true,
           configurable: true,
         },
-        wrapAction: {
-          value: wrapInteraction,
-          enumerable: true,
-        },
-        wrapInteraction: {
-          value: wrapInteraction,
-          enumerable: true,
-        },
-        interactionWrappers: {
-          value: new Set(),
-        },
         interactorTimeout: {
           value: 1900,
           enumerable: true,
@@ -124,24 +97,6 @@ export function setInteractorTimeout(ms: number): void {
   });
 }
 
-/**
- * @deprecated Use `addInteractionWrapper` instead
- */
-export function addActionWrapper<T>(
-  wrapper: (description: string, perform: () => Promise<T>, type: InteractionType) => Operation<T>
-): () => boolean {
-  return addInteractionWrapper(
-    (perform: () => Promise<T>, interaction: Interaction<T>): Operation<T> =>
-      wrapper(interaction.description, perform, interaction.type)
-  );
-}
-
-export function addInteractionWrapper<T>(wrapper: InteractionWrapper<T>): () => boolean {
-  getGlobals().interactionWrappers.add(wrapper);
-
-  return () => getGlobals().interactionWrappers.delete(wrapper);
-}
-
 export function setKeyboardLayout(layout: KeyboardLayout): void {
   Object.defineProperty(getGlobals(), "keyboardLayout", {
     value: layout,
diff --git a/packages/globals/test/globals.test.ts b/packages/globals/test/globals.test.ts
@@ -1,12 +1,12 @@
-import { beforeEach, describe, it } from '@std/testing/bdd';
+import { beforeEach, describe, it } from "@std/testing/bdd";
 import { expect } from "@std/expect";
 import { JSDOM } from "jsdom";
-import { Symbol } from "@effection/core";
 
-import { globals, setDocumentResolver, addInteractionWrapper, setInteractorTimeout } from "../mod.ts";
+import { globals, setDocumentResolver, setInteractorTimeout } from "../mod.ts";
 
 function makeDocument(body = ""): Document {
-  return new JSDOM(`<!doctype html><html><body>${body}</body></html>`).window.document;
+  return new JSDOM(`<!doctype html><html><body>${body}</body></html>`).window
+    .document;
 }
 
 describe("@interactors/globals", () => {
@@ -34,58 +34,4 @@ describe("@interactors/globals", () => {
       expect(globals.interactorTimeout).toEqual(3000);
     });
   });
-
-  describe("wrapInteraction", () => {
-    it("returns the same interaction without any change", () => {
-      let action = async () => {};
-      expect(
-        (globals.wrapInteraction(
-          action,
-          {
-            type: "action",
-            interactor: "Interactor",
-            description: "plain action",
-            action,
-            code: () => "",
-            halt: () => Promise.resolve(),
-            options: {
-              interactor: "Interactor",
-              name: "plain",
-              type: "action",
-              code: () => "",
-              args: [],
-            },
-            [Symbol.operation]: Promise.resolve(),
-          }
-        ) as () => unknown)()
-      ).toBe(action);
-    });
-
-    it("applies defined interaction wrapper", () => {
-      let action = async () => await Promise.resolve("foo");
-      let removeWrapper = addInteractionWrapper(() => async () => await Promise.resolve("bar"));
-      globals.wrapInteraction(
-        action,
-        {
-          type: "action",
-          interactor: "Interactor",
-          description: "foo action",
-          action,
-          code: () => "",
-          halt: () => Promise.resolve(),
-          options: {
-            interactor: "Interactor",
-            name: "foo",
-            type: "action",
-            code: () => "",
-            args: [],
-          },
-          [Symbol.operation]: Promise.resolve(),
-        },
-      );
-
-      removeWrapper();
-      expect(globals.interactionWrappers.has(action)).toEqual(false);
-    });
-  });
 });
