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

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 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)
+
+### Bug Fixes
+
+- **schema:** Check for undefined value in resolveQueryObjectId resolver ([#2914](https://github.com/feathersjs/feathers/issues/2914)) ([d9449fa](https://github.com/feathersjs/feathers/commit/d9449fa835f58fc9cec5f7254c50219494129140))
+
+### 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)
+
+### Features
+
+- **mongodb:** Add ObjectId resolvers and MongoDB option in the guide ([#2847](https://github.com/feathersjs/feathers/issues/2847)) ([c5c1fba](https://github.com/feathersjs/feathers/commit/c5c1fba5718a63412075cd3838b86b889eb0bd48))
+
 # [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/mongodb

package/lib/adapter.d.ts

@@ -1,18 +1,21 @@
-import { ObjectId, Collection, FindOptions, BulkWriteOptions, InsertOneOptions, DeleteOptions, CountDocumentsOptions, ReplaceOptions } from 'mongodb';
+import { ObjectId, Collection, FindOptions, BulkWriteOptions, InsertOneOptions, DeleteOptions, CountDocumentsOptions, ReplaceOptions, Document } from 'mongodb';
 import { AdapterBase, AdapterParams, AdapterServiceOptions, PaginationOptions, AdapterQuery } from '@feathersjs/adapter-commons';
-import { NullableId, Id, Paginated } from '@feathersjs/feathers';
+import { Id, Paginated } from '@feathersjs/feathers';
 export interface MongoDBAdapterOptions extends AdapterServiceOptions {
     Model: Collection | Promise<Collection>;
     disableObjectify?: boolean;
     useEstimatedDocumentCount?: boolean;
 }
 export interface MongoDBAdapterParams<Q = AdapterQuery> extends AdapterParams<Q, Partial<MongoDBAdapterOptions>> {
+    pipeline?: Document[];
     mongodb?: BulkWriteOptions | FindOptions | InsertOneOptions | DeleteOptions | CountDocumentsOptions | ReplaceOptions;
 }
-export declare class MongoDbAdapter<T, D = Partial<T>, P extends MongoDBAdapterParams<any> = MongoDBAdapterParams> extends AdapterBase<T, D, P, MongoDBAdapterOptions> {
+export type AdapterId = Id | ObjectId;
+export type NullableAdapterId = AdapterId | null;
+export declare class MongoDbAdapter<Result, Data = Partial<Result>, ServiceParams extends MongoDBAdapterParams<any> = MongoDBAdapterParams, PatchData = Partial<Data>> extends AdapterBase<Result, Data, PatchData, ServiceParams, MongoDBAdapterOptions, AdapterId> {
     constructor(options: MongoDBAdapterOptions);
-    getObjectId(id: Id | ObjectId): Id | ObjectId;
-    filterQuery(id: NullableId, params: P): {
+    getObjectId(id: AdapterId): AdapterId;
+    filterQuery(id: NullableAdapterId, params: ServiceParams): {
         filters: {
             $select: string[];
             $sort: {
@@ -25,29 +28,33 @@ export declare class MongoDbAdapter<T, D = Partial<T>, P extends MongoDBAdapterP
             [key: string]: any;
         };
     };
+    getModel(params: ServiceParams): Promise<Collection<Document>>;
+    findRaw(params: ServiceParams): Promise<import("mongodb").FindCursor<import("mongodb").WithId<Document>>>;
+    aggregateRaw(params: ServiceParams): Promise<import("mongodb").AggregationCursor<Document>>;
+    makeFeathersPipeline(params: ServiceParams): Document[];
     getSelect(select: string[] | {
         [key: string]: number;
     }): {
         [key: string]: number;
     };
-    $findOrGet(id: NullableId, params: P): Promise<T | Paginated<T> | T[]>;
-    normalizeId(id: NullableId, data: Partial<D>): Partial<D>;
-    $get(id: Id, params?: P): Promise<T>;
-    $find(params?: P & {
+    _findOrGet(id: NullableAdapterId, params: ServiceParams): Promise<Result | Paginated<Result> | Result[]>;
+    normalizeId<D>(id: NullableAdapterId, data: D): D;
+    _get(id: AdapterId, params?: ServiceParams): Promise<Result>;
+    _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[]>;
-    $create(data: D, params?: P): Promise<T>;
-    $create(data: D[], params?: P): Promise<T[]>;
-    $create(data: D | D[], _params?: P): Promise<T | 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[]>;
-    $update(id: Id, data: D, params?: P): Promise<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[]>;
+    _create(data: Data, params?: ServiceParams): Promise<Result>;
+    _create(data: Data[], params?: ServiceParams): Promise<Result[]>;
+    _create(data: Data | Data[], _params?: ServiceParams): Promise<Result | Result[]>;
+    _patch(id: null, data: PatchData, params?: ServiceParams): Promise<Result[]>;
+    _patch(id: AdapterId, data: PatchData, params?: ServiceParams): Promise<Result>;
+    _patch(id: NullableAdapterId, data: PatchData, _params?: ServiceParams): Promise<Result | Result[]>;
+    _update(id: AdapterId, data: Data, params?: ServiceParams): Promise<Result>;
+    _remove(id: null, params?: ServiceParams): Promise<Result[]>;
+    _remove(id: AdapterId, params?: ServiceParams): Promise<Result>;
+    _remove(id: NullableAdapterId, _params?: ServiceParams): Promise<Result | Result[]>;
 }

package/lib/adapter.js

@@ -41,6 +41,54 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
             query
         };
     }
+    getModel(params) {
+        const { Model } = this.getOptions(params);
+        return Promise.resolve(Model);
+    }
+    async findRaw(params) {
+        const { filters, query } = this.filterQuery(null, params);
+        const model = await this.getModel(params);
+        const q = model.find(query, { ...params.mongodb });
+        if (filters.$select !== undefined) {
+            q.project(this.getSelect(filters.$select));
+        }
+        if (filters.$sort !== undefined) {
+            q.sort(filters.$sort);
+        }
+        if (filters.$skip !== undefined) {
+            q.skip(filters.$skip);
+        }
+        if (filters.$limit !== undefined) {
+            q.limit(filters.$limit);
+        }
+        return q;
+    }
+    async aggregateRaw(params) {
+        const model = await this.getModel(params);
+        const pipeline = params.pipeline || [];
+        const index = pipeline.findIndex((stage) => stage.$feathers);
+        const before = index >= 0 ? pipeline.slice(0, index) : [];
+        const feathersPipeline = this.makeFeathersPipeline(params);
+        const after = index >= 0 ? pipeline.slice(index + 1) : pipeline;
+        return model.aggregate([...before, ...feathersPipeline, ...after]);
+    }
+    makeFeathersPipeline(params) {
+        const { filters, query } = this.filterQuery(null, params);
+        const pipeline = [{ $match: query }];
+        if (filters.$select !== undefined) {
+            pipeline.push({ $project: this.getSelect(filters.$select) });
+        }
+        if (filters.$sort !== undefined) {
+            pipeline.push({ $sort: filters.$sort });
+        }
+        if (filters.$skip !== undefined) {
+            pipeline.push({ $skip: filters.$skip });
+        }
+        if (filters.$limit !== undefined) {
+            pipeline.push({ $limit: filters.$limit });
+        }
+        return pipeline;
+    }
     getSelect(select) {
         if (Array.isArray(select)) {
             return select.reduce((value, name) => ({
@@ -50,8 +98,8 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
         }
         return select;
     }
-    async $findOrGet(id, params) {
-        return id === null ? await this.$find(params) : await this.$get(id, params);
+    async _findOrGet(id, params) {
+        return id === null ? await this._find(params) : await this._get(id, params);
     }
     normalizeId(id, data) {
         if (this.id === '_id') {
@@ -69,8 +117,7 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
         }
         return data;
     }
-    async $get(id, params = {}) {
-        const { Model } = this.getOptions(params);
+    async _get(id, params = {}) {
         const { query, filters: { $select } } = this.filterQuery(id, params);
         const projection = $select
             ? {
@@ -84,7 +131,7 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
             ...params.mongodb,
             ...projection
         };
-        return Promise.resolve(Model)
+        return this.getModel(params)
             .then((model) => model.findOne(query, findOptions))
             .then((data) => {
             if (data == null) {
@@ -94,42 +141,37 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
         })
             .catch(error_handler_1.errorHandler);
     }
-    async $find(params = {}) {
+    async _find(params = {}) {
+        const { paginate, useEstimatedDocumentCount } = this.getOptions(params);
         const { filters, query } = this.filterQuery(null, params);
-        const { paginate, Model, useEstimatedDocumentCount } = this.getOptions(params);
-        const findOptions = { ...params.mongodb };
-        const model = await Promise.resolve(Model);
-        const q = model.find(query, findOptions);
-        if (filters.$select !== undefined) {
-            q.project(this.getSelect(filters.$select));
-        }
-        if (filters.$sort !== undefined) {
-            q.sort(filters.$sort);
-        }
-        if (filters.$limit !== undefined) {
-            q.limit(filters.$limit);
-        }
-        if (filters.$skip !== undefined) {
-            q.skip(filters.$skip);
-        }
-        const runQuery = async (total) => ({
+        const useAggregation = !params.mongodb && filters.$limit !== 0;
+        const countDocuments = async () => {
+            if (paginate && paginate.default) {
+                const model = await this.getModel(params);
+                if (useEstimatedDocumentCount && typeof model.estimatedDocumentCount === 'function') {
+                    return model.estimatedDocumentCount();
+                }
+                else {
+                    return model.countDocuments(query, { ...params.mongodb });
+                }
+            }
+            return Promise.resolve(0);
+        };
+        const [request, total] = await Promise.all([
+            useAggregation ? this.aggregateRaw(params) : this.findRaw(params),
+            countDocuments()
+        ]);
+        const page = {
             total,
             limit: filters.$limit,
             skip: filters.$skip || 0,
-            data: filters.$limit === 0 ? [] : (await q.toArray())
-        });
-        if (paginate && paginate.default) {
-            if (useEstimatedDocumentCount && typeof model.estimatedDocumentCount === 'function') {
-                return model.estimatedDocumentCount().then(runQuery);
-            }
-            return model.countDocuments(query, findOptions).then(runQuery);
-        }
-        return runQuery(0).then((page) => page.data);
+            data: filters.$limit === 0 ? [] : (await request.toArray())
+        };
+        return paginate && paginate.default ? page : page.data;
     }
-    async $create(data, params = {}) {
+    async _create(data, params = {}) {
         const writeOptions = params.mongodb;
-        const { Model } = this.getOptions(params);
-        const model = await Promise.resolve(Model);
+        const model = await this.getModel(params);
         const setId = (item) => {
             const entry = Object.assign({}, item);
             // Generate a MongoId if we use a custom id
@@ -150,10 +192,12 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
                 .then(async (result) => model.findOne({ _id: result.insertedId }, params.mongodb));
         return promise.then((0, adapter_commons_1.select)(params, this.id)).catch(error_handler_1.errorHandler);
     }
-    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 data = this.normalizeId(id, _data);
-        const { Model } = this.getOptions(params);
-        const model = await Promise.resolve(Model);
+        const model = await this.getModel(params);
         const { query, filters: { $select } } = this.filterQuery(id, params);
         const updateOptions = { ...params.mongodb };
         const modifier = Object.keys(data).reduce((current, key) => {
@@ -169,7 +213,7 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
             }
             return current;
         }, {});
-        const originalIds = await this.$findOrGet(id, {
+        const originalIds = await this._findOrGet(id, {
             ...params,
             query: {
                 ...query,
@@ -188,19 +232,23 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
             }
         };
         await model.updateMany(query, modifier, updateOptions);
-        return this.$findOrGet(id, findParams).catch(error_handler_1.errorHandler);
+        return this._findOrGet(id, findParams).catch(error_handler_1.errorHandler);
     }
-    async $update(id, data, params = {}) {
-        const { Model } = this.getOptions(params);
-        const model = await Promise.resolve(Model);
+    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 model = await this.getModel(params);
         const { query } = this.filterQuery(id, params);
         const replaceOptions = { ...params.mongodb };
         await model.replaceOne(query, this.normalizeId(id, data), replaceOptions);
-        return this.$findOrGet(id, params).catch(error_handler_1.errorHandler);
+        return this._findOrGet(id, params).catch(error_handler_1.errorHandler);
     }
-    async $remove(id, params = {}) {
-        const { Model } = this.getOptions(params);
-        const model = await Promise.resolve(Model);
+    async _remove(id, params = {}) {
+        if (id === null && !this.allowsMulti('remove', params)) {
+            throw new errors_1.MethodNotAllowed('Can not remove multiple entries');
+        }
+        const model = await this.getModel(params);
         const { query, filters: { $select } } = this.filterQuery(id, params);
         const deleteOptions = { ...params.mongodb };
         const findParams = {
@@ -211,7 +259,7 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
                 $select
             }
         };
-        return this.$findOrGet(id, findParams)
+        return this._findOrGet(id, findParams)
             .then(async (items) => {
             await model.deleteMany(query, deleteOptions);
             return items;

package/lib/adapter.js.map

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

package/lib/index.d.ts

@@ -1,22 +1,23 @@
 import { PaginationOptions } from '@feathersjs/adapter-commons';
-import { Paginated, ServiceMethods, Id, Params } from '@feathersjs/feathers';
-import { MongoDbAdapter, MongoDBAdapterParams } from './adapter';
+import { Paginated, Params } from '@feathersjs/feathers';
+import { AdapterId, MongoDbAdapter, MongoDBAdapterParams } from './adapter';
 export * from './adapter';
 export * from './error-handler';
-export declare class MongoDBService<T = any, D = Partial<T>, P extends Params<any> = MongoDBAdapterParams> extends MongoDbAdapter<T, D, P> implements ServiceMethods<T | Paginated<T>, D, P> {
-    find(params?: P & {
+export * from './resolvers';
+export declare class MongoDBService<Result = any, Data = Partial<Result>, ServiceParams extends Params<any> = MongoDBAdapterParams, PatchData = Partial<Data>> extends MongoDbAdapter<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: AdapterId, params?: ServiceParams): Promise<Result>;
+    create(data: Data, params?: ServiceParams): Promise<Result>;
+    create(data: Data[], params?: ServiceParams): Promise<Result[]>;
+    update(id: AdapterId, data: Data, params?: ServiceParams): Promise<Result>;
+    patch(id: null, data: PatchData, params?: ServiceParams): Promise<Result[]>;
+    patch(id: AdapterId, data: PatchData, params?: ServiceParams): Promise<Result>;
+    remove(id: AdapterId, params?: ServiceParams): Promise<Result>;
+    remove(id: null, params?: ServiceParams): Promise<Result[]>;
 }

package/lib/index.js

@@ -15,27 +15,49 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoDBService = void 0;
+const lib_1 = require("@feathersjs/errors/lib");
 const adapter_1 = require("./adapter");
 __exportStar(require("./adapter"), exports);
 __exportStar(require("./error-handler"), exports);
+__exportStar(require("./resolvers"), exports);
 class MongoDBService extends adapter_1.MongoDbAdapter {
     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 lib_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.MongoDBService = MongoDBService;

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,uCAAgE;AAEhE,4CAAyB;AACzB,kDAA+B;AAE/B,MAAa,cACX,SAAQ,wBAAuB;IAM/B,KAAK,CAAC,IAAI,CAAC,MAAU;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAQ,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EAAM,EAAE,MAAU;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;IAC9B,CAAC;IAID,KAAK,CAAC,MAAM,CAAC,IAAa,EAAE,MAAU;QACpC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAM,EAAE,IAAO,EAAE,MAAU;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACvC,CAAC;IAID,KAAK,CAAC,KAAK,CAAC,EAAc,EAAE,IAAgB,EAAE,MAAU;QACtD,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACtC,CAAC;IAID,KAAK,CAAC,MAAM,CAAC,EAAc,EAAE,MAAU;QACrC,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;IACjC,CAAC;CACF;AApCD,wCAoCC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,gDAAyD;AAEzD,uCAA8F;AAE9F,4CAAyB;AACzB,kDAA+B;AAC/B,8CAA2B;AAE3B,MAAa,cAKX,SAAQ,wBAAsD;IAI9D,KAAK,CAAC,IAAI,CAAC,MAAsB;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;YAChB,GAAG,MAAM;YACT,KAAK,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;SACxC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EAAa,EAAE,MAAsB;QAC7C,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;YACnB,GAAG,MAAM;YACT,KAAK,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;SACxC,CAAC,CAAA;IACJ,CAAC;IAID,KAAK,CAAC,MAAM,CAAC,IAAmB,EAAE,MAAsB;QACtD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;YAC9D,MAAM,IAAI,sBAAgB,CAAC,iCAAiC,CAAC,CAAA;SAC9D;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAa,EAAE,IAAU,EAAE,MAAsB;QAC5D,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE;YAC5B,GAAG,MAAM;YACT,KAAK,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;SACxC,CAAC,CAAA;IACJ,CAAC;IAID,KAAK,CAAC,KAAK,CAAC,EAAqB,EAAE,IAAe,EAAE,MAAsB;QACxE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;QAE7D,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE;YAC3B,GAAG,MAAM;YACT,KAAK;SACN,CAAC,CAAA;IACJ,CAAC;IAID,KAAK,CAAC,MAAM,CAAC,EAAqB,EAAE,MAAsB;QACxD,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;QAE7D,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;YACtB,GAAG,MAAM;YACT,KAAK;SACN,CAAC,CAAA;IACJ,CAAC;CACF;AA7DD,wCA6DC"}

package/lib/resolvers.d.ts

@@ -0,0 +1,10 @@
+import { ObjectId } from 'mongodb';
+export type ObjectIdParam = string | number | ObjectId;
+export type IdQueryObject<T> = {
+    $in?: T[];
+    $nin?: T[];
+    $ne?: T;
+};
+export declare function resolveObjectId(value: ObjectIdParam): Promise<ObjectId>;
+export declare function resolveQueryObjectId(value: IdQueryObject<ObjectIdParam>): Promise<IdQueryObject<ObjectId>>;
+export declare function resolveQueryObjectId(value: ObjectIdParam): Promise<ObjectId>;

package/lib/resolvers.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveQueryObjectId = exports.resolveObjectId = void 0;
+const mongodb_1 = require("mongodb");
+const toObjectId = (value) => new mongodb_1.ObjectId(value);
+async function resolveObjectId(value) {
+    return toObjectId(value);
+}
+exports.resolveObjectId = resolveObjectId;
+async function resolveQueryObjectId(value) {
+    if (!value) {
+        return undefined;
+    }
+    if (typeof value === 'string' || typeof value === 'number' || value instanceof mongodb_1.ObjectId) {
+        return toObjectId(value);
+    }
+    const convertedObject = {};
+    if (Array.isArray(value.$in)) {
+        convertedObject.$in = value.$in.map(toObjectId);
+    }
+    if (Array.isArray(value.$nin)) {
+        convertedObject.$nin = value.$nin.map(toObjectId);
+    }
+    if (value.$ne !== undefined) {
+        convertedObject.$ne = toObjectId(value.$ne);
+    }
+    return convertedObject;
+}
+exports.resolveQueryObjectId = resolveQueryObjectId;
+//# sourceMappingURL=resolvers.js.map

package/lib/resolvers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolvers.js","sourceRoot":"","sources":["../src/resolvers.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAUlC,MAAM,UAAU,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,IAAI,kBAAQ,CAAC,KAAK,CAAC,CAAA;AAEzD,KAAK,UAAU,eAAe,CAAC,KAAoB;IACxD,OAAO,UAAU,CAAC,KAAK,CAAC,CAAA;AAC1B,CAAC;AAFD,0CAEC;AAMM,KAAK,UAAU,oBAAoB,CAAC,KAAmD;IAC5F,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,kBAAQ,EAAE;QACvF,OAAO,UAAU,CAAC,KAAK,CAAC,CAAA;KACzB;IAED,MAAM,eAAe,GAA4B,EAAE,CAAA;IAEnD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QAC5B,eAAe,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;KAChD;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAC7B,eAAe,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;KAClD;IAED,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,EAAE;QAC3B,eAAe,CAAC,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;KAC5C;IAED,OAAO,eAAe,CAAA;AACxB,CAAC;AAxBD,oDAwBC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/mongodb",
   "description": "Feathers MongoDB service adapter",
-  "version": "5.0.0-pre.32",
+  "version": "5.0.0-pre.34",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "keywords": [
@@ -51,22 +51,22 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/adapter-commons": "^5.0.0-pre.32",
-    "@feathersjs/commons": "^5.0.0-pre.32",
-    "@feathersjs/errors": "^5.0.0-pre.32",
-    "@feathersjs/feathers": "^5.0.0-pre.32"
+    "@feathersjs/adapter-commons": "^5.0.0-pre.34",
+    "@feathersjs/commons": "^5.0.0-pre.34",
+    "@feathersjs/errors": "^5.0.0-pre.34",
+    "@feathersjs/feathers": "^5.0.0-pre.34"
   },
   "peerDependencies": {
     "mongodb": "^4.5.0"
   },
   "devDependencies": {
-    "@feathersjs/adapter-tests": "^5.0.0-pre.32",
-    "@types/mocha": "^10.0.0",
-    "@types/node": "^18.8.2",
-    "mocha": "^10.0.0",
-    "mongodb-memory-server": "^8.9.3",
+    "@feathersjs/adapter-tests": "^5.0.0-pre.34",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.11.10",
+    "mocha": "^10.1.0",
+    "mongodb-memory-server": "^8.10.1",
     "shx": "^0.3.4",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.3"
   },
-  "gitHead": "b405e205fc6d9fbd42b42c7a3f30ea4bf33d121d"
+  "gitHead": "42cca600d00f0b3b9d89fa79be30fcd46bc50132"
 }

package/src/adapter.ts

@@ -6,9 +6,10 @@ import {
   InsertOneOptions,
   DeleteOptions,
   CountDocumentsOptions,
-  ReplaceOptions
+  ReplaceOptions,
+  Document
 } from 'mongodb'
-import { NotFound } from '@feathersjs/errors'
+import { BadRequest, MethodNotAllowed, NotFound } from '@feathersjs/errors'
 import { _ } from '@feathersjs/commons'
 import {
   AdapterBase,
@@ -18,7 +19,7 @@ import {
   PaginationOptions,
   AdapterQuery
 } from '@feathersjs/adapter-commons'
-import { NullableId, Id, Paginated } from '@feathersjs/feathers'
+import { Id, Paginated } from '@feathersjs/feathers'
 import { errorHandler } from './error-handler'
 
 export interface MongoDBAdapterOptions extends AdapterServiceOptions {
@@ -29,6 +30,7 @@ export interface MongoDBAdapterOptions extends AdapterServiceOptions {
 
 export interface MongoDBAdapterParams<Q = AdapterQuery>
   extends AdapterParams<Q, Partial<MongoDBAdapterOptions>> {
+  pipeline?: Document[]
   mongodb?:
     | BulkWriteOptions
     | FindOptions
@@ -38,12 +40,17 @@ export interface MongoDBAdapterParams<Q = AdapterQuery>
     | ReplaceOptions
 }
 
+export type AdapterId = Id | ObjectId
+
+export type NullableAdapterId = AdapterId | null
+
 // Create the service.
 export class MongoDbAdapter<
-  T,
-  D = Partial<T>,
-  P extends MongoDBAdapterParams<any> = MongoDBAdapterParams
-> extends AdapterBase<T, D, P, MongoDBAdapterOptions> {
+  Result,
+  Data = Partial<Result>,
+  ServiceParams extends MongoDBAdapterParams<any> = MongoDBAdapterParams,
+  PatchData = Partial<Data>
+> extends AdapterBase<Result, Data, PatchData, ServiceParams, MongoDBAdapterOptions, AdapterId> {
   constructor(options: MongoDBAdapterOptions) {
     if (!options) {
       throw new Error('MongoDB options have to be provided')
@@ -55,7 +62,7 @@ export class MongoDbAdapter<
     })
   }
 
-  getObjectId(id: Id | ObjectId) {
+  getObjectId(id: AdapterId) {
     if (this.options.disableObjectify) {
       return id
     }
@@ -67,7 +74,7 @@ export class MongoDbAdapter<
     return id
   }
 
-  filterQuery(id: NullableId, params: P) {
+  filterQuery(id: NullableAdapterId, params: ServiceParams) {
     const { $select, $sort, $limit, $skip, ...query } = (params.query || {}) as AdapterQuery
 
     if (id !== null) {
@@ -86,6 +93,68 @@ export class MongoDbAdapter<
     }
   }
 
+  getModel(params: ServiceParams) {
+    const { Model } = this.getOptions(params)
+    return Promise.resolve(Model)
+  }
+
+  async findRaw(params: ServiceParams) {
+    const { filters, query } = this.filterQuery(null, params)
+    const model = await this.getModel(params)
+    const q = model.find(query, { ...params.mongodb })
+
+    if (filters.$select !== undefined) {
+      q.project(this.getSelect(filters.$select))
+    }
+
+    if (filters.$sort !== undefined) {
+      q.sort(filters.$sort)
+    }
+
+    if (filters.$skip !== undefined) {
+      q.skip(filters.$skip)
+    }
+
+    if (filters.$limit !== undefined) {
+      q.limit(filters.$limit)
+    }
+
+    return q
+  }
+
+  async aggregateRaw(params: ServiceParams) {
+    const model = await this.getModel(params)
+    const pipeline = params.pipeline || []
+    const index = pipeline.findIndex((stage: Document) => stage.$feathers)
+    const before = index >= 0 ? pipeline.slice(0, index) : []
+    const feathersPipeline = this.makeFeathersPipeline(params)
+    const after = index >= 0 ? pipeline.slice(index + 1) : pipeline
+
+    return model.aggregate([...before, ...feathersPipeline, ...after])
+  }
+
+  makeFeathersPipeline(params: ServiceParams) {
+    const { filters, query } = this.filterQuery(null, params)
+    const pipeline: Document[] = [{ $match: query }]
+
+    if (filters.$select !== undefined) {
+      pipeline.push({ $project: this.getSelect(filters.$select) })
+    }
+
+    if (filters.$sort !== undefined) {
+      pipeline.push({ $sort: filters.$sort })
+    }
+
+    if (filters.$skip !== undefined) {
+      pipeline.push({ $skip: filters.$skip })
+    }
+
+    if (filters.$limit !== undefined) {
+      pipeline.push({ $limit: filters.$limit })
+    }
+    return pipeline
+  }
+
   getSelect(select: string[] | { [key: string]: number }) {
     if (Array.isArray(select)) {
       return select.reduce<{ [key: string]: number }>(
@@ -100,11 +169,11 @@ export class MongoDbAdapter<
     return select
   }
 
-  async $findOrGet(id: NullableId, params: P) {
-    return id === null ? await this.$find(params) : await this.$get(id, params)
+  async _findOrGet(id: NullableAdapterId, params: ServiceParams) {
+    return id === null ? await this._find(params) : await this._get(id, params)
   }
 
-  normalizeId(id: NullableId, data: Partial<D>): Partial<D> {
+  normalizeId<D>(id: NullableAdapterId, data: D): D {
     if (this.id === '_id') {
       // Default Mongo IDs cannot be updated. The Mongo library handles
       // this automatically.
@@ -120,8 +189,7 @@ export class MongoDbAdapter<
     return data
   }
 
-  async $get(id: Id, params: P = {} as P): Promise<T> {
-    const { Model } = this.getOptions(params)
+  async _get(id: AdapterId, params: ServiceParams = {} as ServiceParams): Promise<Result> {
     const {
       query,
       filters: { $select }
@@ -139,7 +207,7 @@ export class MongoDbAdapter<
       ...projection
     }
 
-    return Promise.resolve(Model)
+    return this.getModel(params)
       .then((model) => model.findOne(query, findOptions))
       .then((data) => {
         if (data == null) {
@@ -151,57 +219,50 @@ export class MongoDbAdapter<
       .catch(errorHandler)
   }
 
-  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, useEstimatedDocumentCount } = this.getOptions(params)
     const { filters, query } = this.filterQuery(null, params)
-    const { paginate, Model, useEstimatedDocumentCount } = this.getOptions(params)
-    const findOptions = { ...params.mongodb }
-    const model = await Promise.resolve(Model)
-    const q = model.find(query, findOptions)
-
-    if (filters.$select !== undefined) {
-      q.project(this.getSelect(filters.$select))
-    }
-
-    if (filters.$sort !== undefined) {
-      q.sort(filters.$sort)
-    }
-
-    if (filters.$limit !== undefined) {
-      q.limit(filters.$limit)
+    const useAggregation = !params.mongodb && filters.$limit !== 0
+
+    const countDocuments = async () => {
+      if (paginate && paginate.default) {
+        const model = await this.getModel(params)
+        if (useEstimatedDocumentCount && typeof model.estimatedDocumentCount === 'function') {
+          return model.estimatedDocumentCount()
+        } else {
+          return model.countDocuments(query, { ...params.mongodb })
+        }
+      }
+      return Promise.resolve(0)
     }
 
-    if (filters.$skip !== undefined) {
-      q.skip(filters.$skip)
-    }
+    const [request, total] = await Promise.all([
+      useAggregation ? this.aggregateRaw(params) : this.findRaw(params),
+      countDocuments()
+    ])
 
-    const runQuery = async (total: number) => ({
+    const page = {
       total,
       limit: filters.$limit,
       skip: filters.$skip || 0,
-      data: filters.$limit === 0 ? [] : ((await q.toArray()) as any as T[])
-    })
-
-    if (paginate && paginate.default) {
-      if (useEstimatedDocumentCount && typeof model.estimatedDocumentCount === 'function') {
-        return model.estimatedDocumentCount().then(runQuery)
-      }
-
-      return model.countDocuments(query, findOptions).then(runQuery)
+      data: filters.$limit === 0 ? [] : ((await request.toArray()) as any as Result[])
     }
 
-    return runQuery(0).then((page) => page.data)
+    return paginate && paginate.default ? page : page.data
   }
 
-  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: D | D[], params: P = {} as 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[]>
+  async _create(
+    data: Data | Data[],
+    params: ServiceParams = {} as ServiceParams
+  ): Promise<Result | Result[]> {
     const writeOptions = params.mongodb
-    const { Model } = this.getOptions(params)
-    const model = await Promise.resolve(Model)
+    const model = await this.getModel(params)
     const setId = (item: any) => {
       const entry = Object.assign({}, item)
 
@@ -231,13 +292,20 @@ export class MongoDbAdapter<
     return promise.then(select(params, this.id)).catch(errorHandler)
   }
 
-  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: AdapterId, data: PatchData, params?: ServiceParams): Promise<Result>
+  async _patch(id: NullableAdapterId, data: PatchData, _params?: ServiceParams): Promise<Result | Result[]>
+  async _patch(
+    id: NullableAdapterId,
+    _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 data = this.normalizeId(id, _data)
-    const { Model } = this.getOptions(params)
-    const model = await Promise.resolve(Model)
+    const model = await this.getModel(params)
     const {
       query,
       filters: { $select }
@@ -257,7 +325,7 @@ export class MongoDbAdapter<
 
       return current
     }, {} as any)
-    const originalIds = await this.$findOrGet(id, {
+    const originalIds = await this._findOrGet(id, {
       ...params,
       query: {
         ...query,
@@ -278,26 +346,35 @@ export class MongoDbAdapter<
 
     await model.updateMany(query, modifier, updateOptions)
 
-    return this.$findOrGet(id, findParams).catch(errorHandler)
+    return this._findOrGet(id, findParams).catch(errorHandler)
   }
 
-  async $update(id: Id, data: D, params: P = {} as P): Promise<T> {
-    const { Model } = this.getOptions(params)
-    const model = await Promise.resolve(Model)
+  async _update(id: AdapterId, 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 model = await this.getModel(params)
     const { query } = this.filterQuery(id, params)
     const replaceOptions = { ...params.mongodb }
 
     await model.replaceOne(query, this.normalizeId(id, data), replaceOptions)
 
-    return this.$findOrGet(id, params).catch(errorHandler)
+    return this._findOrGet(id, params).catch(errorHandler)
   }
 
-  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[]> {
-    const { Model } = this.getOptions(params)
-    const model = await Promise.resolve(Model)
+  async _remove(id: null, params?: ServiceParams): Promise<Result[]>
+  async _remove(id: AdapterId, params?: ServiceParams): Promise<Result>
+  async _remove(id: NullableAdapterId, _params?: ServiceParams): Promise<Result | Result[]>
+  async _remove(
+    id: NullableAdapterId | ObjectId,
+    params: ServiceParams = {} as ServiceParams
+  ): Promise<Result | Result[]> {
+    if (id === null && !this.allowsMulti('remove', params)) {
+      throw new MethodNotAllowed('Can not remove multiple entries')
+    }
+
+    const model = await this.getModel(params)
     const {
       query,
       filters: { $select }
@@ -312,7 +389,7 @@ export class MongoDbAdapter<
       }
     }
 
-    return this.$findOrGet(id, findParams)
+    return this._findOrGet(id, findParams)
       .then(async (items) => {
         await model.deleteMany(query, deleteOptions)
         return items

package/src/index.ts

@@ -1,44 +1,71 @@
 import { PaginationOptions } from '@feathersjs/adapter-commons'
-import { Paginated, ServiceMethods, Id, NullableId, Params } from '@feathersjs/feathers'
-import { MongoDbAdapter, MongoDBAdapterParams } from './adapter'
+import { MethodNotAllowed } from '@feathersjs/errors/lib'
+import { Paginated, Params } from '@feathersjs/feathers'
+import { AdapterId, MongoDbAdapter, MongoDBAdapterParams, NullableAdapterId } from './adapter'
 
 export * from './adapter'
 export * from './error-handler'
+export * from './resolvers'
 
-export class MongoDBService<T = any, D = Partial<T>, P extends Params<any> = MongoDBAdapterParams>
-  extends MongoDbAdapter<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 MongoDBService<
+  Result = any,
+  Data = Partial<Result>,
+  ServiceParams extends Params<any> = MongoDBAdapterParams,
+  PatchData = Partial<Data>
+> extends MongoDbAdapter<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: AdapterId, 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: AdapterId, 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: null, data: PatchData, params?: ServiceParams): Promise<Result[]>
+  async patch(id: AdapterId, data: PatchData, params?: ServiceParams): Promise<Result>
+  async patch(id: NullableAdapterId, 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: AdapterId, params?: ServiceParams): Promise<Result>
+  async remove(id: null, params?: ServiceParams): Promise<Result[]>
+  async remove(id: NullableAdapterId, params?: ServiceParams): Promise<Result | Result[]> {
+    const { $limit, ...query } = await this.sanitizeQuery(params)
+
+    return this._remove(id, {
+      ...params,
+      query
+    })
   }
 }

package/src/resolvers.ts

@@ -0,0 +1,45 @@
+import { ObjectId } from 'mongodb'
+
+export type ObjectIdParam = string | number | ObjectId
+
+export type IdQueryObject<T> = {
+  $in?: T[]
+  $nin?: T[]
+  $ne?: T
+}
+
+const toObjectId = (value: ObjectIdParam) => new ObjectId(value)
+
+export async function resolveObjectId(value: ObjectIdParam) {
+  return toObjectId(value)
+}
+
+export async function resolveQueryObjectId(
+  value: IdQueryObject<ObjectIdParam>
+): Promise<IdQueryObject<ObjectId>>
+export async function resolveQueryObjectId(value: ObjectIdParam): Promise<ObjectId>
+export async function resolveQueryObjectId(value: ObjectIdParam | IdQueryObject<ObjectIdParam>) {
+  if (!value) {
+    return undefined
+  }
+
+  if (typeof value === 'string' || typeof value === 'number' || value instanceof ObjectId) {
+    return toObjectId(value)
+  }
+
+  const convertedObject: IdQueryObject<ObjectId> = {}
+
+  if (Array.isArray(value.$in)) {
+    convertedObject.$in = value.$in.map(toObjectId)
+  }
+
+  if (Array.isArray(value.$nin)) {
+    convertedObject.$nin = value.$nin.map(toObjectId)
+  }
+
+  if (value.$ne !== undefined) {
+    convertedObject.$ne = toObjectId(value.$ne)
+  }
+
+  return convertedObject
+}