@opra/common 1.0.0-alpha.3 → 1.0.0-alpha.31

package/cjs/document/data-type/primitive-types/object.type.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectType = void 0;
 const tslib_1 = require("tslib");
-const constants_js_1 = require("../../constants.js");
 const complex_type_js_1 = require("../complex-type.js");
 let ObjectType = class ObjectType {
     constructor(properties) {
@@ -19,5 +18,3 @@ exports.ObjectType = ObjectType = tslib_1.__decorate([
     }),
     tslib_1.__metadata("design:paramtypes", [Object])
 ], ObjectType);
-const metadata = Reflect.getMetadata(constants_js_1.DATATYPE_METADATA, ObjectType);
-metadata.ctor = Object;

package/cjs/document/data-type/primitive-types/string.type.js

@@ -58,6 +58,10 @@ tslib_1.__decorate([
 exports.StringType = StringType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'A sequence of characters',
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
     }),
     tslib_1.__metadata("design:paramtypes", [Object])
 ], StringType);

package/cjs/document/data-type/required-type.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequiredType = void 0;
+exports.RequiredType = RequiredType;
 const create_mapped_class_js_1 = require("./utils/create-mapped-class.js");
 /**
  *
@@ -10,4 +10,3 @@ function RequiredType(base, ...args) {
     const options = Array.isArray(args[0]) ? args[1] : args[0];
     return (0, create_mapped_class_js_1.createMappedClass)(base, { required: keys }, options);
 }
-exports.RequiredType = RequiredType;

package/cjs/document/data-type/simple-type.js

@@ -23,11 +23,14 @@ exports.SimpleType = function (...args) {
     _this.kind = index_js_2.OpraSchema.SimpleType.Kind;
     if (initArgs.base) {
         // noinspection SuspiciousTypeOfGuard
-        if (!(initArgs.base instanceof exports.SimpleType))
+        if (!(initArgs.base instanceof exports.SimpleType)) {
             throw new TypeError(`"${initArgs.base.kind}" can't be set as base for a "${this.kind}"`);
+        }
         _this.base = initArgs.base;
     }
     _this.properties = initArgs.properties;
+    _this.ownNameMappings = { ...initArgs.nameMappings };
+    _this.nameMappings = { ..._this.base?.nameMappings, ...initArgs.nameMappings };
     _this.ownAttributes = (0, index_js_1.cloneObject)(initArgs.attributes || {});
     _this.attributes = _this.base ? (0, index_js_1.cloneObject)(_this.base.attributes) : {};
     if (_this.ownAttributes) {
@@ -46,6 +49,8 @@ exports.SimpleType = function (...args) {
  */
 class SimpleTypeClass extends data_type_js_1.DataType {
     extendsFrom(baseType) {
+        if (!(baseType instanceof data_type_js_1.DataType))
+            baseType = this.node.getDataType(baseType);
         if (!(baseType instanceof exports.SimpleType))
             return false;
         if (baseType === this)
@@ -66,15 +71,13 @@ class SimpleTypeClass extends data_type_js_1.DataType {
             }
             return valgen_1.isAny;
         }
-        else {
-            let t = this;
-            while (t) {
-                if (t._generateEncoder)
-                    return t._generateEncoder(prop, options?.documentElement || this.owner);
-                t = this.base;
-            }
-            return valgen_1.isAny;
+        let t = this;
+        while (t) {
+            if (t._generateEncoder)
+                return t._generateEncoder(prop, options?.documentElement || this.owner);
+            t = this.base;
         }
+        return valgen_1.isAny;
     }
     toJSON() {
         const attributes = (0, index_js_1.omitUndefined)(this.ownAttributes);
@@ -83,19 +86,17 @@ class SimpleTypeClass extends data_type_js_1.DataType {
             properties = this.properties.toJSON(this.properties, this.owner);
         }
         else
-            properties = this.properties || {};
-        properties = Object.keys(this.attributes).reduce((o, k) => {
-            if (properties[k] !== undefined)
-                o[k] = properties[k];
-            return o;
-        }, {});
+            properties = this.properties ? (0, index_js_1.cloneObject)(this.properties) : {};
         const baseName = this.base ? this.node.getDataTypeNameWithNs(this.base) : undefined;
-        return (0, index_js_1.omitUndefined)({
+        const out = (0, index_js_1.omitUndefined)({
             ...data_type_js_1.DataType.prototype.toJSON.apply(this),
             base: this.base ? (baseName ? baseName : this.base.toJSON()) : undefined,
             attributes: attributes && Object.keys(attributes).length ? attributes : undefined,
             properties: Object.keys(properties).length ? properties : undefined,
         });
+        if (Object.keys(this.ownNameMappings).length)
+            out.nameMappings = { ...this.ownNameMappings };
+        return out;
     }
 }
 exports.SimpleType.prototype = SimpleTypeClass.prototype;

package/cjs/document/data-type/utils/create-mapped-class.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMappedClass = void 0;
+exports.createMappedClass = createMappedClass;
 const index_js_1 = require("../../../helpers/index.js");
 const index_js_2 = require("../../../schema/index.js");
 const constants_js_1 = require("../../constants.js");
@@ -26,8 +26,9 @@ function createMappedClass(source, config, options) {
             throw new TypeError(`Class "${source}" doesn't have datatype metadata information`);
         if (!(m.kind === index_js_2.OpraSchema.ComplexType.Kind ||
             m.kind === index_js_2.OpraSchema.MappedType.Kind ||
-            m.kind === index_js_2.OpraSchema.MixinType.Kind))
+            m.kind === index_js_2.OpraSchema.MixinType.Kind)) {
             throw new TypeError(`Class "${source}" is not a ${index_js_2.OpraSchema.ComplexType.Kind}`);
+        }
     }
     const metadata = {
         ...options,
@@ -51,4 +52,3 @@ function createMappedClass(source, config, options) {
     }
     return MappedClass;
 }
-exports.createMappedClass = createMappedClass;

package/cjs/document/data-type/utils/get-is-inherited-predicate-fn.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getIsInheritedPredicateFn = void 0;
+exports.getIsInheritedPredicateFn = getIsInheritedPredicateFn;
 function getIsInheritedPredicateFn(pick, omit) {
     const pickKeys = pick?.map(x => String(x).toLowerCase());
     const omitKeys = omit?.map(x => String(x).toLowerCase());
@@ -12,4 +12,3 @@ function getIsInheritedPredicateFn(pick, omit) {
         return true;
     };
 }
-exports.getIsInheritedPredicateFn = getIsInheritedPredicateFn;

package/cjs/document/decorators/api-field-decorator.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApiFieldDecorator = void 0;
-const index_js_1 = require("../../helpers/index.js");
-const index_js_2 = require("../../schema/index.js");
+exports.ApiFieldDecorator = ApiFieldDecorator;
+const index_js_1 = require("../../schema/index.js");
 const constants_js_1 = require("../constants.js");
 function ApiFieldDecorator(options) {
     return function (target, propertyKey) {
         if (typeof propertyKey !== 'string')
             throw new TypeError(`Symbol properties can't be used as a field`);
         const metadata = Reflect.getOwnMetadata(constants_js_1.DATATYPE_METADATA, target.constructor) || {};
-        metadata.kind = index_js_2.OpraSchema.ComplexType.Kind;
+        metadata.kind = index_js_1.OpraSchema.ComplexType.Kind;
         metadata.fields = metadata.fields || {};
         const designType = Reflect.getMetadata('design:type', target, propertyKey);
         const elemMeta = (metadata.fields[propertyKey] = {
@@ -20,7 +19,6 @@ function ApiFieldDecorator(options) {
         }
         else
             elemMeta.type = elemMeta.type || designType;
-        Reflect.defineMetadata(constants_js_1.DATATYPE_METADATA, (0, index_js_1.omitUndefined)(metadata), target.constructor);
+        Reflect.defineMetadata(constants_js_1.DATATYPE_METADATA, metadata, target.constructor);
     };
 }
-exports.ApiFieldDecorator = ApiFieldDecorator;

package/cjs/document/decorators/complex-type.decorator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ComplexTypeDecorator = void 0;
+exports.ComplexTypeDecorator = ComplexTypeDecorator;
 const tslib_1 = require("tslib");
 const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const index_js_1 = require("../../schema/index.js");
@@ -30,4 +30,3 @@ function ComplexTypeDecorator(options) {
             Object.assign(metadata, (0, lodash_omit_1.default)(options, ['kind', 'name', 'base', 'fields']));
     };
 }
-exports.ComplexTypeDecorator = ComplexTypeDecorator;

package/cjs/document/decorators/http-controller.decorator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpControllerDecoratorFactory = void 0;
+exports.HttpControllerDecoratorFactory = HttpControllerDecoratorFactory;
 const tslib_1 = require("tslib");
 const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const putil_merge_1 = tslib_1.__importDefault(require("putil-merge"));
@@ -102,6 +102,31 @@ function HttpControllerDecoratorFactory(options) {
         });
         return decorator;
     };
+    /**
+     *
+     */
+    decorator.KeyParam = (name, arg1) => {
+        decoratorChain.push((meta) => {
+            if (!meta.path?.includes(':' + name))
+                meta.path = (meta.path || '') + '@:' + name;
+            const paramMeta = typeof arg1 === 'string' || typeof arg1 === 'function'
+                ? {
+                    name,
+                    location: 'path',
+                    type: arg1,
+                    keyParam: true,
+                }
+                : {
+                    ...arg1,
+                    name,
+                    location: 'path',
+                    keyParam: true,
+                };
+            meta.parameters = meta.parameters || [];
+            meta.parameters.push(paramMeta);
+        });
+        return decorator;
+    };
     /**
      *
      */
@@ -114,4 +139,3 @@ function HttpControllerDecoratorFactory(options) {
     };
     return decorator;
 }
-exports.HttpControllerDecoratorFactory = HttpControllerDecoratorFactory;

package/cjs/document/decorators/http-operation-entity.decorator.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const filter_rules_js_1 = require("../../filter/filter-rules.js");
-const index_js_1 = require("../../helpers/index.js");
-const index_js_2 = require("../../http/index.js");
+const index_js_1 = require("../../http/index.js");
 const constants_js_1 = require("../constants.js");
-const index_js_3 = require("../data-type/extended-types/index.js");
-const index_js_4 = require("../data-type/primitive-types/index.js");
+const index_js_2 = require("../data-type/extended-types/index.js");
+const index_js_3 = require("../data-type/primitive-types/index.js");
 const http_operation_js_1 = require("../http/http-operation.js");
 const http_operation_decorator_js_1 = require("./http-operation.decorator.js");
 /** Implementation **/
@@ -22,20 +21,20 @@ http_operation_js_1.HttpOperation.Entity.Create = function (arg0, arg1) {
         args = { ...arg1, type: arg0 };
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
-    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
+    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, {
         method: 'POST',
+        ...args,
         composition: 'Entity.Create',
         requestBody: {
             immediateFetch: true,
             ...args.requestBody,
             required: true,
         },
-    }));
+    });
     decorator
         .QueryParam('projection', {
         description: 'Determines fields projection',
-        type: new index_js_3.FieldPathType({
+        type: new index_js_2.FieldPathType({
             dataType: args.type,
             allowSigns: 'each',
         }),
@@ -43,18 +42,16 @@ http_operation_js_1.HttpOperation.Entity.Create = function (arg0, arg1) {
         arraySeparator: ',',
     })
         .RequestContent(args.requestBody?.type || args.type)
-        .Response(index_js_2.HttpStatusCode.CREATED, {
+        .Response(index_js_1.HttpStatusCode.CREATED, {
         description: 'Operation is successful. Returns OperationResult with "payload" field that contains the created resource.',
-        contentType: index_js_2.MimeTypes.opra_response_json,
+        contentType: index_js_1.MimeTypes.opra_response_json,
         type: args.type,
         partial: 'deep',
     })
-        .Response(index_js_2.HttpStatusCode.UNPROCESSABLE_ENTITY, {
+        .Response(index_js_1.HttpStatusCode.UNPROCESSABLE_ENTITY, {
         description: 'The request was well-formed but was unable to process operation due to one or many errors.',
-        contentType: index_js_2.MimeTypes.opra_response_json,
+        contentType: index_js_1.MimeTypes.opra_response_json,
     });
-    if (typeof args.type === 'function')
-        decorator.UseType(args.type);
     decoratorChain.push((operationMeta) => {
         const compositionOptions = (operationMeta.compositionOptions = operationMeta.compositionOptions || {});
         compositionOptions.type = getDataTypeName(args.type);
@@ -73,31 +70,42 @@ http_operation_js_1.HttpOperation.Entity.Delete = function (arg0, arg1) {
         args = { ...arg1, type: arg0 };
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
-    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
+    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, {
         method: 'DELETE',
+        ...args,
         composition: 'Entity.Delete',
-    }));
+    });
     decorator
-        .Response(index_js_2.HttpStatusCode.OK, {
+        .Response(index_js_1.HttpStatusCode.OK, {
         description: 'Operation is successful. Returns OperationResult with "affected" field.',
-        contentType: index_js_2.MimeTypes.opra_response_json,
+        contentType: index_js_1.MimeTypes.opra_response_json,
     })
-        .Response(index_js_2.HttpStatusCode.UNPROCESSABLE_ENTITY, {
+        .Response(index_js_1.HttpStatusCode.UNPROCESSABLE_ENTITY, {
         description: 'The request was well-formed but was unable to process operation due to one or many errors.',
-        contentType: index_js_2.MimeTypes.opra_response_json,
+        contentType: index_js_1.MimeTypes.opra_response_json,
     });
-    if (typeof args.type === 'function')
-        decorator.UseType(args.type);
     /**
      *
      */
     decorator.KeyParam = (name, prmOptions) => {
-        decorator.PathParam(name, prmOptions);
+        const paramMeta = typeof prmOptions === 'string' || typeof prmOptions === 'function'
+            ? {
+                name,
+                location: 'path',
+                type: prmOptions,
+                keyParam: true,
+            }
+            : {
+                ...prmOptions,
+                name,
+                location: 'path',
+                keyParam: true,
+            };
+        decorator.PathParam(name, paramMeta);
         decoratorChain.push((meta) => {
-            meta.path = (meta.path || '') + '@:' + name;
-            meta.compositionOptions = meta.compositionOptions || {};
-            meta.compositionOptions.keyParameter = name;
+            if (!meta.path?.includes(':' + name))
+                meta.path = (meta.path || '') + '@:' + name;
+            meta.mergePath = true;
         });
         return decorator;
     };
@@ -120,28 +128,26 @@ http_operation_js_1.HttpOperation.Entity.DeleteMany = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const filterRules = new filter_rules_js_1.FilterRules();
-    const filterType = new index_js_3.FilterType({ dataType: args.type });
+    const filterType = new index_js_2.FilterType({ dataType: args.type });
     filterType.rules = {};
-    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
+    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, {
         method: 'DELETE',
+        ...args,
         composition: 'Entity.DeleteMany',
-    }));
+    });
     decorator
-        .Response(index_js_2.HttpStatusCode.OK, {
+        .Response(index_js_1.HttpStatusCode.OK, {
         description: 'Operation is successful. Returns OperationResult with "affected" field.',
-        contentType: index_js_2.MimeTypes.opra_response_json,
+        contentType: index_js_1.MimeTypes.opra_response_json,
     })
-        .Response(index_js_2.HttpStatusCode.UNPROCESSABLE_ENTITY, {
+        .Response(index_js_1.HttpStatusCode.UNPROCESSABLE_ENTITY, {
         description: 'The request was well-formed but was unable to process operation due to one or many errors.',
-        contentType: index_js_2.MimeTypes.opra_response_json,
+        contentType: index_js_1.MimeTypes.opra_response_json,
     })
         .QueryParam('filter', {
         type: filterType,
         description: 'Determines filter fields',
     });
-    if (typeof args.type === 'function')
-        decorator.UseType(args.type);
     decoratorChain.push((operationMeta) => {
         const compositionOptions = (operationMeta.compositionOptions = operationMeta.compositionOptions || {});
         compositionOptions.type = getDataTypeName(args.type);
@@ -168,32 +174,32 @@ http_operation_js_1.HttpOperation.Entity.FindMany = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const filterRules = new filter_rules_js_1.FilterRules();
-    const filterType = new index_js_3.FilterType({ dataType: args.type });
+    const filterType = new index_js_2.FilterType({ dataType: args.type });
     filterType.rules = {};
-    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
+    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, {
         method: 'GET',
+        ...args,
         composition: 'Entity.FindMany',
-    }));
+    });
     decorator
-        .Response(index_js_2.HttpStatusCode.OK, {
+        .Response(index_js_1.HttpStatusCode.OK, {
         description: 'Operation is successful. Returns OperationResult with "payload" field that contains list of resources.',
-        contentType: index_js_2.MimeTypes.opra_response_json,
+        contentType: index_js_1.MimeTypes.opra_response_json,
         type: args.type,
         partial: 'deep',
         isArray: true,
     })
-        .Response(index_js_2.HttpStatusCode.UNPROCESSABLE_ENTITY, {
+        .Response(index_js_1.HttpStatusCode.UNPROCESSABLE_ENTITY, {
         description: 'The request was well-formed but was unable to process operation due to one or many errors.',
-        contentType: index_js_2.MimeTypes.opra_response_json,
+        contentType: index_js_1.MimeTypes.opra_response_json,
     })
         .QueryParam('limit', {
         description: 'Determines number of returning instances',
-        type: new index_js_4.IntegerType({ minValue: 1 }),
+        type: new index_js_3.IntegerType({ minValue: 1, maxValue: args.maxLimit }),
     })
         .QueryParam('skip', {
         description: 'Determines number of returning instances',
-        type: new index_js_4.IntegerType({ minValue: 1 }),
+        type: new index_js_3.IntegerType({ minValue: 1 }),
     })
         .QueryParam('count', {
         description: 'Counts all matching instances if enabled',
@@ -201,7 +207,7 @@ http_operation_js_1.HttpOperation.Entity.FindMany = function (arg0, arg1) {
     })
         .QueryParam('projection', {
         description: 'Determines fields projection',
-        type: new index_js_3.FieldPathType({
+        type: new index_js_2.FieldPathType({
             dataType: args.type,
             allowSigns: 'each',
         }),
@@ -214,18 +220,22 @@ http_operation_js_1.HttpOperation.Entity.FindMany = function (arg0, arg1) {
     })
         .QueryParam('sort', {
         description: 'Determines sort fields',
-        type: new index_js_3.FieldPathType({
+        type: new index_js_2.FieldPathType({
             dataType: args.type,
             allowSigns: 'first',
         }),
         isArray: true,
         arraySeparator: ',',
     });
-    if (typeof args.type === 'function')
-        decorator.UseType(args.type);
     decoratorChain.push((operationMeta) => {
         const compositionOptions = (operationMeta.compositionOptions = operationMeta.compositionOptions || {});
         compositionOptions.type = getDataTypeName(args.type);
+        if (args.defaultLimit)
+            compositionOptions.defaultLimit = args.defaultLimit;
+        if (args.defaultProjection)
+            compositionOptions.defaultProjection = args.defaultProjection;
+        if (args.maxLimit)
+            compositionOptions.maxLimit = args.maxLimit;
     });
     decorator.DefaultSort = (...fields) => {
         decoratorChain.push((operationMeta) => {
@@ -262,45 +272,56 @@ http_operation_js_1.HttpOperation.Entity.Get = function (arg0, arg1) {
         args = { ...arg1, type: arg0 };
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
-    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
+    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, {
         method: 'GET',
+        ...args,
         composition: 'Entity.Get',
-    }));
+    });
     decorator
         .QueryParam('projection', {
         description: 'Determines fields projection',
-        type: new index_js_3.FieldPathType({
+        type: new index_js_2.FieldPathType({
             dataType: args.type,
             allowSigns: 'each',
         }),
         isArray: true,
         arraySeparator: ',',
     })
-        .Response(index_js_2.HttpStatusCode.OK, {
+        .Response(index_js_1.HttpStatusCode.OK, {
         description: 'Operation is successful. Returns OperationResult with "payload" field that contains the resource asked for.',
-        contentType: index_js_2.MimeTypes.opra_response_json,
+        contentType: index_js_1.MimeTypes.opra_response_json,
         type: args.type,
         partial: 'deep',
     })
-        .Response(index_js_2.HttpStatusCode.NO_CONTENT, {
+        .Response(index_js_1.HttpStatusCode.NO_CONTENT, {
         description: 'Operation is successful but no resource found',
     })
-        .Response(index_js_2.HttpStatusCode.UNPROCESSABLE_ENTITY, {
+        .Response(index_js_1.HttpStatusCode.UNPROCESSABLE_ENTITY, {
         description: 'The request was well-formed but was unable to process operation due to one or many errors.',
-        contentType: index_js_2.MimeTypes.opra_response_json,
+        contentType: index_js_1.MimeTypes.opra_response_json,
     });
-    if (typeof args.type === 'function')
-        decorator.UseType(args.type);
     /**
      *
      */
     decorator.KeyParam = (name, prmOptions) => {
-        decorator.PathParam(name, prmOptions);
+        const paramMeta = typeof prmOptions === 'string' || typeof prmOptions === 'function'
+            ? {
+                name,
+                location: 'path',
+                type: prmOptions,
+                keyParam: true,
+            }
+            : {
+                ...prmOptions,
+                name,
+                location: 'path',
+                keyParam: true,
+            };
+        decorator.PathParam(name, paramMeta);
         decoratorChain.push((meta) => {
-            meta.path = (meta.path || '') + '@:' + name;
-            meta.compositionOptions = meta.compositionOptions || {};
-            meta.compositionOptions.keyParameter = name;
+            if (!meta.path?.includes(':' + name))
+                meta.path = (meta.path || '') + '@:' + name;
+            meta.mergePath = true;
         });
         return decorator;
     };
@@ -322,12 +343,12 @@ http_operation_js_1.HttpOperation.Entity.UpdateMany = function (arg0, arg1) {
         args = { ...arg1, type: arg0 };
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
-    const filterType = new index_js_3.FilterType({ dataType: args.type });
+    const filterType = new index_js_2.FilterType({ dataType: args.type });
     filterType.rules = {};
     const filterRules = new filter_rules_js_1.FilterRules();
-    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
+    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, {
         method: 'PATCH',
+        ...args,
         composition: 'Entity.UpdateMany',
         requestBody: {
             immediateFetch: true,
@@ -335,18 +356,16 @@ http_operation_js_1.HttpOperation.Entity.UpdateMany = function (arg0, arg1) {
             ...args.requestBody,
             required: true,
         },
-    }));
-    decorator.RequestContent(args.requestBody?.type || args.type);
-    if (typeof args.type === 'function')
-        decorator.UseType(args.type);
+    });
     decorator
-        .Response(index_js_2.HttpStatusCode.OK, {
+        .RequestContent(args.requestBody?.type || args.type)
+        .Response(index_js_1.HttpStatusCode.OK, {
         description: 'Operation is successful. Returns OperationResult with "affected" field.',
-        contentType: index_js_2.MimeTypes.opra_response_json,
+        contentType: index_js_1.MimeTypes.opra_response_json,
     })
-        .Response(index_js_2.HttpStatusCode.UNPROCESSABLE_ENTITY, {
+        .Response(index_js_1.HttpStatusCode.UNPROCESSABLE_ENTITY, {
         description: 'The request was well-formed but was unable to process operation due to one or many errors.',
-        contentType: index_js_2.MimeTypes.opra_response_json,
+        contentType: index_js_1.MimeTypes.opra_response_json,
     })
         .QueryParam('filter', {
         type: filterType,
@@ -378,11 +397,11 @@ http_operation_js_1.HttpOperation.Entity.Update = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const filterRules = new filter_rules_js_1.FilterRules();
-    const filterType = new index_js_3.FilterType({ dataType: args.type });
+    const filterType = new index_js_2.FilterType({ dataType: args.type });
     filterType.rules = {};
-    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
+    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, {
         method: 'PATCH',
+        ...args,
         composition: 'Entity.Update',
         requestBody: {
             partial: 'deep',
@@ -390,11 +409,11 @@ http_operation_js_1.HttpOperation.Entity.Update = function (arg0, arg1) {
             ...args.requestBody,
             required: true,
         },
-    }));
+    });
     decorator
         .QueryParam('projection', {
         description: 'Determines fields projection',
-        type: new index_js_3.FieldPathType({
+        type: new index_js_2.FieldPathType({
             dataType: args.type,
             allowSigns: 'each',
         }),
@@ -406,30 +425,41 @@ http_operation_js_1.HttpOperation.Entity.Update = function (arg0, arg1) {
         description: 'Determines filter fields',
     })
         .RequestContent(args.requestBody?.type || args.type)
-        .Response(index_js_2.HttpStatusCode.OK, {
+        .Response(index_js_1.HttpStatusCode.OK, {
         description: 'Operation is successful. Returns OperationResult with "payload" field that contains updated resource.',
-        contentType: index_js_2.MimeTypes.opra_response_json,
+        contentType: index_js_1.MimeTypes.opra_response_json,
         type: args.type,
         partial: 'deep',
     })
-        .Response(index_js_2.HttpStatusCode.NO_CONTENT, {
+        .Response(index_js_1.HttpStatusCode.NO_CONTENT, {
         description: 'Operation is successful but no resource found',
     })
-        .Response(index_js_2.HttpStatusCode.UNPROCESSABLE_ENTITY, {
+        .Response(index_js_1.HttpStatusCode.UNPROCESSABLE_ENTITY, {
         description: 'The request was well-formed but was unable to process operation due to one or many errors.',
-        contentType: index_js_2.MimeTypes.opra_response_json,
+        contentType: index_js_1.MimeTypes.opra_response_json,
     });
-    if (typeof args.type === 'function')
-        decorator.UseType(args.type);
     /**
      *
      */
     decorator.KeyParam = (name, prmOptions) => {
-        decorator.PathParam(name, prmOptions);
+        const paramMeta = typeof prmOptions === 'string' || typeof prmOptions === 'function'
+            ? {
+                name,
+                location: 'path',
+                type: prmOptions,
+                keyParam: true,
+            }
+            : {
+                ...prmOptions,
+                name,
+                location: 'path',
+                keyParam: true,
+            };
+        decorator.PathParam(name, paramMeta);
         decoratorChain.push((meta) => {
-            meta.path = (meta.path || '') + '@:' + name;
-            meta.compositionOptions = meta.compositionOptions || {};
-            meta.compositionOptions.keyParameter = name;
+            if (!meta.path?.includes(':' + name))
+                meta.path = (meta.path || '') + '@:' + name;
+            meta.mergePath = true;
         });
         return decorator;
     };