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

package/cjs/sqb-singleton-service.js

@@ -40,16 +40,16 @@ class SqbSingletonService extends sqb_entity_service_js_1.SqbEntityService {
      * @throws {Error} if an unknown error occurs while creating the resource
      */
     async create(input, options) {
-        const info = {
+        const command = {
             crud: 'create',
             method: 'create',
             byId: false,
             input,
             options,
         };
-        return this._intercept(async () => {
+        return this._executeCommand(command, async () => {
             const primaryFields = connect_1.EntityMetadata.getPrimaryIndexColumns(this.entityMetadata);
-            const data = { ...input };
+            const data = { ...command.input };
             if (primaryFields.length > 1) {
                 if (typeof primaryFields !== 'object') {
                     throw new TypeError(`"${this.entityMetadata.name}" should has multiple primary key fields. So you should provide and object that contains key fields`);
@@ -60,8 +60,9 @@ class SqbSingletonService extends sqb_entity_service_js_1.SqbEntityService {
             }
             else
                 data[primaryFields[0].name] = this.id;
-            return await this._create(data, options);
-        }, info);
+            command.input = data;
+            return await this._create(command);
+        });
     }
     /**
      * Deletes the singleton record
@@ -70,17 +71,18 @@ class SqbSingletonService extends sqb_entity_service_js_1.SqbEntityService {
      * @return {Promise<number>} - A Promise that resolves to 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 = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._delete(this.id, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._delete(command);
+        });
     }
     /**
      * Checks if the singleton record exists.
@@ -89,17 +91,18 @@ class SqbSingletonService extends sqb_entity_service_js_1.SqbEntityService {
      * @return {Promise<boolean>} - A Promise that resolves to a boolean indicating whether the record exists or not.
      */
     async exists(options) {
-        const info = {
+        const command = {
             crud: 'read',
             method: 'exists',
             byId: true,
             documentId: this.id,
             options,
         };
-        return this._intercept(async () => {
-            const filter = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._exists(this.id, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._exists(command);
+        });
     }
     /**
      * Finds the singleton record. Returns `undefined` if not found
@@ -108,17 +111,18 @@ class SqbSingletonService extends sqb_entity_service_js_1.SqbEntityService {
      * @return {Promise<PartialDTO<T> | undefined>} A promise that resolves with the found document or undefined if no document is found.
      */
     async find(options) {
-        const info = {
+        const command = {
             crud: 'read',
             method: 'findById',
             byId: true,
             documentId: this.id,
             options,
         };
-        return this._intercept(async () => {
-            const filter = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._findById(this.id, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._findById(command);
+        });
     }
     /**
      * Retrieves the singleton record. Throws error if not found.
@@ -143,7 +147,7 @@ class SqbSingletonService extends sqb_entity_service_js_1.SqbEntityService {
      * undefined if the document was not found.
      */
     async update(input, options) {
-        const info = {
+        const command = {
             crud: 'update',
             method: 'update',
             documentId: this.id,
@@ -151,10 +155,11 @@ class SqbSingletonService extends sqb_entity_service_js_1.SqbEntityService {
             input,
             options,
         };
-        return this._intercept(async () => {
-            const filter = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._update(this.id, input, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._update(command);
+        });
     }
     /**
      * Updates the singleton and  returns updated record count
@@ -164,7 +169,7 @@ class SqbSingletonService extends sqb_entity_service_js_1.SqbEntityService {
      * @returns {Promise<number>} - A promise that resolves to the number of documents modified.
      */
     async updateOnly(input, options) {
-        const info = {
+        const command = {
             crud: 'update',
             method: 'update',
             documentId: this.id,
@@ -172,10 +177,11 @@ class SqbSingletonService extends sqb_entity_service_js_1.SqbEntityService {
             input,
             options,
         };
-        return this._intercept(async () => {
-            const filter = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._updateOnly(this.id, input, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._updateOnly(command);
+        });
     }
 }
 exports.SqbSingletonService = SqbSingletonService;

package/esm/sqb-collection-service.js

@@ -39,14 +39,14 @@ export class SqbCollectionService extends SqbEntityService {
      * @throws {Error} if an unknown error occurs while creating the resource
      */
     async create(input, options) {
-        const info = {
+        const command = {
             crud: 'create',
             method: 'create',
             byId: false,
             input,
             options,
         };
-        return this._intercept(() => this._create(input, options), info);
+        return this._executeCommand(command, () => this._create(command));
     }
     /**
      * Returns the count of records based on the provided options
@@ -55,16 +55,17 @@ export class SqbCollectionService extends SqbEntityService {
      * @return {Promise<number>} - A promise that resolves to the count of records
      */
     async count(options) {
-        const info = {
+        const command = {
             crud: 'read',
             method: 'count',
             byId: false,
             options,
         };
-        return this._intercept(async () => {
-            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._count({ ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._count(command);
+        });
     }
     /**
      * Deletes a record from the collection.
@@ -74,17 +75,18 @@ export class SqbCollectionService extends SqbEntityService {
      * @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 = SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._delete(id, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(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.
@@ -93,16 +95,17 @@ export class SqbCollectionService extends SqbEntityService {
      * @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 = SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._deleteMany({ ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._deleteMany(command);
+        });
     }
     /**
      * Checks if a record with the given id exists.
@@ -112,17 +115,18 @@ export class SqbCollectionService extends SqbEntityService {
      * @return {Promise<boolean>} - A Promise that resolves to a boolean indicating whether the record exists or not.
      */
     async exists(id, options) {
-        const info = {
+        const command = {
             crud: 'read',
             method: 'exists',
             byId: true,
             documentId: id,
             options,
         };
-        return this._intercept(async () => {
-            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._exists(id, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._exists(command);
+        });
     }
     /**
      * Checks if a record with the given arguments exists.
@@ -131,37 +135,39 @@ export class SqbCollectionService extends SqbEntityService {
      * @return {Promise<boolean>} - A Promise that resolves to a boolean indicating whether the record exists or not.
      */
     async existsOne(options) {
-        const info = {
+        const command = {
             crud: 'read',
             method: 'existsOne',
             byId: false,
             options,
         };
-        return this._intercept(async () => {
-            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._existsOne({ ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._existsOne(command);
+        });
     }
     /**
      * Finds a record by ID.
      *
-     * @param {SQBAdapter.Id} id - The ID of the record.
+     * @param {SQBAdapter.IdOrIds} id - The ID of the record.
      * @param {SqbCollectionService.FindOneOptions} [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._getCommonFilter(info);
-            const filter = SQBAdapter.parseFilter([documentFilter, options?.filter]);
-            return this._findById(id, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const documentFilter = await this._getCommonFilter(command);
+            const filter = SQBAdapter.parseFilter([documentFilter, command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._findById(command);
+        });
     }
     /**
      * Finds a record in the collection that matches the specified options.
@@ -170,16 +176,17 @@ export class SqbCollectionService extends SqbEntityService {
      * @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 = SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._findOne({ ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._findOne(command);
+        });
     }
     /**
      * Finds multiple records in collection.
@@ -188,16 +195,17 @@ export class SqbCollectionService extends SqbEntityService {
      * @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 = SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._findMany({ ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._findMany(command);
+        });
     }
     /**
      * Finds multiple records in the collection and returns both records (max limit)
@@ -213,7 +221,7 @@ export class SqbCollectionService extends SqbEntityService {
     /**
      * Retrieves a records from the collection by its ID. Throws error if not found.
      *
-     * @param {SQBAdapter.Id} id - The ID of the document to retrieve.
+     * @param {SQBAdapter.IdOrIds} id - The ID of the document to retrieve.
      * @param {SqbCollectionService.FindOneOptions} [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.
@@ -235,7 +243,7 @@ export class SqbCollectionService extends SqbEntityService {
      * undefined if the document was not found.
      */
     async update(id, input, options) {
-        const info = {
+        const command = {
             crud: 'update',
             method: 'update',
             documentId: id,
@@ -243,10 +251,11 @@ export class SqbCollectionService extends SqbEntityService {
             input,
             options,
         };
-        return this._intercept(async () => {
-            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._update(id, input, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._update(command);
+        });
     }
     /**
      * Updates a record in the collection with the specified ID and returns updated record count
@@ -257,7 +266,7 @@ export class SqbCollectionService extends SqbEntityService {
      * @returns {Promise<number>} - A promise that resolves to the number of documents modified.
      */
     async updateOnly(id, input, options) {
-        const info = {
+        const command = {
             crud: 'update',
             method: 'update',
             documentId: id,
@@ -265,10 +274,11 @@ export class SqbCollectionService extends SqbEntityService {
             input,
             options,
         };
-        return this._intercept(async () => {
-            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._updateOnly(id, input, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._updateOnly(command);
+        });
     }
     /**
      * Updates multiple records in the collection based on the specified input and options.
@@ -278,16 +288,17 @@ export class SqbCollectionService extends SqbEntityService {
      * @return {Promise<number>} - A promise that resolves to the number of documents matched and modified.
      */
     async updateMany(input, options) {
-        const info = {
+        const command = {
             crud: 'update',
             method: 'updateMany',
             byId: false,
             input,
             options,
         };
-        return this._intercept(async () => {
-            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._updateMany(input, { ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            command.options = { ...command.options, filter };
+            return this._updateMany(command);
+        });
     }
 }