@goast/kotlin 0.1.5 → 0.1.7

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'],
@@ -132,49 +132,50 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
             .append((builder) => this.generateTypeUsage(ctx, builder, property.schema))
             .if(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?').append(' = null')));
     }
-    generateObjectDataClass(ctx, builder, schema) {
-        const inheritedSchemas = schema.inheritedSchemas
-            .filter((x) => this.shouldGenerateTypeDeclaration(ctx, x) && !x.isNameGenerated)
-            .filter((item, index, self) => self.indexOf(item) === index);
+    generateObjectDataClassProperty(ctx, builder, schema, inheritedSchemas, property) {
         builder
-            .append((builder) => this.generateDocumentation(ctx, builder, schema))
-            .append('data class ')
-            .append(this.getDeclarationTypeName(ctx, schema))
-            .parenthesizeIf(schema.properties.size > 0, '()', (builder) => builder.forEach(this.sortProperties(ctx, schema, schema.properties.values()), (builder, property) => builder
             .ensurePreviousLineEmpty()
             .append((builder) => this.generateObjectDataClassParameterAnnotations(ctx, builder, schema, property))
             .appendIf(inheritedSchemas.some((x) => this.hasProperty(ctx, x, property.name)), 'override ')
             .append(`val ${(0, core_1.toCasing)(property.name, 'camel')}: `)
             .append((builder) => this.generateTypeUsage(ctx, builder, property.schema))
             .if(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?'))
-            .appendIf(property.schema.default !== undefined || !schema.required.has(property.name), ' = ', (builder) => this.generateDefaultValue(ctx, builder, property.schema)), { separator: ',\n' }), { multiline: true })
+            .appendIf(property.schema.default !== undefined || !schema.required.has(property.name), ' = ', (builder) => this.generateDefaultValue(ctx, builder, property.schema));
+    }
+    generateObjectDataClass(ctx, builder, schema) {
+        const inheritedSchemas = this.getInheritedSchemas(ctx, schema);
+        const { params, properties } = this.classifyClassProperties(ctx, schema);
+        builder
+            .append((builder) => this.generateDocumentation(ctx, builder, schema))
+            .append('data class ')
+            .append(this.getDeclarationTypeName(ctx, schema))
+            .parenthesizeIf(schema.properties.size > 0, '()', (builder) => builder.forEach(params, (builder, property) => this.generateObjectDataClassProperty(ctx, builder, schema, inheritedSchemas, property), { separator: ',\n' }), { multiline: true })
             .if(inheritedSchemas.length > 0, (builder) => builder
             .append(' : ')
             .forEach(inheritedSchemas, (builder, schema) => this.generateTypeUsage(ctx, builder, schema), {
             separator: ', ',
         }))
             .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')
+            .parenthesizeIf((schema.additionalProperties !== undefined && schema.additionalProperties !== false) || properties.length > 0, '{}', (builder) => builder
+            .if(schema.additionalProperties !== undefined && schema.additionalProperties !== false, (builder) => builder
+            .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(' ')
-            .parenthesize('{}', 'return this.additionalProperties', { multiline: true })), { multiline: true });
+            .parenthesize('{}', 'return this.additionalProperties', { multiline: true }))
+            .forEach(properties, (builder, property) => this.generateObjectDataClassProperty(ctx, builder, schema, inheritedSchemas, property), { separator: ',\n' }), { multiline: true });
     }
     generateDefaultValue(ctx, builder, schema) {
         if (schema.default === null || schema.default === undefined) {
@@ -212,48 +213,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());
     }
@@ -352,10 +357,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 });
@@ -408,10 +414,36 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
     getDeclarationTypeName(ctx, schema) {
         return (0, core_1.toCasing)(schema.name, 'pascal');
     }
+    getInheritedSchemas(ctx, schema) {
+        return schema.inheritedSchemas
+            .filter((x) => this.shouldGenerateTypeDeclaration(ctx, x) && !x.isNameGenerated)
+            .filter((item, index, self) => self.indexOf(item) === index);
+    }
+    classifyClassProperties(ctx, schema) {
+        var _a, _b;
+        const inheritedSchemas = this.getInheritedSchemas(ctx, schema);
+        const result = { params: [], properties: [] };
+        for (const property of schema.properties.values()) {
+            const discriminator = (_a = inheritedSchemas.find((x) => { var _a; return ((_a = x.discriminator) === null || _a === void 0 ? void 0 : _a.propertyName) === property.name; })) === null || _a === void 0 ? void 0 : _a.discriminator;
+            if (discriminator) {
+                const value = (_b = Object.entries(discriminator.mapping).find(([_, v]) => v.id === schema.id)) === null || _b === void 0 ? void 0 : _b[0];
+                if (value) {
+                    const p = (0, core_1.createOverwriteProxy)(property);
+                    const s = (0, core_1.createOverwriteProxy)(p.schema);
+                    p.schema = s;
+                    s.default = value;
+                    result.properties.push(p);
+                    continue;
+                }
+            }
+            result.params.push(property);
+        }
+        return result;
+    }
     sortProperties(ctx, schema, properties) {
         return [...properties].sort((a, b) => {
-            const aRequired = schema.required.has(a.name) ? 1 : 0;
-            const bRequired = schema.required.has(b.name) ? 1 : 0;
+            const aRequired = schema.required.has(a.name) || schema.default ? 1 : 0;
+            const bRequired = schema.required.has(b.name) || schema.default ? 1 : 0;
             return bRequired - aRequired;
         });
     }

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

@@ -1,6 +1,6 @@
 import { dirname } from 'path';
 import { ensureDirSync, writeFileSync } from 'fs-extra';
-import { getSchemaReference, resolveAnyOfAndAllOf, toCasing, } from '@goast/core';
+import { createOverwriteProxy, getSchemaReference, resolveAnyOfAndAllOf, toCasing, } from '@goast/core';
 import { KotlinFileBuilder } from '../../file-builder';
 import { KotlinFileGenerator } from '../file-generator';
 export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
@@ -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'],
@@ -129,49 +129,50 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             .append((builder) => this.generateTypeUsage(ctx, builder, property.schema))
             .if(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?').append(' = null')));
     }
-    generateObjectDataClass(ctx, builder, schema) {
-        const inheritedSchemas = schema.inheritedSchemas
-            .filter((x) => this.shouldGenerateTypeDeclaration(ctx, x) && !x.isNameGenerated)
-            .filter((item, index, self) => self.indexOf(item) === index);
+    generateObjectDataClassProperty(ctx, builder, schema, inheritedSchemas, property) {
         builder
-            .append((builder) => this.generateDocumentation(ctx, builder, schema))
-            .append('data class ')
-            .append(this.getDeclarationTypeName(ctx, schema))
-            .parenthesizeIf(schema.properties.size > 0, '()', (builder) => builder.forEach(this.sortProperties(ctx, schema, schema.properties.values()), (builder, property) => builder
             .ensurePreviousLineEmpty()
             .append((builder) => this.generateObjectDataClassParameterAnnotations(ctx, builder, schema, property))
             .appendIf(inheritedSchemas.some((x) => this.hasProperty(ctx, x, property.name)), 'override ')
             .append(`val ${toCasing(property.name, 'camel')}: `)
             .append((builder) => this.generateTypeUsage(ctx, builder, property.schema))
             .if(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?'))
-            .appendIf(property.schema.default !== undefined || !schema.required.has(property.name), ' = ', (builder) => this.generateDefaultValue(ctx, builder, property.schema)), { separator: ',\n' }), { multiline: true })
+            .appendIf(property.schema.default !== undefined || !schema.required.has(property.name), ' = ', (builder) => this.generateDefaultValue(ctx, builder, property.schema));
+    }
+    generateObjectDataClass(ctx, builder, schema) {
+        const inheritedSchemas = this.getInheritedSchemas(ctx, schema);
+        const { params, properties } = this.classifyClassProperties(ctx, schema);
+        builder
+            .append((builder) => this.generateDocumentation(ctx, builder, schema))
+            .append('data class ')
+            .append(this.getDeclarationTypeName(ctx, schema))
+            .parenthesizeIf(schema.properties.size > 0, '()', (builder) => builder.forEach(params, (builder, property) => this.generateObjectDataClassProperty(ctx, builder, schema, inheritedSchemas, property), { separator: ',\n' }), { multiline: true })
             .if(inheritedSchemas.length > 0, (builder) => builder
             .append(' : ')
             .forEach(inheritedSchemas, (builder, schema) => this.generateTypeUsage(ctx, builder, schema), {
             separator: ', ',
         }))
             .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')
+            .parenthesizeIf((schema.additionalProperties !== undefined && schema.additionalProperties !== false) || properties.length > 0, '{}', (builder) => builder
+            .if(schema.additionalProperties !== undefined && schema.additionalProperties !== false, (builder) => builder
+            .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(' ')
-            .parenthesize('{}', 'return this.additionalProperties', { multiline: true })), { multiline: true });
+            .parenthesize('{}', 'return this.additionalProperties', { multiline: true }))
+            .forEach(properties, (builder, property) => this.generateObjectDataClassProperty(ctx, builder, schema, inheritedSchemas, property), { separator: ',\n' }), { multiline: true });
     }
     generateDefaultValue(ctx, builder, schema) {
         if (schema.default === null || schema.default === undefined) {
@@ -209,48 +210,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());
     }
@@ -349,10 +354,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 });
@@ -405,10 +411,36 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
     getDeclarationTypeName(ctx, schema) {
         return toCasing(schema.name, 'pascal');
     }
+    getInheritedSchemas(ctx, schema) {
+        return schema.inheritedSchemas
+            .filter((x) => this.shouldGenerateTypeDeclaration(ctx, x) && !x.isNameGenerated)
+            .filter((item, index, self) => self.indexOf(item) === index);
+    }
+    classifyClassProperties(ctx, schema) {
+        var _a, _b;
+        const inheritedSchemas = this.getInheritedSchemas(ctx, schema);
+        const result = { params: [], properties: [] };
+        for (const property of schema.properties.values()) {
+            const discriminator = (_a = inheritedSchemas.find((x) => { var _a; return ((_a = x.discriminator) === null || _a === void 0 ? void 0 : _a.propertyName) === property.name; })) === null || _a === void 0 ? void 0 : _a.discriminator;
+            if (discriminator) {
+                const value = (_b = Object.entries(discriminator.mapping).find(([_, v]) => v.id === schema.id)) === null || _b === void 0 ? void 0 : _b[0];
+                if (value) {
+                    const p = createOverwriteProxy(property);
+                    const s = createOverwriteProxy(p.schema);
+                    p.schema = s;
+                    s.default = value;
+                    result.properties.push(p);
+                    continue;
+                }
+            }
+            result.params.push(property);
+        }
+        return result;
+    }
     sortProperties(ctx, schema, properties) {
         return [...properties].sort((a, b) => {
-            const aRequired = schema.required.has(a.name) ? 1 : 0;
-            const bRequired = schema.required.has(b.name) ? 1 : 0;
+            const aRequired = schema.required.has(a.name) || schema.default ? 1 : 0;
+            const bRequired = schema.required.has(b.name) || schema.default ? 1 : 0;
             return bRequired - aRequired;
         });
     }

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.5",
+  "version": "0.1.7",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",

package/types/lib/generators/models/model-generator.d.ts

@@ -18,6 +18,7 @@ export declare class DefaultKotlinModelGenerator extends KotlinFileGenerator<Con
     protected generateObjectInterfaceAnnotations(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
     protected generateObjectInterfaceSignature(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
     protected generateObjectInterfaceMembers(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
+    protected generateObjectDataClassProperty(ctx: Context, builder: Builder, schema: ApiSchema<'object'>, inheritedSchemas: ApiSchema[], property: ApiSchemaProperty): void;
     protected generateObjectDataClass(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
     protected generateDefaultValue(ctx: Context, builder: Builder, schema: ApiSchema): void;
     protected generateObjectDataClassParameterAnnotations(ctx: Context, builder: Builder, schema: ApiSchema, property: ApiSchemaProperty): void;
@@ -33,6 +34,11 @@ export declare class DefaultKotlinModelGenerator extends KotlinFileGenerator<Con
     protected generateDocumentation(ctx: Context, builder: Builder, schema: ApiSchema): void;
     protected shouldGenerateTypeDeclaration(ctx: Context, schema: ApiSchema): boolean;
     protected getDeclarationTypeName(ctx: Context, schema: ApiSchema): string;
+    protected getInheritedSchemas(ctx: KotlinModelGeneratorContext, schema: ApiSchema): ApiSchema<import("@goast/core").ApiSchemaKind>[];
+    protected classifyClassProperties(ctx: Context, schema: ApiSchema<'object'>): {
+        params: ApiSchemaProperty[];
+        properties: ApiSchemaProperty[];
+    };
     protected sortProperties(ctx: Context, schema: ApiSchema, properties: Iterable<ApiSchemaProperty>): ApiSchemaProperty[];
     private normalizeSchema;
     private hasProperty;

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;