@goast/kotlin 0.0.7 → 0.1.0

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

@@ -30,11 +30,11 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     }
     generateApiInterfaceFileContent(ctx, builder) {
         builder
-            .apply((builder) => this.generateApiInterfaceAnnotations(ctx, builder))
+            .append((builder) => this.generateApiInterfaceAnnotations(ctx, builder))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateApiInterfaceSignature(ctx, builder))
+            .append((builder) => this.generateApiInterfaceSignature(ctx, builder))
             .append(' ')
-            .parenthesizeMultiline('{}', (builder) => this.generateApiInterfaceContent(ctx, builder));
+            .parenthesize('{}', (builder) => this.generateApiInterfaceContent(ctx, builder), { multiline: true });
     }
     generateApiInterfaceAnnotations(ctx, builder) {
         builder
@@ -48,23 +48,25 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     }
     generateApiInterfaceContent(ctx, builder) {
         builder
-            .apply((builder) => this.generateApiInterfaceDelegateAccessor(ctx, builder))
+            .append((builder) => this.generateApiInterfaceDelegateAccessor(ctx, builder))
             .ensurePreviousLineEmpty()
-            .apply((builder) => this.generateApiInterfaceMethods(ctx, builder));
+            .append((builder) => this.generateApiInterfaceMethods(ctx, builder));
     }
     generateApiInterfaceDelegateAccessor(ctx, builder) {
         builder.appendLine(`fun getDelegate(): ${this.getApiDelegateInterfaceName(ctx)} = object : ${this.getApiDelegateInterfaceName(ctx)} {}`);
     }
     generateApiInterfaceMethods(ctx, builder) {
-        builder.forEach(ctx.service.endpoints, (builder, endpoint) => builder.ensurePreviousLineEmpty().apply((builder) => this.generateApiInterfaceMethod(ctx, builder, endpoint)));
+        builder.forEach(ctx.service.endpoints, (builder, endpoint) => builder.ensurePreviousLineEmpty().append((builder) => this.generateApiInterfaceMethod(ctx, builder, endpoint)));
     }
     generateApiInterfaceMethod(ctx, builder, endpoint) {
         builder
-            .apply((builder) => this.generateApiInterfaceMethodAnnnotations(ctx, builder, endpoint))
+            .append((builder) => this.generateApiInterfaceMethodAnnnotations(ctx, builder, endpoint))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateApiInterfaceMethodSignature(ctx, builder, endpoint))
+            .append((builder) => this.generateApiInterfaceMethodSignature(ctx, builder, endpoint))
             .append(' ')
-            .parenthesizeMultiline('{}', (builder) => this.generateApiInterfaceMethodContent(ctx, builder, endpoint));
+            .parenthesize('{}', (builder) => this.generateApiInterfaceMethodContent(ctx, builder, endpoint), {
+            multiline: true,
+        });
     }
     generateApiInterfaceMethodAnnnotations(ctx, builder, endpoint) {
         var _a, _b, _c;
@@ -75,7 +77,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
             ['description', this.toStringLiteral(ctx, (_b = endpoint.description) === null || _b === void 0 ? void 0 : _b.trim())],
             [
                 'responses',
-                (builder) => builder.parenthesizeMultiline('[]', (builder) => builder.forEachSeparated(endpoint.responses, ',\n', (builder, response) => builder
+                (builder) => builder.parenthesize('[]', (builder) => builder.forEach(endpoint.responses, (builder, response) => builder
                     .append('ApiResponse')
                     .addImport('ApiResponse', 'io.swagger.v3.oas.annotations.responses')
                     .parenthesize('()', (builder) => {
@@ -83,7 +85,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
                     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,
             ],
         ])
@@ -101,13 +103,15 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     generateApiInterfaceMethodSignature(ctx, builder, endpoint) {
         builder
             .append(`suspend fun ${(0, core_1.toCasing)(endpoint.name, 'camel')}`)
-            .parenthesizeMultiline('()', (builder) => this.generateApiInterfaceMethodParameters(ctx, builder, endpoint))
+            .parenthesize('()', (builder) => this.generateApiInterfaceMethodParameters(ctx, builder, endpoint), {
+            multiline: true,
+        })
             .append(': ')
-            .apply((builder) => this.generateApiInterfaceMethodReturnType(ctx, builder, endpoint));
+            .append((builder) => this.generateApiInterfaceMethodReturnType(ctx, builder, endpoint));
     }
     generateApiInterfaceMethodParameters(ctx, builder, endpoint) {
         const parameters = this.getAllParameters(ctx, endpoint);
-        builder.forEachSeparated(parameters, ',\n', (builder, parameter) => this.generateApiInterfaceMethodParameter(ctx, builder, endpoint, parameter));
+        builder.forEach(parameters, (builder, parameter) => this.generateApiInterfaceMethodParameter(ctx, builder, endpoint, parameter), { separator: ',\n' });
     }
     generateApiInterfaceMethodReturnType(ctx, builder, endpoint) {
         var _a, _b;
@@ -115,9 +119,9 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     }
     generateApiInterfaceMethodParameter(ctx, builder, endpoint, parameter) {
         builder
-            .apply((builder) => this.generateApiInterfaceMethodParameterAnnotations(ctx, builder, endpoint, parameter))
+            .append((builder) => this.generateApiInterfaceMethodParameterAnnotations(ctx, builder, endpoint, parameter))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateApiInterfaceMethodParameterSignature(ctx, builder, endpoint, parameter));
+            .append((builder) => this.generateApiInterfaceMethodParameterSignature(ctx, builder, endpoint, parameter));
     }
     generateApiInterfaceMethodParameterAnnotations(ctx, builder, endpoint, parameter) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -158,16 +162,20 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         }
     }
     generateApiInterfaceMethodParameterSignature(ctx, builder, endpoint, parameter) {
+        var _a;
         builder
             .append((0, core_1.toCasing)(parameter.name, 'camel'))
             .append(': ')
-            .apply((builder) => this.generateTypeUsage(ctx, builder, parameter.schema));
+            .append((builder) => this.generateTypeUsage(ctx, builder, parameter.schema))
+            .append(!parameter.required && !((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.nullable) ? '?' : '');
     }
     generateApiInterfaceMethodContent(ctx, builder, endpoint) {
         const parameters = this.getAllParameters(ctx, endpoint);
         builder
             .append(`return getDelegate().${(0, core_1.toCasing)(endpoint.name, 'camel')}(`)
-            .forEachSeparated(parameters, ', ', (builder, parameter) => builder.append((0, core_1.toCasing)(parameter.name, 'camel')))
+            .forEach(parameters, (builder, parameter) => builder.append((0, core_1.toCasing)(parameter.name, 'camel')), {
+            separator: ', ',
+        })
             .append(')');
     }
     generateApiControllerFile(ctx, dirPath, packageName) {
@@ -182,11 +190,11 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     }
     generateApiControllerFileContent(ctx, builder) {
         builder
-            .apply((builder) => this.generateApiControllerAnnotations(ctx, builder))
+            .append((builder) => this.generateApiControllerAnnotations(ctx, builder))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateApiControllerSignature(ctx, builder))
+            .append((builder) => this.generateApiControllerSignature(ctx, builder))
             .append(' ')
-            .parenthesizeMultiline('{}', (builder) => this.generateApiControllerContent(ctx, builder));
+            .parenthesize('{}', (builder) => this.generateApiControllerContent(ctx, builder), { multiline: true });
     }
     generateApiControllerAnnotations(ctx, builder) {
         builder
@@ -202,7 +210,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         builder
             .append('class ')
             .append(this.getApiControllerName(ctx))
-            .parenthesizeMultiline('()', (builder) => this.generateApiControllerParameters(ctx, builder))
+            .parenthesize('()', (builder) => this.generateApiControllerParameters(ctx, builder), { multiline: true })
             .append(' : ')
             .append(this.getApiInterfaceName(ctx));
     }
@@ -219,10 +227,10 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
             .appendLine(this.getApiDelegateInterfaceName(ctx))
             .appendLine()
             .append('init ')
-            .parenthesizeMultiline('{}', (builder) => builder
+            .parenthesize('{}', (builder) => builder
             .append('this.delegate = Optional.ofNullable(delegate).orElse')
             .addImport('Optional', 'java.util')
-            .parenthesize('()', (builder) => builder.append('object : ').append(this.getApiDelegateInterfaceName(ctx)).append(' {}')))
+            .parenthesize('()', (builder) => builder.append('object : ').append(this.getApiDelegateInterfaceName(ctx)).append(' {}')), { multiline: true })
             .appendLine()
             .appendLine()
             .appendLine(`override fun getDelegate(): ${this.getApiDelegateInterfaceName(ctx)} = delegate`);
@@ -239,11 +247,11 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     }
     generateApiDelegateInterfaceFileContent(ctx, builder) {
         builder
-            .apply((builder) => this.generateApiDelegateInterfaceAnnotations(ctx, builder))
+            .append((builder) => this.generateApiDelegateInterfaceAnnotations(ctx, builder))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateApiDelegateInterfaceSignature(ctx, builder))
+            .append((builder) => this.generateApiDelegateInterfaceSignature(ctx, builder))
             .append(' ')
-            .parenthesizeMultiline('{}', (builder) => this.generateApiDelegateInterfaceContent(ctx, builder));
+            .parenthesize('{}', (builder) => this.generateApiDelegateInterfaceContent(ctx, builder), { multiline: true });
     }
     generateApiDelegateInterfaceAnnotations(ctx, builder) {
         builder.appendAnnotation('Generated', 'jakarta.annotation', [
@@ -260,15 +268,17 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
             .addImport('NativeWebRequest', 'org.springframework.web.context.request')
             .forEach(ctx.service.endpoints, (builder, endpoint) => builder
             .ensurePreviousLineEmpty()
-            .apply((builder) => this.generateApiDelegateInterfaceMethod(ctx, builder, endpoint)));
+            .append((builder) => this.generateApiDelegateInterfaceMethod(ctx, builder, endpoint)));
     }
     generateApiDelegateInterfaceMethod(ctx, builder, endpoint) {
         builder
-            .apply((builder) => this.generateApiDelegateInterfaceMethodAnnnotations(ctx, builder, endpoint))
+            .append((builder) => this.generateApiDelegateInterfaceMethodAnnnotations(ctx, builder, endpoint))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateApiDelegateInterfaceMethodSignature(ctx, builder, endpoint))
+            .append((builder) => this.generateApiDelegateInterfaceMethodSignature(ctx, builder, endpoint))
             .append(' ')
-            .parenthesizeMultiline('{}', (builder) => this.generateApiDelegateInterfaceMethodContent(ctx, builder, endpoint));
+            .parenthesize('{}', (builder) => this.generateApiDelegateInterfaceMethodContent(ctx, builder, endpoint), {
+            multiline: true,
+        });
     }
     generateApiDelegateInterfaceMethodAnnnotations(ctx, builder, endpoint) {
         // None for now.
@@ -276,13 +286,15 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     generateApiDelegateInterfaceMethodSignature(ctx, builder, endpoint) {
         builder
             .append(`suspend fun ${(0, core_1.toCasing)(endpoint.name, 'camel')}`)
-            .parenthesizeMultiline('()', (builder) => this.generateApiDelegateInterfaceMethodParameters(ctx, builder, endpoint))
+            .parenthesize('()', (builder) => this.generateApiDelegateInterfaceMethodParameters(ctx, builder, endpoint), {
+            multiline: true,
+        })
             .append(': ')
-            .apply((builder) => this.generateApiDelegateInterfaceMethodReturnType(ctx, builder, endpoint));
+            .append((builder) => this.generateApiDelegateInterfaceMethodReturnType(ctx, builder, endpoint));
     }
     generateApiDelegateInterfaceMethodParameters(ctx, builder, endpoint) {
         const parameters = this.getAllParameters(ctx, endpoint);
-        builder.forEachSeparated(parameters, ',\n', (builder, parameter) => this.generateApiDelegateInterfaceMethodParameter(ctx, builder, endpoint, parameter));
+        builder.forEach(parameters, (builder, parameter) => this.generateApiDelegateInterfaceMethodParameter(ctx, builder, endpoint, parameter), { separator: ',\n' });
     }
     generateApiDelegateInterfaceMethodReturnType(ctx, builder, endpoint) {
         var _a, _b;
@@ -290,18 +302,20 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     }
     generateApiDelegateInterfaceMethodParameter(ctx, builder, endpoint, parameter) {
         builder
-            .apply((builder) => this.generateApiDelegateInterfaceMethodParameterAnnotations(ctx, builder, endpoint, parameter))
+            .append((builder) => this.generateApiDelegateInterfaceMethodParameterAnnotations(ctx, builder, endpoint, parameter))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateApiDelegateInterfaceMethodParameterSignature(ctx, builder, endpoint, parameter));
+            .append((builder) => this.generateApiDelegateInterfaceMethodParameterSignature(ctx, builder, endpoint, parameter));
     }
     generateApiDelegateInterfaceMethodParameterAnnotations(ctx, builder, endpoint, parameter) {
         // None for now.
     }
     generateApiDelegateInterfaceMethodParameterSignature(ctx, builder, endpoint, parameter) {
+        var _a;
         builder
             .append((0, core_1.toCasing)(parameter.name, 'camel'))
             .append(': ')
-            .apply((builder) => this.generateTypeUsage(ctx, builder, parameter.schema));
+            .append((builder) => this.generateTypeUsage(ctx, builder, parameter.schema))
+            .append(!parameter.required && !((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.nullable) ? '?' : '');
     }
     generateApiDelegateInterfaceMethodContent(ctx, builder, endpoint) {
         builder

package/esm/lib/file-builder.js

@@ -35,9 +35,9 @@ export class KotlinFileBuilder extends SourceBuilder {
                 allArgs.reduce((c, [key, value]) => { var _a; return c + (key ? key.length + 3 : 0) + ((_a = value === null || value === void 0 ? void 0 : value.length) !== null && _a !== void 0 ? _a : 0); }, 0) > 80;
             this.parenthesize('()', (builder) => builder
                 .appendLineIf(multiline)
-                .forEachSeparated(allArgs, multiline ? ',\n' : ', ', (builder, [name, value]) => builder
+                .forEach(allArgs, (builder, [name, value]) => builder
                 .append(name ? `${name} = ` : '')
-                .apply((builder) => (typeof value === 'string' ? builder.append(value) : value(builder))))
+                .append((builder) => (typeof value === 'string' ? builder.append(value) : value(builder))), { separator: multiline ? ',\n' : ', ' })
                 .appendLineIf(multiline));
         }
         this.appendLine();
@@ -49,11 +49,11 @@ export class KotlinFileBuilder extends SourceBuilder {
     }
     toString(addPadding = true) {
         return new SourceBuilder(this.options)
-            .applyIf(this.packageName !== undefined, (builder) => builder.appendLine(`package ${this.packageName}`).appendLine())
-            .apply((builder) => this.imports.writeTo(builder))
-            .applyIf(addPadding, (builder) => builder.ensurePreviousLineEmpty())
+            .if(this.packageName !== undefined, (builder) => builder.appendLine(`package ${this.packageName}`).appendLine())
+            .append((builder) => this.imports.writeTo(builder))
+            .if(addPadding, (builder) => builder.ensurePreviousLineEmpty())
             .append(super.toString())
-            .applyIf(addPadding, (builder) => builder.ensureCurrentLineEmpty())
+            .if(addPadding, (builder) => builder.ensureCurrentLineEmpty())
             .toString();
     }
 }

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

@@ -1,6 +1,6 @@
 import { dirname } from 'path';
 import { ensureDirSync, writeFileSync } from 'fs-extra';
-import { resolveAnyOfAndAllOf, toCasing } from '@goast/core';
+import { getSchemaReference, resolveAnyOfAndAllOf, toCasing, } from '@goast/core';
 import { KotlinFileBuilder } from '../../file-builder';
 import { KotlinFileGenerator } from '../file-generator';
 export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
@@ -28,7 +28,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             }
         }
         if (this.shouldGenerateTypeDeclaration(ctx, ctx.schema)) {
-            const typeName = this.getDeclarationTypeName(ctx);
+            const typeName = this.getDeclarationTypeName(ctx, ctx.schema);
             const packageName = ctx.config.packageName + ctx.config.packageSuffix;
             const filePath = `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}/${typeName}.kt`;
             console.log(`Generating model ${packageName}.${typeName} to ${filePath}...`);
@@ -49,8 +49,9 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
     generateFileContent(ctx, builder) {
         let schema = ctx.schema;
         if (schema.kind === 'oneOf') {
-            schema = ctx.config.oneOfBehavior === 'treat-as-any-of'
-                ? Object.assign(Object.assign({}, schema), { kind: 'combined', anyOf: schema.oneOf, allOf: [], oneOf: undefined }) : Object.assign(Object.assign({}, schema), { kind: 'combined', allOf: schema.oneOf, anyOf: [], oneOf: undefined });
+            schema =
+                ctx.config.oneOfBehavior === 'treat-as-any-of'
+                    ? Object.assign(Object.assign({}, schema), { kind: 'combined', anyOf: schema.oneOf, allOf: [], oneOf: undefined }) : Object.assign(Object.assign({}, schema), { kind: 'combined', allOf: schema.oneOf, anyOf: [], oneOf: undefined });
             ctx.schema = schema;
         }
         if (schema.kind === 'object' || schema.kind === 'combined') {
@@ -69,6 +70,20 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             this.generateType(ctx, builder, schema);
         }
     }
+    generateTypeUsage(ctx, builder, schema) {
+        schema = getSchemaReference(schema, ['description']);
+        if (this.shouldGenerateTypeDeclaration(ctx, schema)) {
+            const name = this.getDeclarationTypeName(ctx, schema);
+            const packageName = ctx.config.packageName + ctx.config.packageSuffix;
+            if (packageName) {
+                builder.addImport(name, packageName);
+            }
+            builder.append(name);
+        }
+        else {
+            this.generateType(ctx, builder, schema);
+        }
+    }
     generateObjectType(ctx, builder, schema) {
         if (schema.properties.size === 0) {
             if (schema.additionalProperties) {
@@ -92,13 +107,13 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
     }
     generateObjectInterface(ctx, builder, schema) {
         builder
-            .apply((builder) => this.generateDocumentation(ctx, builder, schema))
+            .append((builder) => this.generateDocumentation(ctx, builder, schema))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateObjectInterfaceAnnotations(ctx, builder, schema))
+            .append((builder) => this.generateObjectInterfaceAnnotations(ctx, builder, schema))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateObjectInterfaceSignature(ctx, builder, schema))
+            .append((builder) => this.generateObjectInterfaceSignature(ctx, builder, schema))
             .append(' ')
-            .parenthesizeMultiline('{}', (builder) => this.generateObjectInterfaceMembers(ctx, builder, schema));
+            .parenthesize('{}', (builder) => this.generateObjectInterfaceMembers(ctx, builder, schema), { multiline: true });
     }
     generateObjectInterfaceAnnotations(ctx, builder, schema) {
         if (schema.discriminator) {
@@ -110,66 +125,64 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             ]);
             const entries = Object.entries(schema.discriminator.mapping);
             if (entries.length > 0) {
-                builder.appendAnnotation('JsonSubTypes', 'com.fasterxml.jackson.annotation', entries.map(([value, schema]) => (builder) => {
-                    const schemaResult = ctx.getSchemaResult(schema);
-                    builder
-                        .append(`JsonSubTypes.Type(value = ${schemaResult.typeName}::class, name = ${this.toStringLiteral(ctx, value)})`)
-                        .addImport(schemaResult.typeName, schemaResult.packageName);
-                }));
+                builder.appendAnnotation('JsonSubTypes', 'com.fasterxml.jackson.annotation', entries.map(([value, schema]) => (builder) => builder.append('JsonSubTypes.Type(value = ', (builder) => this.generateTypeUsage(ctx, builder, schema), `::class, name = ${this.toStringLiteral(ctx, value)})`)));
             }
         }
     }
     generateObjectInterfaceSignature(ctx, builder, schema) {
-        builder.append('interface ').append(this.getDeclarationTypeName(ctx));
+        builder.append('interface ').append(this.getDeclarationTypeName(ctx, schema));
     }
     generateObjectInterfaceMembers(ctx, builder, schema) {
         builder.forEach(this.sortProperties(ctx, schema, schema.properties.values()), (builder, property) => builder
             .ensurePreviousLineEmpty()
-            .apply((builder) => this.generateJsonPropertyAnnotation(ctx, builder, schema, property, 'get'))
+            .append((builder) => this.generateJsonPropertyAnnotation(ctx, builder, schema, property, 'get'))
             .ensureCurrentLineEmpty()
             .append(`val ${toCasing(property.name, 'camel')}: `)
-            .apply((builder) => this.generateType(ctx, builder, property.schema))
-            .applyIf(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?').append(' = null')));
+            .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);
+        const inheritedSchemas = schema.inheritedSchemas
+            .filter((x) => this.shouldGenerateTypeDeclaration(ctx, x) && !x.isNameGenerated)
+            .filter((item, index, self) => self.indexOf(item) === index);
         builder
-            .apply((builder) => this.generateDocumentation(ctx, builder, schema))
+            .append((builder) => this.generateDocumentation(ctx, builder, schema))
             .append('data class ')
-            .append(this.getDeclarationTypeName(ctx))
-            .parenthesizeMultilineIf(schema.properties.size > 0, '()', (builder) => builder.forEachSeparated(this.sortProperties(ctx, schema, schema.properties.values()), ',\n', (builder, property) => builder
+            .append(this.getDeclarationTypeName(ctx, schema))
+            .parenthesizeIf(schema.properties.size > 0, '()', (builder) => builder.forEach(this.sortProperties(ctx, schema, schema.properties.values()), (builder, property) => builder
             .ensurePreviousLineEmpty()
-            .apply((builder) => this.generateObjectDataClassParameterAnnotations(ctx, builder, schema, property))
+            .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')}: `)
-            .apply((builder) => this.generateType(ctx, builder, property.schema))
-            .applyIf(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?').append(' = null'))))
-            .applyIf(inheritedSchemas.length > 0, (builder) => builder
+            .append((builder) => this.generateTypeUsage(ctx, builder, property.schema))
+            .if(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?').append(' = null')), { separator: ',\n' }), { multiline: true })
+            .if(inheritedSchemas.length > 0, (builder) => builder
             .append(' : ')
-            .forEachSeparated(inheritedSchemas, ', ', (builder, schema) => builder.append(toCasing(schema.name, 'pascal'))) // TODO: Calling generateType here will lead to endless loop
-        )
+            .forEach(inheritedSchemas, (builder, schema) => this.generateTypeUsage(ctx, builder, schema), {
+            separator: ', ',
+        }))
             .append(' ')
-            .parenthesizeMultilineIf(schema.additionalProperties !== undefined && schema.additionalProperties !== false, '{}', (builder) => builder.applyIf(schema.additionalProperties !== undefined && schema.additionalProperties !== false, (builder) => builder
+            .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')
             .append('val additionalProperties: Mutable')
-            .apply((builder) => this.generateMapType(ctx, builder, schema))
+            .append((builder) => this.generateMapType(ctx, builder, schema))
             .appendLine(' = mutableMapOf()')
             .appendLine()
             .appendLine('@JsonAnySetter')
             .addImport('JsonAnySetter', 'com.fasterxml.jackson.annotation')
             .append('fun set')
-            .parenthesize('()', (builder) => builder.append('name: String, value: ').applyIfElse(schema.additionalProperties === true, (builder) => builder.append('Any?'), (builder) => this.generateType(ctx, builder, schema.additionalProperties)))
+            .parenthesize('()', (builder) => builder.append('name: String, value: ').if(schema.additionalProperties === true, (builder) => builder.append('Any?'), (builder) => this.generateTypeUsage(ctx, builder, schema.additionalProperties)))
             .append(' ')
-            .parenthesizeMultiline('{}', 'this.additionalProperties[name] = value')
+            .parenthesize('{}', 'this.additionalProperties[name] = value', { multiline: true })
             .appendLine()
             .appendLine()
             .appendLine('@JsonAnyGetter')
             .addImport('JsonAnyGetter', 'com.fasterxml.jackson.annotation')
             .append('fun getMap(): ')
-            .apply((builder) => this.generateMapType(ctx, builder, schema))
+            .append((builder) => this.generateMapType(ctx, builder, schema))
             .append(' ')
-            .parenthesizeMultiline('{}', 'return this.additionalProperties')));
+            .parenthesize('{}', 'return this.additionalProperties', { multiline: true })), { multiline: true });
     }
     generateObjectDataClassParameterAnnotations(ctx, builder, schema, property) {
         this.generatePropertyValidationAnnotations(ctx, builder, schema, property);
@@ -203,7 +216,9 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         builder
             .append('@Schema')
             .addImport('Schema', 'io.swagger.v3.oas.annotations.media')
-            .parenthesizeIf(parts.size > 0, '()', (builder) => builder.forEachSeparated(parts.entries(), ', ', (builder, [key, value]) => builder.append(`${key} = ${value}`)))
+            .parenthesizeIf(parts.size > 0, '()', (builder) => builder.forEach(parts.entries(), (builder, [key, value]) => builder.append(`${key} = ${value}`), {
+            separator: ', ',
+        }))
             .appendLine();
     }
     generateJsonPropertyAnnotation(ctx, builder, schema, property, scope) {
@@ -214,7 +229,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             .append(this.toStringLiteral(ctx, property.name))
             .appendIf(schema.required.has(property.name), ', required = true'))
             .appendLine()
-            .applyIf(property.schema.custom['exclude-when-null'] === true, (builder) => builder
+            .if(property.schema.custom['exclude-when-null'] === true, (builder) => builder
             .append('@get:JsonInclude')
             .addImport('JsonInclude', 'com.fasterxml.jackson.annotation')
             .parenthesize('()', 'JsonInclude.Include.NON_NULL')
@@ -228,22 +243,10 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             const propertiesType = schema.additionalProperties;
             builder
                 .append('Map')
-                .parenthesize('<>', (builder) => builder.append('String, ').apply((builder) => this.generateType(ctx, builder, propertiesType)));
+                .parenthesize('<>', (builder) => builder.append('String, ').append((builder) => this.generateTypeUsage(ctx, builder, propertiesType)));
         }
     }
     generateType(ctx, builder, schema) {
-        if (this.shouldGenerateTypeDeclaration(ctx, schema)) {
-            if (schema === ctx.schema) {
-                builder.append('Any?');
-                return;
-            }
-            const schemaResult = ctx.getSchemaResult(schema);
-            builder.append(schemaResult.typeName);
-            if (schemaResult.packageName) {
-                builder.addImport(schemaResult.typeName, schemaResult.packageName);
-            }
-            return;
-        }
         switch (schema.kind) {
             case 'boolean':
                 builder.append('Boolean');
@@ -320,23 +323,23 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
     }
     generateEnum(ctx, builder, schema) {
         builder
-            .apply((builder) => this.generateDocumentation(ctx, builder, schema))
+            .append((builder) => this.generateDocumentation(ctx, builder, schema))
             .append('enum class ')
-            .append(this.getDeclarationTypeName(ctx))
+            .append(this.getDeclarationTypeName(ctx, schema))
             .append('(val value: String) ')
-            .parenthesizeMultiline('{}', (builder) => {
+            .parenthesize('{}', (builder) => {
             var _a;
-            return builder.forEachSeparated((_a = schema.enum) !== null && _a !== void 0 ? _a : [], (builder) => builder.appendLine(',').appendLine(), (builder, value) => builder
+            return builder.forEach((_a = schema.enum) !== null && _a !== void 0 ? _a : [], (builder, value) => builder
                 .append('@JsonProperty')
                 .addImport('JsonProperty', 'com.fasterxml.jackson.annotation')
                 .parenthesize('()', this.toStringLiteral(ctx, String(value)))
                 .appendLine()
                 .append(toCasing(String(value), 'snake'))
-                .parenthesize('()', this.toStringLiteral(ctx, String(value))));
-        });
+                .parenthesize('()', this.toStringLiteral(ctx, String(value))), { separator: (builder) => builder.appendLine(',').appendLine() });
+        }, { multiline: true });
     }
     generateArrayType(ctx, builder, schema) {
-        builder.append('List').parenthesize('<>', (builder) => builder.applyIfElse(schema.items === undefined, (builder) => builder.append('Any?'), (builder) => this.generateType(ctx, builder, schema.items)));
+        builder.append('List').parenthesize('<>', (builder) => builder.if(schema.items === undefined, (builder) => builder.append('Any?'), (builder) => this.generateTypeUsage(ctx, builder, schema.items)));
     }
     generateDocumentation(ctx, builder, schema) {
         var _a, _b;
@@ -345,7 +348,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             builder
                 .ensurePreviousLineEmpty()
                 .appendLine('/**')
-                .applyWithLinePrefix(' * ', (builder) => builder
+                .appendWithLinePrefix(' * ', (builder) => builder
                 .appendLineIf(!!schema.description, schema.description)
                 .forEach(propertiesWithDescription, (builder, property) => { var _a; return builder.appendLine(`@param ${toCasing(property.name, 'camel')} ${(_a = property.schema.description) === null || _a === void 0 ? void 0 : _a.trim()}`); }))
                 .appendLine(' */');
@@ -372,8 +375,8 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         }
         return true;
     }
-    getDeclarationTypeName(ctx) {
-        return toCasing(ctx.schema.name, 'pascal');
+    getDeclarationTypeName(ctx, schema) {
+        return toCasing(schema.name, 'pascal');
     }
     sortProperties(ctx, schema, properties) {
         return [...properties].sort((a, b) => {

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

@@ -16,7 +16,7 @@ export class KotlinModelsGenerator extends OpenApiSchemasGenerationProviderBase
     }
     generateSchema(ctx, schema) {
         const modelGenerator = this._modelGeneratorFactory.create();
-        return modelGenerator.generate(Object.assign(Object.assign({}, ctx), { schema, getSchemaResult: (schema) => this.getSchemaResult(ctx, schema) }));
+        return modelGenerator.generate(Object.assign(Object.assign({}, ctx), { schema }));
     }
     addSchemaResult(ctx, schema, result) {
         ctx.output.models[schema.id] = result;