@opra/mongodb 1.0.0-alpha.16 → 1.0.0-alpha.18

package/cjs/mongo-service.js

@@ -23,20 +23,20 @@ class MongoService extends core_1.ServiceBase {
         this._outputCodecs = {};
         this._dataType_ = dataType;
         this.db = options?.db;
-        this.$documentFilter = this.$documentFilter || options?.documentFilter;
-        this.$interceptor = this.$interceptor || options?.interceptor;
-        this.$collectionName = options?.collectionName;
-        if (!this.$collectionName) {
+        this.documentFilter = options?.documentFilter;
+        this.interceptor = options?.interceptor;
+        this.collectionName = options?.collectionName;
+        if (!this.collectionName) {
             if (typeof dataType === 'string')
-                this.$collectionName = dataType;
+                this.collectionName = dataType;
             if (typeof dataType === 'function') {
                 const metadata = Reflect.getMetadata(common_1.DATATYPE_METADATA, dataType);
                 if (metadata)
-                    this.$collectionName = metadata.name;
+                    this.collectionName = metadata.name;
             }
         }
-        this.$resourceName = options?.resourceName;
-        this.$idGenerator = options?.idGenerator;
+        this.resourceName = options?.resourceName;
+        this.idGenerator = options?.idGenerator;
     }
     /**
      * Retrieves the collection name.
@@ -46,7 +46,7 @@ class MongoService extends core_1.ServiceBase {
      * @throws {Error} If the collection name is not defined.
      */
     getCollectionName() {
-        const out = typeof this.$collectionName === 'function' ? this.$collectionName(this) : this.$collectionName;
+        const out = typeof this.collectionName === 'function' ? this.collectionName(this) : this.collectionName;
         if (out)
             return out;
         throw new Error('collectionName is not defined');
@@ -59,9 +59,7 @@ class MongoService extends core_1.ServiceBase {
      * @throws {Error} If the resource name is not defined.
      */
     getResourceName() {
-        const out = typeof this.$resourceName === 'function'
-            ? this.$resourceName(this)
-            : this.$resourceName || this.getCollectionName();
+        const out = typeof this.resourceName === 'function' ? this.resourceName(this) : this.resourceName || this.getCollectionName();
         if (out)
             return out;
         throw new Error('resourceName is not defined');
@@ -370,8 +368,8 @@ class MongoService extends core_1.ServiceBase {
      * @protected
      * @returns {MongoAdapter.AnyId} The generated ID.
      */
-    _generateId() {
-        return typeof this.$idGenerator === 'function' ? this.$idGenerator(this) : new mongodb_1.ObjectId();
+    _generateId(command) {
+        return typeof this.idGenerator === 'function' ? this.idGenerator(command, this) : new mongodb_1.ObjectId();
     }
     /**
      * Retrieves the common filter used for querying documents.
@@ -381,18 +379,29 @@ class MongoService extends core_1.ServiceBase {
      * @returns {FilterInput | Promise<FilterInput> | undefined} The common filter or a Promise
      * that resolves to the common filter, or undefined if not available.
      */
-    _getDocumentFilter(info) {
-        return typeof this.$documentFilter === 'function' ? this.$documentFilter(info, this) : this.$documentFilter;
+    _getDocumentFilter(command) {
+        return typeof this.documentFilter === 'function' ? this.documentFilter(command, this) : this.documentFilter;
     }
-    async _intercept(callback, info) {
+    async _executeCommand(command, commandFn) {
+        let proto;
+        const next = async () => {
+            proto = proto ? Object.getPrototypeOf(proto) : this;
+            while (proto) {
+                if (proto.interceptor) {
+                    return await proto.interceptor.call(this, next, command, this);
+                }
+                proto = Object.getPrototypeOf(proto);
+                if (!(proto instanceof MongoService))
+                    break;
+            }
+            return commandFn();
+        };
         try {
-            if (this.$interceptor)
-                return this.$interceptor(callback, info, this);
-            return callback();
+            return await next();
         }
         catch (e) {
-            Error.captureStackTrace(e, this._intercept);
-            await this.$onError?.(e, this);
+            Error.captureStackTrace(e, this._executeCommand);
+            await this.onError?.(e, this);
             throw e;
         }
     }

package/cjs/mongo-singleton-service.js

@@ -26,7 +26,7 @@ class MongoSingletonService extends mongo_entity_service_js_1.MongoEntityService
     /**
      * Asserts the existence of a resource based on the given options.
      *
-     * @param {MongoSingletonService.ExistsOptions<T>} [options]
+     * @param {MongoEntityService.ExistsOptions<T>} [options]
      * @returns {Promise<void>} A Promise that resolves when the resource exists.
      * @throws {ResourceNotAvailableError} If the resource does not exist.
      */
@@ -38,72 +38,88 @@ class MongoSingletonService extends mongo_entity_service_js_1.MongoEntityService
      * Creates the document in the database.
      *
      * @param {PartialDTO<T>} input - The partial input to create the document with.
-     * @param {MongoSingletonService.CreateOptions} [options] - The options for creating the document.
+     * @param {MongoEntityService.CreateOptions} [options] - The options for creating the document.
      * @return {Promise<PartialDTO<T>>} A promise that resolves to the partial output of the created document.
      * @throws {Error} Throws an error if an unknown error occurs while creating the document.
      */
     async create(input, options) {
-        input._id = this._id;
-        const info = {
+        const command = {
             crud: 'create',
             method: 'create',
             byId: false,
-            documentId: this._id,
             input,
             options,
         };
-        return this._intercept(() => this._create(input, options), info);
+        input._id = this._id;
+        return this._executeCommand(command, () => this._create(command));
     }
     /**
      * Deletes a record from the database
      *
-     * @param {MongoSingletonService.DeleteOptions<T>} options - The options for deleting the record
+     * @param {MongoEntityService.DeleteOptions<T>} options - The options for deleting the record
      * @returns {Promise<number>} The number of records deleted
      */
     async delete(options) {
-        const info = {
+        const command = {
             crud: 'delete',
             method: 'delete',
             byId: true,
             documentId: this._id,
             options,
         };
-        return this._intercept(async () => {
-            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._delete(this._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);
+        });
     }
     /**
      * Checks if the document exists in the database.
      *
+     * @param {MongoEntityService.FindOneOptions<T>} [options] - The options for finding the document.
      * @return {Promise<boolean>} - A promise that resolves to a boolean value indicating if the document exists.
      */
     async exists(options) {
-        return !!(await this.find({ ...options, projection: ['_id'], skip: undefined }));
+        const command = {
+            crud: 'read',
+            method: 'exists',
+            byId: true,
+            documentId: this._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));
+        });
     }
     /**
      * Fetches the document if it exists. Returns undefined if not found.
      *
-     * @param {MongoSingletonService.FindOneOptions<T>} [options] - The options for finding the document.
+     * @param {MongoEntityService.FindOneOptions<T>} [options] - The options for finding the document.
      * @returns {Promise<PartialDTO<T> | undefined>} - A promise that resolves to the found document or undefined if not found.
      */
     async find(options) {
-        const info = {
+        const command = {
             crud: 'read',
-            method: 'findOne',
+            method: 'findById',
             byId: true,
             documentId: this._id,
             options,
         };
-        return this._intercept(async () => {
-            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._findById(this._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);
+        });
     }
     /**
      * Fetches the document from the Mongo collection service. Throws error if not found.
      *
-     * @param {MongoSingletonService.FindOneOptions<T>} options - The options to customize the query.
+     * @param {MongoEntityService.FindOneOptions<T>} options - The options to customize the query.
      * @return {Promise<PartialDTO<T>>} - A promise that resolves to the fetched document.
      * @throws {ResourceNotAvailableError} - If the document is not found in the collection.
      */
@@ -117,45 +133,49 @@ class MongoSingletonService extends mongo_entity_service_js_1.MongoEntityService
      * Updates a document in the MongoDB collection.
      *
      * @param {PatchDTO<T>} input - The partial input to update the document.
-     * @param {MongoSingletonService.UpdateOptions<T>} [options] - The update options.
+     * @param {MongoEntityService.UpdateOneOptions<T>} [options] - The update options.
      *
-     * @return {Promise<number>} - A promise that resolves to the updated document or undefined if not found.
+     * @return {Promise<PartialDTO<T> | undefined>} - A promise that resolves to the updated document or undefined if not found.
      */
-    async updateOnly(input, options) {
-        const info = {
+    async update(input, options) {
+        const isUpdateFilter = Array.isArray(input) || !!Object.keys(input).find(x => x.startsWith('$'));
+        const command = {
             crud: 'update',
             method: 'update',
-            byId: true,
             documentId: this._id,
-            input,
+            byId: true,
+            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(this._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 MongoDB collection.
      *
      * @param {PatchDTO<T>} input - The partial input to update the document.
-     * @param {MongoSingletonService.UpdateOptions<T>} [options] - The update options.
+     * @param {MongoEntityService.UpdateOneOptions<T>} [options] - The update options.
      *
-     * @return {Promise<PartialDTO<T> | undefined>} - A promise that resolves to the updated document or undefined if not found.
+     * @return {Promise<number>} - A promise that resolves to the updated document or undefined if not found.
      */
-    async update(input, options) {
-        const info = {
+    async updateOnly(input, options) {
+        const command = {
             crud: 'update',
-            method: 'update',
-            byId: true,
+            method: 'updateOnly',
             documentId: this._id,
+            byId: true,
             input,
             options,
         };
-        return this._intercept(async () => {
-            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([await this._getDocumentFilter(info), options?.filter]);
-            return this._update(this._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);
+        });
     }
 }
 exports.MongoSingletonService = MongoSingletonService;