@opra/mongodb 1.2.2 → 1.3.0

package/cjs/{mongo-adapter.js → adapter/mongo-adapter.js}

@@ -2,16 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoAdapter = void 0;
 const tslib_1 = require("tslib");
-const prepare_filter_js_1 = tslib_1.__importDefault(require("./adapter-utils/prepare-filter.js"));
-const prepare_key_values_js_1 = tslib_1.__importDefault(require("./adapter-utils/prepare-key-values.js"));
-const prepare_patch_js_1 = tslib_1.__importDefault(require("./adapter-utils/prepare-patch.js"));
-const prepare_projection_js_1 = tslib_1.__importDefault(require("./adapter-utils/prepare-projection.js"));
-const prepare_sort_js_1 = tslib_1.__importDefault(require("./adapter-utils/prepare-sort.js"));
+const prepare_filter_js_1 = tslib_1.__importDefault(require("./prepare-filter.js"));
+const prepare_key_values_js_1 = tslib_1.__importDefault(require("./prepare-key-values.js"));
+const prepare_projection_js_1 = tslib_1.__importDefault(require("./prepare-projection.js"));
+const prepare_sort_js_1 = tslib_1.__importDefault(require("./prepare-sort.js"));
 var MongoAdapter;
 (function (MongoAdapter) {
     MongoAdapter.prepareFilter = prepare_filter_js_1.default;
     MongoAdapter.prepareKeyValues = prepare_key_values_js_1.default;
-    MongoAdapter.preparePatch = prepare_patch_js_1.default;
     MongoAdapter.prepareProjection = prepare_projection_js_1.default;
     MongoAdapter.prepareSort = prepare_sort_js_1.default;
     async function parseRequest(context) {

package/cjs/adapter/mongo-patch-generator.js

@@ -0,0 +1,124 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MongoPatchGenerator = void 0;
+const common_1 = require("@opra/common");
+const FIELD_NAME_PATTERN = /^([-><*:])?(.+)$/;
+class MongoPatchGenerator {
+    generatePatch(dataType, doc, options) {
+        const ctx = {};
+        this._processComplexType(ctx, dataType, options?.currentPath || '', doc);
+        const update = {};
+        if (ctx.$pull)
+            update.$pull = ctx.$pull;
+        if (ctx.$unset)
+            update.$unset = ctx.$unset;
+        if (ctx.$set)
+            update.$set = ctx.$set;
+        return {
+            update,
+            arrayFilters: ctx.arrayFilters,
+        };
+    }
+    _processComplexType(ctx, dataType, path, input) {
+        if (input.$remove) {
+            this._processRemove(ctx, dataType, path, input.$remove);
+        }
+        const keys = Object.keys(input);
+        const pathDot = path + (path ? '.' : '');
+        let field;
+        let key;
+        let value;
+        let keyField;
+        let keyValue;
+        let arrayIndex = 0;
+        let arrayFilterName = '';
+        for (key of keys) {
+            const m = FIELD_NAME_PATTERN.exec(key);
+            if (!m)
+                continue;
+            key = m[2];
+            value = input[key];
+            field = dataType.fields.get(key);
+            if (!field) {
+                if (dataType.additionalFields === true) {
+                    if (value === null) {
+                        ctx.$unset = ctx.$unset || {};
+                        ctx.$unset[pathDot + key] = 1;
+                    }
+                    else {
+                        ctx.$set = ctx.$set || {};
+                        ctx.$set[pathDot + key] = value;
+                    }
+                }
+                continue;
+            }
+            if (field.readonly)
+                continue;
+            if (value === null) {
+                ctx.$unset = ctx.$unset || {};
+                ctx.$unset[pathDot + field.name] = 1;
+                continue;
+            }
+            if (field.type instanceof common_1.ComplexType) {
+                if (!value)
+                    continue;
+                if (field.isArray) {
+                    if (!value.length)
+                        continue;
+                    keyField = field.keyField || field.type.keyField;
+                    if (keyField) {
+                        for (let v of value) {
+                            /** Increase arrayIndex and determine a new name for array filter  */
+                            arrayFilterName = 'f' + String(++arrayIndex);
+                            /** Extract key value from object */
+                            keyValue = v[keyField];
+                            if (keyValue == null)
+                                continue;
+                            v = { ...v };
+                            /** Remove key field from object */
+                            delete v[keyField];
+                            /** Add array filter */
+                            ctx.arrayFilters = ctx.arrayFilters || {};
+                            ctx.arrayFilters[`${arrayFilterName}.${keyField}`] = keyValue;
+                            /** Process each object in array */
+                            this._processComplexType(ctx, field.type, pathDot + field.name + `.$[${arrayFilterName}]`, v);
+                        }
+                        continue;
+                    }
+                }
+                if (!(typeof value === 'object'))
+                    continue;
+                /** Process nested object */
+                this._processComplexType(ctx, field.type, pathDot + field.name, value);
+                continue;
+            }
+            ctx.$set = ctx.$set || {};
+            ctx.$set[pathDot + field.name] = value;
+        }
+    }
+    _processRemove(ctx, dataType, path, input) {
+        let field;
+        let key;
+        let value;
+        const pathDot = path + (path ? '.' : '');
+        const keys = Object.keys(input);
+        let keyField;
+        for (key of keys) {
+            value = input[key];
+            field = dataType.fields.get(key);
+            if (!(field && field.isArray))
+                continue;
+            ctx.$pull = ctx.$pull || {};
+            if (field.type instanceof common_1.ComplexType) {
+                keyField = field.keyField || field.type.keyField;
+                if (!keyField)
+                    continue;
+                ctx.$pull[pathDot + key] = { $elemMatch: { [keyField]: Array.isArray(value) ? { $in: value } : value } };
+            }
+            else {
+                ctx.$pull[pathDot + key] = Array.isArray(value) ? { $in: value } : value;
+            }
+        }
+    }
+}
+exports.MongoPatchGenerator = MongoPatchGenerator;

package/cjs/index.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./mongo-adapter.js"), exports);
-tslib_1.__exportStar(require("./mongo-collection-service.js"), exports);
-tslib_1.__exportStar(require("./mongo-entity-service.js"), exports);
-tslib_1.__exportStar(require("./mongo-nested-service.js"), exports);
-tslib_1.__exportStar(require("./mongo-service.js"), exports);
-tslib_1.__exportStar(require("./mongo-singleton-service.js"), exports);
+tslib_1.__exportStar(require("./adapter/mongo-adapter.js"), exports);
+tslib_1.__exportStar(require("./adapter/mongo-patch-generator.js"), exports);
+tslib_1.__exportStar(require("./services/mongo-collection-service.js"), exports);
+tslib_1.__exportStar(require("./services/mongo-entity-service.js"), exports);
+tslib_1.__exportStar(require("./services/mongo-nested-service.js"), exports);
+tslib_1.__exportStar(require("./services/mongo-service.js"), exports);
+tslib_1.__exportStar(require("./services/mongo-singleton-service.js"), exports);

package/cjs/{mongo-collection-service.js → services/mongo-collection-service.js}

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoCollectionService = void 0;
 const common_1 = require("@opra/common");
-const mongo_adapter_js_1 = require("./mongo-adapter.js");
+const mongo_adapter_js_1 = require("../adapter/mongo-adapter.js");
 const mongo_entity_service_js_1 = require("./mongo-entity-service.js");
 /**
  * @class MongoCollectionService

package/cjs/{mongo-entity-service.js → services/mongo-entity-service.js}

@@ -4,7 +4,8 @@ exports.MongoEntityService = void 0;
 const objects_1 = require("@jsopen/objects");
 const common_1 = require("@opra/common");
 const valgen_1 = require("valgen");
-const mongo_adapter_js_1 = require("./mongo-adapter.js");
+const mongo_adapter_js_1 = require("../adapter/mongo-adapter.js");
+const mongo_patch_generator_js_1 = require("../adapter/mongo-patch-generator.js");
 const mongo_service_js_1 = require("./mongo-service.js");
 /**
  * @class MongoEntityService
@@ -288,16 +289,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         if (input && inputRaw) {
             throw new TypeError('You must pass one of MongoDB UpdateFilter or a partial document, not both');
         }
-        let update;
-        if (input) {
-            const inputCodec = this._getInputCodec('update');
-            const doc = inputCodec(input);
-            delete doc._id;
-            update = mongo_adapter_js_1.MongoAdapter.preparePatch(doc);
-            update.$set = update.$set || {};
-        }
-        else
-            update = inputRaw;
+        const update = this._prepareUpdate(command);
         const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([
             mongo_adapter_js_1.MongoAdapter.prepareKeyValues(command.documentId, ['_id']),
             options?.filter,
@@ -316,36 +308,6 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         if (out)
             return outputCodec(out);
     }
-    /**
-     * Replaces a document with the given id in the collection
-     *
-     * @param {MongoEntityService.ReplaceCommand<T>} command
-     */
-    async _replace(command) {
-        const input = command.input;
-        (0, valgen_1.isNotNullish)(input, { label: 'input' });
-        (0, valgen_1.isNotNullish)(input._id, { label: 'input._id' });
-        const inputCodec = this._getInputCodec('replace');
-        const document = inputCodec(input);
-        const { options } = command;
-        const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([
-            mongo_adapter_js_1.MongoAdapter.prepareKeyValues(command.documentId, ['_id']),
-            options?.filter,
-        ]);
-        const db = this.getDatabase();
-        const collection = await this.getCollection(db);
-        const out = await collection.findOneAndReplace(filter || {}, document, {
-            upsert: undefined,
-            ...options,
-            returnDocument: 'after',
-            includeResultMetadata: false,
-            session: options?.session ?? this.getSession(),
-            projection: mongo_adapter_js_1.MongoAdapter.prepareProjection(this.dataType, options?.projection),
-        });
-        const outputCodec = this._getOutputCodec('replace');
-        if (out)
-            return outputCodec(out);
-    }
     /**
      * Updates a document in the collection with the specified ID.
      *
@@ -358,17 +320,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         if (input && inputRaw) {
             throw new TypeError('You must pass one of MongoDB UpdateFilter or a partial document, not both');
         }
-        let update;
-        if (input) {
-            const inputCodec = this._getInputCodec('update');
-            const doc = inputCodec(input);
-            delete doc._id;
-            update = mongo_adapter_js_1.MongoAdapter.preparePatch(doc);
-            if (!Object.keys(doc).length)
-                return 0;
-        }
-        else
-            update = inputRaw;
+        const update = this._prepareUpdate(command);
         const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([
             mongo_adapter_js_1.MongoAdapter.prepareKeyValues(command.documentId, ['_id']),
             options?.filter,
@@ -393,17 +345,7 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
         if (input && inputRaw) {
             throw new TypeError('You must pass one of MongoDB UpdateFilter or a partial document, not both');
         }
-        let update;
-        if (input) {
-            const inputCodec = this._getInputCodec('update');
-            const doc = inputCodec(input);
-            delete doc._id;
-            update = mongo_adapter_js_1.MongoAdapter.preparePatch(doc);
-            if (!Object.keys(doc).length)
-                return 0;
-        }
-        else
-            update = inputRaw;
+        const update = this._prepareUpdate(command);
         const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter(options?.filter);
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
@@ -413,6 +355,59 @@ class MongoEntityService extends mongo_service_js_1.MongoService {
             upsert: false,
         })).matchedCount;
     }
+    /**
+     * Replaces a document with the given id in the collection
+     *
+     * @param {MongoEntityService.ReplaceCommand<T>} command
+     */
+    async _replace(command) {
+        const input = command.input;
+        (0, valgen_1.isNotNullish)(input, { label: 'input' });
+        (0, valgen_1.isNotNullish)(input._id, { label: 'input._id' });
+        const inputCodec = this._getInputCodec('replace');
+        const document = inputCodec(input);
+        const { options } = command;
+        const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([
+            mongo_adapter_js_1.MongoAdapter.prepareKeyValues(command.documentId, ['_id']),
+            options?.filter,
+        ]);
+        const db = this.getDatabase();
+        const collection = await this.getCollection(db);
+        const out = await collection.findOneAndReplace(filter || {}, document, {
+            upsert: undefined,
+            ...options,
+            returnDocument: 'after',
+            includeResultMetadata: false,
+            session: options?.session ?? this.getSession(),
+            projection: mongo_adapter_js_1.MongoAdapter.prepareProjection(this.dataType, options?.projection),
+        });
+        const outputCodec = this._getOutputCodec('replace');
+        if (out)
+            return outputCodec(out);
+    }
+    _prepareUpdate(command) {
+        const { input, inputRaw } = command;
+        (0, valgen_1.isNotNullish)(input || inputRaw, { label: 'input' });
+        if (input && inputRaw) {
+            throw new TypeError('You must pass one of MongoDB UpdateFilter or a partial document, not both');
+        }
+        if (inputRaw)
+            return inputRaw;
+        const inputCodec = this._getInputCodec('update');
+        const doc = inputCodec(input);
+        delete doc._id;
+        return this._generatePatch(command, doc);
+    }
+    _generatePatch(command, doc) {
+        const patchGenerator = new mongo_patch_generator_js_1.MongoPatchGenerator();
+        const { update, arrayFilters } = patchGenerator.generatePatch(this.dataType, doc);
+        command.options = command.options || {};
+        if (arrayFilters) {
+            command.options.arrayFilters = command.options.arrayFilters || [];
+            command.options.arrayFilters.push(arrayFilters);
+        }
+        return update;
+    }
     async _executeCommand(command, commandFn) {
         try {
             const result = await super._executeCommand(command, async () => {

package/cjs/{mongo-nested-service.js → services/mongo-nested-service.js}

@@ -4,7 +4,8 @@ exports.MongoNestedService = void 0;
 const objects_1 = require("@jsopen/objects");
 const common_1 = require("@opra/common");
 const valgen_1 = require("valgen");
-const mongo_adapter_js_1 = require("./mongo-adapter.js");
+const mongo_adapter_js_1 = require("../adapter/mongo-adapter.js");
+const mongo_patch_generator_js_1 = require("../adapter/mongo-patch-generator.js");
 const mongo_service_js_1 = require("./mongo-service.js");
 /**
  * A class that provides methods to perform operations on an array field in a MongoDB collection.
@@ -687,9 +688,15 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
             const elemMatch = mongo_adapter_js_1.MongoAdapter.prepareFilter([options?.filter], { fieldPrefix: 'elem.' });
             options.arrayFilters = [elemMatch];
         }
-        const update = mongo_adapter_js_1.MongoAdapter.preparePatch(doc, {
-            fieldPrefix: this.fieldName + (options?.filter ? '.$[elem].' : '.$[].'),
+        const patchGenerator = new mongo_patch_generator_js_1.MongoPatchGenerator();
+        const { update, arrayFilters } = patchGenerator.generatePatch(this.dataType, doc, {
+            currentPath: this.fieldName + (options?.filter ? '.$[elem]' : '.$[]'),
         });
+        command.options = command.options || {};
+        if (arrayFilters) {
+            command.options.arrayFilters = command.options.arrayFilters || [];
+            command.options.arrayFilters.push(arrayFilters);
+        }
         // Count matching items, we will use this as result
         const count = await this._count({
             crud: 'read',

package/cjs/{mongo-service.js → services/mongo-service.js}

@@ -4,7 +4,7 @@ exports.MongoService = void 0;
 const common_1 = require("@opra/common");
 const core_1 = require("@opra/core");
 const mongodb_1 = require("mongodb");
-const mongo_adapter_js_1 = require("./mongo-adapter.js");
+const mongo_adapter_js_1 = require("../adapter/mongo-adapter.js");
 const transactionKey = Symbol.for('transaction');
 /**
  * Class representing a MongoDB service for interacting with a collection.
@@ -232,8 +232,10 @@ class MongoService extends core_1.ServiceBase {
         if (validator)
             return validator;
         const options = { projection: '*' };
-        if (operation === 'update')
+        if (operation === 'update') {
             options.partial = 'deep';
+            options.allowPatchOperators = true;
+        }
         const dataType = this.dataType;
         validator = dataType.generateCodec('decode', options);
         this._inputCodecs[operation] = validator;

package/cjs/{mongo-singleton-service.js → services/mongo-singleton-service.js}

@@ -4,7 +4,7 @@ exports.MongoSingletonService = void 0;
 const objects_1 = require("@jsopen/objects");
 const common_1 = require("@opra/common");
 const mongodb_1 = require("mongodb");
-const mongo_adapter_js_1 = require("./mongo-adapter.js");
+const mongo_adapter_js_1 = require("../adapter/mongo-adapter.js");
 const mongo_entity_service_js_1 = require("./mongo-entity-service.js");
 /**
  * A class that provides access to a MongoDB collection, with support for singleton document operations.

package/esm/{mongo-adapter.js → adapter/mongo-adapter.js}

@@ -1,13 +1,11 @@
-import _prepareFilter from './adapter-utils/prepare-filter.js';
-import _prepareKeyValues from './adapter-utils/prepare-key-values.js';
-import _preparePatch from './adapter-utils/prepare-patch.js';
-import _prepareProjection from './adapter-utils/prepare-projection.js';
-import _prepareSort from './adapter-utils/prepare-sort.js';
+import _prepareFilter from './prepare-filter.js';
+import _prepareKeyValues from './prepare-key-values.js';
+import _prepareProjection from './prepare-projection.js';
+import _prepareSort from './prepare-sort.js';
 export var MongoAdapter;
 (function (MongoAdapter) {
     MongoAdapter.prepareFilter = _prepareFilter;
     MongoAdapter.prepareKeyValues = _prepareKeyValues;
-    MongoAdapter.preparePatch = _preparePatch;
     MongoAdapter.prepareProjection = _prepareProjection;
     MongoAdapter.prepareSort = _prepareSort;
     async function parseRequest(context) {

package/esm/adapter/mongo-patch-generator.js

@@ -0,0 +1,120 @@
+import { ComplexType } from '@opra/common';
+const FIELD_NAME_PATTERN = /^([-><*:])?(.+)$/;
+export class MongoPatchGenerator {
+    generatePatch(dataType, doc, options) {
+        const ctx = {};
+        this._processComplexType(ctx, dataType, options?.currentPath || '', doc);
+        const update = {};
+        if (ctx.$pull)
+            update.$pull = ctx.$pull;
+        if (ctx.$unset)
+            update.$unset = ctx.$unset;
+        if (ctx.$set)
+            update.$set = ctx.$set;
+        return {
+            update,
+            arrayFilters: ctx.arrayFilters,
+        };
+    }
+    _processComplexType(ctx, dataType, path, input) {
+        if (input.$remove) {
+            this._processRemove(ctx, dataType, path, input.$remove);
+        }
+        const keys = Object.keys(input);
+        const pathDot = path + (path ? '.' : '');
+        let field;
+        let key;
+        let value;
+        let keyField;
+        let keyValue;
+        let arrayIndex = 0;
+        let arrayFilterName = '';
+        for (key of keys) {
+            const m = FIELD_NAME_PATTERN.exec(key);
+            if (!m)
+                continue;
+            key = m[2];
+            value = input[key];
+            field = dataType.fields.get(key);
+            if (!field) {
+                if (dataType.additionalFields === true) {
+                    if (value === null) {
+                        ctx.$unset = ctx.$unset || {};
+                        ctx.$unset[pathDot + key] = 1;
+                    }
+                    else {
+                        ctx.$set = ctx.$set || {};
+                        ctx.$set[pathDot + key] = value;
+                    }
+                }
+                continue;
+            }
+            if (field.readonly)
+                continue;
+            if (value === null) {
+                ctx.$unset = ctx.$unset || {};
+                ctx.$unset[pathDot + field.name] = 1;
+                continue;
+            }
+            if (field.type instanceof ComplexType) {
+                if (!value)
+                    continue;
+                if (field.isArray) {
+                    if (!value.length)
+                        continue;
+                    keyField = field.keyField || field.type.keyField;
+                    if (keyField) {
+                        for (let v of value) {
+                            /** Increase arrayIndex and determine a new name for array filter  */
+                            arrayFilterName = 'f' + String(++arrayIndex);
+                            /** Extract key value from object */
+                            keyValue = v[keyField];
+                            if (keyValue == null)
+                                continue;
+                            v = { ...v };
+                            /** Remove key field from object */
+                            delete v[keyField];
+                            /** Add array filter */
+                            ctx.arrayFilters = ctx.arrayFilters || {};
+                            ctx.arrayFilters[`${arrayFilterName}.${keyField}`] = keyValue;
+                            /** Process each object in array */
+                            this._processComplexType(ctx, field.type, pathDot + field.name + `.$[${arrayFilterName}]`, v);
+                        }
+                        continue;
+                    }
+                }
+                if (!(typeof value === 'object'))
+                    continue;
+                /** Process nested object */
+                this._processComplexType(ctx, field.type, pathDot + field.name, value);
+                continue;
+            }
+            ctx.$set = ctx.$set || {};
+            ctx.$set[pathDot + field.name] = value;
+        }
+    }
+    _processRemove(ctx, dataType, path, input) {
+        let field;
+        let key;
+        let value;
+        const pathDot = path + (path ? '.' : '');
+        const keys = Object.keys(input);
+        let keyField;
+        for (key of keys) {
+            value = input[key];
+            field = dataType.fields.get(key);
+            if (!(field && field.isArray))
+                continue;
+            ctx.$pull = ctx.$pull || {};
+            if (field.type instanceof ComplexType) {
+                keyField = field.keyField || field.type.keyField;
+                if (!keyField)
+                    continue;
+                ctx.$pull[pathDot + key] = { $elemMatch: { [keyField]: Array.isArray(value) ? { $in: value } : value } };
+            }
+            else {
+                ctx.$pull[pathDot + key] = Array.isArray(value) ? { $in: value } : value;
+            }
+        }
+    }
+}

package/esm/index.js

@@ -1,6 +1,7 @@
-export * from './mongo-adapter.js';
-export * from './mongo-collection-service.js';
-export * from './mongo-entity-service.js';
-export * from './mongo-nested-service.js';
-export * from './mongo-service.js';
-export * from './mongo-singleton-service.js';
+export * from './adapter/mongo-adapter.js';
+export * from './adapter/mongo-patch-generator.js';
+export * from './services/mongo-collection-service.js';
+export * from './services/mongo-entity-service.js';
+export * from './services/mongo-nested-service.js';
+export * from './services/mongo-service.js';
+export * from './services/mongo-singleton-service.js';

package/esm/{mongo-collection-service.js → services/mongo-collection-service.js}

@@ -1,5 +1,5 @@
 import { ResourceNotAvailableError } from '@opra/common';
-import { MongoAdapter } from './mongo-adapter.js';
+import { MongoAdapter } from '../adapter/mongo-adapter.js';
 import { MongoEntityService } from './mongo-entity-service.js';
 /**
  * @class MongoCollectionService

package/esm/{mongo-entity-service.js → services/mongo-entity-service.js}

@@ -1,7 +1,8 @@
 import { omit } from '@jsopen/objects';
 import { InternalServerError } from '@opra/common';
 import { isNotNullish } from 'valgen';
-import { MongoAdapter } from './mongo-adapter.js';
+import { MongoAdapter } from '../adapter/mongo-adapter.js';
+import { MongoPatchGenerator } from '../adapter/mongo-patch-generator.js';
 import { MongoService } from './mongo-service.js';
 /**
  * @class MongoEntityService
@@ -285,16 +286,7 @@ export class MongoEntityService extends MongoService {
         if (input && inputRaw) {
             throw new TypeError('You must pass one of MongoDB UpdateFilter or a partial document, not both');
         }
-        let update;
-        if (input) {
-            const inputCodec = this._getInputCodec('update');
-            const doc = inputCodec(input);
-            delete doc._id;
-            update = MongoAdapter.preparePatch(doc);
-            update.$set = update.$set || {};
-        }
-        else
-            update = inputRaw;
+        const update = this._prepareUpdate(command);
         const filter = MongoAdapter.prepareFilter([
             MongoAdapter.prepareKeyValues(command.documentId, ['_id']),
             options?.filter,
@@ -313,36 +305,6 @@ export class MongoEntityService extends MongoService {
         if (out)
             return outputCodec(out);
     }
-    /**
-     * Replaces a document with the given id in the collection
-     *
-     * @param {MongoEntityService.ReplaceCommand<T>} command
-     */
-    async _replace(command) {
-        const input = command.input;
-        isNotNullish(input, { label: 'input' });
-        isNotNullish(input._id, { label: 'input._id' });
-        const inputCodec = this._getInputCodec('replace');
-        const document = inputCodec(input);
-        const { options } = command;
-        const filter = MongoAdapter.prepareFilter([
-            MongoAdapter.prepareKeyValues(command.documentId, ['_id']),
-            options?.filter,
-        ]);
-        const db = this.getDatabase();
-        const collection = await this.getCollection(db);
-        const out = await collection.findOneAndReplace(filter || {}, document, {
-            upsert: undefined,
-            ...options,
-            returnDocument: 'after',
-            includeResultMetadata: false,
-            session: options?.session ?? this.getSession(),
-            projection: MongoAdapter.prepareProjection(this.dataType, options?.projection),
-        });
-        const outputCodec = this._getOutputCodec('replace');
-        if (out)
-            return outputCodec(out);
-    }
     /**
      * Updates a document in the collection with the specified ID.
      *
@@ -355,17 +317,7 @@ export class MongoEntityService extends MongoService {
         if (input && inputRaw) {
             throw new TypeError('You must pass one of MongoDB UpdateFilter or a partial document, not both');
         }
-        let update;
-        if (input) {
-            const inputCodec = this._getInputCodec('update');
-            const doc = inputCodec(input);
-            delete doc._id;
-            update = MongoAdapter.preparePatch(doc);
-            if (!Object.keys(doc).length)
-                return 0;
-        }
-        else
-            update = inputRaw;
+        const update = this._prepareUpdate(command);
         const filter = MongoAdapter.prepareFilter([
             MongoAdapter.prepareKeyValues(command.documentId, ['_id']),
             options?.filter,
@@ -390,17 +342,7 @@ export class MongoEntityService extends MongoService {
         if (input && inputRaw) {
             throw new TypeError('You must pass one of MongoDB UpdateFilter or a partial document, not both');
         }
-        let update;
-        if (input) {
-            const inputCodec = this._getInputCodec('update');
-            const doc = inputCodec(input);
-            delete doc._id;
-            update = MongoAdapter.preparePatch(doc);
-            if (!Object.keys(doc).length)
-                return 0;
-        }
-        else
-            update = inputRaw;
+        const update = this._prepareUpdate(command);
         const filter = MongoAdapter.prepareFilter(options?.filter);
         const db = this.getDatabase();
         const collection = await this.getCollection(db);
@@ -410,6 +352,59 @@ export class MongoEntityService extends MongoService {
             upsert: false,
         })).matchedCount;
     }
+    /**
+     * Replaces a document with the given id in the collection
+     *
+     * @param {MongoEntityService.ReplaceCommand<T>} command
+     */
+    async _replace(command) {
+        const input = command.input;
+        isNotNullish(input, { label: 'input' });
+        isNotNullish(input._id, { label: 'input._id' });
+        const inputCodec = this._getInputCodec('replace');
+        const document = inputCodec(input);
+        const { options } = command;
+        const filter = MongoAdapter.prepareFilter([
+            MongoAdapter.prepareKeyValues(command.documentId, ['_id']),
+            options?.filter,
+        ]);
+        const db = this.getDatabase();
+        const collection = await this.getCollection(db);
+        const out = await collection.findOneAndReplace(filter || {}, document, {
+            upsert: undefined,
+            ...options,
+            returnDocument: 'after',
+            includeResultMetadata: false,
+            session: options?.session ?? this.getSession(),
+            projection: MongoAdapter.prepareProjection(this.dataType, options?.projection),
+        });
+        const outputCodec = this._getOutputCodec('replace');
+        if (out)
+            return outputCodec(out);
+    }
+    _prepareUpdate(command) {
+        const { input, inputRaw } = command;
+        isNotNullish(input || inputRaw, { label: 'input' });
+        if (input && inputRaw) {
+            throw new TypeError('You must pass one of MongoDB UpdateFilter or a partial document, not both');
+        }
+        if (inputRaw)
+            return inputRaw;
+        const inputCodec = this._getInputCodec('update');
+        const doc = inputCodec(input);
+        delete doc._id;
+        return this._generatePatch(command, doc);
+    }
+    _generatePatch(command, doc) {
+        const patchGenerator = new MongoPatchGenerator();
+        const { update, arrayFilters } = patchGenerator.generatePatch(this.dataType, doc);
+        command.options = command.options || {};
+        if (arrayFilters) {
+            command.options.arrayFilters = command.options.arrayFilters || [];
+            command.options.arrayFilters.push(arrayFilters);
+        }
+        return update;
+    }
     async _executeCommand(command, commandFn) {
         try {
             const result = await super._executeCommand(command, async () => {

package/esm/{mongo-nested-service.js → services/mongo-nested-service.js}

@@ -1,7 +1,8 @@
 import { omit } from '@jsopen/objects';
 import { ComplexType, NotAcceptableError, ResourceNotAvailableError } from '@opra/common';
 import { isNotNullish } from 'valgen';
-import { MongoAdapter } from './mongo-adapter.js';
+import { MongoAdapter } from '../adapter/mongo-adapter.js';
+import { MongoPatchGenerator } from '../adapter/mongo-patch-generator.js';
 import { MongoService } from './mongo-service.js';
 /**
  * A class that provides methods to perform operations on an array field in a MongoDB collection.
@@ -684,9 +685,15 @@ export class MongoNestedService extends MongoService {
             const elemMatch = MongoAdapter.prepareFilter([options?.filter], { fieldPrefix: 'elem.' });
             options.arrayFilters = [elemMatch];
         }
-        const update = MongoAdapter.preparePatch(doc, {
-            fieldPrefix: this.fieldName + (options?.filter ? '.$[elem].' : '.$[].'),
+        const patchGenerator = new MongoPatchGenerator();
+        const { update, arrayFilters } = patchGenerator.generatePatch(this.dataType, doc, {
+            currentPath: this.fieldName + (options?.filter ? '.$[elem]' : '.$[]'),
         });
+        command.options = command.options || {};
+        if (arrayFilters) {
+            command.options.arrayFilters = command.options.arrayFilters || [];
+            command.options.arrayFilters.push(arrayFilters);
+        }
         // Count matching items, we will use this as result
         const count = await this._count({
             crud: 'read',

package/esm/{mongo-service.js → services/mongo-service.js}

@@ -1,7 +1,7 @@
 import { DATATYPE_METADATA } from '@opra/common';
 import { ServiceBase } from '@opra/core';
 import { ObjectId } from 'mongodb';
-import { MongoAdapter } from './mongo-adapter.js';
+import { MongoAdapter } from '../adapter/mongo-adapter.js';
 const transactionKey = Symbol.for('transaction');
 /**
  * Class representing a MongoDB service for interacting with a collection.
@@ -229,8 +229,10 @@ export class MongoService extends ServiceBase {
         if (validator)
             return validator;
         const options = { projection: '*' };
-        if (operation === 'update')
+        if (operation === 'update') {
             options.partial = 'deep';
+            options.allowPatchOperators = true;
+        }
         const dataType = this.dataType;
         validator = dataType.generateCodec('decode', options);
         this._inputCodecs[operation] = validator;

package/esm/{mongo-singleton-service.js → services/mongo-singleton-service.js}

@@ -1,7 +1,7 @@
 import { omit } from '@jsopen/objects';
 import { ResourceNotAvailableError } from '@opra/common';
 import { ObjectId } from 'mongodb';
-import { MongoAdapter } from './mongo-adapter.js';
+import { MongoAdapter } from '../adapter/mongo-adapter.js';
 import { MongoEntityService } from './mongo-entity-service.js';
 /**
  * A class that provides access to a MongoDB collection, with support for singleton document operations.

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@opra/mongodb",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "Opra MongoDB adapter package",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
-    "@jsopen/objects": "^1.4.2",
+    "@jsopen/objects": "^1.5.0",
     "tslib": "^2.8.1",
     "valgen": "^5.12.0"
   },
   "peerDependencies": {
-    "@opra/common": "^1.2.2",
-    "@opra/core": "^1.2.2",
-    "@opra/http": "^1.2.2",
+    "@opra/common": "^1.3.0",
+    "@opra/core": "^1.3.0",
+    "@opra/http": "^1.3.0",
     "mongodb": ">= 6.0.0"
   },
   "type": "module",

package/types/{mongo-adapter.d.ts → adapter/mongo-adapter.d.ts}

@@ -1,17 +1,15 @@
 import { OpraFilter } from '@opra/common';
 import type { ExecutionContext } from '@opra/core';
 import mongodb, { ObjectId } from 'mongodb';
-import _prepareFilter from './adapter-utils/prepare-filter.js';
-import _prepareKeyValues from './adapter-utils/prepare-key-values.js';
-import _preparePatch from './adapter-utils/prepare-patch.js';
-import _prepareProjection from './adapter-utils/prepare-projection.js';
-import _prepareSort from './adapter-utils/prepare-sort.js';
+import _prepareFilter from './prepare-filter.js';
+import _prepareKeyValues from './prepare-key-values.js';
+import _prepareProjection from './prepare-projection.js';
+import _prepareSort from './prepare-sort.js';
 export declare namespace MongoAdapter {
     type AnyId = string | number | ObjectId;
     type FilterInput<T = any> = OpraFilter.Expression | mongodb.Filter<T> | string | undefined;
     const prepareFilter: typeof _prepareFilter;
     const prepareKeyValues: typeof _prepareKeyValues;
-    const preparePatch: typeof _preparePatch;
     const prepareProjection: typeof _prepareProjection;
     const prepareSort: typeof _prepareSort;
     interface TransformedRequest {

package/types/adapter/mongo-patch-generator.d.ts

@@ -0,0 +1,23 @@
+import { ComplexType } from '@opra/common';
+import type { UpdateFilter } from 'mongodb';
+import type { PatchDTO } from 'ts-gems';
+interface Context {
+    $set?: Record<string, any>;
+    $unset?: Record<string, any>;
+    $pull?: Record<string, any>;
+    arrayFilters?: Record<string, any>;
+}
+export declare class MongoPatchGenerator {
+    generatePatch<T extends object>(dataType: ComplexType, doc: PatchDTO<T>, options?: MongoPatchGenerator.Options): {
+        update: UpdateFilter<T>;
+        arrayFilters?: Record<string, any>;
+    };
+    protected _processComplexType(ctx: Context, dataType: ComplexType, path: string, input: any): void;
+    protected _processRemove(ctx: Context, dataType: ComplexType, path: string, input: any): void;
+}
+export declare namespace MongoPatchGenerator {
+    interface Options {
+        currentPath?: string;
+    }
+}
+export {};

package/types/{adapter-utils → adapter}/prepare-filter.d.ts

@@ -1,5 +1,5 @@
 import mongodb from 'mongodb';
-import type { MongoAdapter } from '../mongo-adapter.js';
+import type { MongoAdapter } from './mongo-adapter';
 /**
  * Prepare the MongoDB filter based on the provided filters and options.
  *

package/types/index.d.cts

@@ -1,6 +1,7 @@
-export * from './mongo-adapter.js';
-export * from './mongo-collection-service.js';
-export * from './mongo-entity-service.js';
-export * from './mongo-nested-service.js';
-export * from './mongo-service.js';
-export * from './mongo-singleton-service.js';
+export * from './adapter/mongo-adapter.js';
+export * from './adapter/mongo-patch-generator.js';
+export * from './services/mongo-collection-service.js';
+export * from './services/mongo-entity-service.js';
+export * from './services/mongo-nested-service.js';
+export * from './services/mongo-service.js';
+export * from './services/mongo-singleton-service.js';

package/types/index.d.ts

@@ -1,6 +1,7 @@
-export * from './mongo-adapter.js';
-export * from './mongo-collection-service.js';
-export * from './mongo-entity-service.js';
-export * from './mongo-nested-service.js';
-export * from './mongo-service.js';
-export * from './mongo-singleton-service.js';
+export * from './adapter/mongo-adapter.js';
+export * from './adapter/mongo-patch-generator.js';
+export * from './services/mongo-collection-service.js';
+export * from './services/mongo-entity-service.js';
+export * from './services/mongo-nested-service.js';
+export * from './services/mongo-service.js';
+export * from './services/mongo-singleton-service.js';

package/types/{mongo-collection-service.d.ts → services/mongo-collection-service.d.ts}

@@ -1,6 +1,6 @@
 import mongodb, { type UpdateFilter } from 'mongodb';
 import type { PartialDTO, PatchDTO, RequiredSome, Type } from 'ts-gems';
-import { MongoAdapter } from './mongo-adapter.js';
+import { MongoAdapter } from '../adapter/mongo-adapter.js';
 import { MongoEntityService } from './mongo-entity-service.js';
 /**
  *

package/types/{mongo-entity-service.d.ts → services/mongo-entity-service.d.ts}

@@ -1,4 +1,4 @@
-import mongodb from 'mongodb';
+import mongodb, { type UpdateFilter } from 'mongodb';
 import type { PartialDTO, PatchDTO, StrictOmit, Type } from 'ts-gems';
 import { MongoService } from './mongo-service.js';
 /**
@@ -168,12 +168,6 @@ export declare class MongoEntityService<T extends mongodb.Document> extends Mong
      * @param {MongoEntityService.UpdateOneCommand<T>} command
      */
     protected _update(command: MongoEntityService.UpdateOneCommand<T>): Promise<PartialDTO<T> | undefined>;
-    /**
-     * Replaces a document with the given id in the collection
-     *
-     * @param {MongoEntityService.ReplaceCommand<T>} command
-     */
-    protected _replace(command: MongoEntityService.ReplaceCommand<T>): Promise<PartialDTO<T> | undefined>;
     /**
      * Updates a document in the collection with the specified ID.
      *
@@ -186,6 +180,14 @@ export declare class MongoEntityService<T extends mongodb.Document> extends Mong
      * @param {MongoEntityService.UpdateManyCommand<T>} command
      */
     protected _updateMany(command: MongoEntityService.UpdateManyCommand<T>): Promise<number>;
+    /**
+     * Replaces a document with the given id in the collection
+     *
+     * @param {MongoEntityService.ReplaceCommand<T>} command
+     */
+    protected _replace(command: MongoEntityService.ReplaceCommand<T>): Promise<PartialDTO<T> | undefined>;
+    protected _prepareUpdate(command: MongoEntityService.UpdateOneCommand<T> | MongoEntityService.UpdateManyCommand<T>): UpdateFilter<T>;
+    protected _generatePatch(command: MongoEntityService.UpdateOneCommand<T> | MongoEntityService.UpdateManyCommand<T>, doc: any): mongodb.UpdateFilter<T>;
     protected _executeCommand(command: MongoEntityService.CommandInfo, commandFn: () => any): Promise<any>;
     protected _beforeCreate(command: MongoEntityService.CreateCommand<T>): Promise<void>;
     protected _beforeDelete(command: MongoEntityService.DeleteCommand<T>): Promise<void>;

package/types/{mongo-nested-service.d.ts → services/mongo-nested-service.d.ts}

@@ -1,8 +1,8 @@
 import { ComplexType } from '@opra/common';
 import mongodb from 'mongodb';
 import type { DTO, PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
-import { MongoAdapter } from './mongo-adapter.js';
-import type { MongoEntityService } from './mongo-entity-service';
+import { MongoAdapter } from '../adapter/mongo-adapter.js';
+import type { MongoEntityService } from './mongo-entity-service.js';
 import { MongoService } from './mongo-service.js';
 /**
  *

package/types/{mongo-service.d.ts → services/mongo-service.d.ts}

@@ -3,7 +3,7 @@ import { ExecutionContext, ServiceBase } from '@opra/core';
 import mongodb, { ClientSession, type Document, type TransactionOptions } from 'mongodb';
 import type { Nullish, StrictOmit, Type } from 'ts-gems';
 import type { IsObject } from 'valgen';
-import { MongoAdapter } from './mongo-adapter.js';
+import { MongoAdapter } from '../adapter/mongo-adapter.js';
 /**
  * The namespace for the MongoService.
  *

package/types/{mongo-singleton-service.d.ts → services/mongo-singleton-service.d.ts}

@@ -1,6 +1,6 @@
 import mongodb, { type UpdateFilter } from 'mongodb';
 import type { PartialDTO, PatchDTO, RequiredSome, Type } from 'ts-gems';
-import { MongoAdapter } from './mongo-adapter.js';
+import { MongoAdapter } from '../adapter/mongo-adapter.js';
 import { MongoEntityService } from './mongo-entity-service.js';
 /**
  *

package/cjs/adapter-utils/prepare-patch.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = preparePatch;
-const objects_1 = require("@jsopen/objects");
-function preparePatch(doc, options) {
-    const trg = {};
-    _preparePatch(doc, trg, '', options);
-    trg.$set = trg.$set || {};
-    return trg;
-}
-function _preparePatch(src, trg, path, options) {
-    let f;
-    let key;
-    let field;
-    trg = trg || {};
-    const fieldPrefix = options?.fieldPrefix;
-    for (const [k, v] of Object.entries(src)) {
-        f = k.startsWith('*') ? k.substring(1) : k;
-        key = path ? path + '.' + f : f;
-        field = (fieldPrefix ? fieldPrefix : '') + key;
-        if (v == null) {
-            trg.$unset = trg.$unset || {};
-            trg.$unset[field] = '';
-            continue;
-        }
-        if (v && typeof v === 'object' && !(0, objects_1.isBuiltIn)(v)) {
-            // If field name starts with "*", do "replace" operation except "merge"
-            if (!k.startsWith('*')) {
-                _preparePatch(v, trg, key);
-                continue;
-            }
-        }
-        trg.$set = trg.$set || {};
-        trg.$set[field] = v;
-    }
-    return trg;
-}

package/esm/adapter-utils/prepare-patch.js

@@ -1,34 +0,0 @@
-import { isBuiltIn } from '@jsopen/objects';
-export default function preparePatch(doc, options) {
-    const trg = {};
-    _preparePatch(doc, trg, '', options);
-    trg.$set = trg.$set || {};
-    return trg;
-}
-function _preparePatch(src, trg, path, options) {
-    let f;
-    let key;
-    let field;
-    trg = trg || {};
-    const fieldPrefix = options?.fieldPrefix;
-    for (const [k, v] of Object.entries(src)) {
-        f = k.startsWith('*') ? k.substring(1) : k;
-        key = path ? path + '.' + f : f;
-        field = (fieldPrefix ? fieldPrefix : '') + key;
-        if (v == null) {
-            trg.$unset = trg.$unset || {};
-            trg.$unset[field] = '';
-            continue;
-        }
-        if (v && typeof v === 'object' && !isBuiltIn(v)) {
-            // If field name starts with "*", do "replace" operation except "merge"
-            if (!k.startsWith('*')) {
-                _preparePatch(v, trg, key);
-                continue;
-            }
-        }
-        trg.$set = trg.$set || {};
-        trg.$set[field] = v;
-    }
-    return trg;
-}

package/types/adapter-utils/prepare-patch.d.ts

@@ -1,3 +0,0 @@
-export default function preparePatch(doc: any, options?: {
-    fieldPrefix?: string;
-}): any;