@goast/kotlin 0.0.7 → 0.1.0

package/cjs/lib/file-builder.js

@@ -38,9 +38,9 @@ class KotlinFileBuilder extends core_1.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();
@@ -52,11 +52,11 @@ class KotlinFileBuilder extends core_1.SourceBuilder {
     }
     toString(addPadding = true) {
         return new core_1.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/cjs/lib/generators/models/model-generator.js

@@ -31,7 +31,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.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}...`);
@@ -52,8 +52,9 @@ class DefaultKotlinModelGenerator extends file_generator_1.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') {
@@ -72,6 +73,20 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
             this.generateType(ctx, builder, schema);
         }
     }
+    generateTypeUsage(ctx, builder, schema) {
+        schema = (0, core_1.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) {
@@ -95,13 +110,13 @@ class DefaultKotlinModelGenerator extends file_generator_1.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) {
@@ -113,66 +128,64 @@ class DefaultKotlinModelGenerator extends file_generator_1.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 ${(0, core_1.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 ${(0, core_1.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((0, core_1.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);
@@ -206,7 +219,9 @@ class DefaultKotlinModelGenerator extends file_generator_1.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) {
@@ -217,7 +232,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.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')
@@ -231,22 +246,10 @@ class DefaultKotlinModelGenerator extends file_generator_1.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');
@@ -323,23 +326,23 @@ class DefaultKotlinModelGenerator extends file_generator_1.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((0, core_1.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;
@@ -348,7 +351,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.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 ${(0, core_1.toCasing)(property.name, 'camel')} ${(_a = property.schema.description) === null || _a === void 0 ? void 0 : _a.trim()}`); }))
                 .appendLine(' */');
@@ -375,8 +378,8 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
         }
         return true;
     }
-    getDeclarationTypeName(ctx) {
-        return (0, core_1.toCasing)(ctx.schema.name, 'pascal');
+    getDeclarationTypeName(ctx, schema) {
+        return (0, core_1.toCasing)(schema.name, 'pascal');
     }
     sortProperties(ctx, schema, properties) {
         return [...properties].sort((a, b) => {

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

@@ -19,7 +19,7 @@ class KotlinModelsGenerator extends core_1.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;

package/cjs/lib/generators/services/okhttp3-clients/okhttp3-client-generator.js

@@ -21,11 +21,11 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
     }
     generateApiClientFileContent(ctx, builder) {
         builder
-            .apply((builder) => this.generateApiClientClassAnnotations(ctx, builder))
+            .append((builder) => this.generateApiClientClassAnnotations(ctx, builder))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateApiClientClassSignature(ctx, builder))
+            .append((builder) => this.generateApiClientClassSignature(ctx, builder))
             .append(' ')
-            .parenthesizeMultiline('{}', (builder) => this.generateApiClientClassContent(ctx, builder));
+            .parenthesize('{}', (builder) => this.generateApiClientClassContent(ctx, builder), { multiline: true });
     }
     generateApiClientClassAnnotations(ctx, builder) {
         // None for now
@@ -34,31 +34,31 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
         builder
             .append('class ')
             .append(this.getApiClientName(ctx))
-            .parenthesizeMultiline('()', (builder) => builder
+            .parenthesize('()', (builder) => builder
             .appendLine('basePath: String = defaultBasePath,')
             .appendLine('client: OkHttpClient = ApiClient.defaultClient')
             .addImport('OkHttpClient', 'okhttp3')
-            .addImport('ApiClient', ctx.infrastructurePackageName))
+            .addImport('ApiClient', ctx.infrastructurePackageName), { multiline: true })
             .append(' : ')
             .append('ApiClient(basePath, client)');
     }
     generateApiClientClassContent(ctx, builder) {
         builder
-            .apply((builder) => this.generateApiClientCompanionObject(ctx, builder))
+            .append((builder) => this.generateApiClientCompanionObject(ctx, builder))
             .forEach(ctx.service.endpoints, (builder, endpoint) => builder
             .ensurePreviousLineEmpty()
-            .apply((builder) => this.generateApiClientMethod(ctx, builder, endpoint))
+            .append((builder) => this.generateApiClientMethod(ctx, builder, endpoint))
             .ensurePreviousLineEmpty()
-            .apply((builder) => this.generateApiClientHttpInfoMethod(ctx, builder, endpoint))
+            .append((builder) => this.generateApiClientHttpInfoMethod(ctx, builder, endpoint))
             .ensurePreviousLineEmpty()
-            .apply((builder) => this.generateApiClientRequestConfigMethod(ctx, builder, endpoint)))
+            .append((builder) => this.generateApiClientRequestConfigMethod(ctx, builder, endpoint)))
             .ensurePreviousLineEmpty()
-            .apply((builder) => this.generateAdditionalMethods(ctx, builder));
+            .append((builder) => this.generateAdditionalMethods(ctx, builder));
     }
     generateApiClientCompanionObject(ctx, builder) {
         builder
             .append('companion object ')
-            .parenthesizeMultiline('{}', (builder) => this.generateApiClientCompanionObjectContent(ctx, builder));
+            .parenthesize('{}', (builder) => this.generateApiClientCompanionObjectContent(ctx, builder), { multiline: true });
     }
     generateApiClientCompanionObjectContent(ctx, builder) {
         this.generateApiClientCompanionObjectDefaultBasePathProperty(ctx, builder);
@@ -67,30 +67,32 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
         builder
             .appendAnnotation('JvmStatic')
             .append('val defaultBasePath: String by lazy ')
-            .parenthesizeMultiline('{}', (builder) => builder
+            .parenthesize('{}', (builder) => builder
             .appendLine(`System.getProperties().getProperty(ApiClient.baseUrlKey, ${this.toStringLiteral(ctx, this.getBasePath(ctx))})`)
-            .addImport('ApiClient', ctx.infrastructurePackageName));
+            .addImport('ApiClient', ctx.infrastructurePackageName), { multiline: true });
     }
     generateApiClientMethod(ctx, builder, endpoint) {
         builder
-            .apply((builder) => this.generateApiClientMethodDocumentation(ctx, builder, endpoint))
+            .append((builder) => this.generateApiClientMethodDocumentation(ctx, builder, endpoint))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateApiClientMethodAnnotations(ctx, builder, endpoint))
+            .append((builder) => this.generateApiClientMethodAnnotations(ctx, builder, endpoint))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateApiClientMethodSignature(ctx, builder, endpoint))
+            .append((builder) => this.generateApiClientMethodSignature(ctx, builder, endpoint))
             .append(' ')
-            .parenthesizeMultiline('{}', (builder) => this.generateApiClientMethodContent(ctx, builder, endpoint));
+            .parenthesize('{}', (builder) => this.generateApiClientMethodContent(ctx, builder, endpoint), {
+            multiline: true,
+        });
     }
     generateApiClientMethodDocumentation(ctx, builder, endpoint) {
         builder
             .appendLine('/**')
-            .applyWithLinePrefix(' * ', (builder) => {
+            .appendWithLinePrefix(' * ', (builder) => {
             var _a;
             return builder
                 .appendLine(`${(_a = endpoint.summary) !== null && _a !== void 0 ? _a : 'TODO: Provide summary'}`)
-                .apply((builder) => this.generateParamDocEntries(ctx, builder, endpoint))
+                .append((builder) => this.generateParamDocEntries(ctx, builder, endpoint))
                 .append('@return ')
-                .apply((builder) => this.generateApiClientMethodReturnType(ctx, builder, endpoint))
+                .append((builder) => this.generateApiClientMethodReturnType(ctx, builder, endpoint))
                 .appendLine()
                 .appendLine('@throws IllegalStateException If the request is not correctly configured')
                 .appendLine('@throws IOException Rethrows the OkHttp execute method exception')
@@ -119,7 +121,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             .append((0, core_1.toCasing)(endpoint.name, 'camel'))
             .parenthesize('()', (builder) => this.generateApiClientMethodParameters(ctx, builder, endpoint))
             .append(': ')
-            .apply((builder) => this.generateApiClientMethodReturnType(ctx, builder, endpoint));
+            .append((builder) => this.generateApiClientMethodReturnType(ctx, builder, endpoint));
     }
     generateApiClientMethodParameters(ctx, builder, endpoint) {
         this.generateParams(ctx, builder, endpoint, true);
@@ -135,38 +137,40 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             .appendLine()
             .appendLine()
             .append('return when (localVarResponse.responseType) ')
-            .parenthesizeMultiline('{}', (builder) => builder
+            .parenthesize('{}', (builder) => builder
             .append('ResponseType.Success -> ')
-            .applyIfElse(responseSchema === undefined, (builder) => builder.append('Unit'), (builder) => builder
+            .if(responseSchema === undefined, (builder) => builder.append('Unit'), (builder) => builder
             .append('(localVarResponse as Success<*>).data as ')
             .addImport('Success', ctx.infrastructurePackageName)
-            .apply((builder) => this.generateTypeUsage(ctx, builder, responseSchema)))
+            .append((builder) => this.generateTypeUsage(ctx, builder, responseSchema)))
             .ensureCurrentLineEmpty()
             .appendLine(responseErrorHandlingCode)
             .addImport('ClientError', ctx.infrastructurePackageName)
             .addImport('ServerError', ctx.infrastructurePackageName)
-            .addImport('ResponseType', ctx.infrastructurePackageName));
+            .addImport('ResponseType', ctx.infrastructurePackageName), { multiline: true });
     }
     generateApiClientHttpInfoMethod(ctx, builder, endpoint) {
         builder
-            .apply((builder) => this.generateApiClientHttpInfoMethodDocumentation(ctx, builder, endpoint))
+            .append((builder) => this.generateApiClientHttpInfoMethodDocumentation(ctx, builder, endpoint))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateApiClientHttpInfoMethodAnnotations(ctx, builder, endpoint))
+            .append((builder) => this.generateApiClientHttpInfoMethodAnnotations(ctx, builder, endpoint))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateApiClientHttpInfoMethodSignature(ctx, builder, endpoint))
+            .append((builder) => this.generateApiClientHttpInfoMethodSignature(ctx, builder, endpoint))
             .append(' ')
-            .parenthesizeMultiline('{}', (builder) => this.generateApiClientHttpInfoMethodContent(ctx, builder, endpoint));
+            .parenthesize('{}', (builder) => this.generateApiClientHttpInfoMethodContent(ctx, builder, endpoint), {
+            multiline: true,
+        });
     }
     generateApiClientHttpInfoMethodDocumentation(ctx, builder, endpoint) {
         builder
             .appendLine('/**')
-            .applyWithLinePrefix(' * ', (builder) => {
+            .appendWithLinePrefix(' * ', (builder) => {
             var _a;
             return builder
                 .appendLine(`${(_a = endpoint.summary) !== null && _a !== void 0 ? _a : 'TODO: Provide summary'}`)
-                .apply((builder) => this.generateParamDocEntries(ctx, builder, endpoint))
+                .append((builder) => this.generateParamDocEntries(ctx, builder, endpoint))
                 .append('@return ')
-                .apply((builder) => this.generateApiClientHttpInfoMethodReturnType(ctx, builder, endpoint))
+                .append((builder) => this.generateApiClientHttpInfoMethodReturnType(ctx, builder, endpoint))
                 .appendLine()
                 .appendLine('@throws IllegalStateException If the request is not correctly configured')
                 .appendLine('@throws IOException Rethrows the OkHttp execute method exception')
@@ -187,7 +191,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             .append((0, core_1.toCasing)(endpoint.name, 'camel'), 'WithHttpInfo')
             .parenthesize('()', (builder) => this.generateApiClientHttpInfoMethodSignatureParameters(ctx, builder, endpoint))
             .append(': ')
-            .apply((builder) => this.generateApiClientHttpInfoMethodReturnType(ctx, builder, endpoint));
+            .append((builder) => this.generateApiClientHttpInfoMethodReturnType(ctx, builder, endpoint));
     }
     generateApiClientHttpInfoMethodSignatureParameters(ctx, builder, endpoint) {
         this.generateParams(ctx, builder, endpoint, true);
@@ -206,27 +210,29 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             .appendLine()
             .append('return request')
             .parenthesize('<>', (builder) => builder
-            .apply((builder) => { var _a; return this.generateTypeUsage(ctx, builder, (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0].schema, 'Unit'); })
+            .append((builder) => { var _a; return this.generateTypeUsage(ctx, builder, (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0].schema, 'Unit'); })
             .append(', ')
-            .apply((builder) => this.generateTypeUsage(ctx, builder, this.getResponseSchema(ctx, endpoint), 'Unit')))
-            .parenthesizeMultiline('()', (builder) => builder.append('localVariableConfig'));
+            .append((builder) => this.generateTypeUsage(ctx, builder, this.getResponseSchema(ctx, endpoint), 'Unit')))
+            .parenthesize('()', (builder) => builder.append('localVariableConfig'), { multiline: true });
     }
     generateApiClientRequestConfigMethod(ctx, builder, endpoint) {
         builder
-            .apply((builder) => this.generateApiClientRequestConfigMethodDocumentation(ctx, builder, endpoint))
+            .append((builder) => this.generateApiClientRequestConfigMethodDocumentation(ctx, builder, endpoint))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateApiClientRequestConfigMethodAnnotations(ctx, builder, endpoint))
+            .append((builder) => this.generateApiClientRequestConfigMethodAnnotations(ctx, builder, endpoint))
             .ensureCurrentLineEmpty()
-            .apply((builder) => this.generateApiClientRequestConfigMethodSignature(ctx, builder, endpoint))
+            .append((builder) => this.generateApiClientRequestConfigMethodSignature(ctx, builder, endpoint))
             .append(' ')
-            .parenthesizeMultiline('{}', (builder) => this.generateApiClientRequestConfigMethodContent(ctx, builder, endpoint));
+            .parenthesize('{}', (builder) => this.generateApiClientRequestConfigMethodContent(ctx, builder, endpoint), {
+            multiline: true,
+        });
     }
     generateApiClientRequestConfigMethodDocumentation(ctx, builder, endpoint) {
         builder
             .appendLine('/**')
-            .applyWithLinePrefix(' * ', (builder) => builder
+            .appendWithLinePrefix(' * ', (builder) => builder
             .appendLine(`To obtain the request config of the operation ${(0, core_1.toCasing)(endpoint.name, 'camel')}`)
-            .apply((builder) => this.generateParamDocEntries(ctx, builder, endpoint))
+            .append((builder) => this.generateParamDocEntries(ctx, builder, endpoint))
             .append('@return RequestConfig'))
             .appendLine(' */');
     }
@@ -239,7 +245,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             .append((0, core_1.toCasing)(endpoint.name, 'camel'), 'RequestConfig')
             .parenthesize('()', (builder) => this.generateApiClientRequestConfigMethodSignatureParameters(ctx, builder, endpoint))
             .append(': ')
-            .apply((builder) => this.generateApiClientRequestConfigMethodReturnType(ctx, builder, endpoint));
+            .append((builder) => this.generateApiClientRequestConfigMethodReturnType(ctx, builder, endpoint));
     }
     generateApiClientRequestConfigMethodSignatureParameters(ctx, builder, endpoint) {
         this.generateParams(ctx, builder, endpoint, true);
@@ -257,24 +263,24 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             .appendLineIf(!!endpoint.requestBody, `val localVariableBody = ${(0, core_1.toCasing)(this.getRequestBodyParamName(ctx, endpoint), 'camel')}`)
             .appendLine('val localVariableQuery: MultiValueMap = mutableMapOf<String, List<String>>()')
             .addImport('MultiValueMap', ctx.infrastructurePackageName)
-            .applyIf(queryParameters.length > 0, (builder) => builder.indent((builder) => builder.append('.apply ').parenthesizeMultiline('{}', (builder) => builder.forEach(queryParameters, (builder, param) => builder
+            .if(queryParameters.length > 0, (builder) => builder.indent((builder) => builder.append('.apply ').parenthesize('{}', (builder) => builder.forEach(queryParameters, (builder, param) => builder
             .appendIf(!param.required, `if (${(0, core_1.toCasing)(param.name, 'camel')} != null) `)
-            .parenthesizeMultilineIf(!param.required, '{}', (builder) => builder.appendLine(`put(${this.toStringLiteral(ctx, (0, core_1.toCasing)(param.name, 'camel'))}, listOf(${(0, core_1.toCasing)(param.name, 'camel')}.toString()))`))
-            .appendLine()))))
+            .parenthesizeIf(!param.required, '{}', (builder) => builder.appendLine(`put(${this.toStringLiteral(ctx, (0, core_1.toCasing)(param.name, 'camel'))}, listOf(${(0, core_1.toCasing)(param.name, 'camel')}.toString()))`), { multiline: true })
+            .appendLine()), { multiline: true })))
             .ensureCurrentLineEmpty()
             .appendLine('val localVariableHeaders: MutableMap<String, String> = mutableMapOf()')
             .appendLineIf(((_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0]) !== undefined, `localVariableHeaders["Content-Type"] = "${(_b = endpoint.requestBody) === null || _b === void 0 ? void 0 : _b.content[0].type}"`)
             .appendLine()
             .append('return RequestConfig')
             .addImport('RequestConfig', ctx.infrastructurePackageName)
-            .parenthesizeMultiline('()', (builder) => builder
+            .parenthesize('()', (builder) => builder
             .appendLine(`method = RequestMethod.${endpoint.method.toUpperCase()},`)
             .addImport('RequestMethod', ctx.infrastructurePackageName)
             .appendLine(`path = "${this.getPathWithInterpolation(ctx, endpoint)}",`)
             .appendLine('query = localVariableQuery,')
             .appendLine('headers = localVariableHeaders,')
             .appendLine('requiresAuthentication = false,')
-            .appendLineIf(!!endpoint.requestBody, 'body = localVariableBody'));
+            .appendLineIf(!!endpoint.requestBody, 'body = localVariableBody'), { multiline: true });
     }
     generateAdditionalMethods(ctx, builder) {
         this.generateEncodeUriComponentMethod(ctx, builder);
@@ -291,10 +297,10 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
     }
     generateParams(ctx, builder, endpoint, includeTypeDefinition) {
         const parameters = this.getAllParameters(ctx, endpoint);
-        builder.forEachSeparated(parameters, ', ', (builder, parameter) => builder.append((0, core_1.toCasing)(parameter.name, 'camel')).applyIf(includeTypeDefinition, (builder) => builder
+        builder.forEach(parameters, (builder, parameter) => builder.append((0, core_1.toCasing)(parameter.name, 'camel')).if(includeTypeDefinition, (builder) => builder
             .append(': ')
-            .apply((builder) => this.generateTypeUsage(ctx, builder, parameter.schema))
-            .appendIf(!parameter.required, '? = ', this.getDefaultValue(ctx, parameter.schema))));
+            .append((builder) => this.generateTypeUsage(ctx, builder, parameter.schema))
+            .appendIf(!parameter.required, '? = ', this.getDefaultValue(ctx, parameter.schema))), { separator: ', ' });
     }
     generateTypeUsage(ctx, builder, schema, fallback, nullable) {
         if (schema && schema.kind === 'array') {