@goast/kotlin 0.2.8 → 0.3.0

package/README.md

@@ -1,7 +1,39 @@
-# kotlin
+# gOAst (@goast/kotlin)
 
-This library was generated with [Nx](https://nx.dev).
+[![@goast/kotlin NPM Version](https://img.shields.io/npm/v/%40goast%2Fkotlin?logo=npm&label=%40goast%2Fkotlin)](https://www.npmjs.com/package/@goast/kotlin)
 
-## Running unit tests
+**gOAst** stands for **g**enerative **O**pen **A**PI **s**pecification **t**ransformer, a tool designed to transform OpenAPI specifications into various forms with flexibility and extensibility at its core.
 
-Run `nx test kotlin` to execute the unit tests via [Jest](https://jestjs.io).
+For more Information, please visit the [gOAst GitHub Repository](https://github.com/MaSch0212/goast/blob/main).
+
+## Purpose 👍
+
+The `@goast/kotlin` package provides generators for [Kotlin](https://kotlinlang.org/) code generation from OpenAPI specifications.
+
+## Usage Example 🚀
+
+```typescript
+import { OpenApiGenerator } from '@goast/core';
+import { KotlinModelsGenerator, KotlinSpringControllersGenerator } from '@goast/kotlin';
+
+async function main() {
+  await new OpenApiGenerator({ outputDir: '.api' })
+    .useType(KotlinModelsGenerator)
+    .useType(KotlinSpringControllersGenerator)
+    .parseAndGenerateFromDir('.openapi');
+}
+
+main();
+```
+
+## Available Generators 📚
+
+- [`KotlinModelsGenerator`](https://github.com/MaSch0212/goast/wiki/Kotlin%20Models%20Generator): Generates Kotlin data classes from schemas in the OpenAPI specification(s).
+- [`KotlinSpringControllersGenerator`](https://github.com/MaSch0212/goast/wiki/Kotlin%20Spring%20Controllers%20Generator): Generates [Spring](https://spring.io/) controllers for Kotlin from paths in the OpenAPI specification(s).
+  - Depends on the output of the `KotlinModelsGenerator` generator.
+- [`KotlinOkHttp3ClientsGenerator`](https://github.com/MaSch0212/goast/wiki/Kotlin%20OkHttp3%20Clients%20Generator): Generates [OkHttp3](https://square.github.io/okhttp/) clients for Kotlin from paths in the OpenAPI specification(s).
+  - Depends on the output of the `KotlinModelsGenerator` generator.
+
+## API Documentation 📖
+
+The API documentation can be found [here](https://github.com/MaSch0212/goast/wiki/Kotlin%20Generators).

package/cjs/index.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.kt = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./lib/common-results"), exports);
 tslib_1.__exportStar(require("./lib/config"), exports);
@@ -9,4 +8,3 @@ tslib_1.__exportStar(require("./lib/file-builder"), exports);
 tslib_1.__exportStar(require("./lib/import-collection"), exports);
 tslib_1.__exportStar(require("./lib/utils"), exports);
 tslib_1.__exportStar(require("./lib/ast"), exports);
-exports.kt = tslib_1.__importStar(require("./lib/ast/references"));

package/cjs/lib/ast/nodes/annotation.js

@@ -33,7 +33,7 @@ class KtAnnotation extends node_1.KtNode {
     }
 }
 exports.KtAnnotation = KtAnnotation;
-const createAnnotation = ($class, $arguments, options) => new KtAnnotation(Object.assign(Object.assign({}, options), { class: $class, arguments: $arguments }));
+const createAnnotation = ($class, $arguments, options) => new KtAnnotation({ ...options, class: $class, arguments: $arguments });
 exports.ktAnnotation = Object.assign(createAnnotation, {
     write: write_kt_annotations_1.writeKtAnnotations,
 });

package/cjs/lib/ast/nodes/argument.js

@@ -24,8 +24,8 @@ class KtArgument extends node_1.KtNode {
     }
 }
 exports.KtArgument = KtArgument;
-const createArgument = (value, options) => new KtArgument(Object.assign(Object.assign({}, options), { value }));
-const createNamedArgument = (name, value, options) => new KtArgument(Object.assign(Object.assign({}, options), { value, name }));
+const createArgument = (value, options) => new KtArgument({ ...options, value });
+const createNamedArgument = (name, value, options) => new KtArgument({ ...options, value, name });
 exports.ktArgument = Object.assign(createArgument, {
     named: createNamedArgument,
     write: write_kt_arguments_1.writeKtArguments,

package/cjs/lib/ast/nodes/call.js

@@ -31,7 +31,7 @@ class KtCall extends node_1.KtNode {
     }
 }
 exports.KtCall = KtCall;
-const createCall = (path, args, options) => new KtCall(Object.assign(Object.assign({}, options), { path: Array.isArray(path) ? path : [path], arguments: args }));
+const createCall = (path, args, options) => new KtCall({ ...options, path: Array.isArray(path) ? path : [path], arguments: args });
 exports.ktCall = Object.assign(createCall, {
     write: write_kt_node_1.writeKtNodes,
 });

package/cjs/lib/ast/nodes/class.js

@@ -88,7 +88,7 @@ class KtClass extends node_1.KtNode {
     }
 }
 exports.KtClass = KtClass;
-const createClass = (name, options) => new KtClass(Object.assign(Object.assign({}, options), { name }));
+const createClass = (name, options) => new KtClass({ ...options, name });
 exports.ktClass = Object.assign(createClass, {
     write: write_kt_node_1.writeKtNodes,
 });

package/cjs/lib/ast/nodes/collection-literal.js

@@ -18,7 +18,7 @@ class KtCollectionLiteral extends node_1.KtNode {
     }
 }
 exports.KtCollectionLiteral = KtCollectionLiteral;
-const createCollectionLiteral = (elements, options) => new KtCollectionLiteral(Object.assign(Object.assign({}, options), { elements }));
+const createCollectionLiteral = (elements, options) => new KtCollectionLiteral({ ...options, elements });
 exports.ktCollectionLiteral = Object.assign(createCollectionLiteral, {
     write: write_kt_node_1.writeKtNodes,
 });

package/cjs/lib/ast/nodes/constructor.js

@@ -69,7 +69,7 @@ class KtConstructor extends node_1.KtNode {
     }
 }
 exports.KtConstructor = KtConstructor;
-const createConstructor = (parameters, body, options) => new KtConstructor(Object.assign(Object.assign({}, options), { parameters: parameters !== null && parameters !== void 0 ? parameters : undefined, body }));
+const createConstructor = (parameters, body, options) => new KtConstructor({ ...options, parameters: parameters !== null && parameters !== void 0 ? parameters : undefined, body });
 exports.ktConstructor = Object.assign(createConstructor, {
     write: write_kt_node_1.writeKtNodes,
 });

package/cjs/lib/ast/nodes/doc-tag.js

@@ -50,7 +50,7 @@ function createDocTag(tag, ...args) {
             opt.description = description;
         }
     }
-    return new KtDocTag(Object.assign(Object.assign({}, opt), { tag, args: params }));
+    return new KtDocTag({ ...opt, tag, args: params });
 }
 const writeDocTags = (builder, nodes) => {
     (0, write_kt_node_1.writeKtNodes)(builder, nodes, { separator: '\n' });

package/cjs/lib/ast/nodes/doc.js

@@ -30,7 +30,7 @@ class KtDoc extends node_1.KtNode {
     }
 }
 exports.KtDoc = KtDoc;
-const createDoc = (description, tags, options) => new KtDoc(Object.assign(Object.assign({}, options), { description, tags: tags !== null && tags !== void 0 ? tags : undefined }));
+const createDoc = (description, tags, options) => new KtDoc({ ...options, description, tags: tags !== null && tags !== void 0 ? tags : undefined });
 function getDoc(baseDoc, options) {
     var _a, _b, _c, _d, _e, _f;
     const paramsWithDesc = (_b = (_a = options.parameters) === null || _a === void 0 ? void 0 : _a.filter((0, core_1.getIsInstanceOf)((parameter_1.KtParameter))).filter((x) => !!x.description)) !== null && _b !== void 0 ? _b : [];

package/cjs/lib/ast/nodes/enum-value.js

@@ -44,7 +44,7 @@ class KtEnumValue extends node_1.KtNode {
     }
 }
 exports.KtEnumValue = KtEnumValue;
-const createEnumValue = (name, options) => new KtEnumValue(Object.assign(Object.assign({}, options), { name }));
+const createEnumValue = (name, options) => new KtEnumValue({ ...options, name });
 exports.ktEnumValue = Object.assign(createEnumValue, {
     write: write_kt_enum_values_1.writeKtEnumValues,
 });

package/cjs/lib/ast/nodes/enum.js

@@ -77,7 +77,7 @@ class KtEnum extends node_1.KtNode {
     }
 }
 exports.KtEnum = KtEnum;
-const createEnum = (name, values, options) => new KtEnum(Object.assign(Object.assign({}, options), { name, values: values !== null && values !== void 0 ? values : undefined }));
+const createEnum = (name, values, options) => new KtEnum({ ...options, name, values: values !== null && values !== void 0 ? values : undefined });
 exports.ktEnum = Object.assign(createEnum, {
     write: write_kt_node_1.writeKtNodes,
 });

package/cjs/lib/ast/nodes/function.js

@@ -99,7 +99,7 @@ class KtFunction extends node_1.KtNode {
     }
 }
 exports.KtFunction = KtFunction;
-const createFunction = (name, options) => new KtFunction(Object.assign(Object.assign({}, options), { name }));
+const createFunction = (name, options) => new KtFunction({ ...options, name });
 exports.ktFunction = Object.assign(createFunction, {
     write: write_kt_node_1.writeKtNodes,
 });

package/cjs/lib/ast/nodes/generic-parameter.js

@@ -23,7 +23,7 @@ class KtGenericParameter extends node_1.KtNode {
     }
 }
 exports.KtGenericParameter = KtGenericParameter;
-const createGenericParameter = (name, options) => new KtGenericParameter(Object.assign(Object.assign({}, options), { name }));
+const createGenericParameter = (name, options) => new KtGenericParameter({ ...options, name });
 exports.ktGenericParameter = Object.assign(createGenericParameter, {
     write: write_kt_generic_parameters_1.writeKtGenericParameters,
 });

package/cjs/lib/ast/nodes/init-block.js

@@ -13,7 +13,7 @@ class KtInitBlock extends node_1.KtNode {
     }
 }
 exports.KtInitBlock = KtInitBlock;
-const createInitBlock = (body, options) => new KtInitBlock(Object.assign(Object.assign({}, options), { body }));
+const createInitBlock = (body, options) => new KtInitBlock({ ...options, body });
 exports.ktInitBlock = Object.assign(createInitBlock, {
     write: write_kt_node_1.writeKtNodes,
 });

package/cjs/lib/ast/nodes/interface.js

@@ -62,7 +62,7 @@ class KtInterface extends node_1.KtNode {
     }
 }
 exports.KtInterface = KtInterface;
-const createInterface = (name, options) => new KtInterface(Object.assign(Object.assign({}, options), { name }));
+const createInterface = (name, options) => new KtInterface({ ...options, name });
 exports.ktInterface = Object.assign(createInterface, {
     write: write_kt_node_1.writeKtNodes,
 });

package/cjs/lib/ast/nodes/lambda-type.js

@@ -38,7 +38,7 @@ class KtLambdaType extends node_1.KtNode {
     }
 }
 exports.KtLambdaType = KtLambdaType;
-const createLambdaType = (parameters, returnType, options) => new KtLambdaType(Object.assign(Object.assign({}, options), { parameters, returnType }));
+const createLambdaType = (parameters, returnType, options) => new KtLambdaType({ ...options, parameters, returnType });
 exports.ktLambdaType = Object.assign(createLambdaType, {
     write: write_kt_node_1.writeKtNodes,
 });

package/cjs/lib/ast/nodes/lambda.js

@@ -30,7 +30,7 @@ class KtLambda extends node_1.KtNode {
     }
 }
 exports.KtLambda = KtLambda;
-const createLambda = (args, body, options) => new KtLambda(Object.assign(Object.assign({}, options), { arguments: args, body }));
+const createLambda = (args, body, options) => new KtLambda({ ...options, arguments: args, body });
 exports.ktLambda = Object.assign(createLambda, {
     write: write_kt_node_1.writeKtNodes,
 });

package/cjs/lib/ast/nodes/parameter.js

@@ -49,8 +49,8 @@ class KtParameter extends node_1.KtNode {
     }
 }
 exports.KtParameter = KtParameter;
-const createParameter = (name, type, options) => new KtParameter(Object.assign(Object.assign({}, options), { name, type }));
-const createClassParameter = (name, type, options) => new KtParameter(Object.assign(Object.assign({}, options), { name, type }));
+const createParameter = (name, type, options) => new KtParameter({ ...options, name, type });
+const createClassParameter = (name, type, options) => new KtParameter({ ...options, name, type });
 exports.ktParameter = Object.assign(createParameter, {
     class: createClassParameter,
     write: write_kt_parameters_1.writeKtParameters,

package/cjs/lib/ast/nodes/property.js

@@ -134,7 +134,7 @@ class KtProperty extends node_1.KtNode {
 exports.KtProperty = KtProperty;
 const createPropertyGetter = (options) => new KtPropertyGetter(options !== null && options !== void 0 ? options : {});
 const createPropertySetter = (options) => new KtPropertySetter(options !== null && options !== void 0 ? options : {});
-const createProperty = (name, options) => new KtProperty(Object.assign(Object.assign({}, options), { name }));
+const createProperty = (name, options) => new KtProperty({ ...options, name });
 exports.ktProperty = Object.assign(createProperty, {
     getter: createPropertyGetter,
     setter: createPropertySetter,

package/cjs/lib/ast/nodes/reference.js

@@ -52,7 +52,7 @@ KtReference.addImportHandlers = [
         handler: (builder, reference) => builder.addImport(reference.name, reference.packageName),
     },
 ];
-const createReference = (name, packageName, options) => new KtReference(Object.assign(Object.assign({}, options), { name, packageName }));
+const createReference = (name, packageName, options) => new KtReference({ ...options, name, packageName });
 const createFactory = (name, packageName) => {
     return Object.assign((options) => createReference(name, packageName, options), {
         refName: name,
@@ -61,7 +61,7 @@ const createFactory = (name, packageName) => {
     });
 };
 const createGenericFactory = (name, packageName) => {
-    return Object.assign((generics, options) => createReference(name, packageName, Object.assign(Object.assign({}, options), { generics })), {
+    return Object.assign((generics, options) => createReference(name, packageName, { ...options, generics }), {
         refName: name,
         packageName,
         infer: (options) => createReference(name, packageName, options),

package/cjs/lib/ast/nodes/string.js

@@ -81,7 +81,7 @@ class KtString extends node_1.KtNode {
     }
 }
 exports.KtString = KtString;
-const createString = (value, options) => new KtString(Object.assign(Object.assign({}, options), { value }));
+const createString = (value, options) => new KtString({ ...options, value });
 exports.ktString = Object.assign(createString, {
     write: write_kt_node_1.writeKtNodes,
 });

package/cjs/lib/ast/utils/get-kotlin-builder-options.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getKotlinBuilderOptions = void 0;
+exports.getKotlinBuilderOptions = getKotlinBuilderOptions;
 const core_1 = require("@goast/core");
 const config_1 = require("../../config");
 const file_builder_1 = require("../../file-builder");
@@ -12,8 +12,7 @@ function getKotlinBuilderOptions(builder) {
     if (ktConfigSymbol in builder.options) {
         return builder.options[ktConfigSymbol];
     }
-    const options = Object.assign(Object.assign(Object.assign({}, core_1.defaultOpenApiGeneratorConfig), config_1.defaultKotlinGeneratorConfig), builder.options);
+    const options = { ...core_1.defaultOpenApiGeneratorConfig, ...config_1.defaultKotlinGeneratorConfig, ...builder.options };
     builder[ktConfigSymbol] = options;
     return options;
 }
-exports.getKotlinBuilderOptions = getKotlinBuilderOptions;

package/cjs/lib/ast/utils/to-kt-node.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toKtNode = void 0;
+exports.toKtNode = toKtNode;
 const call_1 = require("../nodes/call");
 const string_1 = require("../nodes/string");
 const references_1 = require("../references");
@@ -19,4 +19,3 @@ function toKtNode(value) {
     }
     return (0, string_1.ktString)(String(value));
 }
-exports.toKtNode = toKtNode;

package/cjs/lib/ast/utils/write-kt-annotations.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeKtAnnotations = void 0;
+exports.writeKtAnnotations = writeKtAnnotations;
 const core_1 = require("@goast/core");
 const write_kt_node_1 = require("./write-kt-node");
 function writeKtAnnotations(builder, nodes, options) {
@@ -10,4 +10,3 @@ function writeKtAnnotations(builder, nodes, options) {
         b.append((options === null || options === void 0 ? void 0 : options.multiline) ? '\n' : ' ');
     });
 }
-exports.writeKtAnnotations = writeKtAnnotations;

package/cjs/lib/ast/utils/write-kt-arguments.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeKtArguments = void 0;
+exports.writeKtArguments = writeKtArguments;
 const core_1 = require("@goast/core");
 const write_kt_node_1 = require("./write-kt-node");
 const lambda_1 = require("../nodes/lambda");
@@ -30,4 +30,3 @@ function writeKtArguments(builder, nodes) {
         (0, write_kt_node_1.writeKtNode)(builder, lambda);
     }
 }
-exports.writeKtArguments = writeKtArguments;

package/cjs/lib/ast/utils/write-kt-enum-values.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeKtEnumValues = void 0;
+exports.writeKtEnumValues = writeKtEnumValues;
 const core_1 = require("@goast/core");
 const write_kt_node_1 = require("./write-kt-node");
 function writeKtEnumValues(builder, nodes) {
@@ -14,4 +14,3 @@ function writeKtEnumValues(builder, nodes) {
         filteredNodes.some((v) => typeof v === 'object' && 'arguments' in v && Array.isArray(v.arguments) && v.arguments.length > 0);
     builder.forEach(filteredNodes, (b, v, i) => b.if(spacing && i > 0, (b) => b.ensurePreviousLineEmpty()).append((b) => (0, write_kt_node_1.writeKtNode)(b, v)), { separator: multiline ? ',\n' : ', ' });
 }
-exports.writeKtEnumValues = writeKtEnumValues;

package/cjs/lib/ast/utils/write-kt-generic-parameters.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeKtGenericParameters = void 0;
+exports.writeKtGenericParameters = writeKtGenericParameters;
 const core_1 = require("@goast/core");
 const write_kt_node_1 = require("./write-kt-node");
 function writeKtGenericParameters(builder, nodes) {
@@ -9,4 +9,3 @@ function writeKtGenericParameters(builder, nodes) {
         return;
     builder.parenthesize('<>', (b) => b.forEach(filteredNodes, write_kt_node_1.writeKtNode, { separator: ', ' }));
 }
-exports.writeKtGenericParameters = writeKtGenericParameters;

package/cjs/lib/ast/utils/write-kt-members.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeKtMembers = void 0;
+exports.writeKtMembers = writeKtMembers;
 const core_1 = require("@goast/core");
 const write_kt_node_1 = require("./write-kt-node");
 const property_1 = require("../nodes/property");
@@ -13,4 +13,3 @@ function writeKtMembers(builder, members, options) {
         .append((b) => (0, write_kt_node_1.writeKtNode)(b, m))
         .if(i < filteredMembers.length - 1, (b) => b.ensurePreviousLineEmpty()), (b) => b.append((b) => (0, write_kt_node_1.writeKtNode)(b, m)).ensureCurrentLineEmpty()));
 }
-exports.writeKtMembers = writeKtMembers;

package/cjs/lib/ast/utils/write-kt-node.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeKtNodes = exports.writeKtNode = void 0;
+exports.writeKtNode = writeKtNode;
+exports.writeKtNodes = writeKtNodes;
 const core_1 = require("@goast/core");
 const node_1 = require("../node");
 function writeKtNode(builder, node) {
@@ -11,7 +12,6 @@ function writeKtNode(builder, node) {
         builder.append(node);
     }
 }
-exports.writeKtNode = writeKtNode;
 function writeKtNodes(builder, nodes, options) {
     const filteredNodes = (0, core_1.toArray)(nodes).filter(core_1.notNullish);
     if (filteredNodes.length === 1) {
@@ -21,4 +21,3 @@ function writeKtNodes(builder, nodes, options) {
         builder.forEach(filteredNodes, writeKtNode, { separator: options === null || options === void 0 ? void 0 : options.separator });
     }
 }
-exports.writeKtNodes = writeKtNodes;

package/cjs/lib/ast/utils/write-kt-parameters.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeKtParameters = void 0;
+exports.writeKtParameters = writeKtParameters;
 const core_1 = require("@goast/core");
 const write_kt_node_1 = require("./write-kt-node");
 function writeKtParameters(builder, nodes) {
@@ -10,4 +10,3 @@ function writeKtParameters(builder, nodes) {
     const spacing = multiline && hasAnnotations;
     builder.parenthesize('()', (b) => b.forEach(filteredNodes, (b, p, i) => b.if(i > 0 && spacing, (b) => b.ensurePreviousLineEmpty()).append((b) => (0, write_kt_node_1.writeKtNode)(b, p)), { separator: multiline ? ',\n' : ', ' }), { multiline });
 }
-exports.writeKtParameters = writeKtParameters;

package/cjs/lib/file-builder.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KotlinFileBuilder = exports.isKotlinAppendValue = void 0;
+exports.KotlinFileBuilder = void 0;
+exports.isKotlinAppendValue = isKotlinAppendValue;
 const core_1 = require("@goast/core");
 const node_1 = require("./ast/node");
 const config_1 = require("./config");
@@ -8,7 +9,6 @@ const import_collection_1 = require("./import-collection");
 function isKotlinAppendValue(value) {
     return (0, core_1.isAppendValue)(value) || value instanceof node_1.KtNode;
 }
-exports.isKotlinAppendValue = isKotlinAppendValue;
 class KotlinFileBuilder extends core_1.SourceBuilder {
     get options() {
         return super.options;

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

@@ -68,7 +68,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
             annotations: [schema.deprecated ? ast_1.kt.annotation(ast_1.kt.refs.deprecated(), [ast_1.kt.argument(ast_1.kt.string(''))]) : null],
             classKind: parameters.length === 0 ? null : 'data',
             implements: inheritedSchemas.map((schema) => this.getType(ctx, { schema })),
-            primaryConstructor: ast_1.kt.constructor(parameters.map((property) => this.getClassParameter(ctx, Object.assign(Object.assign({}, args), { inheritedSchemas, parameters, property })))),
+            primaryConstructor: ast_1.kt.constructor(parameters.map((property) => this.getClassParameter(ctx, { ...args, inheritedSchemas, parameters, property }))),
             members: [
                 ...(schema.additionalProperties !== undefined && schema.additionalProperties !== false
                     ? [
@@ -326,9 +326,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
                 property.schema.description !== undefined
                     ? ast_1.kt.argument.named('description', ast_1.kt.string(property.schema.description))
                     : null,
-                property.schema.deprecated !== undefined
-                    ? ast_1.kt.argument.named('deprecated', ast_1.kt.toNode(property.schema.deprecated))
-                    : null,
+                property.schema.deprecated ? ast_1.kt.argument.named('deprecated', ast_1.kt.toNode(property.schema.deprecated)) : null,
             ])
             : null;
     }
@@ -415,7 +413,8 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
         if (schema.kind === 'oneOf') {
             schema =
                 ctx.config.oneOfBehavior === 'treat-as-any-of'
-                    ? Object.assign(Object.assign({}, schema), { kind: 'combined', anyOf: schema.oneOf, allOf: [], oneOf: undefined }) : Object.assign(Object.assign({}, schema), { kind: 'combined', allOf: schema.oneOf, anyOf: [], oneOf: undefined });
+                    ? { ...schema, kind: 'combined', anyOf: schema.oneOf, allOf: [], oneOf: undefined }
+                    : { ...schema, kind: 'combined', allOf: schema.oneOf, anyOf: [], oneOf: undefined };
             ctx.schema = schema;
         }
         if (schema.kind === 'object' || schema.kind === 'combined') {

package/cjs/lib/generators/models/models-generator.js

@@ -11,7 +11,9 @@ class KotlinModelsGenerator extends core_1.OpenApiSchemasGenerationProviderBase
     }
     initResult() {
         return {
-            models: {},
+            kotlin: {
+                models: {},
+            },
         };
     }
     buildContext(context, config) {
@@ -19,10 +21,13 @@ class KotlinModelsGenerator extends core_1.OpenApiSchemasGenerationProviderBase
     }
     generateSchema(ctx, schema) {
         const modelGenerator = this._modelGeneratorFactory.create();
-        return modelGenerator.generate(Object.assign(Object.assign({}, ctx), { schema }));
+        return modelGenerator.generate({
+            ...ctx,
+            schema,
+        });
     }
     addSchemaResult(ctx, schema, result) {
-        ctx.output.models[schema.id] = result;
+        ctx.output.kotlin.models[schema.id] = result;
     }
 }
 exports.KotlinModelsGenerator = KotlinModelsGenerator;

package/cjs/lib/generators/models/models.js

@@ -2,4 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultKotlinModelsGeneratorConfig = void 0;
 const config_1 = require("../../config");
-exports.defaultKotlinModelsGeneratorConfig = Object.assign(Object.assign({}, config_1.defaultKotlinGeneratorConfig), { packageName: 'com.openapi.generated', packageSuffix: '.model', oneOfBehavior: 'treat-as-any-of', addJacksonAnnotations: true, addJakartaValidationAnnotations: true, addSwaggerAnnotations: true });
+exports.defaultKotlinModelsGeneratorConfig = {
+    ...config_1.defaultKotlinGeneratorConfig,
+    packageName: 'com.openapi.generated',
+    packageSuffix: '.model',
+    oneOfBehavior: 'treat-as-any-of',
+    addJacksonAnnotations: true,
+    addJakartaValidationAnnotations: true,
+    addSwaggerAnnotations: true,
+};

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

@@ -2,4 +2,9 @@
 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: '.api.client', infrastructurePackageName: { mode: 'append-full-package-name', value: '.infrastructure' } });
+exports.defaultKotlinOkHttp3ClientsGeneratorConfig = {
+    ...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

@@ -104,31 +104,31 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
         return (0, core_1.appendValueGroup)([
             (0, core_1.builderTemplate) `val localVarResponse = ${ast_1.kt.call([(0, core_1.toCasing)(endpoint.name + '_WithHttpInfo', ctx.config.functionNameCasing)], parameters.map((x) => x.name))}`,
             '',
-            (0, core_1.builderTemplate) `return when (localVarResponse.responseType) {${core_1.builderTemplate.indent `
+            (0, core_1.builderTemplate) `return when (localVarResponse.responseType) {${core_1.builderTemplate.indent `
             ${ctx.refs.responseType()}.Success -> ${responseSchema === undefined
                 ? ast_1.kt.refs.unit()
                 : (0, core_1.builderTemplate) `(localVarResponse as ${ctx.refs.success(['*'])}).data as ${this.getTypeUsage(ctx, {
                     schema: responseSchema,
-                })}`}
-            ${ctx.refs.responseType()}.Informational -> throw ${ast_1.kt.refs.java.unsupportedOperationException()}("Client does not support Informational responses.")
-            ${ctx.refs.responseType()}.Redirection -> throw ${ast_1.kt.refs.java.unsupportedOperationException()}("Client does not support Redirection responses.")
-            ${ctx.refs.responseType()}.ClientError -> {${core_1.builderTemplate.indent `
-              val localVarError = localVarResponse as ${ctx.refs.clientError(['*'])}
-              throw ${ctx.refs.clientException()}(${core_1.builderTemplate.indent `
-                "Client error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
-                localVarError.statusCode,
-                localVarResponse`}
-              )`}
-            }
-
-            ${ctx.refs.responseType()}.ServerError -> {${core_1.builderTemplate.indent `
-              val localVarError = localVarResponse as ${ctx.refs.serverError(['*'])}
-              throw ${ctx.refs.serverException()}(${core_1.builderTemplate.indent `
-                "Server error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
-                localVarError.statusCode,
-                localVarResponse`}
-              )`}
-            }`}
+                })}`}
+            ${ctx.refs.responseType()}.Informational -> throw ${ast_1.kt.refs.java.unsupportedOperationException()}("Client does not support Informational responses.")
+            ${ctx.refs.responseType()}.Redirection -> throw ${ast_1.kt.refs.java.unsupportedOperationException()}("Client does not support Redirection responses.")
+            ${ctx.refs.responseType()}.ClientError -> {${core_1.builderTemplate.indent `
+              val localVarError = localVarResponse as ${ctx.refs.clientError(['*'])}
+              throw ${ctx.refs.clientException()}(${core_1.builderTemplate.indent `
+                "Client error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
+                localVarError.statusCode,
+                localVarResponse`}
+              )`}
+            }
+
+            ${ctx.refs.responseType()}.ServerError -> {${core_1.builderTemplate.indent `
+              val localVarError = localVarResponse as ${ctx.refs.serverError(['*'])}
+              throw ${ctx.refs.serverException()}(${core_1.builderTemplate.indent `
+                "Server error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
+                localVarError.statusCode,
+                localVarResponse`}
+              )`}
+            }`}
           }`,
         ], '\n');
     }
@@ -205,8 +205,8 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
         }
         result.values.push((0, core_1.builderTemplate) `val localVariableQuery: ${ctx.refs.multiValueMap()} = ${ast_1.kt.call([ast_1.kt.refs.mutableMapOf([ast_1.kt.refs.string(), ast_1.kt.refs.list([ast_1.kt.refs.string()])])], [])}${queryParameters.length === 0
             ? ''
-            : core_1.builderTemplate.indent `
-            .apply {${core_1.builderTemplate.indent `
+            : core_1.builderTemplate.indent `
+            .apply {${core_1.builderTemplate.indent `
               ${(0, core_1.appendValueGroup)(queryParameters.map((param) => {
                 var _a;
                 const paramName = (0, core_1.toCasing)(param.name, ctx.config.parameterNameCasing);
@@ -214,10 +214,10 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
                 const put = (0, core_1.builderTemplate) `put(${ast_1.kt.string(paramName)}, listOf(${paramName}${toString}))`;
                 return param.required
                     ? put
-                    : (0, core_1.builderTemplate) `if (${paramName} != null) {${core_1.builderTemplate.indent `
-                        ${put}`}
+                    : (0, core_1.builderTemplate) `if (${paramName} != null) {${core_1.builderTemplate.indent `
+                        ${put}`}
                       }`;
-            }), '\n')}`}
+            }), '\n')}`}
             }`}`);
         result.values.push('val localVariableHeaders: MutableMap<String, String> = mutableMapOf()');
         if (((_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0]) !== undefined) {
@@ -249,7 +249,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
         const type = this.getSchemaType(ctx, { schema });
         return type
             ? (0, core_1.createOverwriteProxy)(type, { nullable: nullable !== null && nullable !== void 0 ? nullable : type.nullable })
-            : fallback !== null && fallback !== void 0 ? fallback : ast_1.kt.refs.any({ nullable });
+            : (fallback !== null && fallback !== void 0 ? fallback : ast_1.kt.refs.any({ nullable }));
     }
     getPackageName(ctx, args) {
         const packageSuffix = typeof ctx.config.packageSuffix === 'string' ? ctx.config.packageSuffix : ctx.config.packageSuffix(ctx.service);
@@ -272,7 +272,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
     }
     getSchemaType(ctx, args) {
         const { schema } = args;
-        return schema && ctx.input.models[schema.id].type;
+        return schema && ctx.input.kotlin.models[schema.id].type;
     }
     getAllParameters(ctx, args) {
         const { endpoint } = args;