@opra/sqb 1.0.0-alpha.3 → 1.0.0-alpha.30

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = parseFilter;
 const tslib_1 = require("tslib");
 require("@opra/core");
 const common_1 = require("@opra/common");
@@ -31,7 +32,6 @@ function parseFilter(filters) {
     }
     return arr.length > 1 ? sqb.And(...arr) : arr[0];
 }
-exports.default = parseFilter;
 function prepareFilterAst(ast) {
     if (!ast)
         return;
@@ -79,13 +79,13 @@ function prepareFilterAst(ast) {
             case '!in':
                 return sqb.Nin(left, right);
             case 'like':
-                return sqb.Like(left, String(right).replace(/\*/, '%'));
+                return sqb.Like(left, String(right).replace(/\*/g, '%'));
             case 'ilike':
-                return sqb.Ilike(left, String(right).replace(/\*/, '%'));
+                return sqb.Ilike(left, String(right).replace(/\*/g, '%'));
             case '!like':
-                return sqb.NotLike(left, String(right).replace(/\*/, '%'));
+                return sqb.NotLike(left, String(right).replace(/\*/g, '%'));
             case '!ilike':
-                return sqb.NotILike(left, String(right).replace(/\*/, '%'));
+                return sqb.NotILike(left, String(right).replace(/\*/g, '%'));
             default:
                 throw new Error(`ComparisonExpression operator (${ast.op}) not implemented yet`);
         }

package/cjs/augmentation/datatype-factory.augmentation.js

@@ -59,16 +59,20 @@ DataTypeFactory._prepareComplexTypeArgs = async function (context, owner, initAr
                         if (hasNoType || fieldSchema.type === String)
                             fieldSchema.type = 'time';
                         break;
+                    default:
+                        break;
                 }
             }
             if ((0, connect_1.isAssociationField)(sqbField)) {
                 if (sqbField.association.returnsMany())
                     fieldSchema.isArray = true;
-                if (!fieldSchema.hasOwnProperty('exclusive'))
+                if (!Object.prototype.hasOwnProperty.call(fieldSchema, 'exclusive'))
                     fieldSchema.exclusive = true;
             }
-            if (!fieldSchema.hasOwnProperty('exclusive') && sqbField.hasOwnProperty('exclusive'))
+            if (!Object.prototype.hasOwnProperty.call(fieldSchema, 'exclusive') &&
+                Object.prototype.hasOwnProperty.call(sqbField, 'exclusive')) {
                 fieldSchema.exclusive = sqbField.exclusive;
+            }
         }
     }
     return _prepareComplexTypeArgs.apply(DataTypeFactory, [context, owner, initArgs, metadata]);

package/cjs/sqb-adapter.js

@@ -9,12 +9,12 @@ var SQBAdapter;
     SQBAdapter.parseFilter = parse_filter_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 dataType = context.document.node.getComplexType(operation.compositionOptions?.type);
             const entityMetadata = connect_1.EntityMetadata.get(dataType.ctor);
             if (!entityMetadata)
                 throw new Error(`Type class "${dataType.ctor}" is not an SQB entity`);
-            const { compositionOptions } = operation;
+            const controller = operation.owner;
             switch (operation.composition) {
                 case 'Entity.Create': {
                     const data = await context.getBody();
@@ -24,7 +24,8 @@ var SQBAdapter;
                     return { method: 'create', data, options };
                 }
                 case 'Entity.Delete': {
-                    const key = context.pathParams[compositionOptions.keyParameter];
+                    const keyParam = operation.parameters.find(p => p.keyParam) || controller.parameters.find(p => p.keyParam);
+                    const key = keyParam && context.pathParams[String(keyParam.name)];
                     const options = {
                         filter: SQBAdapter.parseFilter(context.queryParams.filter),
                     };
@@ -40,15 +41,16 @@ var SQBAdapter;
                     const options = {
                         count: context.queryParams.count,
                         filter: SQBAdapter.parseFilter(context.queryParams.filter),
-                        limit: context.queryParams.limit,
+                        projection: context.queryParams.projection || operation.compositionOptions.defaultProjection,
+                        limit: context.queryParams.limit || operation.compositionOptions.defaultLimit,
                         offset: context.queryParams.skip,
-                        projection: context.queryParams.projection,
-                        sort: context.queryParams.sort,
+                        sort: context.queryParams.sort || operation.compositionOptions.defaultSort,
                     };
                     return { method: 'findMany', options };
                 }
                 case 'Entity.Get': {
-                    const key = context.pathParams[compositionOptions.keyParameter];
+                    const keyParam = operation.parameters.find(p => p.keyParam) || controller.parameters.find(p => p.keyParam);
+                    const key = keyParam && context.pathParams[String(keyParam.name)];
                     const options = {
                         projection: context.queryParams.projection,
                         filter: SQBAdapter.parseFilter(context.queryParams.filter),
@@ -57,7 +59,8 @@ var SQBAdapter;
                 }
                 case 'Entity.Update': {
                     const data = await context.getBody();
-                    const key = context.pathParams[compositionOptions.keyParameter];
+                    const keyParam = operation.parameters.find(p => p.keyParam) || controller.parameters.find(p => p.keyParam);
+                    const key = keyParam && context.pathParams[String(keyParam.name)];
                     const options = {
                         projection: context.queryParams.projection,
                         filter: SQBAdapter.parseFilter(context.queryParams.filter),
@@ -71,6 +74,8 @@ var SQBAdapter;
                     };
                     return { method: 'updateMany', data, options };
                 }
+                default:
+                    break;
             }
         }
         throw new Error(`This operation is not compatible to SQB Adapter`);

package/cjs/sqb-collection-service.js

@@ -42,14 +42,14 @@ class SqbCollectionService 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(() => this._create(input, options), info);
+        return this._executeCommand(command, () => this._create(command));
     }
     /**
      * Returns the count of records based on the provided options
@@ -58,16 +58,17 @@ class SqbCollectionService extends sqb_entity_service_js_1.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 = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._count({ ...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._count(command);
+        });
     }
     /**
      * Deletes a record from the collection.
@@ -77,17 +78,18 @@ class SqbCollectionService extends sqb_entity_service_js_1.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 = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._delete(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);
+        });
     }
     /**
      * Deletes multiple documents from the collection that meet the specified filter criteria.
@@ -96,16 +98,17 @@ class SqbCollectionService extends sqb_entity_service_js_1.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 = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._deleteMany({ ...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._deleteMany(command);
+        });
     }
     /**
      * Checks if a record with the given id exists.
@@ -115,17 +118,18 @@ class SqbCollectionService 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(id, options) {
-        const info = {
+        const command = {
             crud: 'read',
             method: 'exists',
             byId: true,
             documentId: id,
             options,
         };
-        return this._intercept(async () => {
-            const filter = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._exists(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);
+        });
     }
     /**
      * Checks if a record with the given arguments exists.
@@ -134,37 +138,39 @@ class SqbCollectionService 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 existsOne(options) {
-        const info = {
+        const command = {
             crud: 'read',
             method: 'existsOne',
             byId: false,
             options,
         };
-        return this._intercept(async () => {
-            const filter = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._existsOne({ ...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._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 = sqb_adapter_js_1.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 = sqb_adapter_js_1.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.
@@ -173,16 +179,17 @@ class SqbCollectionService 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 findOne(options) {
-        const info = {
+        const command = {
             crud: 'read',
             method: 'findOne',
             byId: false,
             options,
         };
-        return this._intercept(async () => {
-            const filter = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._findOne({ ...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._findOne(command);
+        });
     }
     /**
      * Finds multiple records in collection.
@@ -191,16 +198,18 @@ class SqbCollectionService extends sqb_entity_service_js_1.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 = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._findMany({ ...options, filter });
-        }, info);
+        return this._executeCommand(command, async () => {
+            const filter = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(command), command.options?.filter]);
+            const limit = command.options?.limit || this.defaultLimit;
+            command.options = { ...command.options, filter, limit };
+            return this._findMany(command);
+        });
     }
     /**
      * Finds multiple records in the collection and returns both records (max limit)
@@ -216,7 +225,7 @@ class SqbCollectionService extends sqb_entity_service_js_1.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.
@@ -238,7 +247,7 @@ class SqbCollectionService extends sqb_entity_service_js_1.SqbEntityService {
      * undefined if the document was not found.
      */
     async update(id, input, options) {
-        const info = {
+        const command = {
             crud: 'update',
             method: 'update',
             documentId: id,
@@ -246,10 +255,11 @@ class SqbCollectionService 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(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 a record in the collection with the specified ID and returns updated record count
@@ -260,7 +270,7 @@ class SqbCollectionService extends sqb_entity_service_js_1.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,
@@ -268,10 +278,11 @@ class SqbCollectionService 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(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);
+        });
     }
     /**
      * Updates multiple records in the collection based on the specified input and options.
@@ -281,17 +292,18 @@ class SqbCollectionService extends sqb_entity_service_js_1.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 = sqb_adapter_js_1.SQBAdapter.parseFilter([await this._getCommonFilter(info), options?.filter]);
-            return this._updateMany(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._updateMany(command);
+        });
     }
 }
 exports.SqbCollectionService = SqbCollectionService;