change definition of Server and Collection constructors to use objects

Author: slax57

README.md

@@ -111,7 +111,7 @@ const data = {
         preferred_format: 'hardback',
     }
 };
-const restServer = new FakeRest.FetchServer('http://localhost:3000');
+const restServer = new FakeRest.FetchServer({ baseUrl: 'http://localhost:3000' });
 restServer.init(data);
 fetchMock.mock('begin:http://localhost:3000', restServer.getHandler());
 ```
@@ -366,7 +366,7 @@ Operators are specified as suffixes on each filtered field. For instance, applyi
 
 ```js
 // initialize a rest server with a custom base URL
-const restServer = new FakeRest.Server('http://my.custom.domain'); // // only URLs starting with my.custom.domain will be intercepted
+const restServer = new FakeRest.Server({ baseUrl: 'http://my.custom.domain' }); // only URLs starting with my.custom.domain will be intercepted
 restServer.toggleLogging(); // logging is off by default, enable it to see network calls in the console
 // Set all JSON data at once - only if identifier name is 'id'
 restServer.init(json);
@@ -406,9 +406,9 @@ restServer.setDefaultQuery(function(resourceName) {
 restServer.setBatchUrl('/batch');
 
 // you can create more than one fake server to listen to several domains
-const restServer2 = new FakeRest.Server('http://my.other.domain');
+const restServer2 = new FakeRest.Server({ baseUrl: 'http://my.other.domain' });
 // Set data collection by collection - allows to customize the identifier name
-const authorsCollection = new FakeRest.Collection([], '_id');
+const authorsCollection = new FakeRest.Collection({ items: [], identifierName: '_id' });
 authorsCollection.addOne({ first_name: 'Leo', last_name: 'Tolstoi' }); // { _id: 0, first_name: 'Leo', last_name: 'Tolstoi' }
 authorsCollection.addOne({ first_name: 'Jane', last_name: 'Austen' }); // { _id: 1, first_name: 'Jane', last_name: 'Austen' }
 // collections have auto incremented identifiers by default but accept identifiers already set
@@ -432,7 +432,7 @@ By default, FakeRest uses an auto incremented sequence for the items identifiers
 import FakeRest from 'fakerest';
 import uuid from 'uuid';
 
-const restServer = new FakeRest.Server('http://my.custom.domain', () => uuid.v5());
+const restServer = new FakeRest.Server({ baseUrl: 'http://my.custom.domain', getNewId: () => uuid.v5() });
 ```
 
 This can also be specified at the collection level:
@@ -441,8 +441,8 @@ This can also be specified at the collection level:
 import FakeRest from 'fakerest';
 import uuid from 'uuid';
 
-const restServer = new FakeRest.Server('http://my.custom.domain');
-const authorsCollection = new FakeRest.Collection([], '_id', () => uuid.v5());
+const restServer = new FakeRest.Server({ baseUrl: 'http://my.custom.domain' });
+const authorsCollection = new FakeRest.Collection({ items: [], identifierName: '_id', getNewId: () => uuid.v5() });
 ```
 
 ## Development

example/fetchMock.ts

@@ -3,7 +3,9 @@ import FakeRest from 'fakerest';
 import { data } from './data';
 
 export const initializeFetchMock = () => {
-    const restServer = new FakeRest.FetchServer('http://localhost:3000');
+    const restServer = new FakeRest.FetchServer({
+        baseUrl: 'http://localhost:3000',
+    });
     if (window) {
         // @ts-ignore
         window.restServer = restServer; // give way to update data in the console

src/BaseServer.ts

@@ -11,7 +11,13 @@ export class BaseServer {
     singles: Record<string, Single<any>> = {};
     getNewId?: () => number | string;
 
-    constructor(baseUrl = '', getNewId?: () => number | string) {
+    constructor({
+        baseUrl = '',
+        getNewId,
+    }: {
+        baseUrl?: string;
+        getNewId?: () => number | string;
+    } = {}) {
         this.baseUrl = baseUrl;
         this.getNewId = getNewId;
     }
@@ -25,7 +31,11 @@ export class BaseServer {
             if (Array.isArray(value)) {
                 this.addCollection(
                     name,
-                    new Collection(value, 'id', this.getNewId),
+                    new Collection({
+                        items: value,
+                        identifierName: 'id',
+                        getNewId: this.getNewId,
+                    }),
                 );
             } else {
                 this.addSingle(name, new Single(value));
@@ -116,7 +126,11 @@ export class BaseServer {
         if (!Object.prototype.hasOwnProperty.call(this.collections, name)) {
             this.addCollection(
                 name,
-                new Collection([] as CollectionItem[], 'id', this.getNewId),
+                new Collection({
+                    items: [],
+                    identifierName: 'id',
+                    getNewId: this.getNewId,
+                }),
             );
         }
         return this.collections[name].addOne(item);