From 4fde47ef00bbddc6fdea2b6bdb8ac77b1d398c33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Duliscou=C3=ABt?=
 <101416921+gduliscouet-ubitransport@users.noreply.github.com>
Date: Tue, 24 Jan 2023 16:56:45 +0100
Subject: [PATCH] feat: rename "SetupWorkerApi"/"SetupServerApi" types to
 "SetupWorker"/"SetupServer" (#1478)

* feat(types): export SetupWorkerApi class

BREAKING CHANGE: export the SetupWorkerApi class instead of the interface

* feat(types): export SetupServerApi class

BREAKING CHANGE: export the SetupServerApi class instead of the interface

Co-authored-by: Artem Zakharchenko <kettanaito@gmail.com>
---
 src/index.ts                                       | 3 ++-
 src/node/SetupServerApi.ts                         | 6 +++++-
 src/node/glossary.ts                               | 2 +-
 src/node/index.ts                                  | 3 ++-
 src/setupWorker/glossary.ts                        | 2 +-
 src/setupWorker/setupWorker.ts                     | 8 +++++---
 src/setupWorker/start/utils/prepareStartHandler.ts | 4 ++--
 7 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index f0de4b04a..3bb24a9d3 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -28,7 +28,8 @@ export { cleanUrl } from './utils/url/cleanUrl'
 /**
  * Type definitions.
  */
-export type { SetupWorkerApi, StartOptions } from './setupWorker/glossary'
+export type { SetupWorker, StartOptions } from './setupWorker/glossary'
+export { SetupWorkerApi } from './setupWorker/setupWorker'
 export type { SharedOptions } from './sharedOptions'
 
 export * from './utils/request/MockedRequest'
diff --git a/src/node/SetupServerApi.ts b/src/node/SetupServerApi.ts
index 7c02f4219..02cf2932d 100644
--- a/src/node/SetupServerApi.ts
+++ b/src/node/SetupServerApi.ts
@@ -16,6 +16,7 @@ import { mergeRight } from '../utils/internal/mergeRight'
 import { MockedRequest } from '../utils/request/MockedRequest'
 import { handleRequest } from '../utils/handleRequest'
 import { devUtils } from '../utils/internal/devUtils'
+import { SetupServer } from './glossary'
 
 /**
  * @see https://github.com/mswjs/msw/pull/1399
@@ -28,7 +29,10 @@ const DEFAULT_LISTEN_OPTIONS: RequiredDeep<SharedOptions> = {
   onUnhandledRequest: 'warn',
 }
 
-export class SetupServerApi extends SetupApi<ServerLifecycleEventsMap> {
+export class SetupServerApi
+  extends SetupApi<ServerLifecycleEventsMap>
+  implements SetupServer
+{
   protected readonly interceptor: BatchInterceptor<
     Array<Interceptor<HttpRequestEventMap>>,
     HttpRequestEventMap
diff --git a/src/node/glossary.ts b/src/node/glossary.ts
index 876150943..c8ed0aa85 100644
--- a/src/node/glossary.ts
+++ b/src/node/glossary.ts
@@ -14,7 +14,7 @@ import { MockedRequest } from '../utils/request/MockedRequest'
 
 export type ServerLifecycleEventsMap = LifeCycleEventsMap<IsomorphicResponse>
 
-export interface SetupServerApi {
+export interface SetupServer {
   /**
    * Starts requests interception based on the previously provided request handlers.
    * @see {@link https://mswjs.io/docs/api/setup-server/listen `server.listen()`}
diff --git a/src/node/index.ts b/src/node/index.ts
index 12f6ac48a..11a0dd223 100644
--- a/src/node/index.ts
+++ b/src/node/index.ts
@@ -1,3 +1,4 @@
 export { ServerLifecycleEventsMap } from './SetupServerApi'
 export { setupServer } from './setupServer'
-export type { SetupServerApi } from './glossary'
+export type { SetupServer } from './glossary'
+export { SetupServerApi } from './SetupServerApi'
diff --git a/src/setupWorker/glossary.ts b/src/setupWorker/glossary.ts
index 145b37668..d0370cff9 100644
--- a/src/setupWorker/glossary.ts
+++ b/src/setupWorker/glossary.ts
@@ -209,7 +209,7 @@ export type StartHandler = (
 ) => StartReturnType
 export type StopHandler = () => void
 
-export interface SetupWorkerApi {
+export interface SetupWorker {
   /**
    * Registers and activates the mock Service Worker.
    * @see {@link https://mswjs.io/docs/api/setup-worker/start `worker.start()`}
diff --git a/src/setupWorker/setupWorker.ts b/src/setupWorker/setupWorker.ts
index bb4ec9544..bdbed3dbf 100644
--- a/src/setupWorker/setupWorker.ts
+++ b/src/setupWorker/setupWorker.ts
@@ -19,7 +19,7 @@ import { createFallbackStop } from './stop/createFallbackStop'
 import { devUtils } from '../utils/internal/devUtils'
 import { SetupApi } from '../SetupApi'
 import { mergeRight } from '../utils/internal/mergeRight'
-import { SetupWorkerApi as SetupWorker } from './glossary'
+import { SetupWorker } from './glossary'
 
 interface Listener {
   target: EventTarget
@@ -27,7 +27,7 @@ interface Listener {
   callback: EventListener
 }
 
-class SetupWorkerApi
+export class SetupWorkerApi
   extends SetupApi<WorkerLifecycleEventsMap>
   implements SetupWorker
 {
@@ -225,6 +225,8 @@ class SetupWorkerApi
  * @param {RequestHandler[]} handlers List of request handlers.
  * @see {@link https://mswjs.io/docs/api/setup-worker `setupWorker`}
  */
-export function setupWorker(...handlers: Array<RequestHandler>): SetupWorker {
+export function setupWorker(
+  ...handlers: Array<RequestHandler>
+): SetupWorkerApi {
   return new SetupWorkerApi(...handlers)
 }
diff --git a/src/setupWorker/start/utils/prepareStartHandler.ts b/src/setupWorker/start/utils/prepareStartHandler.ts
index 4f98a495b..3828a13c1 100644
--- a/src/setupWorker/start/utils/prepareStartHandler.ts
+++ b/src/setupWorker/start/utils/prepareStartHandler.ts
@@ -1,7 +1,7 @@
 import { RequiredDeep } from '../../../typeUtils'
 import { mergeRight } from '../../../utils/internal/mergeRight'
 import {
-  SetupWorkerApi,
+  SetupWorker,
   SetupWorkerInternalContext,
   StartHandler,
   StartOptions,
@@ -36,7 +36,7 @@ export function resolveStartOptions(
 export function prepareStartHandler(
   handler: StartHandler,
   context: SetupWorkerInternalContext,
-): SetupWorkerApi['start'] {
+): SetupWorker['start'] {
   return (initialOptions) => {
     context.startOptions = resolveStartOptions(initialOptions)
     return handler(context.startOptions, initialOptions || {})