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

package/browser.js

@@ -1172,6 +1172,10 @@ var ComplexTypeBaseClass = class extends DataType {
     const pickList = !!(projection && Object.values(projection).find((p) => !p.sign));
     let fieldName;
     for (const field of this.fields.values()) {
+      if (context.ignoreReadonlyFields && field.readonly || context.ignoreWriteonlyFields && field.writeonly) {
+        schema[field.name] = vg.isUndefined({ coerce: true });
+        continue;
+      }
       fieldName = field.name;
       let p;
       if (projection !== "*") {
@@ -1230,6 +1234,8 @@ var ApiField = /* @__PURE__ */ __name(function(...args) {
   _this.exclusive = initArgs.exclusive;
   _this.translatable = initArgs.translatable;
   _this.deprecated = initArgs.deprecated;
+  _this.readonly = initArgs.readonly;
+  _this.writeonly = initArgs.writeonly;
   _this.examples = initArgs.examples;
 }, "ApiField");
 var ApiFieldClass = class extends DocumentElement {
@@ -1248,6 +1254,8 @@ var ApiFieldClass = class extends DocumentElement {
       exclusive: this.exclusive,
       translatable: this.translatable,
       deprecated: this.deprecated,
+      readonly: this.readonly,
+      writeonly: this.writeonly,
       examples: this.examples
     });
   }
@@ -1297,6 +1305,8 @@ var ComplexTypeClass = class extends ComplexTypeBase {
     __name(this, "ComplexTypeClass");
   }
   extendsFrom(baseType) {
+    if (!(baseType instanceof DataType))
+      baseType = this.node.getDataType(baseType);
     if (!(baseType instanceof ComplexTypeBase))
       return false;
     if (baseType === this)
@@ -1364,6 +1374,8 @@ var EnumTypeClass = class extends DataType {
     __name(this, "EnumTypeClass");
   }
   extendsFrom(baseType) {
+    if (!(baseType instanceof DataType))
+      baseType = this.node.getDataType(baseType);
     if (!(baseType instanceof EnumType2))
       return false;
     if (baseType === this)
@@ -1495,6 +1507,8 @@ var MappedTypeClass = class extends ComplexTypeBase {
     __name(this, "MappedTypeClass");
   }
   extendsFrom(baseType) {
+    if (!(baseType instanceof DataType))
+      baseType = this.node.getDataType(baseType);
     if (!(baseType instanceof ComplexTypeBase))
       return false;
     if (baseType === this)
@@ -1549,6 +1563,8 @@ var MixinTypeClass = class extends ComplexTypeBase {
     __name(this, "MixinTypeClass");
   }
   extendsFrom(baseType) {
+    if (!(baseType instanceof DataType))
+      baseType = this.node.getDataType(baseType);
     if (!(baseType instanceof ComplexTypeBase))
       return false;
     if (baseType === this)
@@ -1683,6 +1699,8 @@ var SimpleType2 = /* @__PURE__ */ __name(function(...args) {
     _this.base = initArgs.base;
   }
   _this.properties = initArgs.properties;
+  _this.ownNameMappings = { ...initArgs.nameMappings };
+  _this.nameMappings = { ..._this.base?.nameMappings, ...initArgs.nameMappings };
   _this.ownAttributes = cloneObject(initArgs.attributes || {});
   _this.attributes = _this.base ? cloneObject(_this.base.attributes) : {};
   if (_this.ownAttributes) {
@@ -1700,6 +1718,8 @@ var SimpleTypeClass = class extends DataType {
     __name(this, "SimpleTypeClass");
   }
   extendsFrom(baseType) {
+    if (!(baseType instanceof DataType))
+      baseType = this.node.getDataType(baseType);
     if (!(baseType instanceof SimpleType2))
       return false;
     if (baseType === this)
@@ -1742,12 +1762,15 @@ var SimpleTypeClass = class extends DataType {
       return o;
     }, {});
     const baseName = this.base ? this.node.getDataTypeNameWithNs(this.base) : void 0;
-    return omitUndefined({
+    const out = omitUndefined({
       ...DataType.prototype.toJSON.apply(this),
       base: this.base ? baseName ? baseName : this.base.toJSON() : void 0,
       attributes: attributes && Object.keys(attributes).length ? attributes : void 0,
       properties: Object.keys(properties).length ? properties : void 0
     });
+    if (Object.keys(this.ownNameMappings).length)
+      out.nameMappings = { ...this.ownNameMappings };
+    return out;
   }
 };
 SimpleType2.prototype = SimpleTypeClass.prototype;
@@ -1872,7 +1895,7 @@ var DataTypeFactory = class {
     thunk = await resolveThunk(thunk);
     const { importQueue, initArgsMap } = context;
     const dataType = owner.node.findDataType(thunk);
-    if (dataType)
+    if (dataType instanceof DataType)
       return dataType.name;
     let metadata2;
     let ctor;
@@ -1941,10 +1964,14 @@ var DataTypeFactory = class {
       };
       out[initializingSymbol] = true;
       try {
-        if (out.name && importQueue?.has(out.name)) {
-          initArgsMap?.set(metadata2.name, out);
-        } else if (out.name)
-          return context.addError(`Data Type (${out.name}) must be explicitly added to type list in the document scope`);
+        if (out.name) {
+          if (importQueue?.has(out.name)) {
+            initArgsMap?.set(metadata2.name, out);
+            out._instance = { name: metadata2.name };
+            out[kDataTypeMap] = owner.node[kDataTypeMap];
+          } else
+            return context.addError(`Data Type (${out.name}) must be explicitly added to type list in the document scope`);
+        }
         switch (out.kind) {
           case OpraSchema.ComplexType.Kind:
             out.ctor = ctor;
@@ -2055,6 +2082,7 @@ var DataTypeFactory = class {
       initArgs.ctor = initArgs.ctor || baseArgs.ctor;
     });
     initArgs.properties = metadata2.properties;
+    initArgs.nameMappings = metadata2.nameMappings;
     if (!initArgs.properties && initArgs.ctor)
       initArgs.properties = new initArgs.ctor();
     if (metadata2.attributes)
@@ -2106,26 +2134,40 @@ var DataTypeFactory = class {
     });
   }
   static _createDataType(context, owner, args) {
+    let dataType = owner.node.findDataType(typeof args === "string" ? args : args.name || "");
+    if (dataType instanceof DataType)
+      return dataType;
     const initArgs = typeof args === "string" ? context.initArgsMap?.get(args) : args;
-    switch (initArgs?.kind) {
-      case OpraSchema.ComplexType.Kind:
-        return this._createComplexType(context, owner, initArgs);
-      case OpraSchema.EnumType.Kind:
-        return this._createEnumType(context, owner, initArgs);
-      case OpraSchema.MappedType.Kind:
-        return this._createMappedType(context, owner, initArgs);
-      case OpraSchema.MixinType.Kind:
-        return this._createMixinType(context, owner, initArgs);
-      case OpraSchema.SimpleType.Kind:
-        return this._createSimpleType(context, owner, initArgs);
+    if (initArgs) {
+      const dataTypeMap = initArgs[kDataTypeMap];
+      if (!dataTypeMap)
+        delete initArgs._instance;
+      dataType = initArgs._instance;
+      if (dataType?.name && dataTypeMap) {
+        dataTypeMap.set(dataType.name, dataType);
+      }
+      switch (initArgs?.kind) {
+        case OpraSchema.ComplexType.Kind:
+          return this._createComplexType(context, owner, initArgs);
+        case OpraSchema.EnumType.Kind:
+          return this._createEnumType(context, owner, initArgs);
+        case OpraSchema.MappedType.Kind:
+          return this._createMappedType(context, owner, initArgs);
+        case OpraSchema.MixinType.Kind:
+          return this._createMixinType(context, owner, initArgs);
+        case OpraSchema.SimpleType.Kind:
+          return this._createSimpleType(context, owner, initArgs);
+      }
     }
     context.addError(`Unknown data type (${String(args)})`);
   }
   static _createComplexType(context, owner, args) {
+    const dataType = args._instance || {};
+    Object.setPrototypeOf(dataType, ComplexType2.prototype);
     const initArgs = cloneObject(args);
     if (args.base) {
       context.enter(".base", () => {
-        initArgs.base = owner.node.findDataType(args.base) || this._createDataType(context, owner, args.base);
+        initArgs.base = this._createDataType(context, owner, args.base);
       });
     }
     if (args.additionalFields) {
@@ -2133,11 +2175,7 @@ var DataTypeFactory = class {
         if (typeof args.additionalFields === "boolean" || Array.isArray(args.additionalFields))
           initArgs.additionalFields = args.additionalFields;
         else {
-          if (typeof args.additionalFields === "string") {
-            initArgs.additionalFields = owner.node.findDataType(args.additionalFields) || this._createDataType(context, owner, args.additionalFields);
-          } else {
-            initArgs.additionalFields = this._createDataType(context, owner, args.additionalFields);
-          }
+          initArgs.additionalFields = this._createDataType(context, owner, args.additionalFields);
         }
       });
     }
@@ -2146,7 +2184,7 @@ var DataTypeFactory = class {
       context.enter(".fields", () => {
         for (const [k, v] of Object.entries(args.fields)) {
           context.enter(`[${k}]`, () => {
-            const type = owner.node.findDataType(v.type) || this._createDataType(context, owner, v.type);
+            const type = this._createDataType(context, owner, v.type);
             if (type)
               initArgs.fields[k] = {
                 ...v,
@@ -2157,28 +2195,37 @@ var DataTypeFactory = class {
         }
       });
     }
-    return new ComplexType2(owner, initArgs);
+    ComplexType2.apply(dataType, [owner, initArgs]);
+    return dataType;
   }
   static _createEnumType(context, owner, args) {
+    const dataType = args._instance || {};
+    Object.setPrototypeOf(dataType, EnumType2.prototype);
     const initArgs = cloneObject(args);
     if (args.base) {
       context.enter(".base", () => {
-        initArgs.base = owner.node.findDataType(args.base) || this._createDataType(context, owner, args.base);
+        initArgs.base = this._createDataType(context, owner, args.base);
       });
     }
     initArgs.attributes = args.attributes;
-    return new EnumType2(owner, initArgs);
+    EnumType2.apply(dataType, [owner, initArgs]);
+    return dataType;
   }
   static _createMappedType(context, owner, args) {
+    const dataType = args._instance || {};
+    Object.setPrototypeOf(dataType, MappedType2.prototype);
     const initArgs = cloneObject(args);
     if (args.base) {
       context.enter(".base", () => {
-        initArgs.base = owner.node.findDataType(args.base) || this._createDataType(context, owner, args.base);
+        initArgs.base = this._createDataType(context, owner, args.base);
       });
     }
-    return new MappedType2(owner, initArgs);
+    MappedType2.apply(dataType, [owner, initArgs]);
+    return dataType;
   }
   static _createMixinType(context, owner, args) {
+    const dataType = args._instance || {};
+    Object.setPrototypeOf(dataType, MixinType2.prototype);
     const initArgs = cloneObject(args);
     if (args.types) {
       context.enter(".types", () => {
@@ -2186,7 +2233,7 @@ var DataTypeFactory = class {
         let i = 0;
         for (const t of args.types) {
           context.enter(`[${i++}]`, () => {
-            const base = owner.node.findDataType(t) || this._createDataType(context, owner, t);
+            const base = this._createDataType(context, owner, t);
             if (!(base instanceof ComplexTypeBase))
               throw new TypeError(`"${base?.kind}" can't be set as base for a "${initArgs.kind}"`);
             initArgs.types.push(base);
@@ -2194,16 +2241,20 @@ var DataTypeFactory = class {
         }
       });
     }
-    return new MixinType2(owner, initArgs);
+    MixinType2.apply(dataType, [owner, initArgs]);
+    return dataType;
   }
   static _createSimpleType(context, owner, args) {
+    const dataType = args._instance || {};
+    Object.setPrototypeOf(dataType, SimpleType2.prototype);
     const initArgs = cloneObject(args);
     if (args.base) {
       context.enter(".base", () => {
-        initArgs.base = owner.node.findDataType(args.base) || this._createDataType(context, owner, args.base);
+        initArgs.base = this._createDataType(context, owner, args.base);
       });
     }
-    return new SimpleType2(owner, initArgs);
+    SimpleType2.apply(dataType, [owner, initArgs]);
+    return dataType;
   }
 };
 function preferName(initArgs) {
@@ -2377,6 +2428,26 @@ 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;
+  };
   decorator.UseType = (...type) => {
     decoratorChain.push((meta) => {
       meta.types = meta.types || [];
@@ -2479,20 +2550,20 @@ var HttpControllerClass = class extends DocumentElement {
     });
     if (this.operations.size) {
       out.operations = {};
-      for (const [name, v] of this.operations.entries()) {
-        out.operations[name] = v.toJSON();
+      for (const v of this.operations.values()) {
+        out.operations[v.name] = v.toJSON();
       }
     }
     if (this.controllers.size) {
       out.controllers = {};
-      for (const [name, v] of this.controllers.entries()) {
-        out.controllers[name] = v.toJSON();
+      for (const v of this.controllers.values()) {
+        out.controllers[v.name] = v.toJSON();
       }
     }
     if (this.types.size) {
       out.types = {};
-      for (const [name, v] of this.types.entries()) {
-        out.types[name] = v.toJSON();
+      for (const v of this.types.values()) {
+        out.types[v.name] = v.toJSON();
       }
     }
     if (this.parameters.length) {
@@ -2541,8 +2612,8 @@ var HttpApi = class extends ApiBase {
       url: this.url,
       controllers: {}
     };
-    for (const [name, v] of this.controllers.entries()) {
-      out.controllers[name] = v.toJSON();
+    for (const v of this.controllers.values()) {
+      out.controllers[v.name] = v.toJSON();
     }
     return out;
   }
@@ -3243,6 +3314,7 @@ var HttpParameter = /* @__PURE__ */ __name(function(owner, initArgs) {
   _this.deprecated = initArgs.deprecated;
   _this.required = initArgs.required;
   _this.arraySeparator = initArgs.arraySeparator;
+  _this.keyParam = initArgs.keyParam;
 }, "HttpParameter");
 var HttpParameterClass = class extends Value {
   static {
@@ -3254,6 +3326,7 @@ var HttpParameterClass = class extends Value {
       name: this.name,
       location: this.location,
       arraySeparator: this.arraySeparator,
+      keyParam: this.keyParam,
       required: this.required,
       deprecated: this.deprecated
     });
@@ -3845,7 +3918,11 @@ __decorate([
 ], NumberType.prototype, "maxValue", void 0);
 NumberType = __decorate([
   SimpleType2({
-    description: "Both Integer as well as Floating-Point numbers"
+    description: "Both Integer as well as Floating-Point numbers",
+    nameMappings: {
+      js: "number",
+      json: "number"
+    }
   }),
   __metadata("design:paramtypes", [Object])
 ], NumberType);
@@ -3872,7 +3949,11 @@ var BigintType = class BigintType2 extends NumberType {
 };
 BigintType = __decorate([
   SimpleType2({
-    description: "BigInt number"
+    description: "BigInt number",
+    nameMappings: {
+      js: "bigint",
+      json: "string"
+    }
   }),
   __metadata("design:paramtypes", [Object])
 ], BigintType);
@@ -3896,7 +3977,11 @@ var BooleanType = class BooleanType2 {
 };
 BooleanType = __decorate([
   SimpleType2({
-    description: "Simple true/false value"
+    description: "Simple true/false value",
+    nameMappings: {
+      js: "boolean",
+      json: "boolean"
+    }
   }),
   __metadata("design:paramtypes", [Object])
 ], BooleanType);
@@ -3924,7 +4009,11 @@ var IntegerType = class IntegerType2 extends NumberType {
 };
 IntegerType = __decorate([
   SimpleType2({
-    description: "An integer number"
+    description: "An integer number",
+    nameMappings: {
+      js: "number",
+      json: "number"
+    }
   }),
   __metadata("design:paramtypes", [Object])
 ], IntegerType);
@@ -3948,7 +4037,11 @@ var NullType = class NullType2 {
 };
 NullType = __decorate([
   SimpleType2({
-    description: "A Null value"
+    description: "A Null value",
+    nameMappings: {
+      js: "null",
+      json: "null"
+    }
   }),
   __metadata("design:paramtypes", [Object])
 ], NullType);
@@ -4030,7 +4123,11 @@ __decorate([
 ], StringType.prototype, "maxLength", void 0);
 StringType = __decorate([
   SimpleType2({
-    description: "A sequence of characters"
+    description: "A sequence of characters",
+    nameMappings: {
+      js: "string",
+      json: "string"
+    }
   }),
   __metadata("design:paramtypes", [Object])
 ], StringType);
@@ -4054,7 +4151,11 @@ var Base64Type = class Base64Type2 {
 };
 Base64Type = __decorate([
   SimpleType2({
-    description: "A stream of bytes, base64 encoded"
+    description: "A stream of bytes, base64 encoded",
+    nameMappings: {
+      js: "string",
+      json: "string"
+    }
   }),
   __metadata("design:paramtypes", [Object])
 ], Base64Type);
@@ -4110,7 +4211,11 @@ __decorate([
 ], DateType.prototype, "maxValue", void 0);
 DateType = __decorate([
   SimpleType2({
-    description: "A date without time"
+    description: "A date without time",
+    nameMappings: {
+      js: "Date",
+      json: "string"
+    }
   }).Example("2021-04-18", "Full date value"),
   __metadata("design:paramtypes", [Object])
 ], DateType);
@@ -4152,7 +4257,11 @@ __decorate([
 ], DateStringType.prototype, "maxValue", void 0);
 DateStringType = __decorate([
   SimpleType2({
-    description: "Date string value"
+    description: "Date string value",
+    nameMappings: {
+      js: "string",
+      json: "string"
+    }
   }).Example("2021-04-18", "Full date value").Example("2021-04", "Date value without day").Example("2021", "Year only value"),
   __metadata("design:paramtypes", [Object])
 ], DateStringType);
@@ -4208,7 +4317,11 @@ __decorate([
 ], DateTimeType.prototype, "maxValue", void 0);
 DateTimeType = __decorate([
   SimpleType2({
-    description: "A full datetime value"
+    description: "A full datetime value",
+    nameMappings: {
+      js: "string",
+      json: "string"
+    }
   }).Example("2021-04-18T22:30:15").Example("2021-04-18 22:30:15").Example("2021-04-18 22:30"),
   __metadata("design:paramtypes", [Object])
 ], DateTimeType);
@@ -4250,7 +4363,11 @@ __decorate([
 ], DateTimeStringType.prototype, "maxValue", void 0);
 DateTimeStringType = __decorate([
   SimpleType2({
-    description: "DateTime string value"
+    description: "DateTime string value",
+    nameMappings: {
+      js: "string",
+      json: "string"
+    }
   }).Example("2021-04-18T22:30:15+01:00", "Full date-time value with timezone").Example("2021-04-18T22:30:15", "Full date-time value without timezone").Example("2021-04-18 22:30", "Date-time value").Example("2021-04-18", "Date value").Example("2021-04", "Date value without day").Example("2021", "Year only value"),
   __metadata("design:paramtypes", [Object])
 ], DateTimeStringType);
@@ -4334,7 +4451,11 @@ __decorate([
 ], EmailType.prototype, "blacklistedChars", void 0);
 EmailType = __decorate([
   SimpleType2({
-    description: "An email value"
+    description: "An email value",
+    nameMappings: {
+      js: "string",
+      json: "string"
+    }
   }).Example("some.body@example.com"),
   __metadata("design:paramtypes", [Object])
 ], EmailType);
@@ -4383,7 +4504,11 @@ __decorate([
 ], FieldPathType.prototype, "allowSigns", void 0);
 FieldPathType = __decorate([
   SimpleType2({
-    description: "Field path"
+    description: "Field path",
+    nameMappings: {
+      js: "string",
+      json: "string"
+    }
   }),
   __metadata("design:paramtypes", [Object])
 ], FieldPathType);
@@ -12302,7 +12427,11 @@ __decorate([
 ], FilterType.prototype, "rules", void 0);
 FilterType = __decorate([
   SimpleType2({
-    description: "A query filter"
+    description: "A query filter",
+    nameMappings: {
+      js: "object",
+      json: "string"
+    }
   }),
   __metadata("design:paramtypes", [Object])
 ], FilterType);
@@ -12348,7 +12477,11 @@ var ObjectIdType = class ObjectIdType2 {
 };
 ObjectIdType = __decorate([
   SimpleType2({
-    description: "A MongoDB ObjectID value"
+    description: "A MongoDB ObjectID value",
+    nameMappings: {
+      js: "object",
+      json: "string"
+    }
   }),
   __metadata("design:paramtypes", [Object])
 ], ObjectIdType);
@@ -12462,7 +12595,11 @@ __decorate([
 ], TimeType.prototype, "maxValue", void 0);
 TimeType = __decorate([
   SimpleType2({
-    description: "Time string in 24h format"
+    description: "Time string in 24h format",
+    nameMappings: {
+      js: "string",
+      json: "string"
+    }
   }).Example("18:23:00", "Full time value").Example("18:23:00", "Time value without seconds"),
   __metadata("design:paramtypes", [Object])
 ], TimeType);
@@ -12486,7 +12623,11 @@ var UrlType = class UrlType2 {
 };
 UrlType = __decorate([
   SimpleType2({
-    description: "A Uniform Resource Identifier Reference (RFC 3986 icon) value"
+    description: "A Uniform Resource Identifier Reference (RFC 3986 icon) value",
+    nameMappings: {
+      js: "string",
+      json: "string"
+    }
   }).Example("http://tempuri.org"),
   __metadata("design:paramtypes", [Object])
 ], UrlType);
@@ -12516,7 +12657,11 @@ __decorate([
 ], UuidType.prototype, "version", void 0);
 UuidType = __decorate([
   SimpleType2({
-    description: "A Universal Unique Identifier (UUID) value"
+    description: "A Universal Unique Identifier (UUID) value",
+    nameMappings: {
+      js: "string",
+      json: "string"
+    }
   }),
   __metadata("design:paramtypes", [Object])
 ], UuidType);
@@ -12531,8 +12676,8 @@ HttpOperation2.Entity.Create = function(arg0, arg1) {
     args = { ...arg1, type: arg0 };
   const decoratorChain = [];
   const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-    description: args.description,
     method: "POST",
+    ...args,
     composition: "Entity.Create",
     requestBody: {
       immediateFetch: true,
@@ -12573,8 +12718,8 @@ HttpOperation2.Entity.Delete = function(arg0, arg1) {
     args = { ...arg1, type: arg0 };
   const decoratorChain = [];
   const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-    description: args.description,
     method: "DELETE",
+    ...args,
     composition: "Entity.Delete"
   }));
   decorator.Response(HttpStatusCode.OK, {
@@ -12587,11 +12732,21 @@ HttpOperation2.Entity.Delete = function(arg0, arg1) {
   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;
     });
     return decorator;
   };
@@ -12612,8 +12767,8 @@ HttpOperation2.Entity.DeleteMany = function(arg0, arg1) {
   const filterType = new FilterType({ dataType: args.type });
   filterType.rules = {};
   const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-    description: args.description,
     method: "DELETE",
+    ...args,
     composition: "Entity.DeleteMany"
   }));
   decorator.Response(HttpStatusCode.OK, {
@@ -12652,8 +12807,8 @@ HttpOperation2.Entity.FindMany = function(arg0, arg1) {
   const filterType = new FilterType({ dataType: args.type });
   filterType.rules = {};
   const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-    description: args.description,
     method: "GET",
+    ...args,
     composition: "Entity.FindMany"
   }));
   decorator.Response(HttpStatusCode.OK, {
@@ -12731,8 +12886,8 @@ HttpOperation2.Entity.Get = function(arg0, arg1) {
     args = { ...arg1, type: arg0 };
   const decoratorChain = [];
   const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-    description: args.description,
     method: "GET",
+    ...args,
     composition: "Entity.Get"
   }));
   decorator.QueryParam("projection", {
@@ -12757,11 +12912,21 @@ HttpOperation2.Entity.Get = function(arg0, arg1) {
   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;
     });
     return decorator;
   };
@@ -12782,8 +12947,8 @@ HttpOperation2.Entity.UpdateMany = function(arg0, arg1) {
   filterType.rules = {};
   const filterRules = new FilterRules();
   const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-    description: args.description,
     method: "PATCH",
+    ...args,
     composition: "Entity.UpdateMany",
     requestBody: {
       immediateFetch: true,
@@ -12829,8 +12994,8 @@ HttpOperation2.Entity.Update = function(arg0, arg1) {
   const filterType = new FilterType({ dataType: args.type });
   filterType.rules = {};
   const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-    description: args.description,
     method: "PATCH",
+    ...args,
     composition: "Entity.Update",
     requestBody: {
       partial: "deep",
@@ -12864,11 +13029,21 @@ HttpOperation2.Entity.Update = function(arg0, arg1) {
   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;
     });
     return decorator;
   };