fix: abstract "api.use()" to "applyRequestHandlers"

mswjs · Jan 19, 2024 · 9892d86 · 9892d86
1 parent 14b0ba7
commit 9892d86
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 58 deletions.
diff --git a/packages/msw-addon/src/applyRequestHandlers.ts b/packages/msw-addon/src/applyRequestHandlers.ts
@@ -0,0 +1,34 @@
+import type { RequestHandler } from 'msw'
+import { api } from '@build-time/initialize'
+import type { Context } from './decorator'
+
+export function applyRequestHandlers(
+  handlersListOrObject: Context['parameters']['msw']
+): void {
+  if (handlersListOrObject == null) {
+    return
+  }
+
+  if (Array.isArray(handlersListOrObject) && handlersListOrObject.length > 0) {
+    // Support an Array of request handlers (backwards compatability).
+    api.use(...handlersListOrObject)
+    return
+  }
+
+  if ('handlers' in handlersListOrObject && handlersListOrObject.handlers) {
+    // Support an Array named request handlers handlers
+    // or an Object of named request handlers with named arrays of handlers
+    const handlers = Object.values(handlersListOrObject.handlers)
+      .filter(Boolean)
+      .reduce<RequestHandler[]>(
+        (handlers, handlersList) => handlers.concat(handlersList),
+        []
+      )
+
+    if (handlers.length > 0) {
+      api.use(...handlers)
+    }
+
+    return
+  }
+}
diff --git a/packages/msw-addon/src/decorator.ts b/packages/msw-addon/src/decorator.ts
@@ -1,5 +1,5 @@
 import type { RequestHandler } from 'msw'
-import { api } from '@build-time/initialize'
+import { applyRequestHandlers } from './applyRequestHandlers'
 
 export type MswParameters = {
   msw?:
@@ -17,33 +17,6 @@ export const mswDecorator = <Story extends (...args: any[]) => any>(
   storyFn: Story,
   context: Context
 ) => {
-  const {
-    parameters: { msw },
-  } = context
-
-  if (api) {
-    api.resetHandlers()
-
-    if (msw) {
-      if (Array.isArray(msw) && msw.length > 0) {
-        // Support an Array of request handlers (backwards compatability).
-        api.use(...msw)
-      } else if ('handlers' in msw && msw.handlers) {
-        // Support an Array named request handlers handlers
-        // or an Object of named request handlers with named arrays of handlers
-        const handlers = Object.values(msw.handlers)
-          .filter(Boolean)
-          .reduce<RequestHandler[]>(
-            (handlers, handlersList) => handlers.concat(handlersList),
-            []
-          )
-
-        if (handlers.length > 0) {
-          api.use(...handlers)
-        }
-      }
-    }
-  }
-
+  applyRequestHandlers(context.parameters.msw)
   return storyFn()
 }
diff --git a/packages/msw-addon/src/loader.ts b/packages/msw-addon/src/loader.ts
@@ -1,35 +1,8 @@
-import type { RequestHandler } from 'msw'
 import type { Context } from './decorator'
-import { api } from '@build-time/initialize'
+import { applyRequestHandlers } from './applyRequestHandlers'
 
 export const mswLoader = async (context: Context) => {
-  const {
-    parameters: { msw },
-  } = context
-
-  if (api) {
-    api.resetHandlers()
-
-    if (msw) {
-      if (Array.isArray(msw) && msw.length > 0) {
-        // Support an Array of request handlers (backwards compatability).
-        api.use(...msw)
-      } else if ('handlers' in msw && msw.handlers) {
-        // Support an Array named request handlers handlers
-        // or an Object of named request handlers with named arrays of handlers
-        const handlers = Object.values(msw.handlers)
-          .filter(Boolean)
-          .reduce<RequestHandler[]>(
-            (handlers, handlersList) => handlers.concat(handlersList),
-            []
-          )
-
-        if (handlers.length > 0) {
-          api.use(...handlers)
-        }
-      }
-    }
-  }
+  applyRequestHandlers(context.parameters.msw)
 
   if (
     typeof window !== 'undefined' &&