@goast/kotlin 0.0.1 → 0.0.2

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

@@ -0,0 +1,400 @@
+import { writeFileSync } from 'fs';
+import { dirname } from 'path';
+import { ensureDirSync } from 'fs-extra';
+import { toCasing } from '@goast/core';
+import { KotlinFileBuilder } from '../../../file-builder';
+import { toKotlinStringLiteral } from '../../../utils';
+import { KotlinFileGenerator } from '../../file-generator';
+export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
+    generate(ctx) {
+        const packageName = this.getPackageName(ctx);
+        const typeName = this.getApiClientName(ctx);
+        const filePath = this.getFilePath(ctx, packageName);
+        ensureDirSync(dirname(filePath));
+        console.log(`Generating client for service ${ctx.service.name} to ${filePath}...`);
+        const builder = new KotlinFileBuilder(packageName, ctx.config);
+        this.generateApiClientFileContent(ctx, builder);
+        writeFileSync(filePath, builder.toString());
+        return { typeName, packageName };
+    }
+    generateApiClientFileContent(ctx, builder) {
+        builder
+            .apply((builder) => this.generateApiClientClassAnnotations(ctx, builder))
+            .ensureCurrentLineEmpty()
+            .apply((builder) => this.generateApiClientClassSignature(ctx, builder))
+            .append(' ')
+            .parenthesizeMultiline('{}', (builder) => this.generateApiClientClassContent(ctx, builder));
+    }
+    generateApiClientClassAnnotations(ctx, builder) {
+        // None for now
+    }
+    generateApiClientClassSignature(ctx, builder) {
+        builder
+            .append('class ')
+            .append(this.getApiClientName(ctx))
+            .parenthesizeMultiline('()', (builder) => builder
+            .appendLine('basePath: String = defaultBasePath,')
+            .appendLine('client: OkHttpClient = ApiClient.defaultClient')
+            .addImport('OkHttpClient', 'okhttp3')
+            .addImport('ApiClient', ctx.config.infrastructurePackageName))
+            .append(' : ')
+            .append('ApiClient(basePath, client)');
+    }
+    generateApiClientClassContent(ctx, builder) {
+        builder
+            .apply((builder) => this.generateApiClientCompanionObject(ctx, builder))
+            .forEach(ctx.service.endpoints, (builder, endpoint) => builder
+            .ensurePreviousLineEmpty()
+            .apply((builder) => this.generateApiClientMethod(ctx, builder, endpoint))
+            .ensurePreviousLineEmpty()
+            .apply((builder) => this.generateApiClientHttpInfoMethod(ctx, builder, endpoint))
+            .ensurePreviousLineEmpty()
+            .apply((builder) => this.generateApiClientRequestConfigMethod(ctx, builder, endpoint)))
+            .ensurePreviousLineEmpty()
+            .apply((builder) => this.generateAdditionalMethods(ctx, builder));
+    }
+    generateApiClientCompanionObject(ctx, builder) {
+        builder
+            .append('companion object ')
+            .parenthesizeMultiline('{}', (builder) => this.generateApiClientCompanionObjectContent(ctx, builder));
+    }
+    generateApiClientCompanionObjectContent(ctx, builder) {
+        this.generateApiClientCompanionObjectDefaultBasePathProperty(ctx, builder);
+    }
+    generateApiClientCompanionObjectDefaultBasePathProperty(ctx, builder) {
+        builder
+            .appendAnnotation('JvmStatic')
+            .append('val defaultBasePath: String by lazy ')
+            .parenthesizeMultiline('{}', (builder) => builder
+            .appendLine(`System.getProperties().getProperty(ApiClient.baseUrlKey, ${this.toStringLiteral(ctx, this.getBasePath(ctx))})`)
+            .addImport('ApiClient', ctx.config.infrastructurePackageName));
+    }
+    generateApiClientMethod(ctx, builder, endpoint) {
+        builder
+            .apply((builder) => this.generateApiClientMethodDocumentation(ctx, builder, endpoint))
+            .ensureCurrentLineEmpty()
+            .apply((builder) => this.generateApiClientMethodAnnotations(ctx, builder, endpoint))
+            .ensureCurrentLineEmpty()
+            .apply((builder) => this.generateApiClientMethodSignature(ctx, builder, endpoint))
+            .append(' ')
+            .parenthesizeMultiline('{}', (builder) => this.generateApiClientMethodContent(ctx, builder, endpoint));
+    }
+    generateApiClientMethodDocumentation(ctx, builder, endpoint) {
+        builder
+            .appendLine('/**')
+            .applyWithLinePrefix(' * ', (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('@return ')
+                .apply((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')
+                .appendLine('@throws UnsupportedOperationException If the API returns an informational or redirection response')
+                .appendLine('@throws ClientException If the API returns a client error response')
+                .appendLine('@throws ServerException If the API returns a server error response');
+        })
+            .appendLine(' */');
+    }
+    generateApiClientMethodAnnotations(ctx, builder, endpoint) {
+        const responseSchema = this.getResponseSchema(ctx, endpoint);
+        builder
+            .applyIf(responseSchema !== undefined, (builder) => builder.appendAnnotation('Supress', undefined, ['"UNCHECKED_CAST"']))
+            .appendAnnotation('Throws', undefined, [
+            'IllegalStateException::class',
+            'IOException::class',
+            'UnsupportedOperationException::class',
+            'ClientException::class',
+            'ServerException::class',
+        ])
+            .addImport('IOException', 'java.io')
+            .addImport('ClientException', ctx.config.infrastructurePackageName)
+            .addImport('ServerException', ctx.config.infrastructurePackageName);
+    }
+    generateApiClientMethodSignature(ctx, builder, endpoint) {
+        builder
+            .append('fun ')
+            .append(toCasing(endpoint.name, 'camel'))
+            .parenthesize('()', (builder) => this.generateApiClientMethodParameters(ctx, builder, endpoint))
+            .append(': ')
+            .apply((builder) => this.generateApiClientMethodReturnType(ctx, builder, endpoint));
+    }
+    generateApiClientMethodParameters(ctx, builder, endpoint) {
+        this.generateParams(ctx, builder, endpoint, true);
+    }
+    generateApiClientMethodReturnType(ctx, builder, endpoint) {
+        this.generateTypeUsage(ctx, builder, this.getResponseSchema(ctx, endpoint), 'Unit');
+    }
+    generateApiClientMethodContent(ctx, builder, endpoint) {
+        const responseSchema = this.getResponseSchema(ctx, endpoint);
+        builder
+            .append(`val localVarResponse = ${toCasing(endpoint.name, 'camel')}HttpInfo`)
+            .parenthesize('()', (builder) => this.generateParams(ctx, builder, endpoint, false))
+            .appendLine()
+            .appendLine()
+            .append('return when (localVarResponse.responseType) ')
+            .parenthesizeMultiline('{}', (builder) => builder
+            .append('ResponseType.Success -> ')
+            .applyIfElse(responseSchema === undefined, (builder) => builder.append('Unit'), (builder) => builder
+            .append('(localVarResponse as Success<*>).data as ')
+            .addImport('Success', ctx.config.infrastructurePackageName)
+            .apply((builder) => this.generateTypeUsage(ctx, builder, responseSchema)))
+            .ensureCurrentLineEmpty()
+            .appendLine(responseErrorHandlingCode)
+            .addImport('ClientError', ctx.config.infrastructurePackageName)
+            .addImport('ServerError', ctx.config.infrastructurePackageName)
+            .addImport('ResponseType', ctx.config.infrastructurePackageName));
+    }
+    generateApiClientHttpInfoMethod(ctx, builder, endpoint) {
+        builder
+            .apply((builder) => this.generateApiClientHttpInfoMethodDocumentation(ctx, builder, endpoint))
+            .ensureCurrentLineEmpty()
+            .apply((builder) => this.generateApiClientHttpInfoMethodAnnotations(ctx, builder, endpoint))
+            .ensureCurrentLineEmpty()
+            .apply((builder) => this.generateApiClientHttpInfoMethodSignature(ctx, builder, endpoint))
+            .append(' ')
+            .parenthesizeMultiline('{}', (builder) => this.generateApiClientHttpInfoMethodContent(ctx, builder, endpoint));
+    }
+    generateApiClientHttpInfoMethodDocumentation(ctx, builder, endpoint) {
+        builder
+            .appendLine('/**')
+            .applyWithLinePrefix(' * ', (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('@return ')
+                .apply((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')
+                .appendLine('@throws UnsupportedOperationException If the API returns an informational or redirection response')
+                .appendLine('@throws ClientException If the API returns a client error response')
+                .appendLine('@throws ServerException If the API returns a server error response');
+        })
+            .appendLine(' */');
+    }
+    generateApiClientHttpInfoMethodAnnotations(ctx, builder, endpoint) {
+        builder
+            .appendAnnotation('Throws', undefined, ['IllegalStateException::class', 'IOException::class'])
+            .addImport('IOException', 'java.io');
+    }
+    generateApiClientHttpInfoMethodSignature(ctx, builder, endpoint) {
+        builder
+            .append('fun ')
+            .append(toCasing(endpoint.name, 'camel'), 'HttpInfo')
+            .parenthesize('()', (builder) => this.generateApiClientHttpInfoMethodSignatureParameters(ctx, builder, endpoint))
+            .append(': ')
+            .apply((builder) => this.generateApiClientHttpInfoMethodReturnType(ctx, builder, endpoint));
+    }
+    generateApiClientHttpInfoMethodSignatureParameters(ctx, builder, endpoint) {
+        this.generateParams(ctx, builder, endpoint, true);
+    }
+    generateApiClientHttpInfoMethodReturnType(ctx, builder, endpoint) {
+        builder
+            .append('ApiResponse')
+            .addImport('ApiResponse', ctx.config.infrastructurePackageName)
+            .parenthesize('<>', (builder) => this.generateTypeUsage(ctx, builder, this.getResponseSchema(ctx, endpoint), 'Unit'));
+    }
+    generateApiClientHttpInfoMethodContent(ctx, builder, endpoint) {
+        builder
+            .append(`val localVariableConfig = ${toCasing(endpoint.name, 'camel')}RequestConfig`)
+            .parenthesize('()', (builder) => this.generateParams(ctx, builder, endpoint, false))
+            .appendLine()
+            .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(', ')
+            .apply((builder) => this.generateTypeUsage(ctx, builder, this.getResponseSchema(ctx, endpoint), 'Unit')))
+            .parenthesizeMultiline('()', (builder) => builder.append('localVariableConfig'));
+    }
+    generateApiClientRequestConfigMethod(ctx, builder, endpoint) {
+        builder
+            .apply((builder) => this.generateApiClientRequestConfigMethodDocumentation(ctx, builder, endpoint))
+            .ensureCurrentLineEmpty()
+            .apply((builder) => this.generateApiClientRequestConfigMethodAnnotations(ctx, builder, endpoint))
+            .ensureCurrentLineEmpty()
+            .apply((builder) => this.generateApiClientRequestConfigMethodSignature(ctx, builder, endpoint))
+            .append(' ')
+            .parenthesizeMultiline('{}', (builder) => this.generateApiClientRequestConfigMethodContent(ctx, builder, endpoint));
+    }
+    generateApiClientRequestConfigMethodDocumentation(ctx, builder, endpoint) {
+        builder
+            .appendLine('/**')
+            .applyWithLinePrefix(' * ', (builder) => builder
+            .appendLine(`To obtain the request config of the operation ${toCasing(endpoint.name, 'camel')}`)
+            .apply((builder) => this.generateParamDocEntries(ctx, builder, endpoint))
+            .append('@return RequestConfig'))
+            .appendLine(' */');
+    }
+    generateApiClientRequestConfigMethodAnnotations(ctx, builder, endpoint) {
+        // No annotations needed
+    }
+    generateApiClientRequestConfigMethodSignature(ctx, builder, endpoint) {
+        builder
+            .append('private fun ')
+            .append(toCasing(endpoint.name, 'camel'), 'RequestConfig')
+            .parenthesize('()', (builder) => this.generateApiClientRequestConfigMethodSignatureParameters(ctx, builder, endpoint))
+            .append(': ')
+            .apply((builder) => this.generateApiClientRequestConfigMethodReturnType(ctx, builder, endpoint));
+    }
+    generateApiClientRequestConfigMethodSignatureParameters(ctx, builder, endpoint) {
+        this.generateParams(ctx, builder, endpoint, true);
+    }
+    generateApiClientRequestConfigMethodReturnType(ctx, builder, endpoint) {
+        builder
+            .append('RequestConfig')
+            .addImport('RequestConfig', ctx.config.infrastructurePackageName)
+            .parenthesize('<>', (builder) => { var _a; return this.generateTypeUsage(ctx, builder, (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0].schema, 'Unit'); });
+    }
+    generateApiClientRequestConfigMethodContent(ctx, builder, endpoint) {
+        var _a, _b;
+        builder
+            .appendLine(`val localVariableBody = ${this.getRequestBodyParamName(ctx, endpoint)}`)
+            .appendLine('val localVariableQuery: MultiValueMap = mutableMapOf()')
+            .addImport('MultiValueMap', ctx.config.infrastructurePackageName)
+            .forEach(endpoint.parameters.filter((x) => x.target === 'query'), (builder, param) => builder.appendLine(`localVariableQuery["${param.name}"] = ${toCasing(param.name, 'camel')}`))
+            .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.config.infrastructurePackageName)
+            .parenthesizeMultiline('()', (builder) => builder
+            .appendLine(`method = RequestMethod.${endpoint.method.toUpperCase()},`)
+            .addImport('RequestMethod', ctx.config.infrastructurePackageName)
+            .appendLine(`path = "${this.getPathWithInterpolation(ctx, endpoint)}",`)
+            .appendLine('query = localVariableQuery,')
+            .appendLine('headers = localVariableHeaders,')
+            .appendLine('requiresAuthentication = false,')
+            .appendLine('body = localVariableBody'));
+    }
+    generateAdditionalMethods(ctx, builder) {
+        this.generateEncodeUriComponentMethod(ctx, builder);
+    }
+    generateEncodeUriComponentMethod(ctx, builder) {
+        builder
+            .appendLine('private fun encodeURIComponent(uriComponent: String): String =')
+            .indent('HttpUrl.Builder().scheme("http").host("localhost").addPathSegment(uriComponent).build().encodedPathSegments[0]')
+            .addImport('HttpUrl', 'okhttp3');
+    }
+    generateParamDocEntries(ctx, builder, endpoint) {
+        const parameters = this.getAllParameters(ctx, endpoint);
+        builder.forEach(parameters, (builder, parameter) => { var _a; return builder.appendLine(`@param ${parameter.name} ${(_a = parameter.description) !== null && _a !== void 0 ? _a : 'TODO: Provide description'}`); });
+    }
+    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
+            .append(': ')
+            .apply((builder) => this.generateTypeUsage(ctx, builder, parameter.schema))
+            .appendIf(!parameter.required, '? = ', this.getDefaultValue(ctx, parameter.schema))));
+    }
+    generateTypeUsage(ctx, builder, schema, fallback) {
+        if (schema && schema.kind === 'array') {
+            const schemaInfo = this.getSchemaInfo(ctx, schema.items);
+            builder.append(`List<${schemaInfo.typeName}>`);
+            builder.imports.addImports([schemaInfo, ...schemaInfo.additionalImports]);
+        }
+        else if (schema || !fallback) {
+            const schemaInfo = this.getSchemaInfo(ctx, schema);
+            builder.append(schemaInfo.typeName);
+            builder.imports.addImports([schemaInfo, ...schemaInfo.additionalImports]);
+        }
+        else {
+            builder.append(fallback);
+        }
+    }
+    getDefaultValue(ctx, schema) {
+        if (!(schema === null || schema === void 0 ? void 0 : schema.default)) {
+            return 'null';
+        }
+        if (typeof schema.default === 'string') {
+            return toKotlinStringLiteral(schema.default);
+        }
+        else if (typeof schema.default === 'number' || typeof schema.default === 'boolean') {
+            return schema.default.toString();
+        }
+        else {
+            return 'null';
+        }
+    }
+    getPathWithInterpolation(ctx, endpoint) {
+        let path = endpoint.path;
+        endpoint.parameters
+            .filter((x) => x.target === 'path')
+            .forEach((parameter) => {
+            path = path.replace(`{${parameter.name}}`, `\${encodeURIComponent(${toCasing(parameter.name, 'camel')}.toString())}`);
+        });
+        return path;
+    }
+    getResponseSchema(ctx, endpoint) {
+        var _a, _b;
+        return (_b = (_a = endpoint.responses.find((x) => !x.statusCode || (x.statusCode >= 200 && x.statusCode < 300))) === null || _a === void 0 ? void 0 : _a.contentOptions[0]) === null || _b === void 0 ? void 0 : _b.schema;
+    }
+    getSchemaInfo(ctx, schema) {
+        var _a;
+        return ((_a = (schema && ctx.input.models[schema.id])) !== null && _a !== void 0 ? _a : { typeName: 'Any?', packageName: undefined, additionalImports: [] });
+    }
+    getAllParameters(ctx, endpoint) {
+        const parameters = endpoint.parameters.filter((parameter) => parameter.target === 'query' || parameter.target === 'path');
+        if (endpoint.requestBody) {
+            const schema = endpoint.requestBody.content[0].schema;
+            parameters.push({
+                $src: undefined,
+                $ref: undefined,
+                id: 'body',
+                name: this.getRequestBodyParamName(ctx, endpoint),
+                target: 'body',
+                schema,
+                required: endpoint.requestBody.required,
+                description: endpoint.requestBody.description,
+                allowEmptyValue: undefined,
+                allowReserved: undefined,
+                deprecated: false,
+                explode: undefined,
+                style: undefined,
+            });
+        }
+        return parameters.sort((a, b) => (a.required === b.required ? 0 : a.required ? -1 : 1));
+    }
+    getRequestBodyParamName(ctx, endpoint) {
+        var _a;
+        const schema = (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0].schema;
+        const schemaInfo = this.getSchemaInfo(ctx, schema);
+        return /^Any\??$/.test(schemaInfo.typeName) ? 'body' : schemaInfo.typeName;
+    }
+    getBasePath(ctx) {
+        var _a, _b, _c, _d, _e, _f;
+        return (_f = (_e = (_d = (_c = ((_a = ctx.service.$src) !== null && _a !== void 0 ? _a : (_b = ctx.service.endpoints[0]) === null || _b === void 0 ? void 0 : _b.$src)) === null || _c === void 0 ? void 0 : _c.document.servers) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.url) !== null && _f !== void 0 ? _f : '/';
+    }
+    getFilePath(ctx, packageName) {
+        return `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}/${this.getApiClientName(ctx)}.kt`;
+    }
+    getPackageName(ctx) {
+        return ctx.config.packageName + ctx.config.packageSuffix;
+    }
+    getApiClientName(ctx) {
+        return toCasing(ctx.service.name, 'pascal') + 'ApiClient';
+    }
+}
+const responseErrorHandlingCode = `ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+ResponseType.ClientError -> {
+    val localVarError = localVarResponse as ClientError<*>
+    throw ClientException(
+        "Client error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
+        localVarError.statusCode,
+        localVarResponse
+    )
+}
+
+ResponseType.ServerError -> {
+    val localVarError = localVarResponse as ServerError<*>
+    throw ServerException(
+        "Server error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
+        localVarError.statusCode,
+        localVarResponse
+    )
+}`;

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

@@ -0,0 +1,44 @@
+import { writeFileSync } from 'fs';
+import { dirname, resolve } from 'path';
+import { ensureDirSync, readFileSync, readdirSync } from 'fs-extra';
+import { Factory, OpenApiServicesGenerationProviderBase } from '@goast/core';
+import { defaultKotlinOkHttp3ClientsGeneratorConfig, } from './models';
+import { DefaultKotlinOkHttp3Generator } from './okhttp3-client-generator';
+export class KotlinOkHttp3ClientsGenerator extends OpenApiServicesGenerationProviderBase {
+    constructor(serviceGeneratorFactory) {
+        super();
+        this._serviceGeneratorFactory = serviceGeneratorFactory !== null && serviceGeneratorFactory !== void 0 ? serviceGeneratorFactory : Factory.fromValue(new DefaultKotlinOkHttp3Generator());
+    }
+    onGenerate(ctx) {
+        this.copyInfrastructureFiles(ctx);
+        return super.onGenerate(ctx);
+    }
+    initResult() {
+        return {
+            clients: {},
+        };
+    }
+    generateService(ctx, service) {
+        const serviceGenerator = this._serviceGeneratorFactory.create();
+        return serviceGenerator.generate(Object.assign(Object.assign({}, ctx), { service }));
+    }
+    addServiceResult(ctx, service, result) {
+        ctx.output.clients[service.id] = result;
+    }
+    buildContext(context, config) {
+        context.data.services = context.data.services.filter((x) => x.name !== 'exclude-from-generation');
+        return this.getProviderContext(context, config, defaultKotlinOkHttp3ClientsGeneratorConfig);
+    }
+    copyInfrastructureFiles(ctx) {
+        const sourceDir = resolve(dirname(require.resolve('@goast/kotlin')), '../assets/client/okhttp3');
+        const targetDir = resolve(ctx.config.outputDir, ctx.config.infrastructurePackageName.replace(/\./g, '/'));
+        ensureDirSync(targetDir);
+        const files = readdirSync(sourceDir);
+        for (const file of files) {
+            const fileContent = readFileSync(resolve(sourceDir, file))
+                .toString()
+                .replace(/@PACKAGE_NAME@/g, ctx.config.infrastructurePackageName);
+            writeFileSync(resolve(targetDir, file), fileContent);
+        }
+    }
+}

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

@@ -30,10 +30,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
             .ensureCurrentLineEmpty()
             .apply((builder) => this.generateApiInterfaceSignature(ctx, builder))
             .append(' ')
-            .parenthesize('{}', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiInterfaceContent(ctx, builder))
-            .ensureCurrentLineEmpty());
+            .parenthesizeMultiline('{}', (builder) => this.generateApiInterfaceContent(ctx, builder));
     }
     generateApiInterfaceAnnotations(ctx, builder) {
         builder
@@ -63,10 +60,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
             .ensureCurrentLineEmpty()
             .apply((builder) => this.generateApiInterfaceMethodSignature(ctx, builder, endpoint))
             .append(' ')
-            .parenthesize('{}', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiInterfaceMethodContent(ctx, builder, endpoint))
-            .appendLine());
+            .parenthesizeMultiline('{}', (builder) => this.generateApiInterfaceMethodContent(ctx, builder, endpoint));
     }
     generateApiInterfaceMethodAnnnotations(ctx, builder, endpoint) {
         var _a, _b, _c;
@@ -77,9 +71,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
             ['description', this.toStringLiteral(ctx, (_b = endpoint.description) === null || _b === void 0 ? void 0 : _b.trim())],
             [
                 'responses',
-                (builder) => builder.parenthesize('[]', (builder) => builder
-                    .appendLine()
-                    .forEachSeparated(endpoint.responses, ',\n', (builder, response) => builder
+                (builder) => builder.parenthesizeMultiline('[]', (builder) => builder.forEachSeparated(endpoint.responses, ',\n', (builder, response) => builder
                     .append('ApiResponse')
                     .addImport('ApiResponse', 'io.swagger.v3.oas.annotations.responses')
                     .parenthesize('()', (builder) => {
@@ -87,8 +79,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())}`);
-                }))
-                    .appendLine()),
+                }))),
                 endpoint.responses.length > 0,
             ],
         ])
@@ -106,10 +97,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     generateApiInterfaceMethodSignature(ctx, builder, endpoint) {
         builder
             .append(`suspend fun ${toCasing(endpoint.name, 'camel')}`)
-            .parenthesize('()', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiInterfaceMethodParameters(ctx, builder, endpoint))
-            .appendLine())
+            .parenthesizeMultiline('()', (builder) => this.generateApiInterfaceMethodParameters(ctx, builder, endpoint))
             .append(': ')
             .apply((builder) => this.generateApiInterfaceMethodReturnType(ctx, builder, endpoint));
     }
@@ -194,10 +182,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
             .ensureCurrentLineEmpty()
             .apply((builder) => this.generateApiControllerSignature(ctx, builder))
             .append(' ')
-            .parenthesize('{}', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiControllerContent(ctx, builder))
-            .ensureCurrentLineEmpty());
+            .parenthesizeMultiline('{}', (builder) => this.generateApiControllerContent(ctx, builder));
     }
     generateApiControllerAnnotations(ctx, builder) {
         builder
@@ -213,10 +198,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         builder
             .append('class ')
             .append(this.getApiControllerName(ctx))
-            .parenthesize('()', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiControllerParameters(ctx, builder))
-            .ensureCurrentLineEmpty())
+            .parenthesizeMultiline('()', (builder) => this.generateApiControllerParameters(ctx, builder))
             .append(' : ')
             .append(this.getApiInterfaceName(ctx));
     }
@@ -233,12 +215,10 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
             .appendLine(this.getApiDelegateInterfaceName(ctx))
             .appendLine()
             .append('init ')
-            .parenthesize('{}', (builder) => builder
-            .appendLine()
+            .parenthesizeMultiline('{}', (builder) => builder
             .append('this.delegate = Optional.ofNullable(delegate).orElse')
             .addImport('Optional', 'java.util')
-            .parenthesize('()', (builder) => builder.append('object : ').append(this.getApiDelegateInterfaceName(ctx)).append(' {}'))
-            .appendLine())
+            .parenthesize('()', (builder) => builder.append('object : ').append(this.getApiDelegateInterfaceName(ctx)).append(' {}')))
             .appendLine()
             .appendLine()
             .appendLine(`override fun getDelegate(): ${this.getApiDelegateInterfaceName(ctx)} = delegate`);
@@ -259,10 +239,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
             .ensureCurrentLineEmpty()
             .apply((builder) => this.generateApiDelegateInterfaceSignature(ctx, builder))
             .append(' ')
-            .parenthesize('{}', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiDelegateInterfaceContent(ctx, builder))
-            .ensureCurrentLineEmpty());
+            .parenthesizeMultiline('{}', (builder) => this.generateApiDelegateInterfaceContent(ctx, builder));
     }
     generateApiDelegateInterfaceAnnotations(ctx, builder) {
         builder.appendAnnotation('Generated', 'jakarta.annotation', [
@@ -287,10 +264,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
             .ensureCurrentLineEmpty()
             .apply((builder) => this.generateApiDelegateInterfaceMethodSignature(ctx, builder, endpoint))
             .append(' ')
-            .parenthesize('{}', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiDelegateInterfaceMethodContent(ctx, builder, endpoint))
-            .ensureCurrentLineEmpty());
+            .parenthesizeMultiline('{}', (builder) => this.generateApiDelegateInterfaceMethodContent(ctx, builder, endpoint));
     }
     generateApiDelegateInterfaceMethodAnnnotations(ctx, builder, endpoint) {
         // None for now.
@@ -298,10 +272,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     generateApiDelegateInterfaceMethodSignature(ctx, builder, endpoint) {
         builder
             .append(`suspend fun ${toCasing(endpoint.name, 'camel')}`)
-            .parenthesize('()', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiDelegateInterfaceMethodParameters(ctx, builder, endpoint))
-            .appendLine())
+            .parenthesizeMultiline('()', (builder) => this.generateApiDelegateInterfaceMethodParameters(ctx, builder, endpoint))
             .append(': ')
             .apply((builder) => this.generateApiDelegateInterfaceMethodReturnType(ctx, builder, endpoint));
     }
@@ -384,11 +355,13 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         const parameters = endpoint.parameters.filter((parameter) => parameter.target === 'query' || parameter.target === 'path');
         if (endpoint.requestBody) {
             const schema = endpoint.requestBody.content[0].schema;
+            const schemaInfo = this.getSchemaInfo(ctx, schema);
+            const name = /^Any\??$/.test(schemaInfo.typeName) ? 'body' : schemaInfo.typeName;
             parameters.push({
                 $src: undefined,
                 $ref: undefined,
                 id: 'body',
-                name: schema ? this.getSchemaInfo(ctx, schema).typeName : 'body',
+                name,
                 target: 'body',
                 schema,
                 required: endpoint.requestBody.required,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "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.5",
+    "@goast/core": "0.0.6",
     "tslib": "^2.3.0"
   },
   "module": "./esm/index.js",

package/types/lib/file-builder.d.ts

@@ -7,7 +7,7 @@ export declare class KotlinFileBuilder extends SourceBuilder {
     readonly imports: ImportCollection;
     constructor(packageName: string | undefined, options: SourceBuilderOptions);
     addImport(name: string, packageName?: string): this;
-    appendAnnotation(name: string, packageName: string | undefined, args?: AnnotationArgument<this>[]): this;
+    appendAnnotation(name: string, packageName?: string, args?: AnnotationArgument<this>[]): this;
     clear(): void;
     toString(addPadding?: boolean): string;
 }

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

@@ -1,3 +1,4 @@
 export * from './file-generator';
 export * from './models';
+export * from './services/okhttp3-clients';
 export * from './services/spring-controllers';

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

@@ -12,11 +12,16 @@ export declare class DefaultKotlinModelGenerator extends KotlinFileGenerator<Con
     generate(ctx: KotlinModelGeneratorContext): KotlinModelGeneratorOutput;
     protected generateFileContent(ctx: Context, builder: Builder): void;
     protected generateObjectType(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
-    protected generateDataClass(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
-    protected generatePropertyAnnotations(ctx: Context, builder: Builder, schema: ApiSchema, property: ApiSchemaProperty): void;
+    protected generateObjectPackageMember(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
+    protected generateObjectInterface(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
+    protected generateObjectInterfaceAnnotations(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
+    protected generateObjectInterfaceSignature(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
+    protected generateObjectInterfaceMembers(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
+    protected generateObjectDataClass(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
+    protected generateObjectDataClassParameterAnnotations(ctx: Context, builder: Builder, schema: ApiSchema, property: ApiSchemaProperty): void;
     protected generatePropertyValidationAnnotations(ctx: Context, builder: Builder, schema: ApiSchema, property: ApiSchemaProperty): void;
     protected generatePropertySchemaAnnotation(ctx: Context, builder: Builder, schema: ApiSchema, property: ApiSchemaProperty): void;
-    protected generateJsonPropertyAnnotation(ctx: Context, builder: Builder, schema: ApiSchema, property: ApiSchemaProperty): void;
+    protected generateJsonPropertyAnnotation(ctx: Context, builder: Builder, schema: ApiSchema, property: ApiSchemaProperty, scope?: string): void;
     protected generateMapType(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
     protected generateType(ctx: Context, builder: Builder, schema: ApiSchema): void;
     protected generateNumberType(ctx: Context, builder: Builder, schema: ApiSchema<'number' | 'integer'>): void;
@@ -27,5 +32,6 @@ export declare class DefaultKotlinModelGenerator extends KotlinFileGenerator<Con
     protected shouldGenerateTypeDeclaration(ctx: Context, schema: ApiSchema): boolean;
     protected getDeclarationTypeName(ctx: Context): string;
     protected sortProperties(ctx: Context, schema: ApiSchema, properties: Iterable<ApiSchemaProperty>): ApiSchemaProperty[];
+    private hasProperty;
 }
 export {};

package/types/lib/generators/services/okhttp3-clients/index.d.ts

@@ -0,0 +1,3 @@
+export * from './models';
+export * from './okhttp3-client-generator';
+export * from './okhttp3-clients-generator';