@feathersjs/mongodb 5.0.24 → 5.0.26

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.26](https://github.com/feathersjs/feathers/compare/v5.0.25...v5.0.26) (2024-06-09)
+
+### Bug Fixes
+
+- **mongodb:** Added Update Method Prototype to MongoDBService Class ([#3494](https://github.com/feathersjs/feathers/issues/3494)) ([428f23a](https://github.com/feathersjs/feathers/commit/428f23a8c622cd8bc4d06253206aadd514267846))
+- **mongodb:** MongoDB Aggregation improvements ([#3366](https://github.com/feathersjs/feathers/issues/3366)) ([f2829b1](https://github.com/feathersjs/feathers/commit/f2829b1f8e33d13caae3557d37225d990467fb39))
+
+## [5.0.25](https://github.com/feathersjs/feathers/compare/v5.0.24...v5.0.25) (2024-05-03)
+
+**Note:** Version bump only for package @feathersjs/mongodb
+
 ## [5.0.24](https://github.com/feathersjs/feathers/compare/v5.0.23...v5.0.24) (2024-03-13)
 
 **Note:** Version bump only for package @feathersjs/mongodb

package/lib/adapter.d.ts

@@ -1,4 +1,4 @@
-import { ObjectId, Collection, FindOptions, BulkWriteOptions, InsertOneOptions, DeleteOptions, CountDocumentsOptions, ReplaceOptions, Document } from 'mongodb';
+import { ObjectId, Collection, FindOptions, BulkWriteOptions, InsertOneOptions, DeleteOptions, CountDocumentsOptions, ReplaceOptions, FindOneAndReplaceOptions, Document, FindOneAndDeleteOptions } from 'mongodb';
 import { AdapterBase, AdapterParams, AdapterServiceOptions, PaginationOptions, AdapterQuery } from '@feathersjs/adapter-commons';
 import { Id, Paginated } from '@feathersjs/feathers';
 export interface MongoDBAdapterOptions extends AdapterServiceOptions {
@@ -8,7 +8,7 @@ export interface MongoDBAdapterOptions extends AdapterServiceOptions {
 }
 export interface MongoDBAdapterParams<Q = AdapterQuery> extends AdapterParams<Q, Partial<MongoDBAdapterOptions>> {
     pipeline?: Document[];
-    mongodb?: BulkWriteOptions | FindOptions | InsertOneOptions | DeleteOptions | CountDocumentsOptions | ReplaceOptions;
+    mongodb?: BulkWriteOptions | FindOptions | InsertOneOptions | DeleteOptions | CountDocumentsOptions | ReplaceOptions | FindOneAndReplaceOptions | FindOneAndDeleteOptions;
 }
 export type AdapterId = Id | ObjectId;
 export type NullableAdapterId = AdapterId | null;
@@ -32,13 +32,13 @@ export declare class MongoDbAdapter<Result, Data = Partial<Result>, ServiceParam
     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[] | {
+    getProjection(select?: string[] | {
         [key: string]: number;
     }): {
         [key: string]: number;
     };
-    _findOrGet(id: NullableAdapterId, params: ServiceParams): Promise<Result | Paginated<Result> | Result[]>;
     normalizeId<D>(id: NullableAdapterId, data: D): D;
+    countDocuments(params: ServiceParams): Promise<number>;
     _get(id: AdapterId, params?: ServiceParams): Promise<Result>;
     _find(params?: ServiceParams & {
         paginate?: PaginationOptions;

package/lib/adapter.js

@@ -50,13 +50,13 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
     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));
-        }
+        const q = model.find(query, params.mongodb);
         if (filters.$sort !== undefined) {
             q.sort(filters.$sort);
         }
+        if (filters.$select !== undefined) {
+            q.project(this.getProjection(filters.$select));
+        }
         if (filters.$skip !== undefined) {
             q.skip(filters.$skip);
         }
@@ -65,6 +65,7 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
         }
         return q;
     }
+    /* TODO: Remove $out and $merge stages, else it returns an empty cursor. I think its safe to assume this is primarily for querying. */
     async aggregateRaw(params) {
         const model = await this.getModel(params);
         const pipeline = params.pipeline || [];
@@ -72,17 +73,17 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
         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]);
+        return model.aggregate([...before, ...feathersPipeline, ...after], params.mongodb);
     }
     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.$select !== undefined) {
+            pipeline.push({ $project: this.getProjection(filters.$select) });
+        }
         if (filters.$skip !== undefined) {
             pipeline.push({ $skip: filters.$skip });
         }
@@ -91,7 +92,10 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
         }
         return pipeline;
     }
-    getSelect(select) {
+    getProjection(select) {
+        if (!select) {
+            return undefined;
+        }
         if (Array.isArray(select)) {
             if (!select.includes(this.id)) {
                 select = [this.id, ...select];
@@ -109,9 +113,6 @@ 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);
-    }
     normalizeId(id, data) {
         if (this.id === '_id') {
             // Default Mongo IDs cannot be updated. The Mongo library handles
@@ -128,64 +129,105 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
         }
         return data;
     }
+    async countDocuments(params) {
+        const { useEstimatedDocumentCount } = this.getOptions(params);
+        const { query } = this.filterQuery(null, params);
+        if (params.pipeline) {
+            const aggregateParams = {
+                ...params,
+                query: {
+                    ...params.query,
+                    $select: [this.id],
+                    $sort: undefined,
+                    $skip: undefined,
+                    $limit: undefined
+                }
+            };
+            const result = await this.aggregateRaw(aggregateParams).then((result) => result.toArray());
+            return result.length;
+        }
+        const model = await this.getModel(params);
+        if (useEstimatedDocumentCount && typeof model.estimatedDocumentCount === 'function') {
+            return model.estimatedDocumentCount();
+        }
+        return model.countDocuments(query, params.mongodb);
+    }
     async _get(id, params = {}) {
         const { query, filters: { $select } } = this.filterQuery(id, params);
-        const projection = $select
-            ? {
-                projection: {
-                    ...this.getSelect($select),
-                    [this.id]: 1
+        if (params.pipeline) {
+            const aggregateParams = {
+                ...params,
+                query: {
+                    ...params.query,
+                    $limit: 1,
+                    $and: (params.query.$and || []).concat({
+                        [this.id]: this.getObjectId(id)
+                    })
                 }
-            }
-            : {};
+            };
+            return this.aggregateRaw(aggregateParams)
+                .then((result) => result.toArray())
+                .then(([result]) => {
+                if (!result) {
+                    throw new errors_1.NotFound(`No record found for id '${id}'`);
+                }
+                return result;
+            })
+                .catch(error_handler_1.errorHandler);
+        }
         const findOptions = {
-            ...params.mongodb,
-            ...projection
+            projection: this.getProjection($select),
+            ...params.mongodb
         };
         return this.getModel(params)
             .then((model) => model.findOne(query, findOptions))
-            .then((data) => {
-            if (data == null) {
+            .then((result) => {
+            if (!result) {
                 throw new errors_1.NotFound(`No record found for id '${id}'`);
             }
-            return data;
+            return result;
         })
             .catch(error_handler_1.errorHandler);
     }
     async _find(params = {}) {
-        const { paginate, useEstimatedDocumentCount } = this.getOptions(params);
-        const { filters, query } = this.filterQuery(null, params);
-        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 { paginate } = this.getOptions(params);
+        const { filters } = this.filterQuery(null, params);
+        const paginationDisabled = params.paginate === false || !paginate || !paginate.default;
+        const getData = () => {
+            const result = params.pipeline ? this.aggregateRaw(params) : this.findRaw(params);
+            return result.then((result) => result.toArray());
         };
-        const [request, total] = await Promise.all([
-            useAggregation ? this.aggregateRaw(params) : this.findRaw(params),
-            countDocuments()
-        ]);
-        const page = {
+        if (paginationDisabled) {
+            if (filters.$limit === 0) {
+                return [];
+            }
+            const data = await getData();
+            return data;
+        }
+        if (filters.$limit === 0) {
+            return {
+                total: await this.countDocuments(params),
+                data: [],
+                limit: filters.$limit,
+                skip: filters.$skip || 0
+            };
+        }
+        const [data, total] = await Promise.all([getData(), this.countDocuments(params)]);
+        return {
             total,
+            data: data,
             limit: filters.$limit,
-            skip: filters.$skip || 0,
-            data: filters.$limit === 0 ? [] : (await request.toArray())
+            skip: filters.$skip || 0
         };
-        return paginate && paginate.default ? page : page.data;
     }
     async _create(data, params = {}) {
-        const writeOptions = params.mongodb;
+        var _a, _b;
+        if (Array.isArray(data) && !this.allowsMulti('create', params)) {
+            throw new errors_1.MethodNotAllowed('Can not create multiple entries');
+        }
         const model = await this.getModel(params);
         const setId = (item) => {
             const entry = Object.assign({}, item);
-            // Generate a MongoId if we use a custom id
             if (this.id !== '_id' && typeof entry[this.id] === 'undefined') {
                 return {
                     [this.id]: new mongodb_1.ObjectId().toHexString(),
@@ -194,14 +236,28 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
             }
             return entry;
         };
-        const promise = Array.isArray(data)
-            ? model
-                .insertMany(data.map(setId), writeOptions)
-                .then(async (result) => model.find({ _id: { $in: Object.values(result.insertedIds) } }, params.mongodb).toArray())
-            : model
-                .insertOne(setId(data), writeOptions)
-                .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);
+        if (Array.isArray(data)) {
+            const created = await model.insertMany(data.map(setId), params.mongodb).catch(error_handler_1.errorHandler);
+            return this._find({
+                ...params,
+                paginate: false,
+                query: {
+                    _id: { $in: Object.values(created.insertedIds) },
+                    $select: (_a = params.query) === null || _a === void 0 ? void 0 : _a.$select
+                }
+            });
+        }
+        const created = await model.insertOne(setId(data), params.mongodb).catch(error_handler_1.errorHandler);
+        const result = await this._find({
+            ...params,
+            paginate: false,
+            query: {
+                _id: created.insertedId,
+                $select: (_b = params.query) === null || _b === void 0 ? void 0 : _b.$select,
+                $limit: 1
+            }
+        });
+        return result[0];
     }
     async _patch(id, _data, params = {}) {
         if (id === null && !this.allowsMulti('patch', params)) {
@@ -209,71 +265,160 @@ class MongoDbAdapter extends adapter_commons_1.AdapterBase {
         }
         const data = this.normalizeId(id, _data);
         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) => {
+        const { query, filters: { $sort, $select } } = this.filterQuery(id, params);
+        const replacement = Object.keys(data).reduce((current, key) => {
             const value = data[key];
             if (key.charAt(0) !== '$') {
+                current.$set[key] = value;
+            }
+            else if (key === '$set') {
                 current.$set = {
                     ...current.$set,
-                    [key]: value
+                    ...value
                 };
             }
             else {
                 current[key] = value;
             }
             return current;
-        }, {});
-        const originalIds = await this._findOrGet(id, {
-            ...params,
-            query: {
-                ...query,
-                $select: [this.id]
-            },
-            paginate: false
-        });
-        const items = Array.isArray(originalIds) ? originalIds : [originalIds];
-        const idList = items.map((item) => item[this.id]);
-        const findParams = {
-            ...params,
-            paginate: false,
-            query: {
-                [this.id]: { $in: idList },
-                $select
-            }
+        }, { $set: {} });
+        if (id === null) {
+            const findParams = {
+                ...params,
+                paginate: false,
+                query: {
+                    ...params.query,
+                    $select: [this.id]
+                }
+            };
+            return this._find(findParams)
+                .then(async (result) => {
+                const idList = result.map((item) => item[this.id]);
+                await model.updateMany({ [this.id]: { $in: idList } }, replacement, params.mongodb);
+                return this._find({
+                    ...params,
+                    paginate: false,
+                    query: {
+                        [this.id]: { $in: idList },
+                        $sort,
+                        $select
+                    }
+                });
+            })
+                .catch(error_handler_1.errorHandler);
+        }
+        if (params.pipeline) {
+            const getParams = {
+                ...params,
+                query: {
+                    ...params.query,
+                    $select: [this.id]
+                }
+            };
+            return this._get(id, getParams)
+                .then(async () => {
+                await model.updateOne({ [this.id]: id }, replacement, params.mongodb);
+                return this._get(id, {
+                    ...params,
+                    query: { $select }
+                });
+            })
+                .catch(error_handler_1.errorHandler);
+        }
+        const updateOptions = {
+            projection: this.getProjection($select),
+            ...params.mongodb,
+            returnDocument: 'after'
         };
-        await model.updateMany(query, modifier, updateOptions);
-        return this._findOrGet(id, findParams).catch(error_handler_1.errorHandler);
+        return model
+            .findOneAndUpdate(query, replacement, updateOptions)
+            .then((result) => {
+            if (!result) {
+                throw new errors_1.NotFound(`No record found for id '${id}'`);
+            }
+            return result;
+        })
+            .catch(error_handler_1.errorHandler);
     }
     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 { query, filters: { $select } } = this.filterQuery(id, params);
         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);
+        const replacement = this.normalizeId(id, data);
+        if (params.pipeline) {
+            const getParams = {
+                ...params,
+                query: {
+                    ...params.query,
+                    $select: [this.id]
+                }
+            };
+            return this._get(id, getParams)
+                .then(async () => {
+                await model.replaceOne({ [this.id]: id }, replacement, params.mongodb);
+                return this._get(id, {
+                    ...params,
+                    query: { $select }
+                });
+            })
+                .catch(error_handler_1.errorHandler);
+        }
+        const replaceOptions = {
+            projection: this.getProjection($select),
+            ...params.mongodb,
+            returnDocument: 'after'
+        };
+        return model
+            .findOneAndReplace(query, replacement, replaceOptions)
+            .then((result) => {
+            if (!result) {
+                throw new errors_1.NotFound(`No record found for id '${id}'`);
+            }
+            return result;
+        })
+            .catch(error_handler_1.errorHandler);
     }
     async _remove(id, params = {}) {
+        var _a;
         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 { query } = this.filterQuery(id, params);
         const findParams = {
             ...params,
-            paginate: false,
-            query: {
-                ...query,
-                $select
-            }
+            paginate: false
+        };
+        if (id === null) {
+            return this._find(findParams)
+                .then(async (result) => {
+                const idList = result.map((item) => item[this.id]);
+                await model.deleteMany({ [this.id]: { $in: idList } }, params.mongodb);
+                return result;
+            })
+                .catch(error_handler_1.errorHandler);
+        }
+        if (params.pipeline) {
+            return this._get(id, params)
+                .then(async (result) => {
+                await model.deleteOne({ [this.id]: id }, params.mongodb);
+                return result;
+            })
+                .catch(error_handler_1.errorHandler);
+        }
+        const deleteOptions = {
+            ...params.mongodb,
+            projection: this.getProjection((_a = params.query) === null || _a === void 0 ? void 0 : _a.$select)
         };
-        return this._findOrGet(id, findParams)
-            .then(async (items) => {
-            await model.deleteMany(query, deleteOptions);
-            return items;
+        return model
+            .findOneAndDelete(query, deleteOptions)
+            .then((result) => {
+            if (!result) {
+                throw new errors_1.NotFound(`No record found for id '${id}'`);
+            }
+            return result;
         })
             .catch(error_handler_1.errorHandler);
     }

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":";;;AAAA,qCAagB;AAChB,+CAA2E;AAC3E,iDAAuC;AACvC,iEAOoC;AAEpC,mDAA8C;AA0B9C,sBAAsB;AACtB,MAAa,cAKX,SAAQ,6BAAqF;IAC7F,YAAY,OAA8B;QACxC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;QACxD,CAAC;QAED,KAAK,CAAC;YACJ,EAAE,EAAE,KAAK;YACT,GAAG,OAAO;SACX,CAAC,CAAA;IACJ,CAAC;IAED,WAAW,CAAC,EAAa;QACvB,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAClC,OAAO,EAAE,CAAA;QACX,CAAC;QAED,IAAI,IAAI,CAAC,EAAE,KAAK,KAAK,IAAI,kBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YAC9C,EAAE,GAAG,IAAI,kBAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;QAClC,CAAC;QAED,OAAO,EAAE,CAAA;IACX,CAAC;IAED,WAAW,CAAC,EAAqB,EAAE,MAAqB;QACtD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QACvC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAiB,CAAA;QACpG,MAAM,MAAM,GAAG,IAAA,0BAAQ,EAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;QACjD,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAChB,KAAK,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;gBACrC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;aAChC,CAAC,CAAA;QACJ,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACnB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;QACnD,CAAC;QAED,OAAO;YACL,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;YAC1C,KAAK;SACN,CAAA;IACH,CAAC;IAED,QAAQ,CAAC,SAAwB,EAAmB;QAClD,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QACzC,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAqB;QACjC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACzD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACzC,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;QAE3C,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAChC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACvB,CAAC;QAED,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAClC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;QAChD,CAAC;QAED,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAChC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACvB,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACjC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACzB,CAAC;QAED,OAAO,CAAC,CAAA;IACV,CAAC;IAED,sIAAsI;IACtI,KAAK,CAAC,YAAY,CAAC,MAAqB;QACtC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAA;QACtC,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QACtE,MAAM,MAAM,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACzD,MAAM,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;QAC1D,MAAM,KAAK,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAA;QAE/D,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,MAAM,EAAE,GAAG,gBAAgB,EAAE,GAAG,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;IACpF,CAAC;IAED,oBAAoB,CAAC,MAAqB;QACxC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACzD,MAAM,QAAQ,GAAe,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;QAEhD,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;QACzC,CAAC;QAED,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAClE,CAAC;QAED,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;QACzC,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;QAC3C,CAAC;QAED,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,aAAa,CAAC,MAA6C;QACzD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC9B,MAAM,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,CAAA;YAC/B,CAAC;YACD,OAAO,MAAM,CAAC,MAAM,CAClB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;gBAChB,GAAG,KAAK;gBACR,CAAC,IAAI,CAAC,EAAE,CAAC;aACV,CAAC,EACF,EAAE,CACH,CAAA;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACrB,OAAO;gBACL,GAAG,MAAM;gBACT,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;aACb,CAAA;QACH,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,WAAW,CAAI,EAAqB,EAAE,IAAO;QAC3C,IAAI,IAAI,CAAC,EAAE,KAAK,KAAK,EAAE,CAAC;YACtB,iEAAiE;YACjE,sBAAsB;YACtB,OAAO,WAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;QAC9B,CAAC;aAAM,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YACvB,6DAA6D;YAC7D,oDAAoD;YACpD,OAAO;gBACL,GAAG,IAAI;gBACP,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;aACd,CAAA;QACH,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAqB;QACxC,MAAM,EAAE,yBAAyB,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAC7D,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAEhD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,MAAM,eAAe,GAAG;gBACtB,GAAG,MAAM;gBACT,KAAK,EAAE;oBACL,GAAG,MAAM,CAAC,KAAK;oBACf,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;oBAClB,KAAK,EAAE,SAAS;oBAChB,KAAK,EAAE,SAAS;oBAChB,MAAM,EAAE,SAAS;iBAClB;aACF,CAAA;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;YAC1F,OAAO,MAAM,CAAC,MAAM,CAAA;QACtB,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAEzC,IAAI,yBAAyB,IAAI,OAAO,KAAK,CAAC,sBAAsB,KAAK,UAAU,EAAE,CAAC;YACpF,OAAO,KAAK,CAAC,sBAAsB,EAAE,CAAA;QACvC,CAAC;QAED,OAAO,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;IACpD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAa,EAAE,SAAwB,EAAmB;QACnE,MAAM,EACJ,KAAK,EACL,OAAO,EAAE,EAAE,OAAO,EAAE,EACrB,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QAEhC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,MAAM,eAAe,GAAG;gBACtB,GAAG,MAAM;gBACT,KAAK,EAAE;oBACL,GAAG,MAAM,CAAC,KAAK;oBACf,MAAM,EAAE,CAAC;oBACT,IAAI,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;wBACrC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;qBAChC,CAAC;iBACH;aACF,CAAA;YAED,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC;iBACtC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;iBAClC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE;gBACjB,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,MAAM,IAAI,iBAAQ,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAA;gBACtD,CAAC;gBAED,OAAO,MAAM,CAAA;YACf,CAAC,CAAC;iBACD,KAAK,CAAC,4BAAY,CAAC,CAAA;QACxB,CAAC;QAED,MAAM,WAAW,GAAgB;YAC/B,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;YACvC,GAAG,MAAM,CAAC,OAAO;SAClB,CAAA;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;aACzB,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;aAClD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACf,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,iBAAQ,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAA;YACtD,CAAC;YAED,OAAO,MAAM,CAAA;QACf,CAAC,CAAC;aACD,KAAK,CAAC,4BAAY,CAAC,CAAA;IACxB,CAAC;IAKD,KAAK,CAAC,KAAK,CAAC,SAAwB,EAAmB;QACrD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAC5C,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAClD,MAAM,kBAAkB,GAAG,MAAM,CAAC,QAAQ,KAAK,KAAK,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAA;QAEtF,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YACjF,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;QAClD,CAAC,CAAA;QAED,IAAI,kBAAkB,EAAE,CAAC;YACvB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,OAAO,EAAc,CAAA;YACvB,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,OAAO,EAAE,CAAA;YAC5B,OAAO,IAAgB,CAAA;QACzB,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO;gBACL,KAAK,EAAE,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;gBACxC,IAAI,EAAE,EAAc;gBACpB,KAAK,EAAE,OAAO,CAAC,MAAM;gBACrB,IAAI,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;aACzB,CAAA;QACH,CAAC;QAED,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAEjF,OAAO;YACL,KAAK;YACL,IAAI,EAAE,IAAgB;YACtB,KAAK,EAAE,OAAO,CAAC,MAAM;YACrB,IAAI,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;SACzB,CAAA;IACH,CAAC;IAKD,KAAK,CAAC,OAAO,CACX,IAAmB,EACnB,SAAwB,EAAmB;;QAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;YAC/D,MAAM,IAAI,yBAAgB,CAAC,iCAAiC,CAAC,CAAA;QAC/D,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACzC,MAAM,KAAK,GAAG,CAAC,IAAS,EAAE,EAAE;YAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;YAErC,IAAI,IAAI,CAAC,EAAE,KAAK,KAAK,IAAI,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,WAAW,EAAE,CAAC;gBAC/D,OAAO;oBACL,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,kBAAQ,EAAE,CAAC,WAAW,EAAE;oBACvC,GAAG,KAAK;iBACT,CAAA;YACH,CAAC;YAED,OAAO,KAAK,CAAA;QACd,CAAC,CAAA;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,4BAAY,CAAC,CAAA;YAC3F,OAAO,IAAI,CAAC,KAAK,CAAC;gBAChB,GAAG,MAAM;gBACT,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE;oBACL,GAAG,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;oBAChD,OAAO,EAAE,MAAA,MAAM,CAAC,KAAK,0CAAE,OAAO;iBAC/B;aACF,CAAC,CAAA;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,4BAAY,CAAC,CAAA;QACtF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;YAC9B,GAAG,MAAM;YACT,QAAQ,EAAE,KAAK;YACf,KAAK,EAAE;gBACL,GAAG,EAAE,OAAO,CAAC,UAAU;gBACvB,OAAO,EAAE,MAAA,MAAM,CAAC,KAAK,0CAAE,OAAO;gBAC9B,MAAM,EAAE,CAAC;aACV;SACF,CAAC,CAAA;QACF,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC;IASD,KAAK,CAAC,MAAM,CACV,EAAqB,EACrB,KAAkC,EAClC,SAAwB,EAAmB;QAE3C,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;YACtD,MAAM,IAAI,yBAAgB,CAAC,gCAAgC,CAAC,CAAA;QAC9D,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;QACxC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACzC,MAAM,EACJ,KAAK,EACL,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAC5B,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QAEhC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAC1C,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE;YACf,MAAM,KAAK,GAAI,IAAY,CAAC,GAAG,CAAC,CAAA;YAEhC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC1B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;YAC3B,CAAC;iBAAM,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;gBAC1B,OAAO,CAAC,IAAI,GAAG;oBACb,GAAG,OAAO,CAAC,IAAI;oBACf,GAAG,KAAK;iBACT,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;YACtB,CAAC;YAED,OAAO,OAAO,CAAA;QAChB,CAAC,EACD,EAAE,IAAI,EAAE,EAAE,EAAS,CACpB,CAAA;QAED,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAChB,MAAM,UAAU,GAAG;gBACjB,GAAG,MAAM;gBACT,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE;oBACL,GAAG,MAAM,CAAC,KAAK;oBACf,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;iBACnB;aACF,CAAA;YAED,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;iBAC1B,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACrB,MAAM,MAAM,GAAI,MAAmB,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;gBACrE,MAAM,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;gBACnF,OAAO,IAAI,CAAC,KAAK,CAAC;oBAChB,GAAG,MAAM;oBACT,QAAQ,EAAE,KAAK;oBACf,KAAK,EAAE;wBACL,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE;wBAC1B,KAAK;wBACL,OAAO;qBACR;iBACF,CAAC,CAAA;YACJ,CAAC,CAAC;iBACD,KAAK,CAAC,4BAAY,CAAC,CAAA;QACxB,CAAC;QAED,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,MAAM,SAAS,GAAG;gBAChB,GAAG,MAAM;gBACT,KAAK,EAAE;oBACL,GAAG,MAAM,CAAC,KAAK;oBACf,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;iBACnB;aACF,CAAA;YAED,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC;iBAC5B,IAAI,CAAC,KAAK,IAAI,EAAE;gBACf,MAAM,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;gBACrE,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;oBACnB,GAAG,MAAM;oBACT,KAAK,EAAE,EAAE,OAAO,EAAE;iBACnB,CAAC,CAAA;YACJ,CAAC,CAAC;iBACD,KAAK,CAAC,4BAAY,CAAC,CAAA;QACxB,CAAC;QAED,MAAM,aAAa,GAA4B;YAC7C,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;YACvC,GAAI,MAAM,CAAC,OAAmC;YAC9C,cAAc,EAAE,OAAO;SACxB,CAAA;QAED,OAAO,KAAK;aACT,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,aAAa,CAAC;aACnD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACf,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,iBAAQ,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAA;YACtD,CAAC;YACD,OAAO,MAAgB,CAAA;QACzB,CAAC,CAAC;aACD,KAAK,CAAC,4BAAY,CAAC,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAa,EAAE,IAAU,EAAE,SAAwB,EAAmB;QAClF,IAAI,EAAE,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,mBAAU,CAAC,+DAA+D,CAAC,CAAA;QACvF,CAAC;QAED,MAAM,EACJ,KAAK,EACL,OAAO,EAAE,EAAE,OAAO,EAAE,EACrB,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QAChC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACzC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;QAE9C,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,MAAM,SAAS,GAAG;gBAChB,GAAG,MAAM;gBACT,KAAK,EAAE;oBACL,GAAG,MAAM,CAAC,KAAK;oBACf,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;iBACnB;aACF,CAAA;YAED,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC;iBAC5B,IAAI,CAAC,KAAK,IAAI,EAAE;gBACf,MAAM,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;gBACtE,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;oBACnB,GAAG,MAAM;oBACT,KAAK,EAAE,EAAE,OAAO,EAAE;iBACnB,CAAC,CAAA;YACJ,CAAC,CAAC;iBACD,KAAK,CAAC,4BAAY,CAAC,CAAA;QACxB,CAAC;QAED,MAAM,cAAc,GAA6B;YAC/C,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;YACvC,GAAI,MAAM,CAAC,OAAoC;YAC/C,cAAc,EAAE,OAAO;SACxB,CAAA;QAED,OAAO,KAAK;aACT,iBAAiB,CAAC,KAAK,EAAE,WAAW,EAAE,cAAc,CAAC;aACrD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACf,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,iBAAQ,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAA;YACtD,CAAC;YACD,OAAO,MAAgB,CAAA;QACzB,CAAC,CAAC;aACD,KAAK,CAAC,4BAAY,CAAC,CAAA;IACxB,CAAC;IAKD,KAAK,CAAC,OAAO,CACX,EAAgC,EAChC,SAAwB,EAAmB;;QAE3C,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;YACvD,MAAM,IAAI,yBAAgB,CAAC,iCAAiC,CAAC,CAAA;QAC/D,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACzC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QAC9C,MAAM,UAAU,GAAG;YACjB,GAAG,MAAM;YACT,QAAQ,EAAE,KAAK;SAChB,CAAA;QAED,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;iBAC1B,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACrB,MAAM,MAAM,GAAI,MAAmB,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;gBACrE,MAAM,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;gBACtE,OAAO,MAAM,CAAA;YACf,CAAC,CAAC;iBACD,KAAK,CAAC,4BAAY,CAAC,CAAA;QACxB,CAAC;QAED,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC;iBACzB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACrB,MAAM,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;gBACxD,OAAO,MAAM,CAAA;YACf,CAAC,CAAC;iBACD,KAAK,CAAC,4BAAY,CAAC,CAAA;QACxB,CAAC;QAED,MAAM,aAAa,GAA4B;YAC7C,GAAI,MAAM,CAAC,OAAmC;YAC9C,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,MAAA,MAAM,CAAC,KAAK,0CAAE,OAAO,CAAC;SACtD,CAAA;QAED,OAAO,KAAK;aACT,gBAAgB,CAAC,KAAK,EAAE,aAAa,CAAC;aACtC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACf,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,iBAAQ,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAA;YACtD,CAAC;YACD,OAAO,MAAgB,CAAA;QACzB,CAAC,CAAC;aACD,KAAK,CAAC,4BAAY,CAAC,CAAA;IACxB,CAAC;CACF;AAjhBD,wCAihBC"}

package/lib/index.d.ts

@@ -16,7 +16,7 @@ export declare class MongoDBService<Result = any, Data = Partial<Result>, Servic
     create(data: Data, params?: ServiceParams): Promise<Result>;
     create(data: Data[], params?: ServiceParams): Promise<Result[]>;
     create(data: Data | Data[], params?: ServiceParams): Promise<Result | Result[]>;
-    update(id: AdapterId, data: Data, params?: ServiceParams): Promise<Result>;
+    update(id: NullableAdapterId, data: Data, params?: ServiceParams): Promise<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[]>;

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,gDAAyD;AAEzD,uCAA8F;AAE9F,4CAAyB;AACzB,kDAA+B;AAC/B,+CAA4B;AAE5B,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;IAKD,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,CAAC;YAC/D,MAAM,IAAI,sBAAgB,CAAC,iCAAiC,CAAC,CAAA;QAC/D,CAAC;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;IAKD,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;IAKD,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;AAhED,wCAgEC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,gDAAyD;AAEzD,uCAA8F;AAE9F,4CAAyB;AACzB,kDAA+B;AAC/B,+CAA4B;AAE5B,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;IAKD,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,CAAC;YAC/D,MAAM,IAAI,sBAAgB,CAAC,iCAAiC,CAAC,CAAA;QAC/D,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACnC,CAAC;IAGD,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;IAKD,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;IAKD,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;AAjED,wCAiEC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/mongodb",
   "description": "Feathers MongoDB service adapter",
-  "version": "5.0.24",
+  "version": "5.0.26",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "keywords": [
@@ -51,23 +51,23 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/adapter-commons": "^5.0.24",
-    "@feathersjs/commons": "^5.0.24",
-    "@feathersjs/errors": "^5.0.24",
-    "@feathersjs/feathers": "^5.0.24"
+    "@feathersjs/adapter-commons": "^5.0.26",
+    "@feathersjs/commons": "^5.0.26",
+    "@feathersjs/errors": "^5.0.26",
+    "@feathersjs/feathers": "^5.0.26"
   },
   "peerDependencies": {
     "mongodb": "^6.5.0"
   },
   "devDependencies": {
-    "@feathersjs/adapter-tests": "^5.0.24",
-    "@feathersjs/schema": "^5.0.24",
+    "@feathersjs/adapter-tests": "^5.0.26",
+    "@feathersjs/schema": "^5.0.26",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.11.26",
-    "mocha": "^10.3.0",
-    "mongodb-memory-server": "^9.1.7",
+    "@types/node": "^20.12.8",
+    "mocha": "^10.4.0",
+    "mongodb-memory-server": "^9.2.0",
     "shx": "^0.3.4",
-    "typescript": "^5.4.2"
+    "typescript": "^5.4.5"
   },
-  "gitHead": "09519fb1c454ea718747a09797bc6dfd3b6a79a3"
+  "gitHead": "3fe6843c1a478a2887ca91b6f79eda3b61d35ef3"
 }

package/src/adapter.ts

@@ -7,13 +7,15 @@ import {
   DeleteOptions,
   CountDocumentsOptions,
   ReplaceOptions,
-  Document
+  FindOneAndReplaceOptions,
+  FindOneAndUpdateOptions,
+  Document,
+  FindOneAndDeleteOptions
 } from 'mongodb'
 import { BadRequest, MethodNotAllowed, NotFound } from '@feathersjs/errors'
 import { _ } from '@feathersjs/commons'
 import {
   AdapterBase,
-  select,
   AdapterParams,
   AdapterServiceOptions,
   PaginationOptions,
@@ -39,6 +41,8 @@ export interface MongoDBAdapterParams<Q = AdapterQuery>
     | DeleteOptions
     | CountDocumentsOptions
     | ReplaceOptions
+    | FindOneAndReplaceOptions
+    | FindOneAndDeleteOptions
 }
 
 export type AdapterId = Id | ObjectId
@@ -103,16 +107,16 @@ export class MongoDbAdapter<
   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))
-    }
+    const q = model.find(query, params.mongodb)
 
     if (filters.$sort !== undefined) {
       q.sort(filters.$sort)
     }
 
+    if (filters.$select !== undefined) {
+      q.project(this.getProjection(filters.$select))
+    }
+
     if (filters.$skip !== undefined) {
       q.skip(filters.$skip)
     }
@@ -124,6 +128,7 @@ export class MongoDbAdapter<
     return q
   }
 
+  /* TODO: Remove $out and $merge stages, else it returns an empty cursor. I think its safe to assume this is primarily for querying. */
   async aggregateRaw(params: ServiceParams) {
     const model = await this.getModel(params)
     const pipeline = params.pipeline || []
@@ -132,21 +137,21 @@ export class MongoDbAdapter<
     const feathersPipeline = this.makeFeathersPipeline(params)
     const after = index >= 0 ? pipeline.slice(index + 1) : pipeline
 
-    return model.aggregate([...before, ...feathersPipeline, ...after])
+    return model.aggregate([...before, ...feathersPipeline, ...after], params.mongodb)
   }
 
   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.$select !== undefined) {
+      pipeline.push({ $project: this.getProjection(filters.$select) })
+    }
+
     if (filters.$skip !== undefined) {
       pipeline.push({ $skip: filters.$skip })
     }
@@ -154,10 +159,14 @@ export class MongoDbAdapter<
     if (filters.$limit !== undefined) {
       pipeline.push({ $limit: filters.$limit })
     }
+
     return pipeline
   }
 
-  getSelect(select: string[] | { [key: string]: number }) {
+  getProjection(select?: string[] | { [key: string]: number }) {
+    if (!select) {
+      return undefined
+    }
     if (Array.isArray(select)) {
       if (!select.includes(this.id)) {
         select = [this.id, ...select]
@@ -181,10 +190,6 @@ export class MongoDbAdapter<
     return select
   }
 
-  async _findOrGet(id: NullableAdapterId, params: ServiceParams) {
-    return id === null ? await this._find(params) : await this._get(id, params)
-  }
-
   normalizeId<D>(id: NullableAdapterId, data: D): D {
     if (this.id === '_id') {
       // Default Mongo IDs cannot be updated. The Mongo library handles
@@ -201,32 +206,77 @@ export class MongoDbAdapter<
     return data
   }
 
+  async countDocuments(params: ServiceParams) {
+    const { useEstimatedDocumentCount } = this.getOptions(params)
+    const { query } = this.filterQuery(null, params)
+
+    if (params.pipeline) {
+      const aggregateParams = {
+        ...params,
+        query: {
+          ...params.query,
+          $select: [this.id],
+          $sort: undefined,
+          $skip: undefined,
+          $limit: undefined
+        }
+      }
+      const result = await this.aggregateRaw(aggregateParams).then((result) => result.toArray())
+      return result.length
+    }
+
+    const model = await this.getModel(params)
+
+    if (useEstimatedDocumentCount && typeof model.estimatedDocumentCount === 'function') {
+      return model.estimatedDocumentCount()
+    }
+
+    return model.countDocuments(query, params.mongodb)
+  }
+
   async _get(id: AdapterId, params: ServiceParams = {} as ServiceParams): Promise<Result> {
     const {
       query,
       filters: { $select }
     } = this.filterQuery(id, params)
-    const projection = $select
-      ? {
-          projection: {
-            ...this.getSelect($select),
-            [this.id]: 1
-          }
+
+    if (params.pipeline) {
+      const aggregateParams = {
+        ...params,
+        query: {
+          ...params.query,
+          $limit: 1,
+          $and: (params.query.$and || []).concat({
+            [this.id]: this.getObjectId(id)
+          })
         }
-      : {}
+      }
+
+      return this.aggregateRaw(aggregateParams)
+        .then((result) => result.toArray())
+        .then(([result]) => {
+          if (!result) {
+            throw new NotFound(`No record found for id '${id}'`)
+          }
+
+          return result
+        })
+        .catch(errorHandler)
+    }
+
     const findOptions: FindOptions = {
-      ...params.mongodb,
-      ...projection
+      projection: this.getProjection($select),
+      ...params.mongodb
     }
 
     return this.getModel(params)
       .then((model) => model.findOne(query, findOptions))
-      .then((data) => {
-        if (data == null) {
+      .then((result) => {
+        if (!result) {
           throw new NotFound(`No record found for id '${id}'`)
         }
 
-        return data
+        return result
       })
       .catch(errorHandler)
   }
@@ -235,34 +285,40 @@ export class MongoDbAdapter<
   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 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 })
-        }
+    const { paginate } = this.getOptions(params)
+    const { filters } = this.filterQuery(null, params)
+    const paginationDisabled = params.paginate === false || !paginate || !paginate.default
+
+    const getData = () => {
+      const result = params.pipeline ? this.aggregateRaw(params) : this.findRaw(params)
+      return result.then((result) => result.toArray())
+    }
+
+    if (paginationDisabled) {
+      if (filters.$limit === 0) {
+        return [] as Result[]
+      }
+      const data = await getData()
+      return data as Result[]
+    }
+
+    if (filters.$limit === 0) {
+      return {
+        total: await this.countDocuments(params),
+        data: [] as Result[],
+        limit: filters.$limit,
+        skip: filters.$skip || 0
       }
-      return Promise.resolve(0)
     }
 
-    const [request, total] = await Promise.all([
-      useAggregation ? this.aggregateRaw(params) : this.findRaw(params),
-      countDocuments()
-    ])
+    const [data, total] = await Promise.all([getData(), this.countDocuments(params)])
 
-    const page = {
+    return {
       total,
+      data: data as Result[],
       limit: filters.$limit,
-      skip: filters.$skip || 0,
-      data: filters.$limit === 0 ? [] : ((await request.toArray()) as any as Result[])
+      skip: filters.$skip || 0
     }
-
-    return paginate && paginate.default ? page : page.data
   }
 
   async _create(data: Data, params?: ServiceParams): Promise<Result>
@@ -272,12 +328,14 @@ export class MongoDbAdapter<
     data: Data | Data[],
     params: ServiceParams = {} as ServiceParams
   ): Promise<Result | Result[]> {
-    const writeOptions = params.mongodb
+    if (Array.isArray(data) && !this.allowsMulti('create', params)) {
+      throw new MethodNotAllowed('Can not create multiple entries')
+    }
+
     const model = await this.getModel(params)
     const setId = (item: any) => {
       const entry = Object.assign({}, item)
 
-      // Generate a MongoId if we use a custom id
       if (this.id !== '_id' && typeof entry[this.id] === 'undefined') {
         return {
           [this.id]: new ObjectId().toHexString(),
@@ -288,17 +346,29 @@ export class MongoDbAdapter<
       return entry
     }
 
-    const promise = Array.isArray(data)
-      ? model
-          .insertMany(data.map(setId), writeOptions)
-          .then(async (result) =>
-            model.find({ _id: { $in: Object.values(result.insertedIds) } }, params.mongodb).toArray()
-          )
-      : model
-          .insertOne(setId(data), writeOptions)
-          .then(async (result) => model.findOne({ _id: result.insertedId }, params.mongodb))
+    if (Array.isArray(data)) {
+      const created = await model.insertMany(data.map(setId), params.mongodb).catch(errorHandler)
+      return this._find({
+        ...params,
+        paginate: false,
+        query: {
+          _id: { $in: Object.values(created.insertedIds) },
+          $select: params.query?.$select
+        }
+      })
+    }
 
-    return promise.then(select(params, this.id)).catch(errorHandler)
+    const created = await model.insertOne(setId(data), params.mongodb).catch(errorHandler)
+    const result = await this._find({
+      ...params,
+      paginate: false,
+      query: {
+        _id: created.insertedId,
+        $select: params.query?.$select,
+        $limit: 1
+      }
+    })
+    return result[0]
   }
 
   async _patch(id: null, data: PatchData | Partial<Result>, params?: ServiceParams): Promise<Result[]>
@@ -321,45 +391,91 @@ export class MongoDbAdapter<
     const model = await this.getModel(params)
     const {
       query,
-      filters: { $select }
+      filters: { $sort, $select }
     } = this.filterQuery(id, params)
-    const updateOptions = { ...params.mongodb }
-    const modifier = Object.keys(data).reduce((current, key) => {
-      const value = (data as any)[key]
-
-      if (key.charAt(0) !== '$') {
-        current.$set = {
-          ...current.$set,
-          [key]: value
+
+    const replacement = Object.keys(data).reduce(
+      (current, key) => {
+        const value = (data as any)[key]
+
+        if (key.charAt(0) !== '$') {
+          current.$set[key] = value
+        } else if (key === '$set') {
+          current.$set = {
+            ...current.$set,
+            ...value
+          }
+        } else {
+          current[key] = value
         }
-      } else {
-        current[key] = value
-      }
 
-      return current
-    }, {} as any)
-    const originalIds = await this._findOrGet(id, {
-      ...params,
-      query: {
-        ...query,
-        $select: [this.id]
+        return current
       },
-      paginate: false
-    })
-    const items = Array.isArray(originalIds) ? originalIds : [originalIds]
-    const idList = items.map((item: any) => item[this.id])
-    const findParams = {
-      ...params,
-      paginate: false,
-      query: {
-        [this.id]: { $in: idList },
-        $select
+      { $set: {} } as any
+    )
+
+    if (id === null) {
+      const findParams = {
+        ...params,
+        paginate: false,
+        query: {
+          ...params.query,
+          $select: [this.id]
+        }
       }
+
+      return this._find(findParams)
+        .then(async (result) => {
+          const idList = (result as Result[]).map((item: any) => item[this.id])
+          await model.updateMany({ [this.id]: { $in: idList } }, replacement, params.mongodb)
+          return this._find({
+            ...params,
+            paginate: false,
+            query: {
+              [this.id]: { $in: idList },
+              $sort,
+              $select
+            }
+          })
+        })
+        .catch(errorHandler)
     }
 
-    await model.updateMany(query, modifier, updateOptions)
+    if (params.pipeline) {
+      const getParams = {
+        ...params,
+        query: {
+          ...params.query,
+          $select: [this.id]
+        }
+      }
+
+      return this._get(id, getParams)
+        .then(async () => {
+          await model.updateOne({ [this.id]: id }, replacement, params.mongodb)
+          return this._get(id, {
+            ...params,
+            query: { $select }
+          })
+        })
+        .catch(errorHandler)
+    }
+
+    const updateOptions: FindOneAndUpdateOptions = {
+      projection: this.getProjection($select),
+      ...(params.mongodb as FindOneAndUpdateOptions),
+      returnDocument: 'after'
+    }
 
-    return this._findOrGet(id, findParams).catch(errorHandler)
+    return model
+      .findOneAndUpdate(query, replacement, updateOptions)
+      .then((result) => {
+        if (!result) {
+          throw new NotFound(`No record found for id '${id}'`)
+        }
+        return result as Result
+      })
+      .catch(errorHandler)
   }
 
   async _update(id: AdapterId, data: Data, params: ServiceParams = {} as ServiceParams): Promise<Result> {
@@ -367,13 +483,48 @@ export class MongoDbAdapter<
       throw new BadRequest("You can not replace multiple instances. Did you mean 'patch'?")
     }
 
+    const {
+      query,
+      filters: { $select }
+    } = this.filterQuery(id, params)
     const model = await this.getModel(params)
-    const { query } = this.filterQuery(id, params)
-    const replaceOptions = { ...params.mongodb }
+    const replacement = this.normalizeId(id, data)
+
+    if (params.pipeline) {
+      const getParams = {
+        ...params,
+        query: {
+          ...params.query,
+          $select: [this.id]
+        }
+      }
 
-    await model.replaceOne(query, this.normalizeId(id, data), replaceOptions)
+      return this._get(id, getParams)
+        .then(async () => {
+          await model.replaceOne({ [this.id]: id }, replacement, params.mongodb)
+          return this._get(id, {
+            ...params,
+            query: { $select }
+          })
+        })
+        .catch(errorHandler)
+    }
+
+    const replaceOptions: FindOneAndReplaceOptions = {
+      projection: this.getProjection($select),
+      ...(params.mongodb as FindOneAndReplaceOptions),
+      returnDocument: 'after'
+    }
 
-    return this._findOrGet(id, params).catch(errorHandler)
+    return model
+      .findOneAndReplace(query, replacement, replaceOptions)
+      .then((result) => {
+        if (!result) {
+          throw new NotFound(`No record found for id '${id}'`)
+        }
+        return result as Result
+      })
+      .catch(errorHandler)
   }
 
   async _remove(id: null, params?: ServiceParams): Promise<Result[]>
@@ -388,24 +539,43 @@ export class MongoDbAdapter<
     }
 
     const model = await this.getModel(params)
-    const {
-      query,
-      filters: { $select }
-    } = this.filterQuery(id, params)
-    const deleteOptions = { ...params.mongodb }
+    const { query } = this.filterQuery(id, params)
     const findParams = {
       ...params,
-      paginate: false,
-      query: {
-        ...query,
-        $select
-      }
+      paginate: false
+    }
+
+    if (id === null) {
+      return this._find(findParams)
+        .then(async (result) => {
+          const idList = (result as Result[]).map((item: any) => item[this.id])
+          await model.deleteMany({ [this.id]: { $in: idList } }, params.mongodb)
+          return result
+        })
+        .catch(errorHandler)
+    }
+
+    if (params.pipeline) {
+      return this._get(id, params)
+        .then(async (result) => {
+          await model.deleteOne({ [this.id]: id }, params.mongodb)
+          return result
+        })
+        .catch(errorHandler)
     }
 
-    return this._findOrGet(id, findParams)
-      .then(async (items) => {
-        await model.deleteMany(query, deleteOptions)
-        return items
+    const deleteOptions: FindOneAndDeleteOptions = {
+      ...(params.mongodb as FindOneAndDeleteOptions),
+      projection: this.getProjection(params.query?.$select)
+    }
+
+    return model
+      .findOneAndDelete(query, deleteOptions)
+      .then((result) => {
+        if (!result) {
+          throw new NotFound(`No record found for id '${id}'`)
+        }
+        return result as Result
       })
       .catch(errorHandler)
   }

package/src/index.ts

@@ -41,6 +41,7 @@ export class MongoDBService<
     return this._create(data, params)
   }
 
+  async update(id: NullableAdapterId, data: Data, params?: ServiceParams): Promise<Result>
   async update(id: AdapterId, data: Data, params?: ServiceParams): Promise<Result> {
     return this._update(id, data, {
       ...params,