@goast/kotlin 0.4.16 → 0.4.17

package/esm/src/generators/services/spring-controllers/spring-controller-generator.js

@@ -146,7 +146,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     getApiInterfaceEndpointMethodParameter(ctx, endpoint, parameter) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const isEnumSchema = ((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.kind) === 'string' && ((_b = parameter.schema.enum) === null || _b === void 0 ? void 0 : _b.length) &&
-            this.getSchemaType(ctx, { schema: parameter.schema });
+            this.getSchemaType(ctx, { schema: parameter.schema }) && !parameter.multipart;
         const actualType = this.getSchemaType(ctx, { schema: parameter.schema });
         const schemaType = isEnumSchema ? kt.refs.string({ nullable: actualType === null || actualType === void 0 ? void 0 : actualType.nullable }) : actualType;
         const result = kt.parameter(toCasing(parameter.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter, type: isEnumSchema ? schemaType : undefined }), {
@@ -209,7 +209,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         parameters.forEach((x) => {
             var _a, _b;
             const paramName = toCasing(x.name, ctx.config.parameterNameCasing);
-            if (((_a = x.schema) === null || _a === void 0 ? void 0 : _a.kind) === 'string' && ((_b = x.schema.enum) === null || _b === void 0 ? void 0 : _b.length)) {
+            if (((_a = x.schema) === null || _a === void 0 ? void 0 : _a.kind) === 'string' && ((_b = x.schema.enum) === null || _b === void 0 ? void 0 : _b.length) && !x.multipart) {
                 const type = this.getSchemaType(ctx, { schema: x.schema });
                 if (type) {
                     body.values.push(s `val ${paramName} = ${paramName}${type.nullable || !x.required ? '?' : ''}.let { ${type}.fromValue(it) ?: return ${kt.refs.spring.responseEntity.infer()}.status(${kt.refs.spring.httpStatus()}.BAD_REQUEST).body(${kt.string(`Invalid value for parameter ${x.name}`)}) }`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.4.16",
+  "version": "0.4.17",
   "description": "Provides gOAst generators for generating Kotlin code from OpenAPI specifications.",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",

package/script/src/generators/services/spring-controllers/spring-controller-generator.js

@@ -151,7 +151,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
     getApiInterfaceEndpointMethodParameter(ctx, endpoint, parameter) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const isEnumSchema = ((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.kind) === 'string' && ((_b = parameter.schema.enum) === null || _b === void 0 ? void 0 : _b.length) &&
-            this.getSchemaType(ctx, { schema: parameter.schema });
+            this.getSchemaType(ctx, { schema: parameter.schema }) && !parameter.multipart;
         const actualType = this.getSchemaType(ctx, { schema: parameter.schema });
         const schemaType = isEnumSchema ? index_js_1.kt.refs.string({ nullable: actualType === null || actualType === void 0 ? void 0 : actualType.nullable }) : actualType;
         const result = index_js_1.kt.parameter((0, core_1.toCasing)(parameter.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter, type: isEnumSchema ? schemaType : undefined }), {
@@ -214,7 +214,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
         parameters.forEach((x) => {
             var _a, _b;
             const paramName = (0, core_1.toCasing)(x.name, ctx.config.parameterNameCasing);
-            if (((_a = x.schema) === null || _a === void 0 ? void 0 : _a.kind) === 'string' && ((_b = x.schema.enum) === null || _b === void 0 ? void 0 : _b.length)) {
+            if (((_a = x.schema) === null || _a === void 0 ? void 0 : _a.kind) === 'string' && ((_b = x.schema.enum) === null || _b === void 0 ? void 0 : _b.length) && !x.multipart) {
                 const type = this.getSchemaType(ctx, { schema: x.schema });
                 if (type) {
                     body.values.push((0, core_1.builderTemplate) `val ${paramName} = ${paramName}${type.nullable || !x.required ? '?' : ''}.let { ${type}.fromValue(it) ?: return ${index_js_1.kt.refs.spring.responseEntity.infer()}.status(${index_js_1.kt.refs.spring.httpStatus()}.BAD_REQUEST).body(${index_js_1.kt.string(`Invalid value for parameter ${x.name}`)}) }`);

package/src/src/generators/services/spring-controllers/spring-controller-generator.ts

@@ -232,7 +232,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator<
     parameter: ApiParameterWithMultipartInfo,
   ): kt.Parameter<Builder> {
     const isEnumSchema = parameter.schema?.kind === 'string' && parameter.schema.enum?.length &&
-      this.getSchemaType(ctx, { schema: parameter.schema });
+      this.getSchemaType(ctx, { schema: parameter.schema }) && !parameter.multipart;
     const actualType = this.getSchemaType(ctx, { schema: parameter.schema });
     const schemaType = isEnumSchema ? kt.refs.string({ nullable: actualType?.nullable }) : actualType;
     const result = kt.parameter(
@@ -320,13 +320,13 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator<
   private getApiInterfaceEndpointMethodBody(
     ctx: Context,
     endpoint: ApiEndpoint,
-    parameters: ApiParameter[],
+    parameters: ApiParameterWithMultipartInfo[],
   ): AppendValueGroup<Builder> {
     const body = appendValueGroup<Builder>([], '\n');
 
     parameters.forEach((x) => {
       const paramName = toCasing(x.name, ctx.config.parameterNameCasing);
-      if (x.schema?.kind === 'string' && x.schema.enum?.length) {
+      if (x.schema?.kind === 'string' && x.schema.enum?.length && !x.multipart) {
         const type = this.getSchemaType(ctx, { schema: x.schema });
         if (type) {
           body.values.push(