@goast/kotlin 0.0.7 → 0.1.1

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

@@ -18,11 +18,11 @@ export class DefaultKotlinOkHttp3Generator extends 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
@@ -31,31 +31,31 @@ export class DefaultKotlinOkHttp3Generator extends 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);
@@ -64,30 +64,32 @@ export class DefaultKotlinOkHttp3Generator extends 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')
@@ -116,7 +118,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             .append(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);
@@ -132,38 +134,40 @@ export class DefaultKotlinOkHttp3Generator extends 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')
@@ -184,7 +188,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             .append(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);
@@ -203,27 +207,29 @@ export class DefaultKotlinOkHttp3Generator extends 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 ${toCasing(endpoint.name, 'camel')}`)
-            .apply((builder) => this.generateParamDocEntries(ctx, builder, endpoint))
+            .append((builder) => this.generateParamDocEntries(ctx, builder, endpoint))
             .append('@return RequestConfig'))
             .appendLine(' */');
     }
@@ -236,7 +242,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             .append(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);
@@ -254,24 +260,24 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             .appendLineIf(!!endpoint.requestBody, `val localVariableBody = ${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 (${toCasing(param.name, 'camel')} != null) `)
-            .parenthesizeMultilineIf(!param.required, '{}', (builder) => builder.appendLine(`put(${this.toStringLiteral(ctx, toCasing(param.name, 'camel'))}, listOf(${toCasing(param.name, 'camel')}.toString()))`))
-            .appendLine()))))
+            .parenthesizeIf(!param.required, '{}', (builder) => builder.appendLine(`put(${this.toStringLiteral(ctx, toCasing(param.name, 'camel'))}, listOf(${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);
@@ -288,10 +294,10 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
     }
     generateParams(ctx, builder, endpoint, includeTypeDefinition) {
         const parameters = this.getAllParameters(ctx, endpoint);
-        builder.forEachSeparated(parameters, ', ', (builder, parameter) => builder.append(toCasing(parameter.name, 'camel')).applyIf(includeTypeDefinition, (builder) => builder
+        builder.forEach(parameters, (builder, parameter) => builder.append(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') {

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

@@ -27,11 +27,11 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     }
     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
@@ -45,23 +45,25 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     }
     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;
@@ -72,7 +74,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
             ['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) => {
@@ -80,7 +82,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
                     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,
             ],
         ])
@@ -98,13 +100,15 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     generateApiInterfaceMethodSignature(ctx, builder, endpoint) {
         builder
             .append(`suspend fun ${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;
@@ -112,9 +116,9 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     }
     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;
@@ -155,16 +159,20 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         }
     }
     generateApiInterfaceMethodParameterSignature(ctx, builder, endpoint, parameter) {
+        var _a, _b;
         builder
             .append(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.default) === undefined && !((_b = parameter.schema) === null || _b === void 0 ? void 0 : _b.nullable) ? '?' : '');
     }
     generateApiInterfaceMethodContent(ctx, builder, endpoint) {
         const parameters = this.getAllParameters(ctx, endpoint);
         builder
             .append(`return getDelegate().${toCasing(endpoint.name, 'camel')}(`)
-            .forEachSeparated(parameters, ', ', (builder, parameter) => builder.append(toCasing(parameter.name, 'camel')))
+            .forEach(parameters, (builder, parameter) => builder.append(toCasing(parameter.name, 'camel')), {
+            separator: ', ',
+        })
             .append(')');
     }
     generateApiControllerFile(ctx, dirPath, packageName) {
@@ -179,11 +187,11 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     }
     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
@@ -199,7 +207,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         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));
     }
@@ -216,10 +224,10 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
             .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`);
@@ -236,11 +244,11 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     }
     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', [
@@ -257,15 +265,17 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
             .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.
@@ -273,13 +283,15 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     generateApiDelegateInterfaceMethodSignature(ctx, builder, endpoint) {
         builder
             .append(`suspend fun ${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;
@@ -287,18 +299,20 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     }
     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, _b;
         builder
             .append(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.default) === undefined && !((_b = parameter.schema) === null || _b === void 0 ? void 0 : _b.nullable) ? '?' : '');
     }
     generateApiDelegateInterfaceMethodContent(ctx, builder, endpoint) {
         builder

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.0.7",
+  "version": "0.1.1",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",
@@ -12,7 +12,7 @@
     "fs-extra": "^11.1.1",
     "node-fetch": "^2.6.11",
     "yaml": "^2.3.1",
-    "@goast/core": "0.0.6",
+    "@goast/core": "0.1.0",
     "tslib": "^2.3.0"
   },
   "module": "./esm/index.js",

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

@@ -11,6 +11,7 @@ export interface KotlinModelGenerator<TOutput extends Output = Output> {
 export declare class DefaultKotlinModelGenerator extends KotlinFileGenerator<Context, Output> implements KotlinModelGenerator {
     generate(ctx: KotlinModelGeneratorContext): KotlinModelGeneratorOutput;
     protected generateFileContent(ctx: Context, builder: Builder): void;
+    protected generateTypeUsage(ctx: Context, builder: Builder, schema: ApiSchema): void;
     protected generateObjectType(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
     protected generateObjectPackageMember(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
     protected generateObjectInterface(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
@@ -30,7 +31,7 @@ export declare class DefaultKotlinModelGenerator extends KotlinFileGenerator<Con
     protected generateArrayType(ctx: Context, builder: Builder, schema: ApiSchema<'array'>): void;
     protected generateDocumentation(ctx: Context, builder: Builder, schema: ApiSchema): void;
     protected shouldGenerateTypeDeclaration(ctx: Context, schema: ApiSchema): boolean;
-    protected getDeclarationTypeName(ctx: Context): string;
+    protected getDeclarationTypeName(ctx: Context, schema: ApiSchema): string;
     protected sortProperties(ctx: Context, schema: ApiSchema, properties: Iterable<ApiSchemaProperty>): ApiSchemaProperty[];
     private hasProperty;
 }

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

@@ -19,5 +19,4 @@ export type KotlinModelGeneratorOutput = KotlinImport & {
 export type KotlinModelsGeneratorContext = OpenApiSchemasGenerationProviderContext<KotlinModelsGeneratorInput, KotlinModelsGeneratorOutput, KotlinModelsGeneratorConfig, KotlinModelGeneratorOutput>;
 export type KotlinModelGeneratorContext = KotlinModelsGeneratorContext & {
     schema: ApiSchema;
-    getSchemaResult(schema: ApiSchema): KotlinModelGeneratorOutput;
 };