@goast/kotlin 0.5.10 → 0.5.11-beta.2

package/assets/client/okhttp3/ApiResponse.kt

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

package/assets/client/okhttp3/Errors.kt

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

package/assets/client/okhttp3/PartConfig.kt

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

package/assets/client/okhttp3/RequestConfig.kt

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

package/assets/client/okhttp3/RequestMethod.kt

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

package/assets/client/okhttp3/ResponseExtensions.kt

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

package/assets/client/spring-reactive-web-clients/ApiRequestFile.kt

@@ -1,33 +1,33 @@
-package @PACKAGE_NAME@
-
-import org.springframework.core.io.buffer.DataBuffer
-import org.springframework.http.MediaType
-import org.springframework.http.client.MultipartBodyBuilder
-import org.springframework.http.codec.multipart.FilePart
-import java.io.File
-
-interface ApiRequestFile {
-    companion object {
-        fun from(file: File): ApiRequestFile =
-            object : ApiRequestFile {
-                override fun addToBuilder(builder: MultipartBodyBuilder) {
-                    builder
-                        .part("file", file)
-                        .filename(file.name)
-                        .contentType(MediaType.APPLICATION_OCTET_STREAM)
-                }
-            }
-
-        fun from(filePart: FilePart): ApiRequestFile =
-            object : ApiRequestFile {
-                override fun addToBuilder(builder: MultipartBodyBuilder) {
-                    builder
-                        .asyncPart("file", filePart.content(), DataBuffer::class.java)
-                        .filename(filePart.filename())
-                        .contentType(filePart.headers().contentType ?: MediaType.APPLICATION_OCTET_STREAM)
-                }
-            }
-    }
-
-    fun addToBuilder(builder: MultipartBodyBuilder)
-}
+package @PACKAGE_NAME@
+
+import org.springframework.core.io.buffer.DataBuffer
+import org.springframework.http.MediaType
+import org.springframework.http.client.MultipartBodyBuilder
+import org.springframework.http.codec.multipart.FilePart
+import java.io.File
+
+interface ApiRequestFile {
+    companion object {
+        fun from(file: File): ApiRequestFile =
+            object : ApiRequestFile {
+                override fun addToBuilder(builder: MultipartBodyBuilder) {
+                    builder
+                        .part("file", file)
+                        .filename(file.name)
+                        .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                }
+            }
+
+        fun from(filePart: FilePart): ApiRequestFile =
+            object : ApiRequestFile {
+                override fun addToBuilder(builder: MultipartBodyBuilder) {
+                    builder
+                        .asyncPart("file", filePart.content(), DataBuffer::class.java)
+                        .filename(filePart.filename())
+                        .contentType(filePart.headers().contentType ?: MediaType.APPLICATION_OCTET_STREAM)
+                }
+            }
+    }
+
+    fun addToBuilder(builder: MultipartBodyBuilder)
+}

package/esm/src/ast/references/spring-reactive.d.ts

@@ -6,4 +6,5 @@ export declare const requestHeadersSpec: KtGenericReferenceFactory<1>;
 export declare const toEntity: KtGenericReferenceFactory<1>;
 export declare const awaitBody: KtGenericReferenceFactory<1>;
 export declare const awaitBodilessEntity: KtReferenceFactory;
+export declare const awaitExchange: KtReferenceFactory;
 //# sourceMappingURL=spring-reactive.d.ts.map

package/esm/src/ast/references/spring-reactive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spring-reactive.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/references/spring-reactive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,yBAAyB,EAAe,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG7G,eAAO,MAAM,aAAa,EAAE,kBAG3B,CAAC;AAGF,eAAO,MAAM,SAAS,EAAE,kBAGvB,CAAC;AACF,eAAO,MAAM,cAAc,EAAE,kBAG5B,CAAC;AACF,eAAO,MAAM,kBAAkB,EAAE,yBAAyB,CAAC,CAAC,CAG3D,CAAC;AACF,eAAO,MAAM,QAAQ,EAAE,yBAAyB,CAAC,CAAC,CAGjD,CAAC;AACF,eAAO,MAAM,SAAS,EAAE,yBAAyB,CAAC,CAAC,CAGlD,CAAC;AACF,eAAO,MAAM,mBAAmB,EAAE,kBAGjC,CAAC"}
+{"version":3,"file":"spring-reactive.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/references/spring-reactive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,yBAAyB,EAAe,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG7G,eAAO,MAAM,aAAa,EAAE,kBAG3B,CAAC;AAGF,eAAO,MAAM,SAAS,EAAE,kBAGvB,CAAC;AACF,eAAO,MAAM,cAAc,EAAE,kBAG5B,CAAC;AACF,eAAO,MAAM,kBAAkB,EAAE,yBAAyB,CAAC,CAAC,CAG3D,CAAC;AACF,eAAO,MAAM,QAAQ,EAAE,yBAAyB,CAAC,CAAC,CAGjD,CAAC;AACF,eAAO,MAAM,SAAS,EAAE,yBAAyB,CAAC,CAAC,CAGlD,CAAC;AACF,eAAO,MAAM,mBAAmB,EAAE,kBAGjC,CAAC;AACF,eAAO,MAAM,aAAa,EAAE,kBAG3B,CAAC"}

package/esm/src/ast/references/spring-reactive.js

@@ -8,3 +8,4 @@ export const requestHeadersSpec = ktReference.genericFactory('RequestHeadersSpec
 export const toEntity = ktReference.genericFactory('toEntity', 'org.springframework.web.reactive.function.client');
 export const awaitBody = ktReference.genericFactory('awaitBody', 'org.springframework.web.reactive.function.client');
 export const awaitBodilessEntity = ktReference.factory('awaitBodilessEntity', 'org.springframework.web.reactive.function.client');
+export const awaitExchange = ktReference.factory('awaitExchange', 'org.springframework.web.reactive.function.client');

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

@@ -109,31 +109,31 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         return appendValueGroup([
             s `val localVarResponse = ${kt.call([toCasing(endpoint.name + '_WithHttpInfo', ctx.config.functionNameCasing)], parameters.map((x) => toCasing(x.name, ctx.config.parameterNameCasing)))}`,
             '',
-            s `return when (localVarResponse.responseType) {${s.indent `
+            s `return when (localVarResponse.responseType) {${s.indent `
             ${ctx.refs.responseType()}.Success -> ${responseSchema === undefined
                 ? kt.refs.unit()
                 : s `(localVarResponse as ${ctx.refs.success(['*'])}).data as ${this.getTypeUsage(ctx, {
                     schema: responseSchema,
-                })}`}
-            ${ctx.refs.responseType()}.Informational -> throw ${kt.refs.java.unsupportedOperationException()}("Client does not support Informational responses.")
-            ${ctx.refs.responseType()}.Redirection -> throw ${kt.refs.java.unsupportedOperationException()}("Client does not support Redirection responses.")
-            ${ctx.refs.responseType()}.ClientError -> {${s.indent `
-              val localVarError = localVarResponse as ${ctx.refs.clientError(['*'])}
-              throw ${ctx.refs.clientException()}(${s.indent `
-                "Client error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
-                localVarError.statusCode,
-                localVarResponse`}
-              )`}
-            }
-
-            ${ctx.refs.responseType()}.ServerError -> {${s.indent `
-              val localVarError = localVarResponse as ${ctx.refs.serverError(['*'])}
-              throw ${ctx.refs.serverException()}(${s.indent `
-                "Server error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
-                localVarError.statusCode,
-                localVarResponse`}
-              )`}
-            }`}
+                })}`}
+            ${ctx.refs.responseType()}.Informational -> throw ${kt.refs.java.unsupportedOperationException()}("Client does not support Informational responses.")
+            ${ctx.refs.responseType()}.Redirection -> throw ${kt.refs.java.unsupportedOperationException()}("Client does not support Redirection responses.")
+            ${ctx.refs.responseType()}.ClientError -> {${s.indent `
+              val localVarError = localVarResponse as ${ctx.refs.clientError(['*'])}
+              throw ${ctx.refs.clientException()}(${s.indent `
+                "Client error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
+                localVarError.statusCode,
+                localVarResponse`}
+              )`}
+            }
+
+            ${ctx.refs.responseType()}.ServerError -> {${s.indent `
+              val localVarError = localVarResponse as ${ctx.refs.serverError(['*'])}
+              throw ${ctx.refs.serverException()}(${s.indent `
+                "Server error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
+                localVarError.statusCode,
+                localVarResponse`}
+              )`}
+            }`}
           }`,
         ], '\n');
     }
@@ -212,16 +212,16 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
                 result.values.push(`val localVariableBody = ${bodyParamName}`);
             }
         }
-        result.values.push(s `val localVariableQuery: ${ctx.refs.multiValueMap()} = ${kt.call([kt.refs.mutableMapOf([kt.refs.string(), kt.refs.list([kt.refs.string()])])], [])}${queryParameters.length === 0 ? '' : s.indent `
-            .apply {${s.indent `
+        result.values.push(s `val localVariableQuery: ${ctx.refs.multiValueMap()} = ${kt.call([kt.refs.mutableMapOf([kt.refs.string(), kt.refs.list([kt.refs.string()])])], [])}${queryParameters.length === 0 ? '' : s.indent `
+            .apply {${s.indent `
               ${appendValueGroup(queryParameters.map((param) => {
             const paramName = toCasing(param.name, ctx.config.parameterNameCasing);
             const toString = this.getParameterToString(ctx, { endpoint, parameter: param });
             const put = s `put(${kt.string(param.name)}, listOf(${paramName}${toString}))`;
-            return param.required ? put : s `if (${paramName} != null) {${s.indent `
-                        ${put}`}
+            return param.required ? put : s `if (${paramName} != null) {${s.indent `
+                        ${put}`}
                       }`;
-        }), '\n')}`}
+        }), '\n')}`}
             }`}`);
         result.values.push('val localVariableHeaders: MutableMap<String, String> = mutableMapOf()');
         if (((_b = endpoint.requestBody) === null || _b === void 0 ? void 0 : _b.content[0]) !== undefined) {
@@ -230,8 +230,8 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         for (const header of headerParameters) {
             const paramName = toCasing(header.name, ctx.config.parameterNameCasing);
             const toString = this.getParameterToString(ctx, { endpoint, parameter: header });
-            result.values.push(s `if (${paramName} != null) {${s.indent `
-          localVariableHeaders["${header.name}"] = ${paramName}${toString}`}
+            result.values.push(s `if (${paramName} != null) {${s.indent `
+          localVariableHeaders["${header.name}"] = ${paramName}${toString}`}
         }`);
         }
         result.values.push(s `return ${kt.call([ctx.refs.requestConfig.infer()], [

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

@@ -100,16 +100,16 @@ export class KotlinOkHttp3ClientsGenerator extends OpenApiServicesGenerationProv
             const jsonIncludeMember = toCasing(ctx.config.serializerJsonInclude, 'snake');
             const defaultFactory = springBootVersion === 4
                 // Jackson 3's ObjectMapper is immutable; configuration moved to the (Kotlin) mapper builder.
-                ? s `${kt.refs.jackson.jacksonMapperBuilder(springBootVersion)}()${s.indent `
-            .findAndAddModules()
-            .changeDefaultPropertyInclusion { it.withValueInclusion(${kt.refs.jackson.jsonInclude()}.Include.${jsonIncludeMember}).withContentInclusion(${kt.refs.jackson.jsonInclude()}.Include.${jsonIncludeMember}) }
-            .configure(${kt.refs.jackson.serializationFeature(springBootVersion)}.WRITE_DATES_AS_TIMESTAMPS, false)
-            .configure(${kt.refs.jackson.deserializationFeature(springBootVersion)}.FAIL_ON_UNKNOWN_PROPERTIES, false)
+                ? s `${kt.refs.jackson.jacksonMapperBuilder(springBootVersion)}()${s.indent `
+            .findAndAddModules()
+            .changeDefaultPropertyInclusion { it.withValueInclusion(${kt.refs.jackson.jsonInclude()}.Include.${jsonIncludeMember}).withContentInclusion(${kt.refs.jackson.jsonInclude()}.Include.${jsonIncludeMember}) }
+            .configure(${kt.refs.jackson.serializationFeature(springBootVersion)}.WRITE_DATES_AS_TIMESTAMPS, false)
+            .configure(${kt.refs.jackson.deserializationFeature(springBootVersion)}.FAIL_ON_UNKNOWN_PROPERTIES, false)
             .build()`}`
-                : s `${kt.refs.jackson.jacksonObjectMapper(springBootVersion)}()${s.indent `
-            .findAndRegisterModules()
-            .setSerializationInclusion(${kt.refs.jackson.jsonInclude()}.Include.${jsonIncludeMember})
-            .configure(${kt.refs.jackson.serializationFeature(springBootVersion)}.WRITE_DATES_AS_TIMESTAMPS, false)
+                : s `${kt.refs.jackson.jacksonObjectMapper(springBootVersion)}()${s.indent `
+            .findAndRegisterModules()
+            .setSerializationInclusion(${kt.refs.jackson.jsonInclude()}.Include.${jsonIncludeMember})
+            .configure(${kt.refs.jackson.serializationFeature(springBootVersion)}.WRITE_DATES_AS_TIMESTAMPS, false)
             .configure(${kt.refs.jackson.deserializationFeature(springBootVersion)}.FAIL_ON_UNKNOWN_PROPERTIES, false)`}`;
             const factory = typeof ctx.config.serializer === 'object'
                 ? ctx.config.serializer.factory

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

@@ -257,13 +257,13 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
                 }
             }
         });
-        body.values.push(s `try {${s.indent `
+        body.values.push(s `try {${s.indent `
           return ${kt.call([
             kt.call(kt.reference('getDelegate'), []),
             toCasing(endpoint.name, ctx.config.functionNameCasing),
-        ], parameters.map((x) => toCasing(x.name, ctx.config.parameterNameCasing)))}`}
-        } catch (e: ${kt.refs.throwable()}) {${s.indent `
-          return getExceptionHandler()?.handleApiException(e) ?: throw e`}
+        ], parameters.map((x) => toCasing(x.name, ctx.config.parameterNameCasing)))}`}
+        } catch (e: ${kt.refs.throwable()}) {${s.indent `
+          return getExceptionHandler()?.handleApiException(e) ?: throw e`}
         }`);
         return body;
     }
@@ -325,11 +325,11 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
                             hasResponseBody ? kt.argument('body') : kt.toNode(null),
                             kt.toNode(code),
                             contentType
-                                ? s `${kt.refs.spring.linkedMultiValueMap([kt.refs.string(), kt.refs.string()])}().also {
-                        if (headers != null) {
-                            it.putAll(headers)
-                        }
-                        it.addIfAbsent("Content-Type", ${kt.string(contentType)})
+                                ? s `${kt.refs.spring.linkedMultiValueMap([kt.refs.string(), kt.refs.string()])}().also {
+                        if (headers != null) {
+                            it.putAll(headers)
+                        }
+                        it.addIfAbsent("Content-Type", ${kt.string(contentType)})
                     }`
                                 : kt.argument('headers'),
                         ]),

package/esm/src/generators/services/spring-reactive-web-clients/spring-reactive-web-client-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spring-reactive-web-client-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/spring-reactive-web-clients/spring-reactive-web-client-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spring-reactive-web-client-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/spring-reactive-web-clients/spring-reactive-web-client-generator.ts"],"names":[],"mappings":"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"}

package/esm/src/generators/services/spring-reactive-web-clients/spring-reactive-web-client-generator.js

@@ -83,7 +83,7 @@ export class DefaultKotlinSpringReactiveWebClientGenerator extends KotlinFileGen
         return kt.function(functionName, {
             doc: kt.doc(this.getEndpointDocDescription(ctx, { endpoint })),
             suspend: true,
-            // Spring 7's `WebClient.exchangeToMono` is `<V : Any>`, so the `<T>` overloads need an `Any` bound to infer.
+            // Spring 7's `WebClient.awaitExchange` is `<V : Any>`, so the `<T>` overloads need an `Any` bound to infer.
             generics: [
                 kt.genericParameter('T', ctx.config.springBootVersion === 4 ? { constraint: kt.refs.any() } : undefined),
             ],
@@ -103,11 +103,8 @@ export class DefaultKotlinSpringReactiveWebClientGenerator extends KotlinFileGen
         const parameterNames = parameters.map((p) => toCasing(p.name, ctx.config.parameterNameCasing));
         result.values.push(s `return ${kt.call([
             kt.call(['this', requestFunctionName], parameterNames),
-            kt.call(['exchangeToMono'], [
-                kt.lambda([], kt.call(kt.refs.kotlinx.mono.infer(), [kt.lambda([], 'responseHandler(it)', { singleline: true })]), { singleline: true }),
-            ]),
-            kt.call([kt.refs.kotlinx.awaitFirstOrNull.infer()], []),
-        ])} as T`);
+            kt.call([kt.refs.springReactive.awaitExchange()], ['responseHandler']),
+        ])}`);
         return result;
     }
     getEndpointRequestFunctionName(ctx, args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.5.10",
+  "version": "0.5.11-beta.2",
   "description": "Provides gOAst generators for generating Kotlin code from OpenAPI specifications.",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",

package/script/src/ast/references/spring-reactive.d.ts

@@ -6,4 +6,5 @@ export declare const requestHeadersSpec: KtGenericReferenceFactory<1>;
 export declare const toEntity: KtGenericReferenceFactory<1>;
 export declare const awaitBody: KtGenericReferenceFactory<1>;
 export declare const awaitBodilessEntity: KtReferenceFactory;
+export declare const awaitExchange: KtReferenceFactory;
 //# sourceMappingURL=spring-reactive.d.ts.map

package/script/src/ast/references/spring-reactive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spring-reactive.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/references/spring-reactive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,yBAAyB,EAAe,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG7G,eAAO,MAAM,aAAa,EAAE,kBAG3B,CAAC;AAGF,eAAO,MAAM,SAAS,EAAE,kBAGvB,CAAC;AACF,eAAO,MAAM,cAAc,EAAE,kBAG5B,CAAC;AACF,eAAO,MAAM,kBAAkB,EAAE,yBAAyB,CAAC,CAAC,CAG3D,CAAC;AACF,eAAO,MAAM,QAAQ,EAAE,yBAAyB,CAAC,CAAC,CAGjD,CAAC;AACF,eAAO,MAAM,SAAS,EAAE,yBAAyB,CAAC,CAAC,CAGlD,CAAC;AACF,eAAO,MAAM,mBAAmB,EAAE,kBAGjC,CAAC"}
+{"version":3,"file":"spring-reactive.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/references/spring-reactive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,yBAAyB,EAAe,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG7G,eAAO,MAAM,aAAa,EAAE,kBAG3B,CAAC;AAGF,eAAO,MAAM,SAAS,EAAE,kBAGvB,CAAC;AACF,eAAO,MAAM,cAAc,EAAE,kBAG5B,CAAC;AACF,eAAO,MAAM,kBAAkB,EAAE,yBAAyB,CAAC,CAAC,CAG3D,CAAC;AACF,eAAO,MAAM,QAAQ,EAAE,yBAAyB,CAAC,CAAC,CAGjD,CAAC;AACF,eAAO,MAAM,SAAS,EAAE,yBAAyB,CAAC,CAAC,CAGlD,CAAC;AACF,eAAO,MAAM,mBAAmB,EAAE,kBAGjC,CAAC;AACF,eAAO,MAAM,aAAa,EAAE,kBAG3B,CAAC"}

package/script/src/ast/references/spring-reactive.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.awaitBodilessEntity = exports.awaitBody = exports.toEntity = exports.requestHeadersSpec = exports.clientResponse = exports.webClient = exports.bodyInserters = void 0;
+exports.awaitExchange = exports.awaitBodilessEntity = exports.awaitBody = exports.toEntity = exports.requestHeadersSpec = exports.clientResponse = exports.webClient = exports.bodyInserters = void 0;
 const reference_js_1 = require("../nodes/reference.js");
 // org.springframework.web.reactive.function
 exports.bodyInserters = reference_js_1.ktReference.factory('BodyInserters', 'org.springframework.web.reactive.function');
@@ -11,3 +11,4 @@ exports.requestHeadersSpec = reference_js_1.ktReference.genericFactory('RequestH
 exports.toEntity = reference_js_1.ktReference.genericFactory('toEntity', 'org.springframework.web.reactive.function.client');
 exports.awaitBody = reference_js_1.ktReference.genericFactory('awaitBody', 'org.springframework.web.reactive.function.client');
 exports.awaitBodilessEntity = reference_js_1.ktReference.factory('awaitBodilessEntity', 'org.springframework.web.reactive.function.client');
+exports.awaitExchange = reference_js_1.ktReference.factory('awaitExchange', 'org.springframework.web.reactive.function.client');