@goast/kotlin 0.0.1 → 0.0.3

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

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KotlinOkHttp3ClientsGenerator = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const fs_extra_1 = require("fs-extra");
+const core_1 = require("@goast/core");
+const models_1 = require("./models");
+const okhttp3_client_generator_1 = require("./okhttp3-client-generator");
+class KotlinOkHttp3ClientsGenerator extends core_1.OpenApiServicesGenerationProviderBase {
+    constructor(serviceGeneratorFactory) {
+        super();
+        this._serviceGeneratorFactory = serviceGeneratorFactory !== null && serviceGeneratorFactory !== void 0 ? serviceGeneratorFactory : core_1.Factory.fromValue(new okhttp3_client_generator_1.DefaultKotlinOkHttp3Generator());
+    }
+    onGenerate(ctx) {
+        this.copyInfrastructureFiles(ctx);
+        return super.onGenerate(ctx);
+    }
+    initResult() {
+        return {
+            clients: {},
+        };
+    }
+    generateService(ctx, service) {
+        const serviceGenerator = this._serviceGeneratorFactory.create();
+        return serviceGenerator.generate(Object.assign(Object.assign({}, ctx), { service }));
+    }
+    addServiceResult(ctx, service, result) {
+        ctx.output.clients[service.id] = result;
+    }
+    buildContext(context, config) {
+        context.data.services = context.data.services.filter((x) => x.name !== 'exclude-from-generation');
+        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.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.infrastructurePackageName);
+            (0, fs_1.writeFileSync)((0, path_1.resolve)(targetDir, file), fileContent);
+        }
+    }
+}
+exports.KotlinOkHttp3ClientsGenerator = KotlinOkHttp3ClientsGenerator;

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) {
@@ -33,10 +34,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
             .ensureCurrentLineEmpty()
             .apply((builder) => this.generateApiInterfaceSignature(ctx, builder))
             .append(' ')
-            .parenthesize('{}', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiInterfaceContent(ctx, builder))
-            .ensureCurrentLineEmpty());
+            .parenthesizeMultiline('{}', (builder) => this.generateApiInterfaceContent(ctx, builder));
     }
     generateApiInterfaceAnnotations(ctx, builder) {
         builder
@@ -66,10 +64,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
             .ensureCurrentLineEmpty()
             .apply((builder) => this.generateApiInterfaceMethodSignature(ctx, builder, endpoint))
             .append(' ')
-            .parenthesize('{}', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiInterfaceMethodContent(ctx, builder, endpoint))
-            .appendLine());
+            .parenthesizeMultiline('{}', (builder) => this.generateApiInterfaceMethodContent(ctx, builder, endpoint));
     }
     generateApiInterfaceMethodAnnnotations(ctx, builder, endpoint) {
         var _a, _b, _c;
@@ -80,9 +75,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
             ['description', this.toStringLiteral(ctx, (_b = endpoint.description) === null || _b === void 0 ? void 0 : _b.trim())],
             [
                 'responses',
-                (builder) => builder.parenthesize('[]', (builder) => builder
-                    .appendLine()
-                    .forEachSeparated(endpoint.responses, ',\n', (builder, response) => builder
+                (builder) => builder.parenthesizeMultiline('[]', (builder) => builder.forEachSeparated(endpoint.responses, ',\n', (builder, response) => builder
                     .append('ApiResponse')
                     .addImport('ApiResponse', 'io.swagger.v3.oas.annotations.responses')
                     .parenthesize('()', (builder) => {
@@ -90,14 +83,13 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
                     return builder
                         .append(`responseCode = ${this.toStringLiteral(ctx, (_a = response.statusCode) === null || _a === void 0 ? void 0 : _a.toString())}, `)
                         .append(`description = ${this.toStringLiteral(ctx, (_b = response.description) === null || _b === void 0 ? void 0 : _b.trim())}`);
-                }))
-                    .appendLine()),
+                }))),
                 endpoint.responses.length > 0,
             ],
         ])
             .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(', ')) + ']',
@@ -109,10 +101,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     generateApiInterfaceMethodSignature(ctx, builder, endpoint) {
         builder
             .append(`suspend fun ${(0, core_1.toCasing)(endpoint.name, 'camel')}`)
-            .parenthesize('()', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiInterfaceMethodParameters(ctx, builder, endpoint))
-            .appendLine())
+            .parenthesizeMultiline('()', (builder) => this.generateApiInterfaceMethodParameters(ctx, builder, endpoint))
             .append(': ')
             .apply((builder) => this.generateApiInterfaceMethodReturnType(ctx, builder, endpoint));
     }
@@ -197,10 +186,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
             .ensureCurrentLineEmpty()
             .apply((builder) => this.generateApiControllerSignature(ctx, builder))
             .append(' ')
-            .parenthesize('{}', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiControllerContent(ctx, builder))
-            .ensureCurrentLineEmpty());
+            .parenthesizeMultiline('{}', (builder) => this.generateApiControllerContent(ctx, builder));
     }
     generateApiControllerAnnotations(ctx, builder) {
         builder
@@ -216,10 +202,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         builder
             .append('class ')
             .append(this.getApiControllerName(ctx))
-            .parenthesize('()', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiControllerParameters(ctx, builder))
-            .ensureCurrentLineEmpty())
+            .parenthesizeMultiline('()', (builder) => this.generateApiControllerParameters(ctx, builder))
             .append(' : ')
             .append(this.getApiInterfaceName(ctx));
     }
@@ -236,12 +219,10 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
             .appendLine(this.getApiDelegateInterfaceName(ctx))
             .appendLine()
             .append('init ')
-            .parenthesize('{}', (builder) => builder
-            .appendLine()
+            .parenthesizeMultiline('{}', (builder) => builder
             .append('this.delegate = Optional.ofNullable(delegate).orElse')
             .addImport('Optional', 'java.util')
-            .parenthesize('()', (builder) => builder.append('object : ').append(this.getApiDelegateInterfaceName(ctx)).append(' {}'))
-            .appendLine())
+            .parenthesize('()', (builder) => builder.append('object : ').append(this.getApiDelegateInterfaceName(ctx)).append(' {}')))
             .appendLine()
             .appendLine()
             .appendLine(`override fun getDelegate(): ${this.getApiDelegateInterfaceName(ctx)} = delegate`);
@@ -262,10 +243,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
             .ensureCurrentLineEmpty()
             .apply((builder) => this.generateApiDelegateInterfaceSignature(ctx, builder))
             .append(' ')
-            .parenthesize('{}', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiDelegateInterfaceContent(ctx, builder))
-            .ensureCurrentLineEmpty());
+            .parenthesizeMultiline('{}', (builder) => this.generateApiDelegateInterfaceContent(ctx, builder));
     }
     generateApiDelegateInterfaceAnnotations(ctx, builder) {
         builder.appendAnnotation('Generated', 'jakarta.annotation', [
@@ -290,10 +268,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
             .ensureCurrentLineEmpty()
             .apply((builder) => this.generateApiDelegateInterfaceMethodSignature(ctx, builder, endpoint))
             .append(' ')
-            .parenthesize('{}', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiDelegateInterfaceMethodContent(ctx, builder, endpoint))
-            .ensureCurrentLineEmpty());
+            .parenthesizeMultiline('{}', (builder) => this.generateApiDelegateInterfaceMethodContent(ctx, builder, endpoint));
     }
     generateApiDelegateInterfaceMethodAnnnotations(ctx, builder, endpoint) {
         // None for now.
@@ -301,10 +276,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     generateApiDelegateInterfaceMethodSignature(ctx, builder, endpoint) {
         builder
             .append(`suspend fun ${(0, core_1.toCasing)(endpoint.name, 'camel')}`)
-            .parenthesize('()', (builder) => builder
-            .appendLine()
-            .apply((builder) => this.generateApiDelegateInterfaceMethodParameters(ctx, builder, endpoint))
-            .appendLine())
+            .parenthesizeMultiline('()', (builder) => this.generateApiDelegateInterfaceMethodParameters(ctx, builder, endpoint))
             .append(': ')
             .apply((builder) => this.generateApiDelegateInterfaceMethodReturnType(ctx, builder, endpoint));
     }
@@ -359,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, '/')}`;
     }
@@ -387,11 +365,13 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         const parameters = endpoint.parameters.filter((parameter) => parameter.target === 'query' || parameter.target === 'path');
         if (endpoint.requestBody) {
             const schema = endpoint.requestBody.content[0].schema;
+            const schemaInfo = this.getSchemaInfo(ctx, schema);
+            const name = /^Any\??$/.test(schemaInfo.typeName) ? 'body' : schemaInfo.typeName;
             parameters.push({
                 $src: undefined,
                 $ref: undefined,
                 id: 'body',
-                name: schema ? this.getSchemaInfo(ctx, schema).typeName : 'body',
+                name,
                 target: 'body',
                 schema,
                 required: endpoint.requestBody.required,

package/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/index.js

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

package/esm/lib/generators/models/model-generator.js

@@ -74,26 +74,77 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             }
         }
         else {
-            this.generateDataClass(ctx, builder, schema);
+            this.generateObjectPackageMember(ctx, builder, schema);
         }
     }
-    generateDataClass(ctx, builder, schema) {
+    generateObjectPackageMember(ctx, builder, schema) {
+        if (schema.discriminator) {
+            this.generateObjectInterface(ctx, builder, schema);
+        }
+        else {
+            this.generateObjectDataClass(ctx, builder, schema);
+        }
+    }
+    generateObjectInterface(ctx, builder, schema) {
+        builder
+            .apply((builder) => this.generateDocumentation(ctx, builder, schema))
+            .ensureCurrentLineEmpty()
+            .apply((builder) => this.generateObjectInterfaceAnnotations(ctx, builder, schema))
+            .ensureCurrentLineEmpty()
+            .apply((builder) => this.generateObjectInterfaceSignature(ctx, builder, schema))
+            .append(' ')
+            .parenthesizeMultiline('{}', (builder) => this.generateObjectInterfaceMembers(ctx, builder, schema));
+    }
+    generateObjectInterfaceAnnotations(ctx, builder, schema) {
+        if (schema.discriminator) {
+            builder.appendAnnotation('JsonTypeInfo', 'com.fasterxml.jackson.annotation', [
+                ['use', 'JsonTypeInfo.Id.NAME'],
+                ['include', 'JsonTypeInfo.As.PROPERTY'],
+                ['property', this.toStringLiteral(ctx, schema.discriminator.propertyName)],
+                ['visible', 'true'],
+            ]);
+            const entries = Object.entries(schema.discriminator.mapping);
+            if (entries.length > 0) {
+                builder.appendAnnotation('JsonSubTypes', 'com.fasterxml.jackson.annotation', entries.map(([value, schema]) => (builder) => {
+                    const schemaResult = ctx.getSchemaResult(schema);
+                    builder
+                        .append(`JsonSubTypes.Type(value = ${schemaResult.typeName}::class, name = ${this.toStringLiteral(ctx, value)})`)
+                        .addImport(schemaResult.typeName, schemaResult.packageName);
+                }));
+            }
+        }
+    }
+    generateObjectInterfaceSignature(ctx, builder, schema) {
+        builder.append('interface ').append(this.getDeclarationTypeName(ctx));
+    }
+    generateObjectInterfaceMembers(ctx, builder, schema) {
+        builder.forEach(this.sortProperties(ctx, schema, schema.properties.values()), (builder, property) => builder
+            .ensurePreviousLineEmpty()
+            .apply((builder) => this.generateJsonPropertyAnnotation(ctx, builder, schema, property, 'get'))
+            .ensureCurrentLineEmpty()
+            .append(`val ${toCasing(property.name, 'camel')}: `)
+            .apply((builder) => this.generateType(ctx, builder, property.schema))
+            .applyIf(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?').append(' = null')));
+    }
+    generateObjectDataClass(ctx, builder, schema) {
+        const inheritedSchemas = schema.inheritedSchemas.filter((x) => this.shouldGenerateTypeDeclaration(ctx, x) && !x.isNameGenerated);
         builder
             .apply((builder) => this.generateDocumentation(ctx, builder, schema))
             .append('data class ')
             .append(this.getDeclarationTypeName(ctx))
-            .parenthesizeIf(schema.properties.size > 0, '()', (builder) => builder
-            .appendLine()
-            .forEachSeparated(this.sortProperties(ctx, schema, schema.properties.values()), ',\n', (builder, property) => builder
+            .parenthesizeMultilineIf(schema.properties.size > 0, '()', (builder) => builder.forEachSeparated(this.sortProperties(ctx, schema, schema.properties.values()), ',\n', (builder, property) => builder
             .ensurePreviousLineEmpty()
-            .apply((builder) => this.generatePropertyAnnotations(ctx, builder, schema, property))
+            .apply((builder) => this.generateObjectDataClassParameterAnnotations(ctx, builder, schema, property))
+            .appendIf(inheritedSchemas.some((x) => this.hasProperty(ctx, x, property.name)), 'override ')
             .append(`val ${toCasing(property.name, 'camel')}: `)
             .apply((builder) => this.generateType(ctx, builder, property.schema))
-            .applyIf(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?').append(' = null')))
-            .appendLineIf(schema.properties.size > 0))
-            .parenthesizeIf(schema.additionalProperties !== undefined && schema.additionalProperties !== false, '{}', (builder) => builder
-            .appendLine()
-            .applyIf(schema.additionalProperties !== undefined && schema.additionalProperties !== false, (builder) => builder
+            .applyIf(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?').append(' = null'))))
+            .applyIf(inheritedSchemas.length > 0, (builder) => builder
+            .append(' : ')
+            .forEachSeparated(inheritedSchemas, ', ', (builder, schema) => builder.append(toCasing(schema.name, 'pascal'))) // TODO: Calling generateType here will lead to endless loop
+        )
+            .append(' ')
+            .parenthesizeMultilineIf(schema.additionalProperties !== undefined && schema.additionalProperties !== false, '{}', (builder) => builder.applyIf(schema.additionalProperties !== undefined && schema.additionalProperties !== false, (builder) => builder
             .appendLine('@JsonIgnore')
             .addImport('JsonIgnore', 'com.fasterxml.jackson.annotation')
             .append('val additionalProperties: Mutable')
@@ -105,7 +156,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             .append('fun set')
             .parenthesize('()', (builder) => builder.append('name: String, value: ').applyIfElse(schema.additionalProperties === true, (builder) => builder.append('Any?'), (builder) => this.generateType(ctx, builder, schema.additionalProperties)))
             .append(' ')
-            .parenthesize('{}', (builder) => builder.appendLine().appendLine('this.additionalProperties[name] = value'))
+            .parenthesizeMultiline('{}', 'this.additionalProperties[name] = value')
             .appendLine()
             .appendLine()
             .appendLine('@JsonAnyGetter')
@@ -113,10 +164,9 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             .append('fun getMap(): ')
             .apply((builder) => this.generateMapType(ctx, builder, schema))
             .append(' ')
-            .parenthesize('{}', (builder) => builder.appendLine().appendLine('return this.additionalProperties'))
-            .appendLine()));
+            .parenthesizeMultiline('{}', 'return this.additionalProperties')));
     }
-    generatePropertyAnnotations(ctx, builder, schema, property) {
+    generateObjectDataClassParameterAnnotations(ctx, builder, schema, property) {
         this.generatePropertyValidationAnnotations(ctx, builder, schema, property);
         this.generatePropertySchemaAnnotation(ctx, builder, schema, property);
         this.generateJsonPropertyAnnotation(ctx, builder, schema, property);
@@ -151,9 +201,9 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             .parenthesizeIf(parts.size > 0, '()', (builder) => builder.forEachSeparated(parts.entries(), ', ', (builder, [key, value]) => builder.append(`${key} = ${value}`)))
             .appendLine();
     }
-    generateJsonPropertyAnnotation(ctx, builder, schema, property) {
+    generateJsonPropertyAnnotation(ctx, builder, schema, property, scope) {
         builder
-            .append('@JsonProperty')
+            .append(`@${scope ? scope + ':' : ''}JsonProperty`)
             .addImport('JsonProperty', 'com.fasterxml.jackson.annotation')
             .parenthesize('()', (builder) => builder
             .append(this.toStringLiteral(ctx, property.name))
@@ -162,7 +212,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             .applyIf(property.schema.custom['exclude-when-null'] === true, (builder) => builder
             .append('@get:JsonInclude')
             .addImport('JsonInclude', 'com.fasterxml.jackson.annotation')
-            .parenthesize('()', (builder) => builder.append('JsonInclude.Include.NON_NULL'))
+            .parenthesize('()', 'JsonInclude.Include.NON_NULL')
             .appendLine());
     }
     generateMapType(ctx, builder, schema) {
@@ -269,18 +319,15 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             .append('enum class ')
             .append(this.getDeclarationTypeName(ctx))
             .append('(val value: String) ')
-            .parenthesize('{}', (builder) => {
+            .parenthesizeMultiline('{}', (builder) => {
             var _a;
-            return builder
-                .appendLine()
-                .forEachSeparated((_a = schema.enum) !== null && _a !== void 0 ? _a : [], (builder) => builder.appendLine(',').appendLine(), (builder, value) => builder
+            return builder.forEachSeparated((_a = schema.enum) !== null && _a !== void 0 ? _a : [], (builder) => builder.appendLine(',').appendLine(), (builder, value) => builder
                 .append('@JsonProperty')
                 .addImport('JsonProperty', 'com.fasterxml.jackson.annotation')
-                .parenthesize('()', (builder) => builder.append(this.toStringLiteral(ctx, String(value))))
+                .parenthesize('()', this.toStringLiteral(ctx, String(value)))
                 .appendLine()
                 .append(toCasing(String(value), 'snake'))
-                .parenthesize('()', (builder) => builder.append(this.toStringLiteral(ctx, String(value)))))
-                .appendLine();
+                .parenthesize('()', this.toStringLiteral(ctx, String(value))));
         });
     }
     generateArrayType(ctx, builder, schema) {
@@ -330,4 +377,9 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             return bRequired - aRequired;
         });
     }
+    hasProperty(ctx, schema, name) {
+        return (('properties' in schema && schema.properties.has(name)) ||
+            ('anyOf' in schema && schema.anyOf.some((x) => this.hasProperty(ctx, x, name))) ||
+            ('allOf' in schema && schema.allOf.some((x) => this.hasProperty(ctx, x, name))));
+    }
 }

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

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

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

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