@goast/kotlin 0.1.4 → 0.1.6

package/cjs/lib/generators/models/model-generator.js

@@ -107,7 +107,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
             .parenthesize('{}', (builder) => this.generateObjectInterfaceMembers(ctx, builder, schema), { multiline: true });
     }
     generateObjectInterfaceAnnotations(ctx, builder, schema) {
-        if (schema.discriminator) {
+        if (schema.discriminator && ctx.config.addJacksonAnnotations) {
             builder.appendAnnotation('JsonTypeInfo', 'com.fasterxml.jackson.annotation', [
                 ['use', 'JsonTypeInfo.Id.NAME'],
                 ['include', 'JsonTypeInfo.As.EXISTING_PROPERTY'],
@@ -155,22 +155,19 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
         }))
             .append(' ')
             .parenthesizeIf(schema.additionalProperties !== undefined && schema.additionalProperties !== false, '{}', (builder) => builder.if(schema.additionalProperties !== undefined && schema.additionalProperties !== false, (builder) => builder
-            .appendLine('@JsonIgnore')
-            .addImport('JsonIgnore', 'com.fasterxml.jackson.annotation')
+            .if(ctx.config.addJacksonAnnotations, (builder) => builder.appendLine('@JsonIgnore').addImport('JsonIgnore', 'com.fasterxml.jackson.annotation'))
             .append('val additionalProperties: Mutable')
             .append((builder) => this.generateMapType(ctx, builder, schema))
             .appendLine(' = mutableMapOf()')
             .appendLine()
-            .appendLine('@JsonAnySetter')
-            .addImport('JsonAnySetter', 'com.fasterxml.jackson.annotation')
+            .if(ctx.config.addJacksonAnnotations, (builder) => builder.appendLine('@JsonAnySetter').addImport('JsonAnySetter', 'com.fasterxml.jackson.annotation'))
             .append('fun set')
             .parenthesize('()', (builder) => builder.append('name: String, value: ').if(schema.additionalProperties === true, (builder) => builder.append('Any?'), (builder) => this.generateTypeUsage(ctx, builder, schema.additionalProperties)))
             .append(' ')
             .parenthesize('{}', 'this.additionalProperties[name] = value', { multiline: true })
             .appendLine()
             .appendLine()
-            .appendLine('@JsonAnyGetter')
-            .addImport('JsonAnyGetter', 'com.fasterxml.jackson.annotation')
+            .if(ctx.config.addJacksonAnnotations, (builder) => builder.appendLine('@JsonAnyGetter').addImport('JsonAnyGetter', 'com.fasterxml.jackson.annotation'))
             .append('fun getMap(): ')
             .append((builder) => this.generateMapType(ctx, builder, schema))
             .append(' ')
@@ -190,7 +187,15 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
                     builder.append(String(schema.default));
                     break;
                 case 'string':
-                    builder.append(this.toStringLiteral(ctx, String(schema.default)));
+                    if (schema.enum && schema.enum.length > 0) {
+                        builder
+                            .append((builder) => this.generateTypeUsage(ctx, builder, schema))
+                            .append('.')
+                            .append((0, core_1.toCasing)(String(schema.default), ctx.config.enumValueNameCasing));
+                    }
+                    else {
+                        builder.append(this.toStringLiteral(ctx, String(schema.default)));
+                    }
                     break;
                 default:
                     builder.append('null');
@@ -204,48 +209,52 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
         this.generateJsonPropertyAnnotation(ctx, builder, schema, property);
     }
     generatePropertyValidationAnnotations(ctx, builder, schema, property) {
-        if (property.schema.kind === 'string' && property.schema.pattern) {
-            builder
-                .append('@get:Pattern(regexp = ')
-                .append(this.toStringLiteral(ctx, property.schema.pattern))
-                .append(')')
-                .addImport('Pattern', 'jakarta.validation.constraints')
-                .appendLine();
-        }
-        if (this.shouldGenerateTypeDeclaration(ctx, property.schema)) {
-            builder.append('@field:Valid').addImport('Valid', 'jakarta.validation').appendLine();
+        if (ctx.config.addJakartaValidationAnnotations) {
+            if (property.schema.kind === 'string' && property.schema.pattern) {
+                builder
+                    .append('@get:Pattern(regexp = ')
+                    .append(this.toStringLiteral(ctx, property.schema.pattern))
+                    .append(')')
+                    .addImport('Pattern', 'jakarta.validation.constraints')
+                    .appendLine();
+            }
+            if (this.shouldGenerateTypeDeclaration(ctx, property.schema)) {
+                builder.append('@field:Valid').addImport('Valid', 'jakarta.validation').appendLine();
+            }
         }
     }
     generatePropertySchemaAnnotation(ctx, builder, schema, property) {
-        const parts = new Map();
-        if (property.schema.example !== undefined) {
-            parts.set('example', this.toStringLiteral(ctx, String(property.schema.example)));
-        }
-        if (schema.required.has(property.name)) {
-            parts.set('required', 'true');
-        }
-        if (property.schema.description !== undefined) {
-            parts.set('description', this.toStringLiteral(ctx, property.schema.description));
+        if (ctx.config.addSwaggerAnnotations) {
+            const parts = new Map();
+            if (property.schema.example !== undefined) {
+                parts.set('example', this.toStringLiteral(ctx, String(property.schema.example)));
+            }
+            if (schema.required.has(property.name)) {
+                parts.set('required', 'true');
+            }
+            if (property.schema.description !== undefined) {
+                parts.set('description', this.toStringLiteral(ctx, property.schema.description));
+            }
+            builder
+                .append('@Schema')
+                .addImport('Schema', 'io.swagger.v3.oas.annotations.media')
+                .parenthesizeIf(parts.size > 0, '()', (builder) => builder.forEach(parts.entries(), (builder, [key, value]) => builder.append(`${key} = ${value}`), {
+                separator: ', ',
+            }))
+                .appendLine();
         }
-        builder
-            .append('@Schema')
-            .addImport('Schema', 'io.swagger.v3.oas.annotations.media')
-            .parenthesizeIf(parts.size > 0, '()', (builder) => builder.forEach(parts.entries(), (builder, [key, value]) => builder.append(`${key} = ${value}`), {
-            separator: ', ',
-        }))
-            .appendLine();
     }
     generateJsonPropertyAnnotation(ctx, builder, schema, property, scope) {
         builder
+            .if(ctx.config.addJacksonAnnotations, (builder) => builder
             .append(`@${scope ? scope + ':' : ''}JsonProperty`)
             .addImport('JsonProperty', 'com.fasterxml.jackson.annotation')
             .parenthesize('()', (builder) => builder
             .append(this.toStringLiteral(ctx, property.name))
             .appendIf(schema.required.has(property.name), ', required = true'))
-            .appendLine()
+            .appendLine())
             .if(property.schema.custom['exclude-when-null'] === true, (builder) => builder
-            .append('@get:JsonInclude')
-            .addImport('JsonInclude', 'com.fasterxml.jackson.annotation')
+            .if(ctx.config.addJacksonAnnotations, (builder) => builder.append('@get:JsonInclude').addImport('JsonInclude', 'com.fasterxml.jackson.annotation'))
             .parenthesize('()', 'JsonInclude.Include.NON_NULL')
             .appendLine());
     }
@@ -344,10 +353,11 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
             .parenthesize('{}', (builder) => {
             var _a;
             return builder.forEach((_a = schema.enum) !== null && _a !== void 0 ? _a : [], (builder, value) => builder
+                .if(ctx.config.addJacksonAnnotations, (builder) => builder
                 .append('@JsonProperty')
                 .addImport('JsonProperty', 'com.fasterxml.jackson.annotation')
                 .parenthesize('()', this.toStringLiteral(ctx, String(value)))
-                .appendLine()
+                .appendLine())
                 .append((0, core_1.toCasing)(String(value), 'snake'))
                 .parenthesize('()', this.toStringLiteral(ctx, String(value))), { separator: (builder) => builder.appendLine(',').appendLine() });
         }, { multiline: true });

package/cjs/lib/generators/models/models.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultKotlinModelsGeneratorConfig = void 0;
 const config_1 = require("../../config");
-exports.defaultKotlinModelsGeneratorConfig = Object.assign(Object.assign({}, config_1.defaultKotlinGeneratorConfig), { packageName: 'com.openapi.generated', packageSuffix: '.model', oneOfBehavior: 'treat-as-any-of' });
+exports.defaultKotlinModelsGeneratorConfig = Object.assign(Object.assign({}, config_1.defaultKotlinGeneratorConfig), { packageName: 'com.openapi.generated', packageSuffix: '.model', oneOfBehavior: 'treat-as-any-of', addJacksonAnnotations: true, addJakartaValidationAnnotations: true, addSwaggerAnnotations: true });

package/cjs/lib/generators/services/spring-controllers/models.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultKotlinServicesGeneratorConfig = void 0;
 const config_1 = require("../../../config");
-exports.defaultKotlinServicesGeneratorConfig = Object.assign(Object.assign({}, config_1.defaultKotlinGeneratorConfig), { packageName: 'com.openapi.generated', packageSuffix: '.api' });
+exports.defaultKotlinServicesGeneratorConfig = Object.assign(Object.assign({}, config_1.defaultKotlinGeneratorConfig), { packageName: 'com.openapi.generated', packageSuffix: '.api', addSwaggerAnnotations: true, addJakartaValidationAnnotations: true });

package/cjs/lib/generators/services/spring-controllers/spring-controller-generator.js

@@ -69,32 +69,35 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         });
     }
     generateApiInterfaceMethodAnnnotations(ctx, builder, endpoint) {
-        var _a, _b, _c;
+        var _a;
         builder
-            .appendAnnotation('Operation', 'io.swagger.v3.oas.annotations', [
-            ['summary', this.toStringLiteral(ctx, (_a = endpoint.summary) === null || _a === void 0 ? void 0 : _a.trim())],
-            ['operationId', this.toStringLiteral(ctx, endpoint.name)],
-            ['description', this.toStringLiteral(ctx, (_b = endpoint.description) === null || _b === void 0 ? void 0 : _b.trim())],
-            [
-                'responses',
-                (builder) => builder.parenthesize('[]', (builder) => builder.forEach(endpoint.responses, (builder, response) => builder
-                    .append('ApiResponse')
-                    .addImport('ApiResponse', 'io.swagger.v3.oas.annotations.responses')
-                    .parenthesize('()', (builder) => {
-                    var _a, _b;
-                    return builder
-                        .append(`responseCode = ${this.toStringLiteral(ctx, (_a = response.statusCode) === null || _a === void 0 ? void 0 : _a.toString())}, `)
-                        .append(`description = ${this.toStringLiteral(ctx, (_b = response.description) === null || _b === void 0 ? void 0 : _b.trim())}`);
-                }), { separator: ',\n' }), { multiline: true }),
-                endpoint.responses.length > 0,
-            ],
-        ])
+            .if(ctx.config.addSwaggerAnnotations, (builder) => {
+            var _a, _b;
+            return builder.appendAnnotation('Operation', 'io.swagger.v3.oas.annotations', [
+                ['summary', this.toStringLiteral(ctx, (_a = endpoint.summary) === null || _a === void 0 ? void 0 : _a.trim())],
+                ['operationId', this.toStringLiteral(ctx, endpoint.name)],
+                ['description', this.toStringLiteral(ctx, (_b = endpoint.description) === null || _b === void 0 ? void 0 : _b.trim())],
+                [
+                    'responses',
+                    (builder) => builder.parenthesize('[]', (builder) => builder.forEach(endpoint.responses, (builder, response) => builder
+                        .append('ApiResponse')
+                        .addImport('ApiResponse', 'io.swagger.v3.oas.annotations.responses')
+                        .parenthesize('()', (builder) => {
+                        var _a, _b;
+                        return builder
+                            .append(`responseCode = ${this.toStringLiteral(ctx, (_a = response.statusCode) === null || _a === void 0 ? void 0 : _a.toString())}, `)
+                            .append(`description = ${this.toStringLiteral(ctx, (_b = response.description) === null || _b === void 0 ? void 0 : _b.trim())}`);
+                    }), { separator: ',\n' }), { multiline: true }),
+                    endpoint.responses.length > 0,
+                ],
+            ]);
+        })
             .appendAnnotation('RequestMapping', 'org.springframework.web.bind.annotation', [
             ['method', '[RequestMethod.' + endpoint.method.toUpperCase() + ']'],
             ['value', '[' + this.toStringLiteral(ctx, this.getEndpointPath(ctx, endpoint)) + ']'],
             [
                 'consumes',
-                '[' + ((_c = endpoint.requestBody) === null || _c === void 0 ? void 0 : _c.content.map((x) => this.toStringLiteral(ctx, x.type)).join(', ')) + ']',
+                '[' + ((_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content.map((x) => this.toStringLiteral(ctx, x.type)).join(', ')) + ']',
                 !!endpoint.requestBody && endpoint.requestBody.content.length > 0,
             ],
         ])
@@ -126,19 +129,21 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     generateApiInterfaceMethodParameterAnnotations(ctx, builder, endpoint, parameter) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const parameterSchemaInfo = this.getSchemaInfo(ctx, parameter.schema);
-        if (((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.default) !== undefined) {
-            builder.addImport('Schema', 'io.swagger.v3.oas.annotations.media');
+        if (ctx.config.addSwaggerAnnotations) {
+            if (((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.default) !== undefined) {
+                builder.addImport('Schema', 'io.swagger.v3.oas.annotations.media');
+            }
+            builder.appendAnnotation('Parameter', 'io.swagger.v3.oas.annotations', [
+                ['description', this.toStringLiteral(ctx, (_b = parameter.description) === null || _b === void 0 ? void 0 : _b.trim())],
+                ['required', (_c = parameter.required) === null || _c === void 0 ? void 0 : _c.toString()],
+                [
+                    'schema',
+                    `Schema(defaultValue = ${this.toStringLiteral(ctx, String((_d = parameter.schema) === null || _d === void 0 ? void 0 : _d.default))})`,
+                    ((_e = parameter.schema) === null || _e === void 0 ? void 0 : _e.default) !== undefined,
+                ],
+            ]);
         }
-        builder.appendAnnotation('Parameter', 'io.swagger.v3.oas.annotations', [
-            ['description', this.toStringLiteral(ctx, (_b = parameter.description) === null || _b === void 0 ? void 0 : _b.trim())],
-            ['required', (_c = parameter.required) === null || _c === void 0 ? void 0 : _c.toString()],
-            [
-                'schema',
-                `Schema(defaultValue = ${this.toStringLiteral(ctx, String((_d = parameter.schema) === null || _d === void 0 ? void 0 : _d.default))})`,
-                ((_e = parameter.schema) === null || _e === void 0 ? void 0 : _e.default) !== undefined,
-            ],
-        ]);
-        if (parameterSchemaInfo.packageName) {
+        if (parameterSchemaInfo.packageName && ctx.config.addJakartaValidationAnnotations) {
             builder.appendAnnotation('Valid', 'jakarta.validation');
         }
         if (parameter.target === 'body') {
@@ -198,9 +203,9 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     }
     generateApiControllerAnnotations(ctx, builder) {
         builder
-            .appendAnnotation('Generated', 'jakarta.annotation', [
+            .if(ctx.config.addJakartaValidationAnnotations, (builder) => builder.appendAnnotation('Generated', 'jakarta.annotation', [
             ['value', '[' + this.toStringLiteral(ctx, 'com.goast.kotlin.spring-service-generator') + ']'],
-        ])
+        ]))
             .appendAnnotation('Controller', 'org.springframework.stereotype')
             .appendAnnotation('RequestMapping', 'org.springframework.web.bind.annotation', [
             this.getControllerRequestMapping(ctx),
@@ -254,9 +259,11 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
             .parenthesize('{}', (builder) => this.generateApiDelegateInterfaceContent(ctx, builder), { multiline: true });
     }
     generateApiDelegateInterfaceAnnotations(ctx, builder) {
-        builder.appendAnnotation('Generated', 'jakarta.annotation', [
-            ['value', '[' + this.toStringLiteral(ctx, 'com.goast.kotlin.spring-service-generator') + ']'],
-        ]);
+        if (ctx.config.addJakartaValidationAnnotations) {
+            builder.appendAnnotation('Generated', 'jakarta.annotation', [
+                ['value', '[' + this.toStringLiteral(ctx, 'com.goast.kotlin.spring-service-generator') + ']'],
+            ]);
+        }
     }
     generateApiDelegateInterfaceSignature(ctx, builder) {
         builder.append('interface ').append(this.getApiDelegateInterfaceName(ctx));

package/esm/lib/generators/models/model-generator.js

@@ -104,7 +104,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             .parenthesize('{}', (builder) => this.generateObjectInterfaceMembers(ctx, builder, schema), { multiline: true });
     }
     generateObjectInterfaceAnnotations(ctx, builder, schema) {
-        if (schema.discriminator) {
+        if (schema.discriminator && ctx.config.addJacksonAnnotations) {
             builder.appendAnnotation('JsonTypeInfo', 'com.fasterxml.jackson.annotation', [
                 ['use', 'JsonTypeInfo.Id.NAME'],
                 ['include', 'JsonTypeInfo.As.EXISTING_PROPERTY'],
@@ -152,22 +152,19 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         }))
             .append(' ')
             .parenthesizeIf(schema.additionalProperties !== undefined && schema.additionalProperties !== false, '{}', (builder) => builder.if(schema.additionalProperties !== undefined && schema.additionalProperties !== false, (builder) => builder
-            .appendLine('@JsonIgnore')
-            .addImport('JsonIgnore', 'com.fasterxml.jackson.annotation')
+            .if(ctx.config.addJacksonAnnotations, (builder) => builder.appendLine('@JsonIgnore').addImport('JsonIgnore', 'com.fasterxml.jackson.annotation'))
             .append('val additionalProperties: Mutable')
             .append((builder) => this.generateMapType(ctx, builder, schema))
             .appendLine(' = mutableMapOf()')
             .appendLine()
-            .appendLine('@JsonAnySetter')
-            .addImport('JsonAnySetter', 'com.fasterxml.jackson.annotation')
+            .if(ctx.config.addJacksonAnnotations, (builder) => builder.appendLine('@JsonAnySetter').addImport('JsonAnySetter', 'com.fasterxml.jackson.annotation'))
             .append('fun set')
             .parenthesize('()', (builder) => builder.append('name: String, value: ').if(schema.additionalProperties === true, (builder) => builder.append('Any?'), (builder) => this.generateTypeUsage(ctx, builder, schema.additionalProperties)))
             .append(' ')
             .parenthesize('{}', 'this.additionalProperties[name] = value', { multiline: true })
             .appendLine()
             .appendLine()
-            .appendLine('@JsonAnyGetter')
-            .addImport('JsonAnyGetter', 'com.fasterxml.jackson.annotation')
+            .if(ctx.config.addJacksonAnnotations, (builder) => builder.appendLine('@JsonAnyGetter').addImport('JsonAnyGetter', 'com.fasterxml.jackson.annotation'))
             .append('fun getMap(): ')
             .append((builder) => this.generateMapType(ctx, builder, schema))
             .append(' ')
@@ -187,7 +184,15 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
                     builder.append(String(schema.default));
                     break;
                 case 'string':
-                    builder.append(this.toStringLiteral(ctx, String(schema.default)));
+                    if (schema.enum && schema.enum.length > 0) {
+                        builder
+                            .append((builder) => this.generateTypeUsage(ctx, builder, schema))
+                            .append('.')
+                            .append(toCasing(String(schema.default), ctx.config.enumValueNameCasing));
+                    }
+                    else {
+                        builder.append(this.toStringLiteral(ctx, String(schema.default)));
+                    }
                     break;
                 default:
                     builder.append('null');
@@ -201,48 +206,52 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         this.generateJsonPropertyAnnotation(ctx, builder, schema, property);
     }
     generatePropertyValidationAnnotations(ctx, builder, schema, property) {
-        if (property.schema.kind === 'string' && property.schema.pattern) {
-            builder
-                .append('@get:Pattern(regexp = ')
-                .append(this.toStringLiteral(ctx, property.schema.pattern))
-                .append(')')
-                .addImport('Pattern', 'jakarta.validation.constraints')
-                .appendLine();
-        }
-        if (this.shouldGenerateTypeDeclaration(ctx, property.schema)) {
-            builder.append('@field:Valid').addImport('Valid', 'jakarta.validation').appendLine();
+        if (ctx.config.addJakartaValidationAnnotations) {
+            if (property.schema.kind === 'string' && property.schema.pattern) {
+                builder
+                    .append('@get:Pattern(regexp = ')
+                    .append(this.toStringLiteral(ctx, property.schema.pattern))
+                    .append(')')
+                    .addImport('Pattern', 'jakarta.validation.constraints')
+                    .appendLine();
+            }
+            if (this.shouldGenerateTypeDeclaration(ctx, property.schema)) {
+                builder.append('@field:Valid').addImport('Valid', 'jakarta.validation').appendLine();
+            }
         }
     }
     generatePropertySchemaAnnotation(ctx, builder, schema, property) {
-        const parts = new Map();
-        if (property.schema.example !== undefined) {
-            parts.set('example', this.toStringLiteral(ctx, String(property.schema.example)));
-        }
-        if (schema.required.has(property.name)) {
-            parts.set('required', 'true');
-        }
-        if (property.schema.description !== undefined) {
-            parts.set('description', this.toStringLiteral(ctx, property.schema.description));
+        if (ctx.config.addSwaggerAnnotations) {
+            const parts = new Map();
+            if (property.schema.example !== undefined) {
+                parts.set('example', this.toStringLiteral(ctx, String(property.schema.example)));
+            }
+            if (schema.required.has(property.name)) {
+                parts.set('required', 'true');
+            }
+            if (property.schema.description !== undefined) {
+                parts.set('description', this.toStringLiteral(ctx, property.schema.description));
+            }
+            builder
+                .append('@Schema')
+                .addImport('Schema', 'io.swagger.v3.oas.annotations.media')
+                .parenthesizeIf(parts.size > 0, '()', (builder) => builder.forEach(parts.entries(), (builder, [key, value]) => builder.append(`${key} = ${value}`), {
+                separator: ', ',
+            }))
+                .appendLine();
         }
-        builder
-            .append('@Schema')
-            .addImport('Schema', 'io.swagger.v3.oas.annotations.media')
-            .parenthesizeIf(parts.size > 0, '()', (builder) => builder.forEach(parts.entries(), (builder, [key, value]) => builder.append(`${key} = ${value}`), {
-            separator: ', ',
-        }))
-            .appendLine();
     }
     generateJsonPropertyAnnotation(ctx, builder, schema, property, scope) {
         builder
+            .if(ctx.config.addJacksonAnnotations, (builder) => builder
             .append(`@${scope ? scope + ':' : ''}JsonProperty`)
             .addImport('JsonProperty', 'com.fasterxml.jackson.annotation')
             .parenthesize('()', (builder) => builder
             .append(this.toStringLiteral(ctx, property.name))
             .appendIf(schema.required.has(property.name), ', required = true'))
-            .appendLine()
+            .appendLine())
             .if(property.schema.custom['exclude-when-null'] === true, (builder) => builder
-            .append('@get:JsonInclude')
-            .addImport('JsonInclude', 'com.fasterxml.jackson.annotation')
+            .if(ctx.config.addJacksonAnnotations, (builder) => builder.append('@get:JsonInclude').addImport('JsonInclude', 'com.fasterxml.jackson.annotation'))
             .parenthesize('()', 'JsonInclude.Include.NON_NULL')
             .appendLine());
     }
@@ -341,10 +350,11 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             .parenthesize('{}', (builder) => {
             var _a;
             return builder.forEach((_a = schema.enum) !== null && _a !== void 0 ? _a : [], (builder, value) => builder
+                .if(ctx.config.addJacksonAnnotations, (builder) => builder
                 .append('@JsonProperty')
                 .addImport('JsonProperty', 'com.fasterxml.jackson.annotation')
                 .parenthesize('()', this.toStringLiteral(ctx, String(value)))
-                .appendLine()
+                .appendLine())
                 .append(toCasing(String(value), 'snake'))
                 .parenthesize('()', this.toStringLiteral(ctx, String(value))), { separator: (builder) => builder.appendLine(',').appendLine() });
         }, { multiline: true });

package/esm/lib/generators/models/models.js

@@ -1,2 +1,2 @@
 import { defaultKotlinGeneratorConfig } from '../../config';
-export const defaultKotlinModelsGeneratorConfig = Object.assign(Object.assign({}, defaultKotlinGeneratorConfig), { packageName: 'com.openapi.generated', packageSuffix: '.model', oneOfBehavior: 'treat-as-any-of' });
+export const defaultKotlinModelsGeneratorConfig = Object.assign(Object.assign({}, defaultKotlinGeneratorConfig), { packageName: 'com.openapi.generated', packageSuffix: '.model', oneOfBehavior: 'treat-as-any-of', addJacksonAnnotations: true, addJakartaValidationAnnotations: true, addSwaggerAnnotations: true });

package/esm/lib/generators/services/spring-controllers/models.js

@@ -1,2 +1,2 @@
 import { defaultKotlinGeneratorConfig } from '../../../config';
-export const defaultKotlinServicesGeneratorConfig = Object.assign(Object.assign({}, defaultKotlinGeneratorConfig), { packageName: 'com.openapi.generated', packageSuffix: '.api' });
+export const defaultKotlinServicesGeneratorConfig = Object.assign(Object.assign({}, defaultKotlinGeneratorConfig), { packageName: 'com.openapi.generated', packageSuffix: '.api', addSwaggerAnnotations: true, addJakartaValidationAnnotations: true });

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

@@ -66,32 +66,35 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         });
     }
     generateApiInterfaceMethodAnnnotations(ctx, builder, endpoint) {
-        var _a, _b, _c;
+        var _a;
         builder
-            .appendAnnotation('Operation', 'io.swagger.v3.oas.annotations', [
-            ['summary', this.toStringLiteral(ctx, (_a = endpoint.summary) === null || _a === void 0 ? void 0 : _a.trim())],
-            ['operationId', this.toStringLiteral(ctx, endpoint.name)],
-            ['description', this.toStringLiteral(ctx, (_b = endpoint.description) === null || _b === void 0 ? void 0 : _b.trim())],
-            [
-                'responses',
-                (builder) => builder.parenthesize('[]', (builder) => builder.forEach(endpoint.responses, (builder, response) => builder
-                    .append('ApiResponse')
-                    .addImport('ApiResponse', 'io.swagger.v3.oas.annotations.responses')
-                    .parenthesize('()', (builder) => {
-                    var _a, _b;
-                    return builder
-                        .append(`responseCode = ${this.toStringLiteral(ctx, (_a = response.statusCode) === null || _a === void 0 ? void 0 : _a.toString())}, `)
-                        .append(`description = ${this.toStringLiteral(ctx, (_b = response.description) === null || _b === void 0 ? void 0 : _b.trim())}`);
-                }), { separator: ',\n' }), { multiline: true }),
-                endpoint.responses.length > 0,
-            ],
-        ])
+            .if(ctx.config.addSwaggerAnnotations, (builder) => {
+            var _a, _b;
+            return builder.appendAnnotation('Operation', 'io.swagger.v3.oas.annotations', [
+                ['summary', this.toStringLiteral(ctx, (_a = endpoint.summary) === null || _a === void 0 ? void 0 : _a.trim())],
+                ['operationId', this.toStringLiteral(ctx, endpoint.name)],
+                ['description', this.toStringLiteral(ctx, (_b = endpoint.description) === null || _b === void 0 ? void 0 : _b.trim())],
+                [
+                    'responses',
+                    (builder) => builder.parenthesize('[]', (builder) => builder.forEach(endpoint.responses, (builder, response) => builder
+                        .append('ApiResponse')
+                        .addImport('ApiResponse', 'io.swagger.v3.oas.annotations.responses')
+                        .parenthesize('()', (builder) => {
+                        var _a, _b;
+                        return builder
+                            .append(`responseCode = ${this.toStringLiteral(ctx, (_a = response.statusCode) === null || _a === void 0 ? void 0 : _a.toString())}, `)
+                            .append(`description = ${this.toStringLiteral(ctx, (_b = response.description) === null || _b === void 0 ? void 0 : _b.trim())}`);
+                    }), { separator: ',\n' }), { multiline: true }),
+                    endpoint.responses.length > 0,
+                ],
+            ]);
+        })
             .appendAnnotation('RequestMapping', 'org.springframework.web.bind.annotation', [
             ['method', '[RequestMethod.' + endpoint.method.toUpperCase() + ']'],
             ['value', '[' + this.toStringLiteral(ctx, this.getEndpointPath(ctx, endpoint)) + ']'],
             [
                 'consumes',
-                '[' + ((_c = endpoint.requestBody) === null || _c === void 0 ? void 0 : _c.content.map((x) => this.toStringLiteral(ctx, x.type)).join(', ')) + ']',
+                '[' + ((_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content.map((x) => this.toStringLiteral(ctx, x.type)).join(', ')) + ']',
                 !!endpoint.requestBody && endpoint.requestBody.content.length > 0,
             ],
         ])
@@ -123,19 +126,21 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     generateApiInterfaceMethodParameterAnnotations(ctx, builder, endpoint, parameter) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const parameterSchemaInfo = this.getSchemaInfo(ctx, parameter.schema);
-        if (((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.default) !== undefined) {
-            builder.addImport('Schema', 'io.swagger.v3.oas.annotations.media');
+        if (ctx.config.addSwaggerAnnotations) {
+            if (((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.default) !== undefined) {
+                builder.addImport('Schema', 'io.swagger.v3.oas.annotations.media');
+            }
+            builder.appendAnnotation('Parameter', 'io.swagger.v3.oas.annotations', [
+                ['description', this.toStringLiteral(ctx, (_b = parameter.description) === null || _b === void 0 ? void 0 : _b.trim())],
+                ['required', (_c = parameter.required) === null || _c === void 0 ? void 0 : _c.toString()],
+                [
+                    'schema',
+                    `Schema(defaultValue = ${this.toStringLiteral(ctx, String((_d = parameter.schema) === null || _d === void 0 ? void 0 : _d.default))})`,
+                    ((_e = parameter.schema) === null || _e === void 0 ? void 0 : _e.default) !== undefined,
+                ],
+            ]);
         }
-        builder.appendAnnotation('Parameter', 'io.swagger.v3.oas.annotations', [
-            ['description', this.toStringLiteral(ctx, (_b = parameter.description) === null || _b === void 0 ? void 0 : _b.trim())],
-            ['required', (_c = parameter.required) === null || _c === void 0 ? void 0 : _c.toString()],
-            [
-                'schema',
-                `Schema(defaultValue = ${this.toStringLiteral(ctx, String((_d = parameter.schema) === null || _d === void 0 ? void 0 : _d.default))})`,
-                ((_e = parameter.schema) === null || _e === void 0 ? void 0 : _e.default) !== undefined,
-            ],
-        ]);
-        if (parameterSchemaInfo.packageName) {
+        if (parameterSchemaInfo.packageName && ctx.config.addJakartaValidationAnnotations) {
             builder.appendAnnotation('Valid', 'jakarta.validation');
         }
         if (parameter.target === 'body') {
@@ -195,9 +200,9 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     }
     generateApiControllerAnnotations(ctx, builder) {
         builder
-            .appendAnnotation('Generated', 'jakarta.annotation', [
+            .if(ctx.config.addJakartaValidationAnnotations, (builder) => builder.appendAnnotation('Generated', 'jakarta.annotation', [
             ['value', '[' + this.toStringLiteral(ctx, 'com.goast.kotlin.spring-service-generator') + ']'],
-        ])
+        ]))
             .appendAnnotation('Controller', 'org.springframework.stereotype')
             .appendAnnotation('RequestMapping', 'org.springframework.web.bind.annotation', [
             this.getControllerRequestMapping(ctx),
@@ -251,9 +256,11 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
             .parenthesize('{}', (builder) => this.generateApiDelegateInterfaceContent(ctx, builder), { multiline: true });
     }
     generateApiDelegateInterfaceAnnotations(ctx, builder) {
-        builder.appendAnnotation('Generated', 'jakarta.annotation', [
-            ['value', '[' + this.toStringLiteral(ctx, 'com.goast.kotlin.spring-service-generator') + ']'],
-        ]);
+        if (ctx.config.addJakartaValidationAnnotations) {
+            builder.appendAnnotation('Generated', 'jakarta.annotation', [
+                ['value', '[' + this.toStringLiteral(ctx, 'com.goast.kotlin.spring-service-generator') + ']'],
+            ]);
+        }
     }
     generateApiDelegateInterfaceSignature(ctx, builder) {
         builder.append('interface ').append(this.getApiDelegateInterfaceName(ctx));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",

package/types/lib/generators/models/models.d.ts

@@ -5,6 +5,9 @@ export type KotlinModelsGeneratorConfig = KotlinGeneratorConfig & {
     packageName: string;
     packageSuffix: string;
     oneOfBehavior: 'treat-as-any-of' | 'treat-as-all-of';
+    addJacksonAnnotations: boolean;
+    addJakartaValidationAnnotations: boolean;
+    addSwaggerAnnotations: boolean;
 };
 export declare const defaultKotlinModelsGeneratorConfig: DefaultGenerationProviderConfig<KotlinModelsGeneratorConfig>;
 export type KotlinModelsGeneratorInput = {};

package/types/lib/generators/services/spring-controllers/models.d.ts

@@ -7,6 +7,8 @@ export type KotlinServicesGeneratorConfig = KotlinGeneratorConfig & {
     packageSuffix: string;
     basePath?: string | RegExp | ((basePath: string, service: ApiService) => string);
     pathModifier?: RegExp | ((path: string, endpoint: ApiEndpoint) => string);
+    addSwaggerAnnotations: boolean;
+    addJakartaValidationAnnotations: boolean;
 };
 export declare const defaultKotlinServicesGeneratorConfig: DefaultGenerationProviderConfig<KotlinServicesGeneratorConfig>;
 export type KotlinServicesGeneratorInput = KotlinModelsGeneratorOutput;