Remove action creators from middleware instance

Author: markerikson

packages/action-listener-middleware/src/index.ts

@@ -9,6 +9,7 @@ import type {
 import { createAction, nanoid } from '@reduxjs/toolkit'
 
 import type {
+  ActionListenerMiddleware,
   AddListenerOverloads,
   AnyActionListenerPredicate,
   CreateListenerMiddlewareOptions,
@@ -461,10 +462,7 @@ export function createActionListenerMiddleware<
     {
       addListener: addListener as TypedAddListener<S, D>,
       removeListener: removeListener as TypedRemoveListener<S, D>,
-      addListenerAction: addListenerAction as TypedAddListenerAction<S>,
-      removeListenerAction:
-        removeListenerAction as TypedRemoveListenerAction<S>,
-      clear: clearListenerMiddleware,
+      clearListeners: clearListenerMiddleware,
     },
     {} as WithMiddlewareType<typeof middleware>
   )

packages/action-listener-middleware/src/tests/listenerMiddleware.test.ts

@@ -24,7 +24,11 @@ import type {
   Unsubscribe,
   ActionListenerMiddleware,
 } from '../index'
-import type { ActionListener, AddListenerOverloads } from '../types'
+import type {
+  ActionListener,
+  AddListenerOverloads,
+  TypedRemoveListenerAction,
+} from '../types'
 
 const middlewareApi = {
   getState: expect.any(Function),
@@ -138,6 +142,10 @@ describe('createActionListenerMiddleware', () => {
 
   let reducer: jest.Mock
   let middleware: ReturnType<typeof createActionListenerMiddleware>
+  let addTypedListenerAction =
+    addListenerAction as TypedAddListenerAction<CounterState>
+  let removeTypedListenerAction =
+    removeListenerAction as TypedRemoveListenerAction<CounterState>
   // let middleware: ActionListenerMiddleware<CounterState> //: ReturnType<typeof createActionListenerMiddleware>
 
   const testAction1 = createAction<string>('testAction1')
@@ -237,15 +245,15 @@ describe('createActionListenerMiddleware', () => {
 
       expect(
         store.dispatch(
-          middleware.removeListenerAction({
+          removeTypedListenerAction({
             actionCreator: testAction2,
             listener,
           })
         )
       ).toBe(false)
       expect(
         store.dispatch(
-          middleware.removeListenerAction({
+          removeTypedListenerAction({
             actionCreator: testAction1,
             listener,
           })
@@ -657,7 +665,7 @@ describe('createActionListenerMiddleware', () => {
 
       store.dispatch(testAction1('a'))
 
-      middleware.clear()
+      middleware.clearListeners()
       store.dispatch(testAction1('b'))
       store.dispatch(testAction2('c'))
 
@@ -680,7 +688,7 @@ describe('createActionListenerMiddleware', () => {
 
       store.dispatch(testAction1('a'))
 
-      middleware.clear()
+      middleware.clearListeners()
       store.dispatch(testAction1('b'))
 
       expect(await fork1Test).toHaveProperty('status', 'cancelled')
@@ -1385,7 +1393,7 @@ describe('createActionListenerMiddleware', () => {
       })
 
       store.dispatch(
-        typedMiddleware.addListenerAction({
+        addTypedListenerAction({
           predicate: (
             action,
             currentState,
@@ -1409,7 +1417,7 @@ describe('createActionListenerMiddleware', () => {
       )
 
       store.dispatch(
-        typedMiddleware.addListenerAction({
+        addTypedListenerAction({
           predicate: (
             action,
             currentState,

packages/action-listener-middleware/src/types.ts

@@ -217,12 +217,10 @@ export type ActionListenerMiddleware<
 > & {
   addListener: AddListenerOverloads<Unsubscribe, S, D>
   removeListener: RemoveListenerOverloads<S, D>
-  addListenerAction: TypedAddListenerAction<S, D>
-  removeListenerAction: TypedRemoveListenerAction<S, D>
   /**
    * Unsubscribes all listeners, cancels running listeners and tasks.
    */
-  clear: () => void
+  clearListeners: () => void
 }
 
 /**