@goast/kotlin 0.3.13 → 0.3.15

package/cjs/lib/ast/references/swagger.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apiResponse = exports.schema = exports.operation = exports.parameter = void 0;
+exports.apiResponses = exports.apiResponse = exports.content = exports.schema = exports.operation = exports.parameter = void 0;
 const reference_1 = require("../nodes/reference");
 // io.swagger.v3.oas.annotations
 exports.parameter = reference_1.ktReference.factory('Parameter', 'io.swagger.v3.oas.annotations');
 exports.operation = reference_1.ktReference.factory('Operation', 'io.swagger.v3.oas.annotations');
 // io.swagger.v3.oas.annotations.media
 exports.schema = reference_1.ktReference.factory('Schema', 'io.swagger.v3.oas.annotations.media');
+exports.content = reference_1.ktReference.factory('Content', 'io.swagger.v3.oas.annotations.media');
 // io.swagger.v3.oas.annotations.responses
 exports.apiResponse = reference_1.ktReference.factory('ApiResponse', 'io.swagger.v3.oas.annotations.responses');
+exports.apiResponses = reference_1.ktReference.factory('ApiResponses', 'io.swagger.v3.oas.annotations.responses');

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

@@ -80,19 +80,41 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     }
     getApiInterfaceEndpointMethodAnnnotations(ctx, endpoint) {
         var _a, _b, _c;
-        const operation = ast_1.kt.annotation(ast_1.kt.refs.swagger.operation(), [
-            endpoint.summary ? ast_1.kt.argument.named('summary', ast_1.kt.string((_a = endpoint.summary) === null || _a === void 0 ? void 0 : _a.trim())) : null,
-            ast_1.kt.argument.named('operationId', ast_1.kt.string(endpoint.name)),
-            endpoint.description ? ast_1.kt.argument.named('description', ast_1.kt.string((_b = endpoint.description) === null || _b === void 0 ? void 0 : _b.trim())) : null,
-            ast_1.kt.argument.named('responses', ast_1.kt.collectionLiteral(endpoint.responses.map((response) => {
-                var _a, _b;
-                return ast_1.kt.call(ast_1.kt.refs.swagger.apiResponse(), [
-                    ast_1.kt.argument.named('responseCode', ast_1.kt.string((_a = response.statusCode) === null || _a === void 0 ? void 0 : _a.toString())),
-                    response.description ? ast_1.kt.argument.named('description', ast_1.kt.string((_b = response.description) === null || _b === void 0 ? void 0 : _b.trim())) : null,
-                ]);
-            }))),
-            endpoint.deprecated !== undefined ? ast_1.kt.argument.named('deprecated', ast_1.kt.toNode(endpoint.deprecated)) : null,
-        ]);
+        const annotations = [];
+        if (ctx.config.addSwaggerAnnotations) {
+            annotations.push(ast_1.kt.annotation(ast_1.kt.refs.swagger.operation(), [
+                endpoint.summary ? ast_1.kt.argument.named('summary', ast_1.kt.string((_a = endpoint.summary) === null || _a === void 0 ? void 0 : _a.trim())) : null,
+                ast_1.kt.argument.named('operationId', ast_1.kt.string(endpoint.name)),
+                endpoint.description ? ast_1.kt.argument.named('description', ast_1.kt.string((_b = endpoint.description) === null || _b === void 0 ? void 0 : _b.trim())) : null,
+                endpoint.deprecated !== undefined ? ast_1.kt.argument.named('deprecated', ast_1.kt.toNode(endpoint.deprecated)) : null,
+            ]));
+            if (endpoint.responses.length > 0) {
+                annotations.push(ast_1.kt.annotation(ast_1.kt.refs.swagger.apiResponses(), [
+                    ast_1.kt.argument.named('value', ast_1.kt.collectionLiteral(endpoint.responses.map((response) => {
+                        var _a, _b;
+                        return ast_1.kt.call(ast_1.kt.refs.swagger.apiResponse(), [
+                            ast_1.kt.argument.named('responseCode', ast_1.kt.string((_a = response.statusCode) === null || _a === void 0 ? void 0 : _a.toString())),
+                            response.description
+                                ? ast_1.kt.argument.named('description', ast_1.kt.string((_b = response.description) === null || _b === void 0 ? void 0 : _b.trim()))
+                                : null,
+                            ast_1.kt.argument.named('content', ast_1.kt.collectionLiteral((response.contentOptions.length === 0
+                                ? [{ schema: undefined, type: undefined }]
+                                : response.contentOptions).map((content) => {
+                                var _a;
+                                return ast_1.kt.call(ast_1.kt.refs.swagger.content(), [
+                                    content.type ? ast_1.kt.argument.named('mediaType', ast_1.kt.string(content.type)) : null,
+                                    content.schema
+                                        ? ast_1.kt.argument.named('schema', ast_1.kt.call(ast_1.kt.refs.swagger.schema(), [
+                                            ast_1.kt.argument.named('implementation', (0, core_1.builderTemplate) `${(_a = this.getSchemaType(ctx, { schema: content.schema })) !== null && _a !== void 0 ? _a : ast_1.kt.refs.any()}::class`),
+                                        ]))
+                                        : null,
+                                ]);
+                            }))),
+                        ]);
+                    }))),
+                ]));
+            }
+        }
         const requestMapping = ast_1.kt.annotation(ast_1.kt.refs.spring.requestMapping(), [
             ast_1.kt.argument.named('method', ast_1.kt.collectionLiteral([ast_1.kt.call([ast_1.kt.refs.spring.requestMethod(), endpoint.method.toUpperCase()])])),
             ast_1.kt.argument.named('value', ast_1.kt.collectionLiteral([ast_1.kt.string(this.getEndpointPath(ctx, { endpoint }))])),
@@ -100,7 +122,8 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         if (endpoint.requestBody && endpoint.requestBody.content.length > 0) {
             requestMapping.arguments.push(ast_1.kt.argument.named('consumes', ast_1.kt.collectionLiteral((_c = endpoint.requestBody) === null || _c === void 0 ? void 0 : _c.content.map((x) => ast_1.kt.string(x.type)))));
         }
-        return [operation, requestMapping];
+        annotations.push(requestMapping);
+        return annotations;
     }
     getApiInterfaceEndpointMethodParameter(ctx, endpoint, parameter) {
         var _a, _b, _c, _d, _e;

package/esm/lib/ast/node.js

@@ -1,4 +1,4 @@
-import { AstNode } from '../../index.js';
+import { AstNode } from '@goast/core';
 export class KtNode extends AstNode {
     constructor(options) {
         super(options);

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

@@ -1,4 +1,4 @@
-import { notNullish } from '../../../index.js';
+import { notNullish } from '@goast/core';
 import { ktArgument } from './argument.js';
 import { KtNode } from '../node.js';
 import { writeKtAnnotations } from '../utils/write-kt-annotations.js';

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

@@ -1,4 +1,4 @@
-import { notNullish } from '../../../index.js';
+import { notNullish } from '@goast/core';
 import { ktArgument } from './argument.js';
 import { KtNode } from '../node.js';
 import { writeKtNode, writeKtNodes } from '../utils/write-kt-node.js';

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

@@ -1,4 +1,4 @@
-import { createOverwriteProxy, notNullish, } from '../../../index.js';
+import { createOverwriteProxy, notNullish, } from '@goast/core';
 import { ktAnnotation } from './annotation.js';
 import { ktArgument } from './argument.js';
 import { ktDoc } from './doc.js';

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

@@ -1,4 +1,4 @@
-import { notNullish } from '../../../index.js';
+import { notNullish } from '@goast/core';
 import { KtNode } from '../node.js';
 import { writeKtNodes } from '../utils/write-kt-node.js';
 export class KtCollectionLiteral extends KtNode {

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

@@ -1,4 +1,4 @@
-import { notNullish, } from '../../../index.js';
+import { notNullish, } from '@goast/core';
 import { ktAnnotation } from './annotation.js';
 import { ktArgument } from './argument.js';
 import { ktParameter } from './parameter.js';

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

@@ -1,4 +1,4 @@
-import { notNullish, basicAppendValueGroup, } from '../../../index.js';
+import { notNullish, basicAppendValueGroup, } from '@goast/core';
 import { isKotlinAppendValue } from '../../file-builder.js';
 import { KtNode } from '../node.js';
 import { writeKtNodes } from '../utils/write-kt-node.js';

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

@@ -1,4 +1,4 @@
-import { createOverwriteProxy, notNullish, getIsInstanceOf, } from '../../../index.js';
+import { createOverwriteProxy, notNullish, getIsInstanceOf, } from '@goast/core';
 import { ktDocTag } from './doc-tag.js';
 import { KtGenericParameter } from './generic-parameter.js';
 import { KtParameter } from './parameter.js';

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

@@ -1,4 +1,4 @@
-import { notNullish } from '../../../index.js';
+import { notNullish } from '@goast/core';
 import { ktAnnotation } from './annotation.js';
 import { ktArgument } from './argument.js';
 import { KtNode } from '../node.js';

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

@@ -1,4 +1,4 @@
-import { createOverwriteProxy, notNullish, } from '../../../index.js';
+import { createOverwriteProxy, notNullish, } from '@goast/core';
 import { ktAnnotation } from './annotation.js';
 import { ktDoc } from './doc.js';
 import { ktEnumValue } from './enum-value.js';

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

@@ -1,4 +1,4 @@
-import { notNullish, } from '../../../index.js';
+import { notNullish, } from '@goast/core';
 import { ktAnnotation } from './annotation.js';
 import { ktDoc } from './doc.js';
 import { ktGenericParameter } from './generic-parameter.js';

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

@@ -1,4 +1,4 @@
-import { notNullish, createOverwriteProxy, } from '../../../index.js';
+import { notNullish, createOverwriteProxy, } from '@goast/core';
 import { ktAnnotation } from './annotation.js';
 import { ktDoc } from './doc.js';
 import { ktGenericParameter } from './generic-parameter.js';

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

@@ -1,4 +1,4 @@
-import { notNullish } from '../../../index.js';
+import { notNullish } from '@goast/core';
 import { ktParameter } from './parameter.js';
 import { KtNode } from '../node.js';
 import { writeKtNode, writeKtNodes } from '../utils/write-kt-node.js';

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

@@ -1,4 +1,4 @@
-import { notNullish } from '../../../index.js';
+import { notNullish } from '@goast/core';
 import { KtNode } from '../node.js';
 import { writeKtNodes } from '../utils/write-kt-node.js';
 export class KtLambda extends KtNode {

package/esm/lib/ast/nodes/object.js

@@ -1,4 +1,4 @@
-import { notNullish } from '../../../index.js';
+import { notNullish } from '@goast/core';
 import { ktArgument } from './argument.js';
 import { KtNode } from '../node.js';
 import { writeKtMembers } from '../utils/write-kt-members.js';

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

@@ -1,4 +1,4 @@
-import { notNullish } from '../../../index.js';
+import { notNullish } from '@goast/core';
 import { ktAnnotation } from './annotation.js';
 import { KtNode } from '../node.js';
 import { writeKtNode } from '../utils/write-kt-node.js';

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

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { notNullish } from '../../../index.js';
+import { notNullish } from '@goast/core';
 import { ktAnnotation } from './annotation.js';
 import { ktArgument } from './argument.js';
 import { KtNode } from '../node.js';

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

@@ -1,4 +1,4 @@
-import { notNullish } from '../../../index.js';
+import { notNullish } from '@goast/core';
 import { ktGenericParameter } from './generic-parameter.js';
 import { KotlinFileBuilder } from '../../file-builder.js';
 import { KtNode } from '../node.js';

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

@@ -1,4 +1,4 @@
-import { spliceString } from '../../../index.js';
+import { spliceString } from '@goast/core';
 import { ktArgument } from './argument.js';
 import { KtNode } from '../node.js';
 import { writeKtNodes } from '../utils/write-kt-node.js';

package/esm/lib/ast/references/swagger.js

@@ -4,5 +4,7 @@ export const parameter = ktReference.factory('Parameter', 'io.swagger.v3.oas.ann
 export const operation = ktReference.factory('Operation', 'io.swagger.v3.oas.annotations');
 // io.swagger.v3.oas.annotations.media
 export const schema = ktReference.factory('Schema', 'io.swagger.v3.oas.annotations.media');
+export const content = ktReference.factory('Content', 'io.swagger.v3.oas.annotations.media');
 // io.swagger.v3.oas.annotations.responses
 export const apiResponse = ktReference.factory('ApiResponse', 'io.swagger.v3.oas.annotations.responses');
+export const apiResponses = ktReference.factory('ApiResponses', 'io.swagger.v3.oas.annotations.responses');

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

@@ -1,4 +1,4 @@
-import { defaultOpenApiGeneratorConfig } from '../../../index.js';
+import { defaultOpenApiGeneratorConfig } from '@goast/core';
 import { defaultKotlinGeneratorConfig } from '../../config.js';
 import { KotlinFileBuilder } from '../../file-builder.js';
 const ktConfigSymbol = Symbol();

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

@@ -1,4 +1,4 @@
-import { toArray, notNullish } from '../../../index.js';
+import { toArray, notNullish } from '@goast/core';
 import { writeKtNode } from './write-kt-node.js';
 export function writeKtAnnotations(builder, nodes, options) {
     const filteredNodes = toArray(nodes).filter(notNullish);

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

@@ -1,4 +1,4 @@
-import { notNullish, toArray } from '../../../index.js';
+import { notNullish, toArray } from '@goast/core';
 import { writeKtNode, writeKtNodes } from './write-kt-node.js';
 import { KtLambda } from '../nodes/lambda.js';
 export function writeKtArguments(builder, nodes) {

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

@@ -1,4 +1,4 @@
-import { toArray, notNullish } from '../../../index.js';
+import { toArray, notNullish } from '@goast/core';
 import { writeKtNode } from './write-kt-node.js';
 export function writeKtEnumValues(builder, nodes) {
     const filteredNodes = toArray(nodes).filter(notNullish);

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

@@ -1,4 +1,4 @@
-import { toArray, notNullish } from '../../../index.js';
+import { toArray, notNullish } from '@goast/core';
 import { writeKtNode } from './write-kt-node.js';
 export function writeKtGenericParameters(builder, nodes) {
     const filteredNodes = toArray(nodes).filter(notNullish);

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

@@ -1,4 +1,4 @@
-import { notNullish, isAppendValue, isAppendValueGroup } from '../../../index.js';
+import { notNullish, isAppendValue, isAppendValueGroup } from '@goast/core';
 import { writeKtNode } from './write-kt-node.js';
 import { KtProperty } from '../nodes/property.js';
 export function writeKtMembers(builder, members, options) {

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

@@ -1,4 +1,4 @@
-import { toArray, notNullish } from '../../../index.js';
+import { toArray, notNullish } from '@goast/core';
 import { KtNode } from '../node.js';
 export function writeKtNode(builder, node) {
     if (node instanceof KtNode) {

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

@@ -1,4 +1,4 @@
-import { toArray, notNullish } from '../../../index.js';
+import { toArray, notNullish } from '@goast/core';
 import { writeKtNode } from './write-kt-node.js';
 export function writeKtParameters(builder, nodes) {
     const filteredNodes = toArray(nodes).filter(notNullish);

package/esm/lib/file-builder.js

@@ -1,4 +1,4 @@
-import { SourceBuilder, isAppendValue } from '../index.js';
+import { SourceBuilder, isAppendValue } from '@goast/core';
 import { KtNode } from './ast/node.js';
 import { defaultKotlinGeneratorConfig } from './config.js';
 import { ImportCollection } from './import-collection.js';

package/esm/lib/generators/file-generator.js

@@ -1,4 +1,4 @@
-import { toCasing } from '../../index.js';
+import { toCasing } from '@goast/core';
 import { toKotlinPropertyName, toKotlinStringLiteral } from '../utils.js';
 export class KotlinFileGenerator {
     toPropertyName(context, name) {

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

@@ -1,7 +1,7 @@
 /* eslint-disable unused-imports/no-unused-vars */
 import { dirname } from 'path';
 import fs from 'fs-extra';
-import { appendValueGroup, createOverwriteProxy, getSchemaReference, modify, modifyEach, notNullish, resolveAnyOfAndAllOf, toCasing, } from '../../../index.js';
+import { appendValueGroup, createOverwriteProxy, getSchemaReference, modify, modifyEach, notNullish, resolveAnyOfAndAllOf, toCasing, } from '@goast/core';
 import { kt } from '../../ast/index.js';
 import { KotlinFileBuilder } from '../../file-builder.js';
 import { KotlinFileGenerator } from '../file-generator.js';

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

@@ -1,4 +1,4 @@
-import { Factory, OpenApiSchemasGenerationProviderBase } from '../../../index.js';
+import { Factory, OpenApiSchemasGenerationProviderBase } from '@goast/core';
 import { DefaultKotlinModelGenerator } from './model-generator.js';
 import { defaultKotlinModelsGeneratorConfig, } from './models.js';
 export class KotlinModelsGenerator extends OpenApiSchemasGenerationProviderBase {

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

@@ -2,7 +2,7 @@
 import { writeFileSync } from 'fs';
 import { dirname } from 'path';
 import fs from 'fs-extra';
-import { SourceBuilder, appendValueGroup, builderTemplate as s, createOverwriteProxy, toCasing, resolveAnyOfAndAllOf, } from '../../../../index.js';
+import { SourceBuilder, appendValueGroup, builderTemplate as s, createOverwriteProxy, toCasing, resolveAnyOfAndAllOf, } from '@goast/core';
 import { kt } from '../../../ast/index.js';
 import { KotlinFileBuilder } from '../../../file-builder.js';
 import { modifyString } from '../../../utils.js';

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

@@ -1,7 +1,7 @@
 import { writeFileSync } from 'fs';
 import { dirname, resolve } from 'path';
 import fs from 'fs-extra';
-import { Factory, OpenApiServicesGenerationProviderBase } from '../../../../index.js';
+import { Factory, OpenApiServicesGenerationProviderBase } from '@goast/core';
 import { defaultKotlinOkHttp3ClientsGeneratorConfig, } from './models.js';
 import { DefaultKotlinOkHttp3Generator } from './okhttp3-client-generator.js';
 import { getReferenceFactories } from './refs.js';

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

@@ -1,6 +1,6 @@
 /* eslint-disable unused-imports/no-unused-vars */
 import fs from 'fs-extra';
-import { SourceBuilder, appendValueGroup, builderTemplate as s, createOverwriteProxy, notNullish, toCasing, resolveAnyOfAndAllOf, } from '../../../../index.js';
+import { SourceBuilder, appendValueGroup, builderTemplate as s, createOverwriteProxy, notNullish, toCasing, resolveAnyOfAndAllOf, } from '@goast/core';
 import { kt } from '../../../ast/index.js';
 import { KotlinFileBuilder } from '../../../file-builder.js';
 import { modifyString } from '../../../utils.js';
@@ -75,19 +75,41 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     }
     getApiInterfaceEndpointMethodAnnnotations(ctx, endpoint) {
         var _a, _b, _c;
-        const operation = kt.annotation(kt.refs.swagger.operation(), [
-            endpoint.summary ? kt.argument.named('summary', kt.string((_a = endpoint.summary) === null || _a === void 0 ? void 0 : _a.trim())) : null,
-            kt.argument.named('operationId', kt.string(endpoint.name)),
-            endpoint.description ? kt.argument.named('description', kt.string((_b = endpoint.description) === null || _b === void 0 ? void 0 : _b.trim())) : null,
-            kt.argument.named('responses', kt.collectionLiteral(endpoint.responses.map((response) => {
-                var _a, _b;
-                return kt.call(kt.refs.swagger.apiResponse(), [
-                    kt.argument.named('responseCode', kt.string((_a = response.statusCode) === null || _a === void 0 ? void 0 : _a.toString())),
-                    response.description ? kt.argument.named('description', kt.string((_b = response.description) === null || _b === void 0 ? void 0 : _b.trim())) : null,
-                ]);
-            }))),
-            endpoint.deprecated !== undefined ? kt.argument.named('deprecated', kt.toNode(endpoint.deprecated)) : null,
-        ]);
+        const annotations = [];
+        if (ctx.config.addSwaggerAnnotations) {
+            annotations.push(kt.annotation(kt.refs.swagger.operation(), [
+                endpoint.summary ? kt.argument.named('summary', kt.string((_a = endpoint.summary) === null || _a === void 0 ? void 0 : _a.trim())) : null,
+                kt.argument.named('operationId', kt.string(endpoint.name)),
+                endpoint.description ? kt.argument.named('description', kt.string((_b = endpoint.description) === null || _b === void 0 ? void 0 : _b.trim())) : null,
+                endpoint.deprecated !== undefined ? kt.argument.named('deprecated', kt.toNode(endpoint.deprecated)) : null,
+            ]));
+            if (endpoint.responses.length > 0) {
+                annotations.push(kt.annotation(kt.refs.swagger.apiResponses(), [
+                    kt.argument.named('value', kt.collectionLiteral(endpoint.responses.map((response) => {
+                        var _a, _b;
+                        return kt.call(kt.refs.swagger.apiResponse(), [
+                            kt.argument.named('responseCode', kt.string((_a = response.statusCode) === null || _a === void 0 ? void 0 : _a.toString())),
+                            response.description
+                                ? kt.argument.named('description', kt.string((_b = response.description) === null || _b === void 0 ? void 0 : _b.trim()))
+                                : null,
+                            kt.argument.named('content', kt.collectionLiteral((response.contentOptions.length === 0
+                                ? [{ schema: undefined, type: undefined }]
+                                : response.contentOptions).map((content) => {
+                                var _a;
+                                return kt.call(kt.refs.swagger.content(), [
+                                    content.type ? kt.argument.named('mediaType', kt.string(content.type)) : null,
+                                    content.schema
+                                        ? kt.argument.named('schema', kt.call(kt.refs.swagger.schema(), [
+                                            kt.argument.named('implementation', s `${(_a = this.getSchemaType(ctx, { schema: content.schema })) !== null && _a !== void 0 ? _a : kt.refs.any()}::class`),
+                                        ]))
+                                        : null,
+                                ]);
+                            }))),
+                        ]);
+                    }))),
+                ]));
+            }
+        }
         const requestMapping = kt.annotation(kt.refs.spring.requestMapping(), [
             kt.argument.named('method', kt.collectionLiteral([kt.call([kt.refs.spring.requestMethod(), endpoint.method.toUpperCase()])])),
             kt.argument.named('value', kt.collectionLiteral([kt.string(this.getEndpointPath(ctx, { endpoint }))])),
@@ -95,7 +117,8 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         if (endpoint.requestBody && endpoint.requestBody.content.length > 0) {
             requestMapping.arguments.push(kt.argument.named('consumes', kt.collectionLiteral((_c = endpoint.requestBody) === null || _c === void 0 ? void 0 : _c.content.map((x) => kt.string(x.type)))));
         }
-        return [operation, requestMapping];
+        annotations.push(requestMapping);
+        return annotations;
     }
     getApiInterfaceEndpointMethodParameter(ctx, endpoint, parameter) {
         var _a, _b, _c, _d, _e;

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

@@ -1,4 +1,4 @@
-import { Factory, OpenApiServicesGenerationProviderBase } from '../../../../index.js';
+import { Factory, OpenApiServicesGenerationProviderBase } from '@goast/core';
 import { defaultKotlinServicesGeneratorConfig, } from './models.js';
 import { DefaultKotlinSpringControllerGenerator } from './spring-controller-generator.js';
 export class KotlinSpringControllersGenerator extends OpenApiServicesGenerationProviderBase {

package/esm/lib/import-collection.js

@@ -1,4 +1,4 @@
-import { StringBuilder } from '../index.js';
+import { StringBuilder } from '@goast/core';
 import { defaultKotlinGeneratorConfig } from './config.js';
 export const defaultImportCollectionOptions = {
     globalImports: defaultKotlinGeneratorConfig.globalImports,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "repository": "https://github.com/MaSch0212/goast.git",
   "description": "Provides gOAst generators for generating Kotlin code from OpenAPI specifications.",
   "keywords": [

package/types/lib/ast/node.d.ts

@@ -1,4 +1,4 @@
-import { AstNode, AstNodeOptions, SourceBuilder } from '../..';
+import { AstNode, AstNodeOptions, SourceBuilder } from '@goast/core';
 export declare abstract class KtNode<TBuilder extends SourceBuilder, TInjects extends string = never> extends AstNode<TBuilder, TInjects> {
     constructor(options: AstNodeOptions<typeof AstNode<TBuilder, TInjects>>);
 }

package/types/lib/ast/nodes/annotation.d.ts

@@ -1,4 +1,4 @@
-import { AstNodeOptions, Nullable, Prettify, SourceBuilder } from '../../..';
+import { AstNodeOptions, Nullable, Prettify, SourceBuilder } from '@goast/core';
 import { KtArgument } from './argument';
 import { KtType, KtValue } from './types';
 import { KtNode } from '../node';

package/types/lib/ast/nodes/argument.d.ts

@@ -1,4 +1,4 @@
-import { AstNodeOptions, Nullable, Prettify, SourceBuilder } from '../../..';
+import { AstNodeOptions, Nullable, Prettify, SourceBuilder } from '@goast/core';
 import { KtValue } from './types';
 import { KtNode } from '../node';
 import { writeKtArguments } from '../utils/write-kt-arguments';

package/types/lib/ast/nodes/call.d.ts

@@ -1,4 +1,4 @@
-import { ArrayItem, AstNodeOptions, Nullable, Prettify, SourceBuilder } from '../../..';
+import { ArrayItem, AstNodeOptions, Nullable, Prettify, SourceBuilder } from '@goast/core';
 import { KtArgument } from './argument';
 import { KtType, KtValue } from './types';
 import { KtNode } from '../node';

package/types/lib/ast/nodes/class.d.ts

@@ -1,4 +1,4 @@
-import { AppendValue, AstNodeOptions, BasicAppendValue, Nullable, Prettify, SourceBuilder } from '../../..';
+import { AppendValue, AstNodeOptions, BasicAppendValue, Nullable, Prettify, SourceBuilder } from '@goast/core';
 import { KtAnnotation } from './annotation';
 import { KtConstructor } from './constructor';
 import { KtDoc } from './doc';

package/types/lib/ast/nodes/collection-literal.d.ts

@@ -1,4 +1,4 @@
-import { SourceBuilder, AstNodeOptions, Nullable } from '../../..';
+import { SourceBuilder, AstNodeOptions, Nullable } from '@goast/core';
 import { KtValue } from './types';
 import { KtNode } from '../node';
 import { writeKtNodes } from '../utils/write-kt-node';

package/types/lib/ast/nodes/constructor.d.ts

@@ -1,4 +1,4 @@
-import { AppendValue, AstNodeOptions, BasicAppendValue, Nullable, Prettify, SourceBuilder } from '../../..';
+import { AppendValue, AstNodeOptions, BasicAppendValue, Nullable, Prettify, SourceBuilder } from '@goast/core';
 import { KtAnnotation } from './annotation';
 import { KtArgument } from './argument';
 import { KtParameter } from './parameter';

package/types/lib/ast/nodes/doc-tag.d.ts

@@ -1,4 +1,4 @@
-import { SourceBuilder, AstNodeOptions, StringSuggestions, ParametersWithOverloads, Prettify, SingleOrMultiple, Nullable, BasicAppendValue } from '../../..';
+import { SourceBuilder, AstNodeOptions, StringSuggestions, ParametersWithOverloads, Prettify, SingleOrMultiple, Nullable, BasicAppendValue } from '@goast/core';
 import { KtNode } from '../node';
 import { KtAppendValue } from '../utils/write-kt-node';
 type Injects = never;

package/types/lib/ast/nodes/doc.d.ts

@@ -1,4 +1,4 @@
-import { SourceBuilder, AstNodeOptions, Prettify, Nullable, BasicAppendValue } from '../../..';
+import { SourceBuilder, AstNodeOptions, Prettify, Nullable, BasicAppendValue } from '@goast/core';
 import { KtDocTag } from './doc-tag';
 import { KtGenericParameter } from './generic-parameter';
 import { KtParameter } from './parameter';

package/types/lib/ast/nodes/enum-value.d.ts

@@ -1,4 +1,4 @@
-import { AppendValue, AstNodeOptions, Nullable, Prettify, SourceBuilder } from '../../..';
+import { AppendValue, AstNodeOptions, Nullable, Prettify, SourceBuilder } from '@goast/core';
 import { KtAnnotation } from './annotation';
 import { KtArgument } from './argument';
 import { KtDoc } from './doc';

package/types/lib/ast/nodes/enum.d.ts

@@ -1,4 +1,4 @@
-import { AppendValue, AstNodeOptions, Nullable, Prettify, SourceBuilder } from '../../..';
+import { AppendValue, AstNodeOptions, Nullable, Prettify, SourceBuilder } from '@goast/core';
 import { KtAnnotation } from './annotation';
 import { KtClass } from './class';
 import { KtConstructor } from './constructor';

package/types/lib/ast/nodes/function.d.ts

@@ -1,4 +1,4 @@
-import { SourceBuilder, AstNodeOptions, AppendValue, Prettify, Nullable, BasicAppendValue } from '../../..';
+import { SourceBuilder, AstNodeOptions, AppendValue, Prettify, Nullable, BasicAppendValue } from '@goast/core';
 import { KtAnnotation } from './annotation';
 import { KtDoc } from './doc';
 import { KtGenericParameter } from './generic-parameter';

package/types/lib/ast/nodes/generic-parameter.d.ts

@@ -1,4 +1,4 @@
-import { AstNodeOptions, BasicAppendValue, Nullable, Prettify, SourceBuilder } from '../../..';
+import { AstNodeOptions, BasicAppendValue, Nullable, Prettify, SourceBuilder } from '@goast/core';
 import { KtType } from './types';
 import { KtNode } from '../node';
 import { writeKtGenericParameters } from '../utils/write-kt-generic-parameters';

package/types/lib/ast/nodes/init-block.d.ts

@@ -1,4 +1,4 @@
-import { AppendValue, AstNodeOptions, Prettify, SourceBuilder } from '../../..';
+import { AppendValue, AstNodeOptions, Prettify, SourceBuilder } from '@goast/core';
 import { KtNode } from '../node';
 import { writeKtNodes } from '../utils/write-kt-node';
 type Injects = never;

package/types/lib/ast/nodes/interface.d.ts

@@ -1,4 +1,4 @@
-import { SourceBuilder, AppendValue, AstNodeOptions, Prettify, Nullable, BasicAppendValue } from '../../..';
+import { SourceBuilder, AppendValue, AstNodeOptions, Prettify, Nullable, BasicAppendValue } from '@goast/core';
 import { KtAnnotation } from './annotation';
 import { KtClass } from './class';
 import { KtDoc } from './doc';

package/types/lib/ast/nodes/lambda-type.d.ts

@@ -1,4 +1,4 @@
-import { SourceBuilder, AstNodeOptions, Nullable } from '../../..';
+import { SourceBuilder, AstNodeOptions, Nullable } from '@goast/core';
 import { KtType } from './types';
 import { KtNode } from '../node';
 import { writeKtNodes } from '../utils/write-kt-node';

package/types/lib/ast/nodes/lambda.d.ts

@@ -1,4 +1,4 @@
-import { SourceBuilder, AstNodeOptions, Nullable, BasicAppendValue, AppendValue } from '../../..';
+import { SourceBuilder, AstNodeOptions, Nullable, BasicAppendValue, AppendValue } from '@goast/core';
 import { KtNode } from '../node';
 import { writeKtNodes } from '../utils/write-kt-node';
 type Injects = 'arguments' | 'body';

package/types/lib/ast/nodes/object.d.ts

@@ -1,4 +1,4 @@
-import { SourceBuilder, AstNodeOptions, Nullable, BasicAppendValue } from '../../..';
+import { SourceBuilder, AstNodeOptions, Nullable, BasicAppendValue } from '@goast/core';
 import { KtArgument } from './argument';
 import { KtFunction } from './function';
 import { KtInitBlock } from './init-block';

package/types/lib/ast/nodes/parameter.d.ts

@@ -1,4 +1,4 @@
-import { SourceBuilder, AstNodeOptions, Prettify, Nullable, BasicAppendValue } from '../../..';
+import { SourceBuilder, AstNodeOptions, Prettify, Nullable, BasicAppendValue } from '@goast/core';
 import { KtAnnotation } from './annotation';
 import { KtType, KtValue } from './types';
 import { KtAccessModifier } from '../common';

package/types/lib/ast/nodes/property.d.ts

@@ -1,4 +1,4 @@
-import { SourceBuilder, AppendValue, AstNodeOptions, Prettify, Nullable } from '../../..';
+import { SourceBuilder, AppendValue, AstNodeOptions, Prettify, Nullable } from '@goast/core';
 import { KtAnnotation } from './annotation';
 import { KtArgument } from './argument';
 import { KtDoc } from './doc';