@goast/kotlin 0.0.2 → 0.0.4

package/assets/client/okhttp3/ApiAbstractions.kt

@@ -0,0 +1,30 @@
+package @PACKAGE_NAME@
+
+typealias MultiValueMap = MutableMap<String, List<String>>
+
+fun collectionDelimiter(collectionFormat: String) = when (collectionFormat) {
+    "csv" -> ","
+    "tsv" -> "\t"
+    "pipe" -> "|"
+    "space" -> " "
+    else -> ""
+}
+
+val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
+
+fun <T : Any?> toMultiValue(
+    items: Array<T>,
+    collectionFormat: String,
+    map: (item: T) -> String = defaultMultiValueConverter
+) = toMultiValue(items.asIterable(), collectionFormat, map)
+
+fun <T : Any?> toMultiValue(
+    items: Iterable<T>,
+    collectionFormat: String,
+    map: (item: T) -> String = defaultMultiValueConverter
+): List<String> {
+    return when (collectionFormat) {
+        "multi" -> items.map(map)
+        else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))
+    }
+}

package/assets/client/okhttp3/ApiClient.kt

@@ -0,0 +1,248 @@
+package @PACKAGE_NAME@
+
+import com.fasterxml.jackson.core.type.TypeReference
+import okhttp3.FormBody
+import okhttp3.Headers.Companion.toHeaders
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.ResponseBody
+import okhttp3.internal.EMPTY_REQUEST
+import java.io.File
+import java.net.URLConnection
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
+import java.time.OffsetTime
+import java.util.Locale
+
+open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
+    companion object {
+        protected const val ContentType = "Content-Type"
+        protected const val Accept = "Accept"
+        protected const val Authorization = "Authorization"
+        protected const val JsonMediaType = "application/json"
+        protected const val FormDataMediaType = "multipart/form-data"
+        protected const val FormUrlEncMediaType = "application/x-www-form-urlencoded"
+        protected const val XmlMediaType = "application/xml"
+
+        val apiKey: MutableMap<String, String> = mutableMapOf()
+        val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
+        var username: String? = null
+        var password: String? = null
+        var accessToken: String? = null
+        const val baseUrlKey = "org.openapitools.client.baseUrl"
+
+        @JvmStatic
+        val defaultClient: OkHttpClient by lazy {
+            builder.build()
+        }
+
+        @JvmStatic
+        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    protected fun guessContentTypeFromFile(file: File): String {
+        val contentType = URLConnection.guessContentTypeFromName(file.name)
+        return contentType ?: "application/octet-stream"
+    }
+
+    protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
+        when {
+            content is File -> content.asRequestBody(
+                (mediaType ?: guessContentTypeFromFile(content)).toMediaTypeOrNull()
+            )
+
+            mediaType == FormDataMediaType ->
+                MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .apply {
+                        // content's type *must* be Map<String, PartConfig<*>>
+                        @Suppress("UNCHECKED_CAST")
+                        (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
+                            if (part.body is File) {
+                                val partHeaders = part.headers.toMutableMap() +
+                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
+                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
+                                addPart(
+                                    partHeaders.toHeaders(),
+                                    part.body.asRequestBody(fileMediaType)
+                                )
+                            } else {
+                                val partHeaders = part.headers.toMutableMap() +
+                                    ("Content-Disposition" to "form-data; name=\"$name\"")
+                                addPart(
+                                    partHeaders.toHeaders(),
+                                    parameterToString(part.body).toRequestBody(null)
+                                )
+                            }
+                        }
+                    }.build()
+
+            mediaType == FormUrlEncMediaType -> {
+                FormBody.Builder().apply {
+                    // content's type *must* be Map<String, PartConfig<*>>
+                    @Suppress("UNCHECKED_CAST")
+                    (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
+                        add(name, parameterToString(part.body))
+                    }
+                }.build()
+            }
+
+            mediaType == null || mediaType.startsWith("application/") && mediaType.endsWith("json") ->
+                if (content == null) {
+                    EMPTY_REQUEST
+                } else {
+                    Serializer.jacksonObjectMapper.writeValueAsString(content)
+                        .toRequestBody((mediaType ?: JsonMediaType).toMediaTypeOrNull())
+                }
+
+            mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
+            // TODO: this should be extended with other serializers
+            else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.")
+        }
+
+    protected inline fun <reified T : Any?> responseBody(body: ResponseBody?, mediaType: String? = JsonMediaType): T? {
+        if (body == null) {
+            return null
+        }
+        if (T::class.java == File::class.java) {
+            // return tempFile
+            // Attention: if you are developing an android app that supports API Level 25 and bellow, please check flag supportAndroidApiLevel25AndBelow in https://openapi-generator.tech/docs/generators/kotlin#config-options
+            val tempFile = java.nio.file.Files.createTempFile("tmp.org.openapitools.client", null).toFile()
+            tempFile.deleteOnExit()
+            body.byteStream().use { inputStream ->
+                tempFile.outputStream().use { tempFileOutputStream ->
+                    inputStream.copyTo(tempFileOutputStream)
+                }
+            }
+            return tempFile as T
+        }
+        val bodyContent = body.string()
+        if (bodyContent.isEmpty()) {
+            return null
+        }
+        return when {
+            mediaType == null || (mediaType.startsWith("application/") && mediaType.endsWith("json")) ->
+                Serializer.jacksonObjectMapper.readValue(bodyContent, object : TypeReference<T>() {})
+
+            else -> throw UnsupportedOperationException("responseBody currently only supports JSON body.")
+        }
+    }
+
+    protected inline fun <reified I, reified T : Any?> request(requestConfig: RequestConfig<I>): ApiResponse<T?> {
+        val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.")
+
+        val url = httpUrl.newBuilder()
+            .addEncodedPathSegments(requestConfig.path.trimStart('/'))
+            .apply {
+                requestConfig.query.forEach { query ->
+                    query.value.forEach { queryValue ->
+                        addQueryParameter(query.key, queryValue)
+                    }
+                }
+            }.build()
+
+        // take content-type/accept from spec or set to default (application/json) if not defined
+        if (requestConfig.body != null && requestConfig.headers[ContentType].isNullOrEmpty()) {
+            requestConfig.headers[ContentType] = JsonMediaType
+        }
+        if (requestConfig.headers[Accept].isNullOrEmpty()) {
+            requestConfig.headers[Accept] = JsonMediaType
+        }
+        val headers = requestConfig.headers
+
+        if (headers[Accept].isNullOrEmpty()) {
+            throw kotlin.IllegalStateException("Missing Accept header. This is required.")
+        }
+
+        val contentType = if (headers[ContentType] != null) {
+            // TODO: support multiple contentType options here.
+            (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault())
+        } else {
+            null
+        }
+
+        val request = when (requestConfig.method) {
+            RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType))
+            RequestMethod.GET -> Request.Builder().url(url)
+            RequestMethod.HEAD -> Request.Builder().url(url).head()
+            RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType))
+            RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType))
+            RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType))
+            RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null)
+        }.apply {
+            headers.forEach { header -> addHeader(header.key, header.value) }
+        }.build()
+
+        val response = client.newCall(request).execute()
+
+        val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault())
+
+        // TODO: handle specific mapping types. e.g. Map<int, Class<?>>
+        return when {
+            response.isRedirect -> Redirection(
+                response.code,
+                response.headers.toMultimap()
+            )
+
+            response.isInformational -> Informational(
+                response.message,
+                response.code,
+                response.headers.toMultimap()
+            )
+
+            response.isSuccessful -> Success(
+                responseBody(response.body, accept),
+                response.code,
+                response.headers.toMultimap()
+            )
+
+            response.isClientError -> ClientError(
+                response.message,
+                response.body?.string(),
+                response.code,
+                response.headers.toMultimap()
+            )
+
+            else -> ServerError(
+                response.message,
+                response.body?.string(),
+                response.code,
+                response.headers.toMultimap()
+            )
+        }
+    }
+
+    protected fun parameterToString(value: Any?): String = when (value) {
+        null -> ""
+        is Array<*> -> toMultiValue(value, "csv").toString()
+        is Iterable<*> -> toMultiValue(value, "csv").toString()
+        is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime ->
+            parseDateToQueryString(value)
+
+        else -> value.toString()
+    }
+
+    protected inline fun <reified T : Any> parseDateToQueryString(value: T): String {
+        /*
+        .replace("\"", "") converts the json object string to an actual string for the query parameter.
+        The moshi or gson adapter allows a more generic solution instead of trying to use a native
+        formatter. It also easily allows to provide a simple way to define a custom date format pattern
+        inside a gson/moshi adapter.
+        */
+        return Serializer.jacksonObjectMapper.writeValueAsString(value).replace("\"", "")
+    }
+}

package/assets/client/okhttp3/ApiResponse.kt

@@ -0,0 +1,43 @@
+package @PACKAGE_NAME@
+
+enum class ResponseType {
+    Success, Informational, Redirection, ClientError, ServerError
+}
+
+interface Response
+
+abstract class ApiResponse<T>(val responseType: ResponseType) : Response {
+    abstract val statusCode: Int
+    abstract val headers: Map<String, List<String>>
+}
+
+class Success<T>(
+    val data: T,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiResponse<T>(ResponseType.Success)
+
+class Informational<T>(
+    val statusText: String,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiResponse<T>(ResponseType.Informational)
+
+class Redirection<T>(
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiResponse<T>(ResponseType.Redirection)
+
+class ClientError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiResponse<T>(ResponseType.ClientError)
+
+class ServerError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>>
+) : ApiResponse<T>(ResponseType.ServerError)

package/assets/client/okhttp3/Errors.kt

@@ -0,0 +1,21 @@
+@file:Suppress("unused")
+
+package @PACKAGE_NAME@
+
+import java.lang.RuntimeException
+
+open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) :
+    RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 123L
+    }
+}
+
+open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) :
+    RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 456L
+    }
+}

package/assets/client/okhttp3/PartConfig.kt

@@ -0,0 +1,11 @@
+package @PACKAGE_NAME@
+
+/**
+ * Defines a config object for a given part of a multi-part request.
+ * NOTE: Headers is a Map<String,String> because rfc2616 defines
+ *       multi-valued headers as csv-only.
+ */
+data class PartConfig<T>(
+    val headers: MutableMap<String, String> = mutableMapOf(),
+    val body: T? = null
+)

package/assets/client/okhttp3/RequestConfig.kt

@@ -0,0 +1,18 @@
+package @PACKAGE_NAME@
+
+/**
+ * Defines a config object for a given request.
+ * NOTE: This object doesn't include 'body' because it
+ *       allows for caching of the constructed object
+ *       for many request definitions.
+ * NOTE: Headers is a Map<String,String> because rfc2616 defines
+ *       multi-valued headers as csv-only.
+ */
+data class RequestConfig<T>(
+    val method: RequestMethod,
+    val path: String,
+    val headers: MutableMap<String, String> = mutableMapOf(),
+    val query: MutableMap<String, List<String>> = mutableMapOf(),
+    val requiresAuthentication: Boolean,
+    val body: T? = null
+)

package/assets/client/okhttp3/RequestMethod.kt

@@ -0,0 +1,8 @@
+package @PACKAGE_NAME@
+
+/**
+ * Provides enumerated HTTP verbs
+ */
+enum class RequestMethod {
+    GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
+}

package/assets/client/okhttp3/ResponseExtensions.kt

@@ -0,0 +1,24 @@
+package @PACKAGE_NAME@
+
+import okhttp3.Response
+
+/**
+ * Provides an extension to evaluation whether the response is a 1xx code
+ */
+val Response.isInformational: Boolean get() = this.code in 100..199
+
+/**
+ * Provides an extension to evaluation whether the response is a 3xx code
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+val Response.isRedirect: Boolean get() = this.code in 300..399
+
+/**
+ * Provides an extension to evaluation whether the response is a 4xx code
+ */
+val Response.isClientError: Boolean get() = this.code in 400..499
+
+/**
+ * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
+ */
+val Response.isServerError: Boolean get() = this.code in 500..999

package/assets/client/okhttp3/Serializer.kt

@@ -0,0 +1,14 @@
+package @PACKAGE_NAME@
+
+import com.fasterxml.jackson.annotation.JsonInclude
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.SerializationFeature
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+
+object Serializer {
+    @JvmStatic
+    val jacksonObjectMapper: ObjectMapper = jacksonObjectMapper()
+        .findAndRegisterModules()
+        .setSerializationInclusion(JsonInclude.Include.NON_ABSENT)
+        .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
+}

package/cjs/lib/generators/services/okhttp3-clients/models.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultKotlinOkHttp3ClientsGeneratorConfig = void 0;
 const config_1 = require("../../../config");
-exports.defaultKotlinOkHttp3ClientsGeneratorConfig = Object.assign(Object.assign({}, config_1.defaultKotlinGeneratorConfig), { packageName: 'com.openapi.generated', packageSuffix: '.client', infrastructurePackageName: 'com.openapi.client.infrastructure' });
+exports.defaultKotlinOkHttp3ClientsGeneratorConfig = Object.assign(Object.assign({}, config_1.defaultKotlinGeneratorConfig), { packageName: 'com.openapi.generated', packageSuffix: '.api.client', infrastructurePackageName: { mode: 'append-full-package-name', value: '.infrastructure' } });

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

@@ -10,15 +10,14 @@ const utils_1 = require("../../../utils");
 const file_generator_1 = require("../../file-generator");
 class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator {
     generate(ctx) {
-        const packageName = this.getPackageName(ctx);
         const typeName = this.getApiClientName(ctx);
-        const filePath = this.getFilePath(ctx, packageName);
+        const filePath = this.getFilePath(ctx);
         (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(filePath));
         console.log(`Generating client for service ${ctx.service.name} to ${filePath}...`);
-        const builder = new file_builder_1.KotlinFileBuilder(packageName, ctx.config);
+        const builder = new file_builder_1.KotlinFileBuilder(ctx.packageName, ctx.config);
         this.generateApiClientFileContent(ctx, builder);
         (0, fs_1.writeFileSync)(filePath, builder.toString());
-        return { typeName, packageName };
+        return { typeName, packageName: ctx.packageName };
     }
     generateApiClientFileContent(ctx, builder) {
         builder
@@ -39,7 +38,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             .appendLine('basePath: String = defaultBasePath,')
             .appendLine('client: OkHttpClient = ApiClient.defaultClient')
             .addImport('OkHttpClient', 'okhttp3')
-            .addImport('ApiClient', ctx.config.infrastructurePackageName))
+            .addImport('ApiClient', ctx.infrastructurePackageName))
             .append(' : ')
             .append('ApiClient(basePath, client)');
     }
@@ -70,7 +69,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             .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));
+            .addImport('ApiClient', ctx.infrastructurePackageName));
     }
     generateApiClientMethod(ctx, builder, endpoint) {
         builder
@@ -102,9 +101,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             .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',
@@ -113,8 +110,8 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             'ServerException::class',
         ])
             .addImport('IOException', 'java.io')
-            .addImport('ClientException', ctx.config.infrastructurePackageName)
-            .addImport('ServerException', ctx.config.infrastructurePackageName);
+            .addImport('ClientException', ctx.infrastructurePackageName)
+            .addImport('ServerException', ctx.infrastructurePackageName);
     }
     generateApiClientMethodSignature(ctx, builder, endpoint) {
         builder
@@ -133,7 +130,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
     generateApiClientMethodContent(ctx, builder, endpoint) {
         const responseSchema = this.getResponseSchema(ctx, endpoint);
         builder
-            .append(`val localVarResponse = ${(0, core_1.toCasing)(endpoint.name, 'camel')}HttpInfo`)
+            .append(`val localVarResponse = ${(0, core_1.toCasing)(endpoint.name, 'camel')}WithHttpInfo`)
             .parenthesize('()', (builder) => this.generateParams(ctx, builder, endpoint, false))
             .appendLine()
             .appendLine()
@@ -142,13 +139,13 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             .append('ResponseType.Success -> ')
             .applyIfElse(responseSchema === undefined, (builder) => builder.append('Unit'), (builder) => builder
             .append('(localVarResponse as Success<*>).data as ')
-            .addImport('Success', ctx.config.infrastructurePackageName)
+            .addImport('Success', ctx.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));
+            .addImport('ClientError', ctx.infrastructurePackageName)
+            .addImport('ServerError', ctx.infrastructurePackageName)
+            .addImport('ResponseType', ctx.infrastructurePackageName));
     }
     generateApiClientHttpInfoMethod(ctx, builder, endpoint) {
         builder
@@ -187,7 +184,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
     generateApiClientHttpInfoMethodSignature(ctx, builder, endpoint) {
         builder
             .append('fun ')
-            .append((0, core_1.toCasing)(endpoint.name, 'camel'), 'HttpInfo')
+            .append((0, core_1.toCasing)(endpoint.name, 'camel'), 'WithHttpInfo')
             .parenthesize('()', (builder) => this.generateApiClientHttpInfoMethodSignatureParameters(ctx, builder, endpoint))
             .append(': ')
             .apply((builder) => this.generateApiClientHttpInfoMethodReturnType(ctx, builder, endpoint));
@@ -198,8 +195,8 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
     generateApiClientHttpInfoMethodReturnType(ctx, builder, endpoint) {
         builder
             .append('ApiResponse')
-            .addImport('ApiResponse', ctx.config.infrastructurePackageName)
-            .parenthesize('<>', (builder) => this.generateTypeUsage(ctx, builder, this.getResponseSchema(ctx, endpoint), 'Unit'));
+            .addImport('ApiResponse', ctx.infrastructurePackageName)
+            .parenthesize('<>', (builder) => this.generateTypeUsage(ctx, builder, this.getResponseSchema(ctx, endpoint), 'Unit', true));
     }
     generateApiClientHttpInfoMethodContent(ctx, builder, endpoint) {
         builder
@@ -250,29 +247,34 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
     generateApiClientRequestConfigMethodReturnType(ctx, builder, endpoint) {
         builder
             .append('RequestConfig')
-            .addImport('RequestConfig', ctx.config.infrastructurePackageName)
+            .addImport('RequestConfig', ctx.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;
+        const queryParameters = endpoint.parameters.filter((x) => x.target === 'query');
         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}"] = ${(0, core_1.toCasing)(param.name, 'camel')}`))
+            .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
+            .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()))))
+            .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.config.infrastructurePackageName)
+            .addImport('RequestConfig', ctx.infrastructurePackageName)
             .parenthesizeMultiline('()', (builder) => builder
             .appendLine(`method = RequestMethod.${endpoint.method.toUpperCase()},`)
-            .addImport('RequestMethod', ctx.config.infrastructurePackageName)
+            .addImport('RequestMethod', ctx.infrastructurePackageName)
             .appendLine(`path = "${this.getPathWithInterpolation(ctx, endpoint)}",`)
             .appendLine('query = localVariableQuery,')
             .appendLine('headers = localVariableHeaders,')
             .appendLine('requiresAuthentication = false,')
-            .appendLine('body = localVariableBody'));
+            .appendLineIf(!!endpoint.requestBody, 'body = localVariableBody'));
     }
     generateAdditionalMethods(ctx, builder) {
         this.generateEncodeUriComponentMethod(ctx, builder);
@@ -294,21 +296,26 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             .apply((builder) => this.generateTypeUsage(ctx, builder, parameter.schema))
             .appendIf(!parameter.required, '? = ', this.getDefaultValue(ctx, parameter.schema))));
     }
-    generateTypeUsage(ctx, builder, schema, fallback) {
+    generateTypeUsage(ctx, builder, schema, fallback, nullable) {
         if (schema && schema.kind === 'array') {
             const schemaInfo = this.getSchemaInfo(ctx, schema.items);
-            builder.append(`List<${schemaInfo.typeName}>`);
+            builder.append(this.getTypeNameWithNullability(`List<${schemaInfo.typeName}>`, nullable));
             builder.imports.addImports([schemaInfo, ...schemaInfo.additionalImports]);
         }
         else if (schema || !fallback) {
             const schemaInfo = this.getSchemaInfo(ctx, schema);
-            builder.append(schemaInfo.typeName);
+            builder.append(this.getTypeNameWithNullability(schemaInfo.typeName, nullable));
             builder.imports.addImports([schemaInfo, ...schemaInfo.additionalImports]);
         }
         else {
-            builder.append(fallback);
+            builder.append(this.getTypeNameWithNullability(fallback, nullable));
         }
     }
+    getTypeNameWithNullability(typeName, nullable) {
+        if (nullable === undefined)
+            return typeName;
+        return nullable ? `${typeName}?` : typeName.match(/^(.*?)\??$/)[1];
+    }
     getDefaultValue(ctx, schema) {
         if (!(schema === null || schema === void 0 ? void 0 : schema.default)) {
             return 'null';
@@ -324,7 +331,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
         }
     }
     getPathWithInterpolation(ctx, endpoint) {
-        let path = endpoint.path;
+        let path = this.getEndpointPath(ctx, endpoint);
         endpoint.parameters
             .filter((x) => x.target === 'path')
             .forEach((parameter) => {
@@ -370,13 +377,13 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
     }
     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 : '/';
+        return (0, utils_1.modifyString)((_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 : '/', ctx.config.basePath, ctx.service);
     }
-    getFilePath(ctx, packageName) {
-        return `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}/${this.getApiClientName(ctx)}.kt`;
+    getEndpointPath(ctx, endpoint) {
+        return (0, utils_1.modifyString)(endpoint.path, ctx.config.pathModifier, endpoint);
     }
-    getPackageName(ctx) {
-        return ctx.config.packageName + ctx.config.packageSuffix;
+    getFilePath(ctx) {
+        return `${ctx.config.outputDir}/${ctx.packageName.replace(/\./g, '/')}/${this.getApiClientName(ctx)}.kt`;
     }
     getApiClientName(ctx) {
         return (0, core_1.toCasing)(ctx.service.name, 'pascal') + 'ApiClient';

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

@@ -30,17 +30,36 @@ class KotlinOkHttp3ClientsGenerator extends core_1.OpenApiServicesGenerationProv
     }
     buildContext(context, config) {
         context.data.services = context.data.services.filter((x) => x.name !== 'exclude-from-generation');
-        return this.getProviderContext(context, config, models_1.defaultKotlinOkHttp3ClientsGeneratorConfig);
+        const providerContext = this.getProviderContext(context, config, models_1.defaultKotlinOkHttp3ClientsGeneratorConfig);
+        return Object.assign(providerContext, {
+            packageName: this.getPackageName(providerContext.config),
+            infrastructurePackageName: this.getInfrastructurePackageName(providerContext.config),
+        });
+    }
+    getInfrastructurePackageName(config) {
+        if (typeof config.infrastructurePackageName === 'string') {
+            return config.infrastructurePackageName;
+        }
+        if (config.infrastructurePackageName.mode === 'append-package-name') {
+            return config.packageName + config.infrastructurePackageName.value;
+        }
+        if (config.infrastructurePackageName.mode === 'append-full-package-name') {
+            return this.getPackageName(config) + config.infrastructurePackageName.value;
+        }
+        return config.infrastructurePackageName.value;
+    }
+    getPackageName(config) {
+        return config.packageName + config.packageSuffix;
     }
     copyInfrastructureFiles(ctx) {
         const sourceDir = (0, path_1.resolve)((0, path_1.dirname)(require.resolve('@goast/kotlin')), '../assets/client/okhttp3');
-        const targetDir = (0, path_1.resolve)(ctx.config.outputDir, ctx.config.infrastructurePackageName.replace(/\./g, '/'));
+        const targetDir = (0, path_1.resolve)(ctx.config.outputDir, ctx.infrastructurePackageName.replace(/\./g, '/'));
         (0, fs_extra_1.ensureDirSync)(targetDir);
         const files = (0, fs_extra_1.readdirSync)(sourceDir);
         for (const file of files) {
             const fileContent = (0, fs_extra_1.readFileSync)((0, path_1.resolve)(sourceDir, file))
                 .toString()
-                .replace(/@PACKAGE_NAME@/g, ctx.config.infrastructurePackageName);
+                .replace(/@PACKAGE_NAME@/g, ctx.infrastructurePackageName);
             (0, fs_1.writeFileSync)((0, path_1.resolve)(targetDir, file), fileContent);
         }
     }

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

@@ -4,6 +4,7 @@ exports.DefaultKotlinSpringControllerGenerator = void 0;
 const fs_extra_1 = require("fs-extra");
 const core_1 = require("@goast/core");
 const file_builder_1 = require("../../../file-builder");
+const utils_1 = require("../../../utils");
 const file_generator_1 = require("../../file-generator");
 class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFileGenerator {
     generate(ctx) {
@@ -88,7 +89,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         ])
             .appendAnnotation('RequestMapping', 'org.springframework.web.bind.annotation', [
             ['method', '[RequestMethod.' + endpoint.method.toUpperCase() + ']'],
-            ['value', '[' + this.toStringLiteral(ctx, endpoint.path) + ']'],
+            ['value', '[' + this.toStringLiteral(ctx, this.getEndpointPath(ctx, endpoint)) + ']'],
             [
                 'consumes',
                 '[' + ((_c = endpoint.requestBody) === null || _c === void 0 ? void 0 : _c.content.map((x) => this.toStringLiteral(ctx, x.type)).join(', ')) + ']',
@@ -330,11 +331,17 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         }
     }
     getControllerRequestMapping(ctx, prefix) {
-        var _a, _b, _c, _d, _e, _f;
-        const basePath = (_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 : '/';
+        const basePath = this.getBasePath(ctx);
         prefix !== null && prefix !== void 0 ? prefix : (prefix = `openapi.${(0, core_1.toCasing)(ctx.service.name, 'camel')}`);
         return this.toStringLiteral(ctx, `\${${prefix}.base-path:${basePath}}`);
     }
+    getBasePath(ctx) {
+        var _a, _b, _c, _d, _e, _f;
+        return (0, utils_1.modifyString)((_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 : '/', ctx.config.basePath, ctx.service);
+    }
+    getEndpointPath(ctx, endpoint) {
+        return (0, utils_1.modifyString)(endpoint.path, ctx.config.pathModifier, endpoint);
+    }
     getDirectoryPath(ctx, packageName) {
         return `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}`;
     }

package/cjs/lib/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toKotlinPropertyName = exports.toKotlinStringLiteral = void 0;
+exports.modifyString = exports.toKotlinPropertyName = exports.toKotlinStringLiteral = void 0;
 function toKotlinStringLiteral(value) {
     if (!value) {
         return '""';
@@ -20,3 +20,18 @@ function toKotlinPropertyName(value) {
     return `\`${value}\``;
 }
 exports.toKotlinPropertyName = toKotlinPropertyName;
+function modifyString(value, modifier, ...args) {
+    var _a;
+    if (typeof modifier === 'string') {
+        return modifier;
+    }
+    if (modifier instanceof RegExp) {
+        const match = value.match(modifier);
+        return (_a = match === null || match === void 0 ? void 0 : match[0]) !== null && _a !== void 0 ? _a : value;
+    }
+    if (typeof modifier === 'function') {
+        return modifier(value, ...args);
+    }
+    return value;
+}
+exports.modifyString = modifyString;

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

@@ -1,2 +1,2 @@
 import { defaultKotlinGeneratorConfig } from '../../../config';
-export const defaultKotlinOkHttp3ClientsGeneratorConfig = Object.assign(Object.assign({}, defaultKotlinGeneratorConfig), { packageName: 'com.openapi.generated', packageSuffix: '.client', infrastructurePackageName: 'com.openapi.client.infrastructure' });
+export const defaultKotlinOkHttp3ClientsGeneratorConfig = Object.assign(Object.assign({}, defaultKotlinGeneratorConfig), { packageName: 'com.openapi.generated', packageSuffix: '.api.client', infrastructurePackageName: { mode: 'append-full-package-name', value: '.infrastructure' } });

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

@@ -3,19 +3,18 @@ import { dirname } from 'path';
 import { ensureDirSync } from 'fs-extra';
 import { toCasing } from '@goast/core';
 import { KotlinFileBuilder } from '../../../file-builder';
-import { toKotlinStringLiteral } from '../../../utils';
+import { modifyString, 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);
+        const filePath = this.getFilePath(ctx);
         ensureDirSync(dirname(filePath));
         console.log(`Generating client for service ${ctx.service.name} to ${filePath}...`);
-        const builder = new KotlinFileBuilder(packageName, ctx.config);
+        const builder = new KotlinFileBuilder(ctx.packageName, ctx.config);
         this.generateApiClientFileContent(ctx, builder);
         writeFileSync(filePath, builder.toString());
-        return { typeName, packageName };
+        return { typeName, packageName: ctx.packageName };
     }
     generateApiClientFileContent(ctx, builder) {
         builder
@@ -36,7 +35,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             .appendLine('basePath: String = defaultBasePath,')
             .appendLine('client: OkHttpClient = ApiClient.defaultClient')
             .addImport('OkHttpClient', 'okhttp3')
-            .addImport('ApiClient', ctx.config.infrastructurePackageName))
+            .addImport('ApiClient', ctx.infrastructurePackageName))
             .append(' : ')
             .append('ApiClient(basePath, client)');
     }
@@ -67,7 +66,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             .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));
+            .addImport('ApiClient', ctx.infrastructurePackageName));
     }
     generateApiClientMethod(ctx, builder, endpoint) {
         builder
@@ -99,9 +98,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             .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',
@@ -110,8 +107,8 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             'ServerException::class',
         ])
             .addImport('IOException', 'java.io')
-            .addImport('ClientException', ctx.config.infrastructurePackageName)
-            .addImport('ServerException', ctx.config.infrastructurePackageName);
+            .addImport('ClientException', ctx.infrastructurePackageName)
+            .addImport('ServerException', ctx.infrastructurePackageName);
     }
     generateApiClientMethodSignature(ctx, builder, endpoint) {
         builder
@@ -130,7 +127,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
     generateApiClientMethodContent(ctx, builder, endpoint) {
         const responseSchema = this.getResponseSchema(ctx, endpoint);
         builder
-            .append(`val localVarResponse = ${toCasing(endpoint.name, 'camel')}HttpInfo`)
+            .append(`val localVarResponse = ${toCasing(endpoint.name, 'camel')}WithHttpInfo`)
             .parenthesize('()', (builder) => this.generateParams(ctx, builder, endpoint, false))
             .appendLine()
             .appendLine()
@@ -139,13 +136,13 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             .append('ResponseType.Success -> ')
             .applyIfElse(responseSchema === undefined, (builder) => builder.append('Unit'), (builder) => builder
             .append('(localVarResponse as Success<*>).data as ')
-            .addImport('Success', ctx.config.infrastructurePackageName)
+            .addImport('Success', ctx.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));
+            .addImport('ClientError', ctx.infrastructurePackageName)
+            .addImport('ServerError', ctx.infrastructurePackageName)
+            .addImport('ResponseType', ctx.infrastructurePackageName));
     }
     generateApiClientHttpInfoMethod(ctx, builder, endpoint) {
         builder
@@ -184,7 +181,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
     generateApiClientHttpInfoMethodSignature(ctx, builder, endpoint) {
         builder
             .append('fun ')
-            .append(toCasing(endpoint.name, 'camel'), 'HttpInfo')
+            .append(toCasing(endpoint.name, 'camel'), 'WithHttpInfo')
             .parenthesize('()', (builder) => this.generateApiClientHttpInfoMethodSignatureParameters(ctx, builder, endpoint))
             .append(': ')
             .apply((builder) => this.generateApiClientHttpInfoMethodReturnType(ctx, builder, endpoint));
@@ -195,8 +192,8 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
     generateApiClientHttpInfoMethodReturnType(ctx, builder, endpoint) {
         builder
             .append('ApiResponse')
-            .addImport('ApiResponse', ctx.config.infrastructurePackageName)
-            .parenthesize('<>', (builder) => this.generateTypeUsage(ctx, builder, this.getResponseSchema(ctx, endpoint), 'Unit'));
+            .addImport('ApiResponse', ctx.infrastructurePackageName)
+            .parenthesize('<>', (builder) => this.generateTypeUsage(ctx, builder, this.getResponseSchema(ctx, endpoint), 'Unit', true));
     }
     generateApiClientHttpInfoMethodContent(ctx, builder, endpoint) {
         builder
@@ -247,29 +244,34 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
     generateApiClientRequestConfigMethodReturnType(ctx, builder, endpoint) {
         builder
             .append('RequestConfig')
-            .addImport('RequestConfig', ctx.config.infrastructurePackageName)
+            .addImport('RequestConfig', ctx.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;
+        const queryParameters = endpoint.parameters.filter((x) => x.target === 'query');
         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')}`))
+            .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
+            .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()))))
+            .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.config.infrastructurePackageName)
+            .addImport('RequestConfig', ctx.infrastructurePackageName)
             .parenthesizeMultiline('()', (builder) => builder
             .appendLine(`method = RequestMethod.${endpoint.method.toUpperCase()},`)
-            .addImport('RequestMethod', ctx.config.infrastructurePackageName)
+            .addImport('RequestMethod', ctx.infrastructurePackageName)
             .appendLine(`path = "${this.getPathWithInterpolation(ctx, endpoint)}",`)
             .appendLine('query = localVariableQuery,')
             .appendLine('headers = localVariableHeaders,')
             .appendLine('requiresAuthentication = false,')
-            .appendLine('body = localVariableBody'));
+            .appendLineIf(!!endpoint.requestBody, 'body = localVariableBody'));
     }
     generateAdditionalMethods(ctx, builder) {
         this.generateEncodeUriComponentMethod(ctx, builder);
@@ -291,21 +293,26 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             .apply((builder) => this.generateTypeUsage(ctx, builder, parameter.schema))
             .appendIf(!parameter.required, '? = ', this.getDefaultValue(ctx, parameter.schema))));
     }
-    generateTypeUsage(ctx, builder, schema, fallback) {
+    generateTypeUsage(ctx, builder, schema, fallback, nullable) {
         if (schema && schema.kind === 'array') {
             const schemaInfo = this.getSchemaInfo(ctx, schema.items);
-            builder.append(`List<${schemaInfo.typeName}>`);
+            builder.append(this.getTypeNameWithNullability(`List<${schemaInfo.typeName}>`, nullable));
             builder.imports.addImports([schemaInfo, ...schemaInfo.additionalImports]);
         }
         else if (schema || !fallback) {
             const schemaInfo = this.getSchemaInfo(ctx, schema);
-            builder.append(schemaInfo.typeName);
+            builder.append(this.getTypeNameWithNullability(schemaInfo.typeName, nullable));
             builder.imports.addImports([schemaInfo, ...schemaInfo.additionalImports]);
         }
         else {
-            builder.append(fallback);
+            builder.append(this.getTypeNameWithNullability(fallback, nullable));
         }
     }
+    getTypeNameWithNullability(typeName, nullable) {
+        if (nullable === undefined)
+            return typeName;
+        return nullable ? `${typeName}?` : typeName.match(/^(.*?)\??$/)[1];
+    }
     getDefaultValue(ctx, schema) {
         if (!(schema === null || schema === void 0 ? void 0 : schema.default)) {
             return 'null';
@@ -321,7 +328,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         }
     }
     getPathWithInterpolation(ctx, endpoint) {
-        let path = endpoint.path;
+        let path = this.getEndpointPath(ctx, endpoint);
         endpoint.parameters
             .filter((x) => x.target === 'path')
             .forEach((parameter) => {
@@ -367,13 +374,13 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
     }
     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 : '/';
+        return modifyString((_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 : '/', ctx.config.basePath, ctx.service);
     }
-    getFilePath(ctx, packageName) {
-        return `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}/${this.getApiClientName(ctx)}.kt`;
+    getEndpointPath(ctx, endpoint) {
+        return modifyString(endpoint.path, ctx.config.pathModifier, endpoint);
     }
-    getPackageName(ctx) {
-        return ctx.config.packageName + ctx.config.packageSuffix;
+    getFilePath(ctx) {
+        return `${ctx.config.outputDir}/${ctx.packageName.replace(/\./g, '/')}/${this.getApiClientName(ctx)}.kt`;
     }
     getApiClientName(ctx) {
         return toCasing(ctx.service.name, 'pascal') + 'ApiClient';

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

@@ -27,17 +27,36 @@ export class KotlinOkHttp3ClientsGenerator extends OpenApiServicesGenerationProv
     }
     buildContext(context, config) {
         context.data.services = context.data.services.filter((x) => x.name !== 'exclude-from-generation');
-        return this.getProviderContext(context, config, defaultKotlinOkHttp3ClientsGeneratorConfig);
+        const providerContext = this.getProviderContext(context, config, defaultKotlinOkHttp3ClientsGeneratorConfig);
+        return Object.assign(providerContext, {
+            packageName: this.getPackageName(providerContext.config),
+            infrastructurePackageName: this.getInfrastructurePackageName(providerContext.config),
+        });
+    }
+    getInfrastructurePackageName(config) {
+        if (typeof config.infrastructurePackageName === 'string') {
+            return config.infrastructurePackageName;
+        }
+        if (config.infrastructurePackageName.mode === 'append-package-name') {
+            return config.packageName + config.infrastructurePackageName.value;
+        }
+        if (config.infrastructurePackageName.mode === 'append-full-package-name') {
+            return this.getPackageName(config) + config.infrastructurePackageName.value;
+        }
+        return config.infrastructurePackageName.value;
+    }
+    getPackageName(config) {
+        return config.packageName + config.packageSuffix;
     }
     copyInfrastructureFiles(ctx) {
         const sourceDir = resolve(dirname(require.resolve('@goast/kotlin')), '../assets/client/okhttp3');
-        const targetDir = resolve(ctx.config.outputDir, ctx.config.infrastructurePackageName.replace(/\./g, '/'));
+        const targetDir = resolve(ctx.config.outputDir, ctx.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);
+                .replace(/@PACKAGE_NAME@/g, ctx.infrastructurePackageName);
             writeFileSync(resolve(targetDir, file), fileContent);
         }
     }

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

@@ -1,6 +1,7 @@
 import { ensureDirSync, writeFileSync } from 'fs-extra';
 import { toCasing } from '@goast/core';
 import { KotlinFileBuilder } from '../../../file-builder';
+import { modifyString } from '../../../utils';
 import { KotlinFileGenerator } from '../../file-generator';
 export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator {
     generate(ctx) {
@@ -85,7 +86,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         ])
             .appendAnnotation('RequestMapping', 'org.springframework.web.bind.annotation', [
             ['method', '[RequestMethod.' + endpoint.method.toUpperCase() + ']'],
-            ['value', '[' + this.toStringLiteral(ctx, endpoint.path) + ']'],
+            ['value', '[' + this.toStringLiteral(ctx, this.getEndpointPath(ctx, endpoint)) + ']'],
             [
                 'consumes',
                 '[' + ((_c = endpoint.requestBody) === null || _c === void 0 ? void 0 : _c.content.map((x) => this.toStringLiteral(ctx, x.type)).join(', ')) + ']',
@@ -327,11 +328,17 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         }
     }
     getControllerRequestMapping(ctx, prefix) {
-        var _a, _b, _c, _d, _e, _f;
-        const basePath = (_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 : '/';
+        const basePath = this.getBasePath(ctx);
         prefix !== null && prefix !== void 0 ? prefix : (prefix = `openapi.${toCasing(ctx.service.name, 'camel')}`);
         return this.toStringLiteral(ctx, `\${${prefix}.base-path:${basePath}}`);
     }
+    getBasePath(ctx) {
+        var _a, _b, _c, _d, _e, _f;
+        return modifyString((_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 : '/', ctx.config.basePath, ctx.service);
+    }
+    getEndpointPath(ctx, endpoint) {
+        return modifyString(endpoint.path, ctx.config.pathModifier, endpoint);
+    }
     getDirectoryPath(ctx, packageName) {
         return `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}`;
     }

package/esm/lib/utils.js

@@ -15,3 +15,17 @@ export function toKotlinPropertyName(value) {
     }
     return `\`${value}\``;
 }
+export function modifyString(value, modifier, ...args) {
+    var _a;
+    if (typeof modifier === 'string') {
+        return modifier;
+    }
+    if (modifier instanceof RegExp) {
+        const match = value.match(modifier);
+        return (_a = match === null || match === void 0 ? void 0 : match[0]) !== null && _a !== void 0 ? _a : value;
+    }
+    if (typeof modifier === 'function') {
+        return modifier(value, ...args);
+    }
+    return value;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",

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

@@ -1,11 +1,16 @@
-import { ApiService, DefaultGenerationProviderConfig, OpenApiServicesGenerationProviderContext } from '@goast/core';
+import { ApiEndpoint, ApiService, DefaultGenerationProviderConfig, OpenApiServicesGenerationProviderContext } from '@goast/core';
 import { KotlinImport } from '../../../common-results';
 import { KotlinGeneratorConfig } from '../../../config';
 import { KotlinModelsGeneratorOutput } from '../../models';
 export type KotlinOkHttp3ClientsGeneratorConfig = KotlinGeneratorConfig & {
     packageName: string;
     packageSuffix: string;
-    infrastructurePackageName: string;
+    infrastructurePackageName: string | {
+        mode: 'append-package-name' | 'append-full-package-name' | 'replace';
+        value: string;
+    };
+    basePath?: string | RegExp | ((basePath: string, service: ApiService) => string);
+    pathModifier?: RegExp | ((path: string, endpoint: ApiEndpoint) => string);
 };
 export declare const defaultKotlinOkHttp3ClientsGeneratorConfig: DefaultGenerationProviderConfig<KotlinOkHttp3ClientsGeneratorConfig>;
 export type KotlinOkHttp3ClientsGeneratorInput = KotlinModelsGeneratorOutput;
@@ -15,7 +20,10 @@ export type KotlinOkHttp3ClientsGeneratorOutput = {
     };
 };
 export type KotlinOkHttp3ClientGeneratorOutput = KotlinImport;
-export type KotlinOkHttp3ClientsGeneratorContext = OpenApiServicesGenerationProviderContext<KotlinOkHttp3ClientsGeneratorInput, KotlinOkHttp3ClientsGeneratorOutput, KotlinOkHttp3ClientsGeneratorConfig, KotlinOkHttp3ClientGeneratorOutput>;
+export type KotlinOkHttp3ClientsGeneratorContext = OpenApiServicesGenerationProviderContext<KotlinOkHttp3ClientsGeneratorInput, KotlinOkHttp3ClientsGeneratorOutput, KotlinOkHttp3ClientsGeneratorConfig, KotlinOkHttp3ClientGeneratorOutput> & {
+    packageName: string;
+    infrastructurePackageName: string;
+};
 export type KotlinOkHttp3ClientGeneratorContext = KotlinOkHttp3ClientsGeneratorContext & {
     service: ApiService;
 };

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

@@ -44,7 +44,8 @@ export declare class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator<C
     protected generateEncodeUriComponentMethod(ctx: Context, builder: Builder): void;
     protected generateParamDocEntries(ctx: Context, builder: Builder, endpoint: ApiEndpoint): void;
     protected generateParams(ctx: Context, builder: Builder, endpoint: ApiEndpoint, includeTypeDefinition: boolean): void;
-    protected generateTypeUsage(ctx: Context, builder: Builder, schema: ApiSchema | undefined, fallback?: string): void;
+    protected generateTypeUsage(ctx: Context, builder: Builder, schema: ApiSchema | undefined, fallback?: string, nullable?: boolean): void;
+    protected getTypeNameWithNullability(typeName: string, nullable: boolean | undefined): string;
     protected getDefaultValue(ctx: Context, schema: ApiSchema | undefined): string;
     protected getPathWithInterpolation(ctx: Context, endpoint: ApiEndpoint): string;
     protected getResponseSchema(ctx: Context, endpoint: ApiEndpoint): ApiSchema | undefined;
@@ -52,8 +53,8 @@ export declare class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator<C
     protected getAllParameters(ctx: Context, endpoint: ApiEndpoint): ApiParameter[];
     protected getRequestBodyParamName(ctx: Context, endpoint: ApiEndpoint): string;
     protected getBasePath(ctx: Context): string;
-    protected getFilePath(ctx: Context, packageName: string): string;
-    protected getPackageName(ctx: Context): string;
+    protected getEndpointPath(ctx: Context, endpoint: ApiEndpoint): string;
+    protected getFilePath(ctx: Context): string;
     protected getApiClientName(ctx: Context): string;
 }
 export {};

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

@@ -15,6 +15,8 @@ export declare class KotlinOkHttp3ClientsGenerator extends OpenApiServicesGenera
     protected generateService(ctx: Context, service: ApiService): ServiceOutput;
     protected addServiceResult(ctx: Context, service: ApiService, result: ServiceOutput): void;
     protected buildContext(context: OpenApiGeneratorContext<KotlinServicesGeneratorInput>, config?: Partial<Config> | undefined): Context;
+    protected getInfrastructurePackageName(config: Config): string;
+    protected getPackageName(config: Config): string;
     private copyInfrastructureFiles;
 }
 export {};

package/types/lib/generators/services/spring-controllers/models.d.ts

@@ -1,10 +1,12 @@
-import { OpenApiServicesGenerationProviderContext, ApiService, DefaultGenerationProviderConfig } from '@goast/core';
+import { OpenApiServicesGenerationProviderContext, ApiService, DefaultGenerationProviderConfig, ApiEndpoint } from '@goast/core';
 import { KotlinImport } from '../../../common-results';
 import { KotlinGeneratorConfig } from '../../../config';
 import { KotlinModelsGeneratorOutput } from '../../models';
 export type KotlinServicesGeneratorConfig = KotlinGeneratorConfig & {
     packageName: string;
     packageSuffix: string;
+    basePath?: string | RegExp | ((basePath: string, service: ApiService) => string);
+    pathModifier?: RegExp | ((path: string, endpoint: ApiEndpoint) => string);
 };
 export declare const defaultKotlinServicesGeneratorConfig: DefaultGenerationProviderConfig<KotlinServicesGeneratorConfig>;
 export type KotlinServicesGeneratorInput = KotlinModelsGeneratorOutput;

package/types/lib/generators/services/spring-controllers/spring-controller-generator.d.ts

@@ -51,6 +51,8 @@ export declare class DefaultKotlinSpringControllerGenerator extends KotlinFileGe
     protected generateResponseEntityType(ctx: Context, builder: Builder, schema: ApiSchema | undefined): void;
     protected generateTypeUsage(ctx: Context, builder: Builder, schema: ApiSchema | undefined, fallback?: string): void;
     protected getControllerRequestMapping(ctx: Context, prefix?: string): string;
+    protected getBasePath(ctx: Context): string;
+    protected getEndpointPath(ctx: Context, endpoint: ApiEndpoint): string;
     protected getDirectoryPath(ctx: Context, packageName: string): string;
     protected getPackageName(ctx: Context): string;
     protected getApiInterfaceName(ctx: Context): string;

package/types/lib/utils.d.ts

@@ -1,3 +1,4 @@
 import { Nullable } from '@goast/core';
 export declare function toKotlinStringLiteral(value: Nullable<string>): string;
 export declare function toKotlinPropertyName(value: string): string;
+export declare function modifyString<TArgs extends any[]>(value: string, modifier: string | RegExp | ((value: string, ...args: TArgs) => string) | undefined, ...args: TArgs): string;