@goast/kotlin 0.0.2 → 0.0.3

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,37 @@ 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) {
+        console.log(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,37 @@ 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) {
+        console.log(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.3",
   "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;