@feathersjs/memory 5.0.0-pre.32 → 5.0.0-pre.34

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-pre.34](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.33...v5.0.0-pre.34) (2022-12-14)
+
+### Features
+
+- **adapter:** Add patch data type to adapters and refactor AdapterBase usage ([#2906](https://github.com/feathersjs/feathers/issues/2906)) ([9ddc2e6](https://github.com/feathersjs/feathers/commit/9ddc2e6b028f026f939d6af68125847e5c6734b4))
+
+# [5.0.0-pre.33](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.32...v5.0.0-pre.33) (2022-11-08)
+
+### Bug Fixes
+
+- **memory:** Use for loop in \_find() for better performance ([#2844](https://github.com/feathersjs/feathers/issues/2844)) ([d6ee5f1](https://github.com/feathersjs/feathers/commit/d6ee5f1c869f0c65cb470130f35956a52356e5c3))
+
 # [5.0.0-pre.32](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.31...v5.0.0-pre.32) (2022-10-26)
 
 **Note:** Version bump only for package @feathersjs/memory

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 import { AdapterBase, AdapterServiceOptions, PaginationOptions, AdapterParams } from '@feathersjs/adapter-commons';
-import { NullableId, Id, Params, ServiceMethods, Paginated } from '@feathersjs/feathers';
+import { NullableId, Id, Params, Paginated } from '@feathersjs/feathers';
 export interface MemoryServiceStore<T> {
     [key: string]: T;
 }
@@ -9,12 +9,12 @@ export interface MemoryServiceOptions<T = any> extends AdapterServiceOptions {
     matcher?: (query: any) => any;
     sorter?: (sort: any) => any;
 }
-export declare class MemoryAdapter<T = any, D = Partial<T>, P extends Params = Params> extends AdapterBase<T, D, P, MemoryServiceOptions<T>> {
-    store: MemoryServiceStore<T>;
+export declare class MemoryAdapter<Result = any, Data = Partial<Result>, ServiceParams extends Params = Params, PatchData = Partial<Data>> extends AdapterBase<Result, Data, PatchData, ServiceParams, MemoryServiceOptions<Result>> {
+    store: MemoryServiceStore<Result>;
     _uId: number;
-    constructor(options?: MemoryServiceOptions<T>);
-    getEntries(_params?: P): Promise<T[]>;
-    getQuery(params: P): {
+    constructor(options?: MemoryServiceOptions<Result>);
+    getEntries(_params?: ServiceParams): Promise<Result[]>;
+    getQuery(params: ServiceParams): {
         query: {
             [key: string]: any;
         };
@@ -25,40 +25,40 @@ export declare class MemoryAdapter<T = any, D = Partial<T>, P extends Params = P
             $select: any;
         };
     };
-    $find(_params?: P & {
+    _find(_params?: ServiceParams & {
         paginate?: PaginationOptions;
-    }): Promise<Paginated<T>>;
-    $find(_params?: P & {
+    }): Promise<Paginated<Result>>;
+    _find(_params?: ServiceParams & {
         paginate: false;
-    }): Promise<T[]>;
-    $find(_params?: P): Promise<Paginated<T> | T[]>;
-    $get(id: Id, params?: P): Promise<T>;
-    $create(data: Partial<D>, params?: P): Promise<T>;
-    $create(data: Partial<D>[], params?: P): Promise<T[]>;
-    $create(data: Partial<D> | Partial<D>[], _params?: P): Promise<T | T[]>;
-    $update(id: Id, data: D, params?: P): Promise<T>;
-    $patch(id: null, data: Partial<D>, params?: P): Promise<T[]>;
-    $patch(id: Id, data: Partial<D>, params?: P): Promise<T>;
-    $patch(id: NullableId, data: Partial<D>, _params?: P): Promise<T | T[]>;
-    $remove(id: null, params?: P): Promise<T[]>;
-    $remove(id: Id, params?: P): Promise<T>;
-    $remove(id: NullableId, _params?: P): Promise<T | T[]>;
+    }): Promise<Result[]>;
+    _find(_params?: ServiceParams): Promise<Paginated<Result> | Result[]>;
+    _get(id: Id, params?: ServiceParams): Promise<Result>;
+    _create(data: Partial<Data>, params?: ServiceParams): Promise<Result>;
+    _create(data: Partial<Data>[], params?: ServiceParams): Promise<Result[]>;
+    _create(data: Partial<Data> | Partial<Data>[], _params?: ServiceParams): Promise<Result | Result[]>;
+    _update(id: Id, data: Data, params?: ServiceParams): Promise<Result>;
+    _patch(id: null, data: PatchData, params?: ServiceParams): Promise<Result[]>;
+    _patch(id: Id, data: PatchData, params?: ServiceParams): Promise<Result>;
+    _patch(id: NullableId, data: PatchData, _params?: ServiceParams): Promise<Result | Result[]>;
+    _remove(id: null, params?: ServiceParams): Promise<Result[]>;
+    _remove(id: Id, params?: ServiceParams): Promise<Result>;
+    _remove(id: NullableId, _params?: ServiceParams): Promise<Result | Result[]>;
 }
-export declare class MemoryService<T = any, D = Partial<T>, P extends AdapterParams = AdapterParams> extends MemoryAdapter<T, D, P> implements ServiceMethods<T | Paginated<T>, D, P> {
-    find(params?: P & {
+export declare class MemoryService<Result = any, Data = Partial<Result>, ServiceParams extends AdapterParams = AdapterParams, PatchData = Partial<Data>> extends MemoryAdapter<Result, Data, ServiceParams, PatchData> {
+    find(params?: ServiceParams & {
         paginate?: PaginationOptions;
-    }): Promise<Paginated<T>>;
-    find(params?: P & {
+    }): Promise<Paginated<Result>>;
+    find(params?: ServiceParams & {
         paginate: false;
-    }): Promise<T[]>;
-    find(params?: P): Promise<Paginated<T> | T[]>;
-    get(id: Id, params?: P): Promise<T>;
-    create(data: D, params?: P): Promise<T>;
-    create(data: D[], params?: P): Promise<T[]>;
-    update(id: Id, data: D, params?: P): Promise<T>;
-    patch(id: Id, data: Partial<D>, params?: P): Promise<T>;
-    patch(id: null, data: Partial<D>, params?: P): Promise<T[]>;
-    remove(id: Id, params?: P): Promise<T>;
-    remove(id: null, params?: P): Promise<T[]>;
+    }): Promise<Result[]>;
+    find(params?: ServiceParams): Promise<Paginated<Result> | Result[]>;
+    get(id: Id, params?: ServiceParams): Promise<Result>;
+    create(data: Data, params?: ServiceParams): Promise<Result>;
+    create(data: Data[], params?: ServiceParams): Promise<Result[]>;
+    update(id: Id, data: Data, params?: ServiceParams): Promise<Result>;
+    patch(id: Id, data: PatchData, params?: ServiceParams): Promise<Result>;
+    patch(id: null, data: PatchData, params?: ServiceParams): Promise<Result[]>;
+    remove(id: Id, params?: ServiceParams): Promise<Result>;
+    remove(id: null, params?: ServiceParams): Promise<Result[]>;
 }
-export declare function memory<T = any, D = Partial<T>, P extends Params = Params>(options?: Partial<MemoryServiceOptions<T>>): MemoryService<T, D, P>;
+export declare function memory<T = any, D = Partial<T>, P extends Params = Params>(options?: Partial<MemoryServiceOptions<T>>): MemoryService<T, D, P, Partial<D>>;

package/lib/index.js

@@ -27,7 +27,7 @@ class MemoryAdapter extends adapter_commons_1.AdapterBase {
     }
     async getEntries(_params) {
         const params = _params || {};
-        return this.$find({
+        return this._find({
             ...params,
             paginate: false
         });
@@ -39,32 +39,50 @@ class MemoryAdapter extends adapter_commons_1.AdapterBase {
             filters: { $skip, $sort, $limit, $select }
         };
     }
-    async $find(params = {}) {
+    async _find(params = {}) {
         const { paginate } = this.getOptions(params);
         const { query, filters } = this.getQuery(params);
-        let values = commons_1._.values(this.store).filter(this.options.matcher(query));
+        let values = commons_1._.values(this.store);
         const total = values.length;
-        if (filters.$sort !== undefined) {
+        const hasSkip = filters.$skip !== undefined;
+        const hasSort = filters.$sort !== undefined;
+        const hasLimit = filters.$limit !== undefined;
+        const hasQuery = commons_1._.keys(query).length > 0;
+        if (hasSort) {
             values.sort(this.options.sorter(filters.$sort));
         }
-        if (filters.$skip !== undefined) {
-            values = values.slice(filters.$skip);
-        }
-        if (filters.$limit !== undefined) {
-            values = values.slice(0, filters.$limit);
+        if (hasQuery || hasLimit || hasSkip) {
+            let skipped = 0;
+            const matcher = this.options.matcher(query);
+            const matched = [];
+            for (let index = 0, length = values.length; index < length; index++) {
+                const value = values[index];
+                if (hasQuery && !matcher(value, index, values)) {
+                    continue;
+                }
+                if (hasSkip && filters.$skip > skipped) {
+                    skipped++;
+                    continue;
+                }
+                matched.push(_select(value, params));
+                if (hasLimit && filters.$limit === matched.length) {
+                    break;
+                }
+            }
+            values = matched;
         }
         const result = {
-            total,
+            total: hasQuery ? values.length : total,
             limit: filters.$limit,
             skip: filters.$skip || 0,
-            data: values.map((value) => _select(value, params))
+            data: filters.$limit === 0 ? [] : values
         };
         if (!paginate) {
             return result.data;
         }
         return result;
     }
-    async $get(id, params = {}) {
+    async _get(id, params = {}) {
         const { query } = this.getQuery(params);
         if (id in this.store) {
             const value = this.store[id];
@@ -74,25 +92,31 @@ class MemoryAdapter extends adapter_commons_1.AdapterBase {
         }
         throw new errors_1.NotFound(`No record found for id '${id}'`);
     }
-    async $create(data, params = {}) {
+    async _create(data, params = {}) {
         if (Array.isArray(data)) {
-            return Promise.all(data.map((current) => this.$create(current, params)));
+            return Promise.all(data.map((current) => this._create(current, params)));
         }
         const id = data[this.id] || this._uId++;
         const current = commons_1._.extend({}, data, { [this.id]: id });
         const result = (this.store[id] = current);
         return _select(result, params, this.id);
     }
-    async $update(id, data, params = {}) {
-        const oldEntry = await this.$get(id);
+    async _update(id, data, params = {}) {
+        if (id === null || Array.isArray(data)) {
+            throw new errors_1.BadRequest("You can not replace multiple instances. Did you mean 'patch'?");
+        }
+        const oldEntry = await this._get(id);
         // We don't want our id to change type if it can be coerced
         const oldId = oldEntry[this.id];
         // eslint-disable-next-line eqeqeq
         id = oldId == id ? oldId : id;
         this.store[id] = commons_1._.extend({}, data, { [this.id]: id });
-        return this.$get(id, params);
+        return this._get(id, params);
     }
-    async $patch(id, data, params = {}) {
+    async _patch(id, data, params = {}) {
+        if (id === null && !this.allowsMulti('patch', params)) {
+            throw new errors_1.MethodNotAllowed('Can not patch multiple entries');
+        }
         const { query } = this.getQuery(params);
         const patchEntry = (entry) => {
             const currentId = entry[this.id];
@@ -106,18 +130,21 @@ class MemoryAdapter extends adapter_commons_1.AdapterBase {
             });
             return entries.map(patchEntry);
         }
-        return patchEntry(await this.$get(id, params)); // Will throw an error if not found
+        return patchEntry(await this._get(id, params)); // Will throw an error if not found
     }
-    async $remove(id, params = {}) {
+    async _remove(id, params = {}) {
+        if (id === null && !this.allowsMulti('remove', params)) {
+            throw new errors_1.MethodNotAllowed('Can not remove multiple entries');
+        }
         const { query } = this.getQuery(params);
         if (id === null) {
             const entries = await this.getEntries({
                 ...params,
                 query
             });
-            return Promise.all(entries.map((current) => this.$remove(current[this.id], params)));
+            return Promise.all(entries.map((current) => this._remove(current[this.id], params)));
         }
-        const entry = await this.$get(id, params);
+        const entry = await this._get(id, params);
         delete this.store[id];
         return entry;
     }
@@ -125,22 +152,42 @@ class MemoryAdapter extends adapter_commons_1.AdapterBase {
 exports.MemoryAdapter = MemoryAdapter;
 class MemoryService extends MemoryAdapter {
     async find(params) {
-        return this._find(params);
+        return this._find({
+            ...params,
+            query: await this.sanitizeQuery(params)
+        });
     }
     async get(id, params) {
-        return this._get(id, params);
+        return this._get(id, {
+            ...params,
+            query: await this.sanitizeQuery(params)
+        });
     }
     async create(data, params) {
+        if (Array.isArray(data) && !this.allowsMulti('create', params)) {
+            throw new errors_1.MethodNotAllowed('Can not create multiple entries');
+        }
         return this._create(data, params);
     }
     async update(id, data, params) {
-        return this._update(id, data, params);
+        return this._update(id, data, {
+            ...params,
+            query: await this.sanitizeQuery(params)
+        });
     }
     async patch(id, data, params) {
-        return this._patch(id, data, params);
+        const { $limit, ...query } = await this.sanitizeQuery(params);
+        return this._patch(id, data, {
+            ...params,
+            query
+        });
     }
     async remove(id, params) {
-        return this._remove(id, params);
+        const { $limit, ...query } = await this.sanitizeQuery(params);
+        return this._remove(id, {
+            ...params,
+            query
+        });
     }
 }
 exports.MemoryService = MemoryService;

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/memory",
   "description": "An in memory service store",
-  "version": "5.0.0-pre.32",
+  "version": "5.0.0-pre.34",
   "homepage": "https://github.com/feathersjs/feathers",
   "main": "lib/",
   "types": "lib/",
@@ -49,20 +49,20 @@
     "lib": "lib"
   },
   "dependencies": {
-    "@feathersjs/adapter-commons": "^5.0.0-pre.32",
-    "@feathersjs/commons": "^5.0.0-pre.32",
-    "@feathersjs/errors": "^5.0.0-pre.32",
-    "sift": "^16.0.0"
+    "@feathersjs/adapter-commons": "^5.0.0-pre.34",
+    "@feathersjs/commons": "^5.0.0-pre.34",
+    "@feathersjs/errors": "^5.0.0-pre.34",
+    "sift": "^16.0.1"
   },
   "devDependencies": {
-    "@feathersjs/adapter-tests": "^5.0.0-pre.32",
-    "@feathersjs/feathers": "^5.0.0-pre.32",
-    "@types/mocha": "^10.0.0",
-    "@types/node": "^18.8.2",
-    "mocha": "^10.0.0",
+    "@feathersjs/adapter-tests": "^5.0.0-pre.34",
+    "@feathersjs/feathers": "^5.0.0-pre.34",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.11.10",
+    "mocha": "^10.1.0",
     "shx": "^0.3.4",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.3"
   },
-  "gitHead": "b405e205fc6d9fbd42b42c7a3f30ea4bf33d121d"
+  "gitHead": "42cca600d00f0b3b9d89fa79be30fcd46bc50132"
 }

package/src/index.ts

@@ -1,4 +1,4 @@
-import { NotFound } from '@feathersjs/errors'
+import { BadRequest, MethodNotAllowed, NotFound } from '@feathersjs/errors'
 import { _ } from '@feathersjs/commons'
 import {
   sorter,
@@ -9,7 +9,7 @@ import {
   AdapterParams
 } from '@feathersjs/adapter-commons'
 import sift from 'sift'
-import { NullableId, Id, Params, ServiceMethods, Paginated } from '@feathersjs/feathers'
+import { NullableId, Id, Params, Paginated } from '@feathersjs/feathers'
 
 export interface MemoryServiceStore<T> {
   [key: string]: T
@@ -28,16 +28,16 @@ const _select = (data: any, params: any, ...args: any[]) => {
   return base(JSON.parse(JSON.stringify(data)))
 }
 
-export class MemoryAdapter<T = any, D = Partial<T>, P extends Params = Params> extends AdapterBase<
-  T,
-  D,
-  P,
-  MemoryServiceOptions<T>
-> {
-  store: MemoryServiceStore<T>
+export class MemoryAdapter<
+  Result = any,
+  Data = Partial<Result>,
+  ServiceParams extends Params = Params,
+  PatchData = Partial<Data>
+> extends AdapterBase<Result, Data, PatchData, ServiceParams, MemoryServiceOptions<Result>> {
+  store: MemoryServiceStore<Result>
   _uId: number
 
-  constructor(options: MemoryServiceOptions<T> = {}) {
+  constructor(options: MemoryServiceOptions<Result> = {}) {
     super({
       id: 'id',
       matcher: sift,
@@ -50,16 +50,16 @@ export class MemoryAdapter<T = any, D = Partial<T>, P extends Params = Params> e
     this.store = { ...this.options.store }
   }
 
-  async getEntries(_params?: P) {
-    const params = _params || ({} as P)
+  async getEntries(_params?: ServiceParams) {
+    const params = _params || ({} as ServiceParams)
 
-    return this.$find({
+    return this._find({
       ...params,
       paginate: false
     })
   }
 
-  getQuery(params: P) {
+  getQuery(params: ServiceParams) {
     const { $skip, $sort, $limit, $select, ...query } = params.query || {}
 
     return {
@@ -68,33 +68,56 @@ export class MemoryAdapter<T = any, D = Partial<T>, P extends Params = Params> e
     }
   }
 
-  async $find(_params?: P & { paginate?: PaginationOptions }): Promise<Paginated<T>>
-  async $find(_params?: P & { paginate: false }): Promise<T[]>
-  async $find(_params?: P): Promise<Paginated<T> | T[]>
-  async $find(params: P = {} as P): Promise<Paginated<T> | T[]> {
+  async _find(_params?: ServiceParams & { paginate?: PaginationOptions }): Promise<Paginated<Result>>
+  async _find(_params?: ServiceParams & { paginate: false }): Promise<Result[]>
+  async _find(_params?: ServiceParams): Promise<Paginated<Result> | Result[]>
+  async _find(params: ServiceParams = {} as ServiceParams): Promise<Paginated<Result> | Result[]> {
     const { paginate } = this.getOptions(params)
     const { query, filters } = this.getQuery(params)
 
-    let values = _.values(this.store).filter(this.options.matcher(query))
+    let values = _.values(this.store)
     const total = values.length
+    const hasSkip = filters.$skip !== undefined
+    const hasSort = filters.$sort !== undefined
+    const hasLimit = filters.$limit !== undefined
+    const hasQuery = _.keys(query).length > 0
 
-    if (filters.$sort !== undefined) {
+    if (hasSort) {
       values.sort(this.options.sorter(filters.$sort))
     }
 
-    if (filters.$skip !== undefined) {
-      values = values.slice(filters.$skip)
-    }
+    if (hasQuery || hasLimit || hasSkip) {
+      let skipped = 0
+      const matcher = this.options.matcher(query)
+      const matched = []
+
+      for (let index = 0, length = values.length; index < length; index++) {
+        const value = values[index]
+
+        if (hasQuery && !matcher(value, index, values)) {
+          continue
+        }
+
+        if (hasSkip && filters.$skip > skipped) {
+          skipped++
+          continue
+        }
 
-    if (filters.$limit !== undefined) {
-      values = values.slice(0, filters.$limit)
+        matched.push(_select(value, params))
+
+        if (hasLimit && filters.$limit === matched.length) {
+          break
+        }
+      }
+
+      values = matched
     }
 
-    const result: Paginated<T> = {
-      total,
+    const result: Paginated<Result> = {
+      total: hasQuery ? values.length : total,
       limit: filters.$limit,
       skip: filters.$skip || 0,
-      data: values.map((value) => _select(value, params))
+      data: filters.$limit === 0 ? [] : values
     }
 
     if (!paginate) {
@@ -104,7 +127,7 @@ export class MemoryAdapter<T = any, D = Partial<T>, P extends Params = Params> e
     return result
   }
 
-  async $get(id: Id, params: P = {} as P): Promise<T> {
+  async _get(id: Id, params: ServiceParams = {} as ServiceParams): Promise<Result> {
     const { query } = this.getQuery(params)
 
     if (id in this.store) {
@@ -118,23 +141,30 @@ export class MemoryAdapter<T = any, D = Partial<T>, P extends Params = Params> e
     throw new NotFound(`No record found for id '${id}'`)
   }
 
-  async $create(data: Partial<D>, params?: P): Promise<T>
-  async $create(data: Partial<D>[], params?: P): Promise<T[]>
-  async $create(data: Partial<D> | Partial<D>[], _params?: P): Promise<T | T[]>
-  async $create(data: Partial<D> | Partial<D>[], params: P = {} as P): Promise<T | T[]> {
+  async _create(data: Partial<Data>, params?: ServiceParams): Promise<Result>
+  async _create(data: Partial<Data>[], params?: ServiceParams): Promise<Result[]>
+  async _create(data: Partial<Data> | Partial<Data>[], _params?: ServiceParams): Promise<Result | Result[]>
+  async _create(
+    data: Partial<Data> | Partial<Data>[],
+    params: ServiceParams = {} as ServiceParams
+  ): Promise<Result | Result[]> {
     if (Array.isArray(data)) {
-      return Promise.all(data.map((current) => this.$create(current, params)))
+      return Promise.all(data.map((current) => this._create(current, params)))
     }
 
     const id = (data as any)[this.id] || this._uId++
     const current = _.extend({}, data, { [this.id]: id })
     const result = (this.store[id] = current)
 
-    return _select(result, params, this.id) as T
+    return _select(result, params, this.id) as Result
   }
 
-  async $update(id: Id, data: D, params: P = {} as P): Promise<T> {
-    const oldEntry = await this.$get(id)
+  async _update(id: Id, data: Data, params: ServiceParams = {} as ServiceParams): Promise<Result> {
+    if (id === null || Array.isArray(data)) {
+      throw new BadRequest("You can not replace multiple instances. Did you mean 'patch'?")
+    }
+
+    const oldEntry = await this._get(id)
     // We don't want our id to change type if it can be coerced
     const oldId = (oldEntry as any)[this.id]
 
@@ -143,15 +173,23 @@ export class MemoryAdapter<T = any, D = Partial<T>, P extends Params = Params> e
 
     this.store[id] = _.extend({}, data, { [this.id]: id })
 
-    return this.$get(id, params)
+    return this._get(id, params)
   }
 
-  async $patch(id: null, data: Partial<D>, params?: P): Promise<T[]>
-  async $patch(id: Id, data: Partial<D>, params?: P): Promise<T>
-  async $patch(id: NullableId, data: Partial<D>, _params?: P): Promise<T | T[]>
-  async $patch(id: NullableId, data: Partial<D>, params: P = {} as P): Promise<T | T[]> {
+  async _patch(id: null, data: PatchData, params?: ServiceParams): Promise<Result[]>
+  async _patch(id: Id, data: PatchData, params?: ServiceParams): Promise<Result>
+  async _patch(id: NullableId, data: PatchData, _params?: ServiceParams): Promise<Result | Result[]>
+  async _patch(
+    id: NullableId,
+    data: PatchData,
+    params: ServiceParams = {} as ServiceParams
+  ): Promise<Result | Result[]> {
+    if (id === null && !this.allowsMulti('patch', params)) {
+      throw new MethodNotAllowed('Can not patch multiple entries')
+    }
+
     const { query } = this.getQuery(params)
-    const patchEntry = (entry: T) => {
+    const patchEntry = (entry: Result) => {
       const currentId = (entry as any)[this.id]
 
       this.store[currentId] = _.extend(this.store[currentId], _.omit(data, this.id))
@@ -168,13 +206,17 @@ export class MemoryAdapter<T = any, D = Partial<T>, P extends Params = Params> e
       return entries.map(patchEntry)
     }
 
-    return patchEntry(await this.$get(id, params)) // Will throw an error if not found
+    return patchEntry(await this._get(id, params)) // Will throw an error if not found
   }
 
-  async $remove(id: null, params?: P): Promise<T[]>
-  async $remove(id: Id, params?: P): Promise<T>
-  async $remove(id: NullableId, _params?: P): Promise<T | T[]>
-  async $remove(id: NullableId, params: P = {} as P): Promise<T | T[]> {
+  async _remove(id: null, params?: ServiceParams): Promise<Result[]>
+  async _remove(id: Id, params?: ServiceParams): Promise<Result>
+  async _remove(id: NullableId, _params?: ServiceParams): Promise<Result | Result[]>
+  async _remove(id: NullableId, params: ServiceParams = {} as ServiceParams): Promise<Result | Result[]> {
+    if (id === null && !this.allowsMulti('remove', params)) {
+      throw new MethodNotAllowed('Can not remove multiple entries')
+    }
+
     const { query } = this.getQuery(params)
 
     if (id === null) {
@@ -183,10 +225,10 @@ export class MemoryAdapter<T = any, D = Partial<T>, P extends Params = Params> e
         query
       })
 
-      return Promise.all(entries.map((current: any) => this.$remove(current[this.id] as Id, params)))
+      return Promise.all(entries.map((current: any) => this._remove(current[this.id] as Id, params)))
     }
 
-    const entry = await this.$get(id, params)
+    const entry = await this._get(id, params)
 
     delete this.store[id]
 
@@ -194,41 +236,66 @@ export class MemoryAdapter<T = any, D = Partial<T>, P extends Params = Params> e
   }
 }
 
-export class MemoryService<T = any, D = Partial<T>, P extends AdapterParams = AdapterParams>
-  extends MemoryAdapter<T, D, P>
-  implements ServiceMethods<T | Paginated<T>, D, P>
-{
-  async find(params?: P & { paginate?: PaginationOptions }): Promise<Paginated<T>>
-  async find(params?: P & { paginate: false }): Promise<T[]>
-  async find(params?: P): Promise<Paginated<T> | T[]>
-  async find(params?: P): Promise<Paginated<T> | T[]> {
-    return this._find(params) as any
+export class MemoryService<
+  Result = any,
+  Data = Partial<Result>,
+  ServiceParams extends AdapterParams = AdapterParams,
+  PatchData = Partial<Data>
+> extends MemoryAdapter<Result, Data, ServiceParams, PatchData> {
+  async find(params?: ServiceParams & { paginate?: PaginationOptions }): Promise<Paginated<Result>>
+  async find(params?: ServiceParams & { paginate: false }): Promise<Result[]>
+  async find(params?: ServiceParams): Promise<Paginated<Result> | Result[]>
+  async find(params?: ServiceParams): Promise<Paginated<Result> | Result[]> {
+    return this._find({
+      ...params,
+      query: await this.sanitizeQuery(params)
+    })
   }
 
-  async get(id: Id, params?: P): Promise<T> {
-    return this._get(id, params)
+  async get(id: Id, params?: ServiceParams): Promise<Result> {
+    return this._get(id, {
+      ...params,
+      query: await this.sanitizeQuery(params)
+    })
   }
 
-  async create(data: D, params?: P): Promise<T>
-  async create(data: D[], params?: P): Promise<T[]>
-  async create(data: D | D[], params?: P): Promise<T | T[]> {
+  async create(data: Data, params?: ServiceParams): Promise<Result>
+  async create(data: Data[], params?: ServiceParams): Promise<Result[]>
+  async create(data: Data | Data[], params?: ServiceParams): Promise<Result | Result[]> {
+    if (Array.isArray(data) && !this.allowsMulti('create', params)) {
+      throw new MethodNotAllowed('Can not create multiple entries')
+    }
+
     return this._create(data, params)
   }
 
-  async update(id: Id, data: D, params?: P): Promise<T> {
-    return this._update(id, data, params)
+  async update(id: Id, data: Data, params?: ServiceParams): Promise<Result> {
+    return this._update(id, data, {
+      ...params,
+      query: await this.sanitizeQuery(params)
+    })
   }
 
-  async patch(id: Id, data: Partial<D>, params?: P): Promise<T>
-  async patch(id: null, data: Partial<D>, params?: P): Promise<T[]>
-  async patch(id: NullableId, data: Partial<D>, params?: P): Promise<T | T[]> {
-    return this._patch(id, data, params)
+  async patch(id: Id, data: PatchData, params?: ServiceParams): Promise<Result>
+  async patch(id: null, data: PatchData, params?: ServiceParams): Promise<Result[]>
+  async patch(id: NullableId, data: PatchData, params?: ServiceParams): Promise<Result | Result[]> {
+    const { $limit, ...query } = await this.sanitizeQuery(params)
+
+    return this._patch(id, data, {
+      ...params,
+      query
+    })
   }
 
-  async remove(id: Id, params?: P): Promise<T>
-  async remove(id: null, params?: P): Promise<T[]>
-  async remove(id: NullableId, params?: P): Promise<T | T[]> {
-    return this._remove(id, params)
+  async remove(id: Id, params?: ServiceParams): Promise<Result>
+  async remove(id: null, params?: ServiceParams): Promise<Result[]>
+  async remove(id: NullableId, params?: ServiceParams): Promise<Result | Result[]> {
+    const { $limit, ...query } = await this.sanitizeQuery(params)
+
+    return this._remove(id, {
+      ...params,
+      query
+    })
   }
 }