@opra/mongodb 1.0.0-alpha.9 → 1.0.0-beta.2

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = prepareFilter;
 const common_1 = require("@opra/common");
 const opMap = {
     '=': '$eq',
@@ -65,7 +66,6 @@ function prepareFilter(filters, options) {
     }
     return i ? (options?.fieldPrefix ? addPrefix(out, options.fieldPrefix) : out) : undefined;
 }
-exports.default = prepareFilter;
 function addPrefix(source, prefix) {
     if (typeof source !== 'object')
         return source;

package/cjs/adapter-utils/prepare-key-values.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = prepareKeyValues;
 const tslib_1 = require("tslib");
 const putil_isplainobject_1 = tslib_1.__importDefault(require("putil-isplainobject"));
 const defaultPrimaryKey = ['_id'];
@@ -19,4 +20,3 @@ function prepareKeyValues(keyValue, primaryKey) {
     }
     return { [primaryKey[0]]: keyValue };
 }
-exports.default = prepareKeyValues;

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

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = preparePatch;
 function preparePatch(doc, options) {
     const trg = {};
     _preparePatch(doc, trg, '', options);
     trg.$set = trg.$set || {};
     return trg;
 }
-exports.default = preparePatch;
 function _preparePatch(src, trg, path, options) {
     let f;
     let key;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepare = void 0;
+exports.default = prepareProjection;
+exports.prepare = prepare;
 const common_1 = require("@opra/common");
 function prepareProjection(dataType, projection) {
     if (projection && typeof projection === 'object' && !Array.isArray(projection))
@@ -11,10 +12,9 @@ function prepareProjection(dataType, projection) {
     prepare(dataType, out, projection_);
     return Object.keys(out).length ? out : undefined;
 }
-exports.default = prepareProjection;
 function prepare(dataType, target, projection) {
     const defaultFields = !projection || !Object.values(projection).find(p => !p.sign);
-    const projectionKeys = projection && Object.keys(projection).map(x => x.toLowerCase());
+    const projectionKeys = projection && Object.keys(projection);
     const projectionKeysSet = new Set(projectionKeys);
     let fieldName;
     let field;
@@ -28,9 +28,9 @@ function prepare(dataType, target, projection) {
         if (
         /** Ignore if field is omitted */
         p?.sign === '-' ||
-            /** Ignore if default fields and field is not in projection */
+            /** Ignore if defaultFields is false and field is not in projection */
             (!defaultFields && !p) ||
-            /** Ignore if default fields enabled and fields is exclusive */
+            /** Ignore if defaultFields is true and fields is exclusive */
             (defaultFields && field.exclusive && !p)) {
             continue;
         }
@@ -44,10 +44,9 @@ function prepare(dataType, target, projection) {
     /** Add additional fields */
     if (dataType.additionalFields) {
         for (k of projectionKeysSet.values()) {
-            const n = projectionKeysSet[k];
+            const n = projection?.[k];
             if (n?.sign !== '-')
                 target[k] = 1;
         }
     }
 }
-exports.prepare = prepare;

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = prepareSort;
 function prepareSort(sort) {
     if (!(sort && sort.length))
         return;
@@ -14,4 +15,3 @@ function prepareSort(sort) {
     });
     return out;
 }
-exports.default = prepareSort;

package/cjs/index.js

@@ -3,6 +3,7 @@ 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);

package/cjs/mongo-adapter.js

@@ -16,7 +16,7 @@ var MongoAdapter;
     MongoAdapter.prepareSort = prepare_sort_js_1.default;
     async function parseRequest(context) {
         const { operation } = context;
-        if (operation.composition?.startsWith('Entity.') && operation.compositionOptions?.type) {
+        if (operation?.composition?.startsWith('Entity.') && operation.compositionOptions?.type) {
             const controller = operation.owner;
             switch (operation.composition) {
                 case 'Entity.Create': {
@@ -43,11 +43,11 @@ var MongoAdapter;
                 case 'Entity.FindMany': {
                     const options = {
                         filter: context.queryParams.filter,
-                        projection: context.queryParams.projection,
+                        projection: context.queryParams.projection || operation.compositionOptions.defaultProjection,
                         count: context.queryParams.count,
-                        limit: context.queryParams.limit,
+                        limit: context.queryParams.limit || operation.compositionOptions.defaultLimit,
                         skip: context.queryParams.skip,
-                        sort: context.queryParams.sort,
+                        sort: context.queryParams.sort || operation.compositionOptions.defaultSort,
                     };
                     return { method: 'findMany', options };
                 }

package/cjs/mongo-collection-service.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoCollectionService = void 0;
+const tslib_1 = require("tslib");
 const common_1 = require("@opra/common");
-const mongodb_1 = require("mongodb");
+const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const mongo_adapter_js_1 = require("./mongo-adapter.js");
 const mongo_entity_service_js_1 = require("./mongo-entity-service.js");
 /**
@@ -19,14 +20,14 @@ class MongoCollectionService extends mongo_entity_service_js_1.MongoEntityServic
      */
     constructor(dataType, options) {
         super(dataType, options);
-        this.defaultLimit = this.defaultLimit || options?.defaultLimit || 10;
+        this.defaultLimit = options?.defaultLimit || 10;
     }
     /**
      * Asserts the existence of a resource with the given ID.
      * Throws a ResourceNotFoundError if the resource does not exist.
      *
      * @param {MongoAdapter.AnyId} id - The ID of the resource to assert.
-     * @param {MongoCollectionService.ExistsOptions<T>} [options] - Optional options for checking the existence.
+     * @param {MongoEntityService.ExistsOptions<T>} [options] - Optional options for checking the existence.
      * @returns {Promise<void>} - A Promise that resolves when the resource exists.
      * @throws {ResourceNotAvailableError} - If the resource does not exist.
      */
@@ -34,286 +35,267 @@ class MongoCollectionService extends mongo_entity_service_js_1.MongoEntityServic
         if (!(await this.exists(id, options)))
             throw new common_1.ResourceNotAvailableError(this.getResourceName(), id);
     }
-    /**
-     * Creates a new document in the MongoDB collection.
-     * Interceptors will be called before performing db operation
-     *
-     * @param {PartialDTO<T>} input - The input data for creating the document.
-     * @param {MongoCollectionService.CreateOptions} [options] - The options for creating the document.
-     * @returns {Promise<PartialDTO<T>>} A promise that resolves to the created document.
-     * @throws {Error} if an unknown error occurs while creating the document.
-     */
     async create(input, options) {
-        const id = input._id || this._generateId();
-        if (id != null)
-            input._id = id;
-        const info = {
+        const command = {
             crud: 'create',
             method: 'create',
             byId: false,
-            documentId: id,
             input,
             options,
         };
-        return this._intercept(() => this._create(input, options), info);
+        input._id = input._id ?? this._generateId(command);
+        return this._executeCommand(command, async () => {
+            const r = await this._create(command);
+            if (!command.options?.projection)
+                return r;
+            const findCommand = {
+                ...command,
+                crud: 'read',
+                byId: true,
+                documentId: r._id,
+                options: (0, lodash_omit_1.default)(options, 'filter'),
+            };
+            const out = await this._findById(findCommand);
+            if (out)
+                return out;
+        });
     }
     /**
      * Returns the count of documents in the collection based on the provided options.
      *
-     * @param {MongoCollectionService.CountOptions<T>} options - The options for the count operation.
+     * @param {MongoEntityService.CountOptions<T>} options - The options for the count operation.
      * @return {Promise<number>} - A promise that resolves to the count of documents in the collection.
      */
     async count(options) {
-        const info = {
+        const command = {
             crud: 'read',
             method: 'count',
             byId: false,
             options,
         };
-        return this._intercept(async () => {
-            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._count({ ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._count(command);
+        });
     }
     /**
      * Deletes a document from the collection.
      *
      * @param {MongoAdapter.AnyId} id - The ID of the document to delete.
-     * @param {MongoCollectionService.DeleteOptions<T>} [options] - Optional delete options.
+     * @param {MongoEntityService.DeleteOptions<T>} [options] - Optional delete options.
      * @return {Promise<number>} - A Promise that resolves to the number of documents deleted.
      */
     async delete(id, options) {
-        const info = {
+        const command = {
             crud: 'delete',
             method: 'delete',
             byId: true,
             documentId: id,
             options,
         };
-        return this._intercept(async () => {
-            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._delete(id, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._delete(command);
+        });
     }
     /**
      * Deletes multiple documents from the collection that meet the specified filter criteria.
      *
-     * @param {MongoCollectionService.DeleteManyOptions<T>} options - The options for the delete operation.
+     * @param {MongoEntityService.DeleteManyOptions<T>} options - The options for the delete operation.
      * @return {Promise<number>} - A promise that resolves to the number of documents deleted.
      */
     async deleteMany(options) {
-        const info = {
+        const command = {
             crud: 'delete',
             method: 'deleteMany',
             byId: false,
             options,
         };
-        return this._intercept(async () => {
-            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._deleteMany({ ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._deleteMany(command);
+        });
     }
     /**
      * The distinct command returns a list of distinct values for the given key across a collection.
      * @param {string} field
-     * @param {MongoCollectionService.DistinctOptions<T>} [options]
+     * @param {MongoEntityService.DistinctOptions<T>} [options]
      * @protected
      */
     async distinct(field, options) {
-        const info = {
+        const command = {
             crud: 'read',
             method: 'distinct',
-            byId: true,
+            byId: false,
+            field,
             options,
         };
-        return this._intercept(async () => {
-            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._distinct(field, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._distinct(command);
+        });
     }
     /**
      * Checks if an object with the given id exists.
      *
      * @param {MongoAdapter.AnyId} id - The id of the object to check.
-     * @param {MongoCollectionService.ExistsOptions<T>} [options] - The options for the query (optional).
+     * @param {MongoEntityService.ExistsOptions<T>} [options] - The options for the query (optional).
      * @return {Promise<boolean>} - A Promise that resolves to a boolean indicating whether the object exists or not.
      */
     async exists(id, options) {
-        return !!(await this.findById(id, { ...options, projection: ['_id'] }));
+        const command = {
+            crud: 'read',
+            method: 'exists',
+            byId: true,
+            documentId: id,
+            options,
+        };
+        return this._executeCommand(command, async () => {
+            const documentFilter = await this._getDocumentFilter(command);
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+            const findCommand = command;
+            findCommand.options = { ...command.options, filter, projection: ['_id'] };
+            return !!(await this._findById(findCommand));
+        });
     }
     /**
      * Checks if an object with the given arguments exists.
      *
-     * @param {MongoCollectionService.ExistsOneOptions} [options] - The options for the query (optional).
+     * @param {MongoEntityService.ExistsOptions} [options] - The options for the query (optional).
      * @return {Promise<boolean>} - A Promise that resolves to a boolean indicating whether the object exists or not.
      */
     async existsOne(options) {
         return !!(await this.findOne({ ...options, projection: ['_id'] }));
     }
-    /**
-     * Finds a document by its ID.
-     *
-     * @param {MongoAdapter.AnyId} id - The ID of the document.
-     * @param {MongoCollectionService.FindOneOptions<T>} [options] - The options for the find query.
-     * @return {Promise<PartialDTO<T | undefined>>} - A promise resolving to the found document, or undefined if not found.
-     */
     async findById(id, options) {
-        const info = {
+        const command = {
             crud: 'read',
             method: 'findById',
             byId: true,
             documentId: id,
             options,
         };
-        return this._intercept(async () => {
-            const documentFilter = await this._getDocumentFilter(info);
-            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([documentFilter, options?.filter]);
-            return this._findById(id, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const documentFilter = await this._getDocumentFilter(command);
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([documentFilter, command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._findById(command);
+        });
     }
-    /**
-     * Finds a document in the collection that matches the specified options.
-     *
-     * @param {MongoCollectionService.FindOneOptions<T>} [options] - The options for the query.
-     * @return {Promise<PartialDTO<T> | undefined>} A promise that resolves with the found document or undefined if no document is found.
-     */
     async findOne(options) {
-        const info = {
+        const command = {
             crud: 'read',
             method: 'findOne',
             byId: false,
             options,
         };
-        return this._intercept(async () => {
-            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._findOne({ ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._findOne(command);
+        });
     }
-    /**
-     * Finds multiple documents in the MongoDB collection.
-     *
-     * @param {MongoCollectionService.FindManyOptions<T>} options - The options for the find operation.
-     * @return A Promise that resolves to an array of partial outputs of type T.
-     */
     async findMany(options) {
-        const info = {
+        const command = {
             crud: 'read',
             method: 'findMany',
             byId: false,
             options,
         };
-        return this._intercept(async () => {
-            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._findMany({ ...options, filter, limit: options?.limit || this.defaultLimit });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(command), command.options?.filter]);
+            const limit = command.options?.limit || this.defaultLimit;
+            command.options = { ...command.options, filter, limit };
+            return this._findMany(command);
+        });
     }
-    /**
-     * Finds multiple documents in the collection and returns both records (max limit)
-     * and total count that matched the given criteria
-     *
-     * @param {MongoCollectionService.FindManyOptions<T>} [options] - The options for the find operation.
-     * @return A Promise that resolves to an array of partial outputs of type T.
-     */
     async findManyWithCount(options) {
-        const info = {
+        const command = {
             crud: 'read',
             method: 'findManyWithCount',
             byId: false,
             options,
         };
-        return this._intercept(async () => {
-            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._findManyWithCount({ ...options, filter, limit: options?.limit || this.defaultLimit });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter, limit: command.options?.limit || this.defaultLimit };
+            return this._findManyWithCount(command);
+        });
     }
-    /**
-     * Retrieves a document from the collection by its ID. Throws error if not found.
-     *
-     * @param {MongoAdapter.AnyId} id - The ID of the document to retrieve.
-     * @param {MongoCollectionService.FindOneOptions<T>} [options] - Optional options for the findOne operation.
-     * @returns {Promise<PartialDTO<T>>} - A promise that resolves to the retrieved document,
-     *    or rejects with a ResourceNotFoundError if the document does not exist.
-     * @throws {ResourceNotAvailableError} - If the document with the specified ID does not exist.
-     */
     async get(id, options) {
         const out = await this.findById(id, options);
         if (!out)
             throw new common_1.ResourceNotAvailableError(this.getResourceName(), id);
         return out;
     }
-    /**
-     * Updates a document with the given id in the collection.
-     *
-     * @param {MongoAdapter.AnyId} id - The id of the document to update.
-     * @param {PatchDTO<T>|UpdateFilter<T>} input - The partial input object containing the fields to update.
-     * @param {MongoCollectionService.UpdateOptions<T>} [options] - The options for the update operation.
-     * @returns {Promise<PartialDTO<T> | undefined>} A promise that resolves to the updated document or
-     * undefined if the document was not found.
-     */
     async update(id, input, options) {
-        const info = {
+        const isUpdateFilter = Array.isArray(input) || !!Object.keys(input).find(x => x.startsWith('$'));
+        const command = {
             crud: 'update',
             method: 'update',
             documentId: id,
             byId: true,
-            input,
+            input: isUpdateFilter ? undefined : input,
+            inputRaw: isUpdateFilter ? input : undefined,
             options,
         };
-        return this._intercept(async () => {
-            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._update(id, input, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._update(command);
+        });
     }
     /**
      * Updates a document in the collection with the specified ID.
      *
      * @param {MongoAdapter.AnyId} id - The ID of the document to update.
      * @param {PatchDTO<T>|UpdateFilter<T>} input - The partial input data to update the document with.
-     * @param {MongoCollectionService.UpdateOptions<T>} [options] - The options for updating the document.
+     * @param {MongoEntityService.UpdateOneOptions<T>} [options] - The options for updating the document.
      * @returns {Promise<number>} - A promise that resolves to the number of documents modified.
      */
     async updateOnly(id, input, options) {
-        const info = {
+        const isUpdateFilter = Array.isArray(input) || !!Object.keys(input).find(x => x.startsWith('$'));
+        const command = {
             crud: 'update',
-            method: 'update',
+            method: 'updateOnly',
             documentId: id,
             byId: true,
-            input,
+            input: isUpdateFilter ? undefined : input,
+            inputRaw: isUpdateFilter ? input : undefined,
             options,
         };
-        return this._intercept(async () => {
-            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._updateOnly(id, input, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._updateOnly(command);
+        });
     }
     /**
      * Updates multiple documents in the collection based on the specified input and options.
      *
      * @param {PatchDTO<T>|UpdateFilter<T>} input - The partial input to update the documents with.
-     * @param {MongoCollectionService.UpdateManyOptions<T>} options - The options for updating the documents.
+     * @param {MongoEntityService.UpdateManyOptions<T>} options - The options for updating the documents.
      * @return {Promise<number>} - A promise that resolves to the number of documents matched and modified.
      */
     async updateMany(input, options) {
-        const info = {
+        const isUpdateFilter = Array.isArray(input) || !!Object.keys(input).find(x => x.startsWith('$'));
+        const command = {
             crud: 'update',
             method: 'updateMany',
             byId: false,
-            input,
+            input: isUpdateFilter ? undefined : input,
+            inputRaw: isUpdateFilter ? input : undefined,
             options,
         };
-        return this._intercept(async () => {
-            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._updateMany(input, { ...options, filter });
-        }, info);
-    }
-    /**
-     * Generates an ID.
-     *
-     * @protected
-     * @returns {MongoAdapter.AnyId} The generated ID.
-     */
-    _generateId() {
-        return typeof this.$idGenerator === 'function' ? this.$idGenerator(this) : new mongodb_1.ObjectId();
+        return this._executeCommand(command, async () => {
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._updateMany(command);
+        });
     }
 }
 exports.MongoCollectionService = MongoCollectionService;