Cleanup options

marmelab · Jun 6, 2024 · 910c4f9 · 910c4f9
1 parent d80d993
commit 910c4f9
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 25 deletions.
diff --git a/example/index.tsx b/example/index.tsx
@@ -32,7 +32,11 @@ switch (import.meta.env.VITE_MOCK) {
     default:
         import('./msw')
             .then(({ worker, dataProvider }) => {
-                return worker.start().then(() => dataProvider);
+                return worker
+                    .start({
+                        quiet: true,
+                    })
+                    .then(() => dataProvider);
             })
             .then((dataProvider) => {
                 ReactDom.render(

diff --git a/src/BaseServer.ts b/src/BaseServer.ts
@@ -11,9 +11,7 @@ import type { CollectionItem, Query, QueryFunction } from './types.js';
 export abstract class BaseServer {
     baseUrl = '';
     identifierName = 'id';
-    loggingEnabled = false;
     defaultQuery: QueryFunction = () => ({});
-    batchUrl: string | null = null;
     collections: Record<string, Collection<any>> = {};
     singles: Record<string, Single<any>> = {};
     getNewId?: () => number | string;
@@ -25,12 +23,9 @@ export abstract class BaseServer {
         defaultQuery = () => ({}),
         identifierName = 'id',
         getNewId,
-        loggingEnabled = false,
     }: BaseServerOptions = {}) {
         this.baseUrl = baseUrl;
-        this.batchUrl = batchUrl;
         this.getNewId = getNewId;
-        this.loggingEnabled = loggingEnabled;
         this.identifierName = identifierName;
         this.defaultQuery = defaultQuery;
 
@@ -60,31 +55,13 @@ export abstract class BaseServer {
         }
     }
 
-    toggleLogging() {
-        this.loggingEnabled = !this.loggingEnabled;
-    }
-
     /**
      * @param Function ResourceName => object
      */
     setDefaultQuery(query: QueryFunction) {
         this.defaultQuery = query;
     }
 
-    setBatchUrl(batchUrl: string) {
-        this.batchUrl = batchUrl;
-    }
-
-    /**
-     * @deprecated use setBatchUrl instead
-     */
-    setBatch(url: string) {
-        console.warn(
-            'Server.setBatch() is deprecated, use Server.setBatchUrl() instead',
-        );
-        this.batchUrl = url;
-    }
-
     addCollection<T extends CollectionItem = CollectionItem>(
         name: string,
         collection: Collection<T>,
@@ -242,7 +219,6 @@ export type BaseServerOptions = {
     defaultQuery?: QueryFunction;
     identifierName?: string;
     getNewId?: () => number | string;
-    loggingEnabled?: boolean;
 };
 
 export type BaseRequest = {

diff --git a/src/FetchMockServer.ts b/src/FetchMockServer.ts
@@ -11,6 +11,20 @@ export class FetchMockServer extends BaseServerWithMiddlewares<
     Request,
     MockResponseObject
 > {
+    loggingEnabled = false;
+
+    constructor({
+        loggingEnabled = false,
+        ...options
+    }: FetchMockServerOptions) {
+        super(options);
+        this.loggingEnabled = loggingEnabled;
+    }
+
+    toggleLogging() {
+        this.loggingEnabled = !this.loggingEnabled;
+    }
+
     async extractContext(request: Request) {
         const req =
             typeof request === 'string' ? new Request(request) : request;
@@ -102,6 +116,10 @@ export const getFetchMockHandler = (options: BaseServerOptions) => {
  */
 export const FetchServer = FetchMockServer;
 
+export type FetchMockServerOptions = BaseServerOptions & {
+    loggingEnabled?: boolean;
+};
+
 export type FetchMockFakeRestRequest = Partial<Request> & {
     requestBody?: string;
     responseText?: string;

diff --git a/src/SinonServer.ts b/src/SinonServer.ts
@@ -7,6 +7,17 @@ export class SinonServer extends BaseServerWithMiddlewares<
     SinonFakeXMLHttpRequest,
     SinonFakeRestResponse
 > {
+    loggingEnabled = false;
+
+    constructor({ loggingEnabled = false, ...options }: SinonServerOptions) {
+        super(options);
+        this.loggingEnabled = loggingEnabled;
+    }
+
+    toggleLogging() {
+        this.loggingEnabled = !this.loggingEnabled;
+    }
+
     extractContextSync(request: SinonFakeXMLHttpRequest) {
         const req: Request | SinonFakeXMLHttpRequest =
             typeof request === 'string' ? new Request(request) : request;
@@ -137,6 +148,10 @@ export const getSinonHandler = (options: BaseServerOptions) => {
  */
 export const Server = SinonServer;
 
+export type SinonServerOptions = BaseServerOptions & {
+    loggingEnabled?: boolean;
+};
+
 export type SinonFakeRestResponse = {
     status: number;
     body: any;