@opra/common 1.0.0-alpha.9 → 1.0.0-beta.1

package/cjs/document/data-type/extended-types/email.type.js

@@ -83,12 +83,12 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", String)
 ], EmailType.prototype, "blacklistedChars", void 0);
 exports.EmailType = EmailType = tslib_1.__decorate([
-    (0, simple_type_js_1.SimpleType)({
+    ((0, simple_type_js_1.SimpleType)({
         description: 'An email value',
         nameMappings: {
             js: 'string',
             json: 'string',
         },
-    }).Example('some.body@example.com'),
+    }).Example('some.body@example.com')),
     tslib_1.__metadata("design:paramtypes", [Object])
 ], EmailType);

package/cjs/document/data-type/extended-types/filter.type.js

@@ -65,7 +65,7 @@ const decodeFilter = (dataType, rules) => (0, valgen_1.validator)('decodeFilter'
             return filter;
         }
         catch (e) {
-            context.fail(_this, `Not a valid filter expression. ${e.message}`, input, e.errors);
+            context.fail(_this, `Not a valid filter expression. ${e.message}`, input);
             return;
         }
     }

package/cjs/document/data-type/extended-types/time.type.js

@@ -41,7 +41,7 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", String)
 ], TimeType.prototype, "maxValue", void 0);
 exports.TimeType = TimeType = tslib_1.__decorate([
-    (0, simple_type_js_1.SimpleType)({
+    ((0, simple_type_js_1.SimpleType)({
         description: 'Time string in 24h format',
         nameMappings: {
             js: 'string',
@@ -49,6 +49,6 @@ exports.TimeType = TimeType = tslib_1.__decorate([
         },
     })
         .Example('18:23:00', 'Full time value')
-        .Example('18:23:00', 'Time value without seconds'),
+        .Example('18:23:00', 'Time value without seconds')),
     tslib_1.__metadata("design:paramtypes", [Object])
 ], TimeType);

package/cjs/document/data-type/extended-types/url.type.js

@@ -19,12 +19,12 @@ let UrlType = class UrlType {
 };
 exports.UrlType = UrlType;
 exports.UrlType = UrlType = tslib_1.__decorate([
-    (0, simple_type_js_1.SimpleType)({
+    ((0, simple_type_js_1.SimpleType)({
         description: 'A Uniform Resource Identifier Reference (RFC 3986 icon) value',
         nameMappings: {
             js: 'string',
             json: 'string',
         },
-    }).Example('http://tempuri.org'),
+    }).Example('http://tempuri.org')),
     tslib_1.__metadata("design:paramtypes", [Object])
 ], UrlType);

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

@@ -1,11 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OmitType = void 0;
+exports.OmitType = OmitType;
 const create_mapped_class_js_1 = require("./utils/create-mapped-class.js");
+/**
+ * Create a new MappedType that omits given fields from base type
+ * @param baseType
+ * @param keys
+ * @param options
+ */
 /**
  *
  */
 function OmitType(baseType, keys, options) {
     return (0, create_mapped_class_js_1.createMappedClass)(baseType, { omit: keys }, options);
 }
-exports.OmitType = OmitType;

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

@@ -1,7 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PartialType = void 0;
+exports.PartialType = PartialType;
 const create_mapped_class_js_1 = require("./utils/create-mapped-class.js");
+/**
+ * Create a new MappedType that marks given or all fields as optional
+ * @param baseType
+ * @param keys
+ * @param options
+ */
 /**
  *
  */
@@ -10,4 +16,3 @@ function PartialType(base, ...args) {
     const options = Array.isArray(args[0]) ? args[1] : args[0];
     return (0, create_mapped_class_js_1.createMappedClass)(base, { partial: keys }, options);
 }
-exports.PartialType = PartialType;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PickType = void 0;
+exports.PickType = PickType;
 const create_mapped_class_js_1 = require("./utils/create-mapped-class.js");
 /**
  *
@@ -8,4 +8,3 @@ const create_mapped_class_js_1 = require("./utils/create-mapped-class.js");
 function PickType(baseType, keys, options) {
     return (0, create_mapped_class_js_1.createMappedClass)(baseType, { pick: keys }, options);
 }
-exports.PickType = PickType;

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/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

@@ -86,12 +86,7 @@ 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;
         const out = (0, index_js_1.omitUndefined)({
             ...data_type_js_1.DataType.prototype.toJSON.apply(this),

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");
@@ -52,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,12 +1,12 @@
 "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"));
 const index_js_1 = require("../../schema/index.js");
 const constants_js_1 = require("../constants.js");
-const CLASS_NAME_PATTERN = /^(.*)(Collection|Singleton|Resource|Controller)$/;
+const CLASS_NAME_PATTERN = /^(.*)(Controller)$/;
 function HttpControllerDecoratorFactory(options) {
     const decoratorChain = [];
     /**
@@ -139,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,7 +21,7 @@ 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)({
+    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, {
         method: 'POST',
         ...args,
         composition: 'Entity.Create',
@@ -31,11 +30,11 @@ http_operation_js_1.HttpOperation.Entity.Create = 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',
         }),
@@ -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,22 +70,20 @@ 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)({
+    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);
     /**
      *
      */
@@ -110,6 +105,7 @@ http_operation_js_1.HttpOperation.Entity.Delete = function (arg0, arg1) {
         decoratorChain.push((meta) => {
             if (!meta.path?.includes(':' + name))
                 meta.path = (meta.path || '') + '@:' + name;
+            meta.mergePath = true;
         });
         return decorator;
     };
@@ -132,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)({
+    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);
@@ -180,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)({
+    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',
@@ -213,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',
         }),
@@ -226,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) => {
@@ -274,36 +272,34 @@ 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)({
+    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);
     /**
      *
      */
@@ -325,6 +321,7 @@ http_operation_js_1.HttpOperation.Entity.Get = function (arg0, arg1) {
         decoratorChain.push((meta) => {
             if (!meta.path?.includes(':' + name))
                 meta.path = (meta.path || '') + '@:' + name;
+            meta.mergePath = true;
         });
         return decorator;
     };
@@ -346,10 +343,10 @@ 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)({
+    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, {
         method: 'PATCH',
         ...args,
         composition: 'Entity.UpdateMany',
@@ -359,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,
@@ -402,9 +397,9 @@ 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)({
+    const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, {
         method: 'PATCH',
         ...args,
         composition: 'Entity.Update',
@@ -414,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',
         }),
@@ -430,21 +425,19 @@ 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);
     /**
      *
      */
@@ -466,6 +459,7 @@ http_operation_js_1.HttpOperation.Entity.Update = function (arg0, arg1) {
         decoratorChain.push((meta) => {
             if (!meta.path?.includes(':' + name))
                 meta.path = (meta.path || '') + '@:' + name;
+            meta.mergePath = true;
         });
         return decorator;
     };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpOperationDecoratorFactory = void 0;
+exports.HttpOperationDecoratorFactory = HttpOperationDecoratorFactory;
 const tslib_1 = require("tslib");
 const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const index_js_1 = require("../../http/index.js");
@@ -118,6 +118,9 @@ function HttpOperationDecoratorFactory(decoratorChain, options) {
             responseMeta.contentType = responseMeta.contentType || index_js_1.MimeTypes.opra_response_json;
             responseMeta.contentEncoding = responseMeta.contentEncoding || 'utf-8';
         }
+        if (responseMeta.contentType === index_js_1.MimeTypes.opra_response_json) {
+            responseMeta.contentEncoding = responseMeta.contentEncoding || 'utf-8';
+        }
         decoratorChain.push((meta) => {
             meta.responses = meta.responses || [];
             meta.responses.push(responseMeta);
@@ -184,4 +187,3 @@ function HttpOperationDecoratorFactory(decoratorChain, options) {
     };
     return decorator;
 }
-exports.HttpOperationDecoratorFactory = HttpOperationDecoratorFactory;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AttributeDecoratorFactory = exports.SimpleTypeDecoratorFactory = void 0;
+exports.SimpleTypeDecoratorFactory = SimpleTypeDecoratorFactory;
+exports.AttributeDecoratorFactory = AttributeDecoratorFactory;
 const tslib_1 = require("tslib");
 const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const index_js_1 = require("../../schema/index.js");
@@ -42,7 +43,6 @@ function SimpleTypeDecoratorFactory(options) {
     };
     return decorator;
 }
-exports.SimpleTypeDecoratorFactory = SimpleTypeDecoratorFactory;
 function AttributeDecoratorFactory(options) {
     return (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
@@ -64,4 +64,3 @@ function AttributeDecoratorFactory(options) {
         Reflect.defineMetadata(constants_js_1.DATATYPE_METADATA, metadata, target.constructor);
     };
 }
-exports.AttributeDecoratorFactory = AttributeDecoratorFactory;