Refactor adapters

.gitignore

@@ -1,4 +1,2 @@
 node_modules
-bower_components
 dist
-example/ng-admin/bower-components

.prettierrc

@@ -0,0 +1,4 @@
+{
+    "tabWidth": 4,
+    "singleQuote": true
+}

Makefile

@@ -2,7 +2,6 @@
 
 install:
 	@npm install
-	@bower install
 
 build-dev:
 	@NODE_ENV=development npm run build

example/App.tsx

@@ -47,9 +47,10 @@ export const App = ({ dataProvider }: { dataProvider: DataProvider }) => {
     );
 };
 
-import { Edit, ReferenceInput, SimpleForm, TextInput } from 'react-admin';
+import { ReferenceInput, SimpleForm, TextInput } from 'react-admin';
 import authProvider from './authProvider';
 
+// The default value for the title field should cause a server validation error as it's not unique
 export const BookCreate = () => (
     <Create>
         <SimpleForm>

example/fetchMock.ts

@@ -1,54 +1,21 @@
 import fetchMock from 'fetch-mock';
-import { FetchMockServer, withDelay } from '../src';
+import { FetchMockServer } from '../src';
 import { data } from './data';
 import { dataProvider as defaultDataProvider } from './dataProvider';
+import { middlewares } from './middlewares';
 
 export const initializeFetchMock = () => {
     const restServer = new FetchMockServer({
         baseUrl: 'http://localhost:3000',
         data,
         loggingEnabled: true,
+        middlewares,
     });
     if (window) {
         // @ts-ignore
         window.restServer = restServer; // give way to update data in the console
     }
 
-    restServer.addMiddleware(withDelay(300));
-    restServer.addMiddleware(async (request, context, next) => {
-        if (!request.headers?.get('Authorization')) {
-            return {
-                status: 401,
-                headers: {},
-            };
-        }
-        return next(request, context);
-    });
-    restServer.addMiddleware(async (request, context, next) => {
-        if (context.collection === 'books' && request.method === 'POST') {
-            if (
-                restServer.database.getCount(context.collection, {
-                    filter: {
-                        title: context.requestBody?.title,
-                    },
-                }) > 0
-            ) {
-                throw new Response(
-                    JSON.stringify({
-                        errors: {
-                            title: 'An article with this title already exists. The title must be unique.',
-                        },
-                    }),
-                    {
-                        status: 400,
-                        statusText: 'Title is required',
-                    },
-                );
-            }
-        }
-
-        return next(request, context);
-    });
     fetchMock.mock('begin:http://localhost:3000', restServer.getHandler());
 };
 

example/middlewares.ts

@@ -0,0 +1,35 @@
+import { withDelay } from '../src';
+import { data } from './data';
+
+export const middlewares = [
+    withDelay(300),
+    async (context, next) => {
+        if (!context.headers?.get('Authorization')) {
+            return {
+                status: 401,
+                headers: {},
+            };
+        }
+        return next(context);
+    },
+    async (context, next) => {
+        if (context.collection === 'books' && context.method === 'POST') {
+            if (
+                data[context.collection].some(
+                    (book) => book.title === context.requestBody?.title,
+                )
+            ) {
+                return {
+                    body: {
+                        errors: {
+                            title: 'An article with this title already exists. The title must be unique.',
+                        },
+                    },
+                    status: 400,
+                    headers: {},
+                };
+            }
+        }
+        return next(context);
+    },
+];

example/msw.ts

@@ -1,52 +1,16 @@
 import { setupWorker } from 'msw/browser';
-import { MswServer, withDelay } from '../src';
+import { getMswHandler } from '../src';
 import { data } from './data';
 import { dataProvider as defaultDataProvider } from './dataProvider';
-
-const restServer = new MswServer({
-    baseUrl: 'http://localhost:3000',
-    data,
-});
-
-restServer.addMiddleware(withDelay(300));
-restServer.addMiddleware(async (request, context, next) => {
-    if (!request.headers?.get('Authorization')) {
-        return {
-            status: 401,
-            headers: {},
-        };
-    }
-    return next(request, context);
-});
-
-restServer.addMiddleware(async (request, context, next) => {
-    if (context.collection === 'books' && request.method === 'POST') {
-        if (
-            restServer.database.getCount(context.collection, {
-                filter: {
-                    title: context.requestBody?.title,
-                },
-            }) > 0
-        ) {
-            throw new Response(
-                JSON.stringify({
-                    errors: {
-                        title: 'An article with this title already exists. The title must be unique.',
-                    },
-                }),
-                {
-                    status: 400,
-                    statusText: 'Title is required',
-                },
-            );
-        }
-    }
-
-    return next(request, context);
-});
+import { middlewares } from './middlewares';
 
 export const initializeMsw = async () => {
-    const worker = setupWorker(restServer.getHandler());
+    const handler = getMswHandler({
+        baseUrl: 'http://localhost:3000',
+        data,
+        middlewares,
+    });
+    const worker = setupWorker(handler);
     return worker.start({
         quiet: true, // Instruct MSW to not log requests in the console
         onUnhandledRequest: 'bypass', // Instruct MSW to ignore requests we don't handle

example/sinon.ts

@@ -1,50 +1,16 @@
 import sinon from 'sinon';
-import { SinonServer, withDelay } from '../src';
-import { data } from './data';
-import { HttpError, type Options } from 'react-admin';
 import simpleRestProvider from 'ra-data-simple-rest';
+import { HttpError, type Options } from 'react-admin';
+import { SinonServer } from '../src';
+import { data } from './data';
+import { middlewares } from './middlewares';
 
 export const initializeSinon = () => {
     const restServer = new SinonServer({
         baseUrl: 'http://localhost:3000',
         data,
         loggingEnabled: true,
-    });
-
-    restServer.addMiddleware(withDelay(300));
-    restServer.addMiddleware(async (request, context, next) => {
-        if (request.requestHeaders.Authorization === undefined) {
-            return {
-                status: 401,
-                headers: {},
-            };
-        }
-
-        return next(request, context);
-    });
-
-    restServer.addMiddleware(async (request, context, next) => {
-        if (context.collection === 'books' && request.method === 'POST') {
-            if (
-                restServer.database.getCount(context.collection, {
-                    filter: {
-                        title: context.requestBody?.title,
-                    },
-                }) > 0
-            ) {
-                return {
-                    status: 400,
-                    headers: {},
-                    body: {
-                        errors: {
-                            title: 'An article with this title already exists. The title must be unique.',
-                        },
-                    },
-                };
-            }
-        }
-
-        return next(request, context);
+        middlewares,
     });
 
     // use sinon.js to monkey-patch XmlHttpRequest