@goast/kotlin 0.4.18 → 0.4.20

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

@@ -0,0 +1,46 @@
+import { type ApiSchema, type AppendValueGroup, type MaybePromise, SourceBuilder } from '@goast/core';
+import { kt } from '../../../ast/index.js';
+import { KotlinFileBuilder } from '../../../file-builder.js';
+import type { ApiParameterWithMultipartInfo } from '../../../types.js';
+import { KotlinFileGenerator } from '../../file-generator.js';
+import type { DefaultKotlinSpringReactiveWebClientGeneratorArgs as Args } from './index.js';
+import type { KotlinSpringReactiveWebClientGeneratorContext, KotlinSpringReactiveWebClientGeneratorOutput } from './models.js';
+type Context = KotlinSpringReactiveWebClientGeneratorContext;
+type Output = KotlinSpringReactiveWebClientGeneratorOutput;
+type Builder = KotlinFileBuilder;
+export interface KotlinSpringReactiveWebClientGenerator<TOutput extends Output = Output> {
+    generate(ctx: Context): MaybePromise<TOutput>;
+}
+export declare class DefaultKotlinSpringReactiveWebClientGenerator extends KotlinFileGenerator<Context, Output> implements KotlinSpringReactiveWebClientGenerator {
+    generate(ctx: Context): MaybePromise<Output>;
+    protected getClientFileContent(ctx: Context, args: Args.GetClientFileContent): AppendValueGroup<Builder>;
+    protected getRequestsObject(ctx: Context, args: Args.GetRequestsObject): kt.Object<Builder>;
+    protected getEndpointMembers(ctx: Context, args: Args.GetEndpointMembers): kt.ObjectMember<Builder>[];
+    protected getEndpointFunctionName(ctx: Context, args: Args.GetEndpointFunctionName): string;
+    protected getEndpointFunction(ctx: Context, args: Args.GetEndpointFunction): kt.Function<Builder>;
+    protected getEndpointFunctionBody(ctx: Context, args: Args.GetEndpointFunctionBody): AppendValueGroup<Builder>;
+    protected getEndpointFunctionWithHandler(ctx: Context, args: Args.GetEndpointFunctionWithHandler): kt.Function<Builder>;
+    protected getEndpointFunctionWithHandlerBody(ctx: Context, args: Args.GetEndpointFunctionWithHandlerBody): AppendValueGroup<Builder>;
+    protected getEndpointRequestFunctionName(ctx: Context, args: Args.GetEndpointRequestFunctionName): string;
+    protected getEndpointRequestFunction(ctx: Context, args: Args.GetEndpointRequestFunction): kt.Function<Builder>;
+    protected getEndpointRequestFunctionBody(ctx: Context, args: Args.GetEndpointRequestFunctionBody): AppendValueGroup<Builder>;
+    protected getEndpointUriFunctionName(ctx: Context, args: Args.GetEndpointUriFunctionName): string;
+    protected getEndpointUriFunction(ctx: Context, args: Args.GetEndpointUriFunction): kt.Function<Builder>;
+    protected getEndpointUriFunctionBody(ctx: Context, args: Args.GetEndpointUriFunctionBody): AppendValueGroup<Builder>;
+    protected getParameterToString(ctx: Context, args: Args.GetParameterToString): kt.Value<Builder>;
+    protected getParameterType(ctx: Context, args: Args.GetParameterType): kt.Type<Builder>;
+    protected getParameterDefaultValue(ctx: Context, args: Args.GetParameterDefaultValue): kt.Value<Builder> | null;
+    protected getTypeUsage(ctx: Context, args: Args.GetTypeUsage<Builder>): kt.Type<Builder>;
+    protected getPackageName(ctx: Context, args: Args.GetPackageName): string;
+    protected getResponseSchema(_ctx: Context, args: Args.GetResponseSchema): ApiSchema | undefined;
+    protected getSchemaType(ctx: Context, args: Args.GetSchemaType): kt.Reference<SourceBuilder> | undefined;
+    protected getAllParameters(ctx: Context, args: Args.GetAllParameters): ApiParameterWithMultipartInfo[];
+    protected getRequestBodyParamName(ctx: Context, args: Args.GetRequestBodyParamName): string;
+    protected getBasePath(ctx: Context, _args: Args.GetBasePath): string;
+    protected getEndpointPath(ctx: Context, args: Args.GetEndpointPath): string;
+    protected getFilePath(ctx: Context, args: Args.GetFilePath): string;
+    protected getRequestsObjectName(ctx: Context, args: Args.GetRequestsObjectName): string;
+    private createApiParameter;
+}
+export {};
+//# sourceMappingURL=spring-reactive-web-client-generator.d.ts.map

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

@@ -0,0 +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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"}

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

@@ -0,0 +1,383 @@
+import { dirname } from 'node:path';
+import fs from 'fs-extra';
+import { appendValueGroup, builderTemplate as s, createOverwriteProxy, resolveAnyOfAndAllOf, SourceBuilder, toCasing, } from '@goast/core';
+import { kt } from '../../../ast/index.js';
+import { KotlinFileBuilder } from '../../../file-builder.js';
+import { modifyString } from '../../../utils.js';
+import { KotlinFileGenerator } from '../../file-generator.js';
+export class DefaultKotlinSpringReactiveWebClientGenerator extends KotlinFileGenerator {
+    generate(ctx) {
+        const typeName = this.getRequestsObjectName(ctx, {});
+        const packageName = this.getPackageName(ctx, {});
+        const filePath = this.getFilePath(ctx, { packageName });
+        fs.ensureDirSync(dirname(filePath));
+        console.log(`Generating client for service ${ctx.service.name} to ${filePath}...`);
+        const builder = new KotlinFileBuilder(packageName, ctx.config);
+        builder.append(this.getClientFileContent(ctx, {}));
+        fs.writeFileSync(filePath, builder.toString());
+        return { typeName, packageName };
+    }
+    // deno-lint-ignore no-unused-vars
+    getClientFileContent(ctx, args) {
+        return appendValueGroup([this.getRequestsObject(ctx, {})], '\n\n');
+    }
+    // deno-lint-ignore no-unused-vars
+    getRequestsObject(ctx, args) {
+        return kt.object({
+            name: this.getRequestsObjectName(ctx, {}),
+            members: ctx.service.endpoints.flatMap((endpoint) => this.getEndpointMembers(ctx, { endpoint, parameters: this.getAllParameters(ctx, { endpoint }) })),
+        });
+    }
+    getEndpointMembers(ctx, args) {
+        const { endpoint, parameters } = args;
+        const responseSchema = this.getResponseSchema(ctx, { endpoint });
+        return [
+            this.getEndpointFunction(ctx, { endpoint, parameters, responseSchema }),
+            this.getEndpointFunctionWithHandler(ctx, { endpoint, parameters, responseSchema }),
+            this.getEndpointUriFunction(ctx, { endpoint, parameters }),
+            this.getEndpointRequestFunction(ctx, { endpoint, parameters, responseSchema }),
+        ];
+    }
+    getEndpointFunctionName(ctx, args) {
+        const { endpoint } = args;
+        return toCasing(endpoint.name, ctx.config.functionNameCasing);
+    }
+    getEndpointFunction(ctx, args) {
+        const { endpoint, parameters, responseSchema } = args;
+        const functionName = this.getEndpointFunctionName(ctx, { endpoint });
+        return kt.function(functionName, {
+            doc: kt.doc(endpoint.description),
+            suspend: true,
+            receiverType: kt.refs.springReactive.webClient(),
+            parameters: parameters.map((parameter) => kt.parameter(toCasing(parameter.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter }), { default: this.getParameterDefaultValue(ctx, { endpoint, parameter }) })),
+            returnType: this.getTypeUsage(ctx, { schema: responseSchema, fallback: kt.refs.unit() }),
+            body: this.getEndpointFunctionBody(ctx, { endpoint, parameters, responseSchema }),
+        });
+    }
+    getEndpointFunctionBody(ctx, args) {
+        const { endpoint, parameters, responseSchema } = args;
+        const result = appendValueGroup([], '\n');
+        const requestFunctionName = this.getEndpointRequestFunctionName(ctx, { endpoint });
+        const parameterNames = parameters.map((p) => toCasing(p.name, ctx.config.parameterNameCasing));
+        const call = kt.call([
+            'this',
+            kt.call(requestFunctionName, parameterNames),
+            kt.call('retrieve', []),
+            responseSchema
+                ? kt.call(kt.refs.springReactive.awaitBody([
+                    this.getTypeUsage(ctx, { schema: responseSchema, fallback: kt.refs.unit() }),
+                ]), [])
+                : kt.call(kt.refs.springReactive.awaitBodilessEntity(), []),
+        ]);
+        if (responseSchema) {
+            result.values.push(s `return ${call}`);
+        }
+        else {
+            result.values.push(call);
+        }
+        return result;
+    }
+    getEndpointFunctionWithHandler(ctx, args) {
+        const { endpoint, parameters, responseSchema } = args;
+        const functionName = this.getEndpointFunctionName(ctx, { endpoint });
+        return kt.function(functionName, {
+            doc: kt.doc(endpoint.description),
+            suspend: true,
+            generics: [kt.genericParameter('T')],
+            receiverType: kt.refs.springReactive.webClient(),
+            parameters: [
+                ...parameters.map((parameter) => kt.parameter(toCasing(parameter.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter }), { default: this.getParameterDefaultValue(ctx, { endpoint, parameter }) })),
+                kt.parameter('responseHandler', kt.lambdaType([kt.refs.springReactive.clientResponse()], 'T', { suspend: true })),
+            ],
+            returnType: 'T',
+            body: this.getEndpointFunctionWithHandlerBody(ctx, { endpoint, parameters, responseSchema }),
+        });
+    }
+    getEndpointFunctionWithHandlerBody(ctx, args) {
+        const { endpoint, parameters } = args;
+        const result = appendValueGroup([], '\n');
+        const requestFunctionName = this.getEndpointRequestFunctionName(ctx, { endpoint });
+        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`);
+        return result;
+    }
+    getEndpointRequestFunctionName(ctx, args) {
+        const { endpoint } = args;
+        return toCasing(`${this.getEndpointFunctionName(ctx, { endpoint })}_request`, ctx.config.functionNameCasing);
+    }
+    getEndpointRequestFunction(ctx, args) {
+        const { endpoint, parameters, responseSchema } = args;
+        const functionName = this.getEndpointRequestFunctionName(ctx, { endpoint });
+        return kt.function(functionName, {
+            doc: kt.doc(endpoint.description),
+            receiverType: kt.refs.springReactive.webClient(),
+            parameters: parameters.map((parameter) => kt.parameter(toCasing(parameter.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter }), { default: this.getParameterDefaultValue(ctx, { endpoint, parameter }) })),
+            returnType: kt.refs.springReactive.requestHeadersSpec(['*']),
+            body: this.getEndpointRequestFunctionBody(ctx, { endpoint, parameters, responseSchema }),
+        });
+    }
+    getEndpointRequestFunctionBody(ctx, args) {
+        var _a, _b;
+        const { endpoint, parameters, responseSchema } = args;
+        const result = appendValueGroup([], '\n');
+        const callChain = [];
+        callChain.push(s `return this.method(${kt.refs.spring.httpMethod()}.${endpoint.method.toUpperCase()})`, kt.call('uri', [kt.call([this.getEndpointUriFunctionName(ctx, { endpoint })], parameters.filter((p) => p.target === 'path' || p.target === 'query').map((p) => toCasing(p.name, ctx.config.parameterNameCasing)))]));
+        if (responseSchema) {
+            callChain.push(s `accept(${kt.refs.spring.mediaType()}.APPLICATION_JSON)`);
+        }
+        if (((_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0]) !== undefined) {
+            callChain.push(s `contentType(${kt.refs.spring.mediaType()}.parseMediaType(${kt.string(endpoint.requestBody.content[0].type)}))`);
+        }
+        if ((_b = endpoint.requestBody) === null || _b === void 0 ? void 0 : _b.content[0]) {
+            if (endpoint.requestBody.content[0].type === 'multipart/form-data') {
+                callChain.push(kt.call('body', [
+                    kt.call([kt.refs.springReactive.bodyInserters(), 'fromMultipartData'], [
+                        kt.call([
+                            kt.call(kt.refs.spring.multipartBodyBuilder(), []),
+                            kt.call('apply', [
+                                kt.lambda([], appendValueGroup(parameters.filter((x) => x.multipart).map((p) => {
+                                    var _a, _b, _c;
+                                    const parameterName = toCasing(p.name, ctx.config.parameterNameCasing);
+                                    if ((_a = p.multipart) === null || _a === void 0 ? void 0 : _a.isFile) {
+                                        return kt.call([
+                                            p.required && !((_b = p.schema) === null || _b === void 0 ? void 0 : _b.nullable) ? parameterName : `${parameterName}?`,
+                                            'addToBuilder',
+                                        ], ['this']);
+                                    }
+                                    else {
+                                        const call = kt.call([
+                                            kt.call('part', [kt.string(p.multipart.name), parameterName]),
+                                            kt.call('contentType', [
+                                                kt.call([
+                                                    kt.refs.spring.mediaType(),
+                                                    'APPLICATION_JSON',
+                                                ]),
+                                            ]),
+                                        ]);
+                                        return p.required && !((_c = p.schema) === null || _c === void 0 ? void 0 : _c.nullable) ? call : kt.call([`${parameterName}?`, 'also'], [
+                                            kt.lambda([parameterName], call, { singleline: true }),
+                                        ]);
+                                    }
+                                }), '\n')),
+                            ]),
+                            'build',
+                        ], []),
+                    ]),
+                ]));
+            }
+            else {
+                const bodySchema = endpoint.requestBody.content[0].schema;
+                const parameterName = this.getRequestBodyParamName(ctx, { endpoint });
+                const call = kt.call('bodyValue', [
+                    toCasing(parameterName, ctx.config.parameterNameCasing),
+                ]);
+                callChain.push(endpoint.requestBody.required && !(bodySchema === null || bodySchema === void 0 ? void 0 : bodySchema.nullable) ? call : kt.call('apply', [
+                    kt.lambda([], kt.call([`${parameterName}?`, 'also'], [kt.lambda([parameterName], call, { singleline: true })]), { singleline: true }),
+                ]));
+            }
+        }
+        if (parameters.some((x) => x.target === 'header')) {
+            callChain.push(kt.call('headers', [
+                kt.lambda(['headers'], appendValueGroup(parameters.filter((x) => x.target === 'header').map((p) => {
+                    var _a;
+                    const parameterName = toCasing(p.name, ctx.config.parameterNameCasing);
+                    const toString = this.getParameterToString(ctx, { endpoint, parameter: p });
+                    return p.required && !((_a = p.schema) === null || _a === void 0 ? void 0 : _a.nullable)
+                        ? kt.call(['headers', 'add'], [kt.string(p.name), parameterName + toString])
+                        : kt.call([`${parameterName}?`, 'also'], [
+                            kt.lambda([], kt.call(['headers', 'add'], [kt.string(p.name), 'it' + toString]), {
+                                singleline: true,
+                            }),
+                        ]);
+                }), '\n')),
+            ]));
+        }
+        result.values.push(kt.call(callChain));
+        return result;
+    }
+    getEndpointUriFunctionName(ctx, args) {
+        const { endpoint } = args;
+        return toCasing(`${this.getEndpointFunctionName(ctx, { endpoint })}_uri`, ctx.config.functionNameCasing);
+    }
+    getEndpointUriFunction(ctx, args) {
+        const { endpoint, parameters } = args;
+        const functionName = this.getEndpointUriFunctionName(ctx, { endpoint });
+        return kt.function(functionName, {
+            parameters: parameters.filter((p) => p.target === 'path' || p.target === 'query').map((parameter) => kt.parameter(toCasing(parameter.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter }), { default: this.getParameterDefaultValue(ctx, { endpoint, parameter }) })),
+            returnType: kt.refs.string(),
+            body: this.getEndpointUriFunctionBody(ctx, { endpoint, parameters }),
+        });
+    }
+    getEndpointUriFunctionBody(ctx, args) {
+        const { endpoint } = args;
+        const result = appendValueGroup([], '\n');
+        const callChain = [];
+        callChain.push(s `${kt.refs.spring.uriComponentsBuilder()}.fromPath(${kt.string(this.getEndpointPath(ctx, { endpoint }))})`);
+        if (endpoint.parameters.some((x) => x.target === 'query')) {
+            callChain.push(kt.call('apply', [kt.lambda([], appendValueGroup(endpoint.parameters.filter((x) => x.target === 'query').map((p) => {
+                    var _a;
+                    const parameterName = toCasing(p.name, ctx.config.parameterNameCasing);
+                    const toString = this.getParameterToString(ctx, { endpoint, parameter: p });
+                    return p.required && !((_a = p.schema) === null || _a === void 0 ? void 0 : _a.nullable)
+                        ? kt.call('queryParam', [kt.string(p.name), parameterName + toString])
+                        : kt.call([`${parameterName}?`, 'also'], [
+                            kt.lambda([], kt.call('queryParam', [kt.string(p.name), 'it' + toString]), { singleline: true }),
+                        ]);
+                }), '\n'))]));
+        }
+        if (endpoint.parameters.some((x) => x.target === 'path')) {
+            callChain.push(kt.call('buildAndExpand', [
+                kt.call([kt.refs.mapOf.infer()], endpoint.parameters.filter((p) => p.target === 'path').map((p) => s `${kt.string(p.name)} to ${toCasing(p.name, ctx.config.parameterNameCasing)}${this.getParameterToString(ctx, { endpoint, parameter: p })}`)),
+            ]));
+        }
+        else {
+            callChain.push(kt.call('build', []));
+        }
+        callChain.push('toUriString');
+        result.values.push(s `return ${kt.call(callChain, [])}`);
+        return result;
+    }
+    getParameterToString(ctx, args) {
+        var _a, _b, _c;
+        const { parameter } = args;
+        if (((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.kind) === 'array') {
+            return '.joinToString()';
+        }
+        else if (((_b = parameter.schema) === null || _b === void 0 ? void 0 : _b.kind) === 'string' && ((_c = parameter.schema.enum) === null || _c === void 0 ? void 0 : _c.length) &&
+            this.getSchemaType(ctx, { schema: parameter.schema })) {
+            return '.value';
+        }
+        else {
+            return '.toString()';
+        }
+    }
+    getParameterType(ctx, args) {
+        var _a;
+        const { parameter } = args;
+        if ((_a = parameter.multipart) === null || _a === void 0 ? void 0 : _a.isFile) {
+            return ctx.refs.apiRequestFile();
+        }
+        return this.getTypeUsage(ctx, {
+            schema: parameter.schema,
+            nullable: !parameter.required,
+        });
+    }
+    getParameterDefaultValue(ctx, args) {
+        var _a, _b;
+        const { parameter } = args;
+        return !parameter.required
+            ? ((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.kind) === 'string' && parameter.schema.enum && parameter.schema.default
+                ? s `${this.getTypeUsage(ctx, { schema: parameter.schema, nullable: false })}.${toCasing(String(parameter.schema.default), ctx.config.enumValueNameCasing)}`
+                : kt.toNode((_b = parameter.schema) === null || _b === void 0 ? void 0 : _b.default)
+            : null;
+    }
+    getTypeUsage(ctx, args) {
+        const { schema, nullable, fallback } = args;
+        const type = this.getSchemaType(ctx, { schema });
+        return type
+            ? createOverwriteProxy(type, { nullable: nullable !== null && nullable !== void 0 ? nullable : type.nullable })
+            : (fallback !== null && fallback !== void 0 ? fallback : kt.refs.any({ nullable }));
+    }
+    // deno-lint-ignore no-unused-vars
+    getPackageName(ctx, args) {
+        const packageSuffix = typeof ctx.config.packageSuffix === 'string'
+            ? ctx.config.packageSuffix
+            : ctx.config.packageSuffix(ctx.service);
+        return ctx.config.packageName + packageSuffix;
+    }
+    getResponseSchema(_ctx, args) {
+        var _a, _b;
+        const { endpoint } = args;
+        return (_b = (_a = endpoint.responses.find((x) => !x.statusCode || (x.statusCode >= 200 && x.statusCode < 300))) === null || _a === void 0 ? void 0 : _a.contentOptions[0]) === null || _b === void 0 ? void 0 : _b.schema;
+    }
+    getSchemaType(ctx, args) {
+        const { schema } = args;
+        return schema && ctx.input.kotlin.models[schema.id].type;
+    }
+    getAllParameters(ctx, args) {
+        var _a, _b;
+        const { endpoint } = args;
+        const parameters = endpoint.parameters.filter((parameter) => parameter.target === 'query' || parameter.target === 'path' || parameter.target === 'header');
+        if (endpoint.requestBody) {
+            const content = endpoint.requestBody.content[0];
+            let schema = content.schema;
+            if (content.type === 'multipart/form-data') {
+                if (schema && schema.kind === 'object') {
+                    schema = (_a = resolveAnyOfAndAllOf(schema, true)) !== null && _a !== void 0 ? _a : schema;
+                    const properties = (_b = schema.properties) !== null && _b !== void 0 ? _b : {};
+                    for (const [name, property] of properties.entries()) {
+                        parameters.push(Object.assign(this.createApiParameter({
+                            id: `multipart-${name}`,
+                            name,
+                            target: 'body',
+                            schema: property.schema,
+                            required: schema.required.has(name),
+                            description: property.schema.description,
+                        }), {
+                            multipart: {
+                                name,
+                                isFile: property.schema.kind === 'string' && property.schema.format === 'binary',
+                            },
+                        }));
+                    }
+                }
+            }
+            else {
+                parameters.push(this.createApiParameter({
+                    id: 'body',
+                    name: this.getRequestBodyParamName(ctx, { endpoint }),
+                    target: 'body',
+                    schema,
+                    required: endpoint.requestBody.required,
+                    description: endpoint.requestBody.description,
+                }));
+            }
+        }
+        return parameters.sort((a, b) => (a.required === b.required ? 0 : a.required ? -1 : 1));
+    }
+    getRequestBodyParamName(ctx, args) {
+        var _a;
+        const { endpoint } = args;
+        const schema = (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0].schema;
+        const schemaInfo = this.getSchemaType(ctx, { schema });
+        return toCasing(schemaInfo && schemaInfo.name !== 'Any' ? SourceBuilder.build((b) => kt.reference.write(b, schemaInfo)) : 'body', ctx.config.parameterNameCasing);
+    }
+    getBasePath(ctx, _args) {
+        var _a, _b, _c, _d, _e, _f;
+        return modifyString((_f = (_e = (_d = (_c = ((_a = ctx.service.$src) !== null && _a !== void 0 ? _a : (_b = ctx.service.endpoints[0]) === null || _b === void 0 ? void 0 : _b.$src)) === null || _c === void 0 ? void 0 : _c.document.servers) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.url) !== null && _f !== void 0 ? _f : '/', ctx.config.basePath, ctx.service);
+    }
+    getEndpointPath(ctx, args) {
+        const { endpoint } = args;
+        return modifyString(endpoint.path.replace(/^\/*/, ''), ctx.config.pathModifier, endpoint);
+    }
+    getFilePath(ctx, args) {
+        const { packageName } = args;
+        return `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}/${this.getRequestsObjectName(ctx, {})}.kt`;
+    }
+    // deno-lint-ignore no-unused-vars
+    getRequestsObjectName(ctx, args) {
+        return toCasing(`${ctx.service.name}_Requests`, ctx.config.typeNameCasing);
+    }
+    createApiParameter(data) {
+        return {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            $src: undefined,
+            $ref: undefined,
+            schema: undefined,
+            required: false,
+            description: undefined,
+            allowEmptyValue: undefined,
+            allowReserved: undefined,
+            deprecated: false,
+            explode: undefined,
+            style: undefined,
+            ...data,
+        };
+    }
+}

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

@@ -0,0 +1,23 @@
+import { type ApiService, Factory, type MaybePromise, type OpenApiGeneratorContext, OpenApiServicesGenerationProviderBase } from '@goast/core';
+import type { KotlinServicesGeneratorInput } from '../spring-controllers/index.js';
+import { type KotlinSpringReactiveWebClientGeneratorOutput, type KotlinSpringReactiveWebClientsGeneratorConfig, type KotlinSpringReactiveWebClientsGeneratorContext, type KotlinSpringReactiveWebClientsGeneratorInput, type KotlinSpringReactiveWebClientsGeneratorOutput } from './models.js';
+import { type KotlinSpringReactiveWebClientGenerator } from './spring-reactive-web-client-generator.js';
+type Input = KotlinSpringReactiveWebClientsGeneratorInput;
+type Output = KotlinSpringReactiveWebClientsGeneratorOutput;
+type Config = KotlinSpringReactiveWebClientsGeneratorConfig;
+type ServiceOutput = KotlinSpringReactiveWebClientGeneratorOutput;
+type Context = KotlinSpringReactiveWebClientsGeneratorContext;
+export declare class KotlinSpringReactiveWebClientsGenerator extends OpenApiServicesGenerationProviderBase<Input, Output, Config, ServiceOutput, Context> {
+    private readonly _serviceGeneratorFactory;
+    constructor(serviceGeneratorFactory?: Factory<KotlinSpringReactiveWebClientGenerator, []>);
+    protected generateAdditionalFiles(ctx: Context): Promise<void>;
+    protected initResult(): Output;
+    protected generateService(ctx: Context, service: ApiService): MaybePromise<ServiceOutput>;
+    protected addServiceResult(ctx: Context, service: ApiService, result: ServiceOutput): void;
+    protected buildContext(context: OpenApiGeneratorContext<KotlinServicesGeneratorInput>, config?: Partial<Config> | undefined): Context;
+    protected getInfrastructurePackageName(config: Config): string;
+    protected getPackageName(config: Config): string;
+    private copyInfrastructureFiles;
+}
+export {};
+//# sourceMappingURL=spring-reactive-web-clients-generator.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"spring-reactive-web-clients-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/spring-reactive-web-clients/spring-reactive-web-clients-generator.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,UAAU,EACf,OAAO,EACP,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAC5B,qCAAqC,EACtC,MAAM,aAAa,CAAC;AAGrB,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AACnF,OAAO,EAEL,KAAK,4CAA4C,EACjD,KAAK,6CAA6C,EAClD,KAAK,8CAA8C,EACnD,KAAK,4CAA4C,EACjD,KAAK,6CAA6C,EACnD,MAAM,aAAa,CAAC;AAErB,OAAO,EAEL,KAAK,sCAAsC,EAC5C,MAAM,2CAA2C,CAAC;AAEnD,KAAK,KAAK,GAAG,4CAA4C,CAAC;AAC1D,KAAK,MAAM,GAAG,6CAA6C,CAAC;AAC5D,KAAK,MAAM,GAAG,6CAA6C,CAAC;AAC5D,KAAK,aAAa,GAAG,4CAA4C,CAAC;AAClE,KAAK,OAAO,GAAG,8CAA8C,CAAC;AAE9D,qBAAa,uCAAwC,SAAQ,qCAAqC,CAChG,KAAK,EACL,MAAM,EACN,MAAM,EACN,aAAa,EACb,OAAO,CACR;IACC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAsD;gBAEnF,uBAAuB,CAAC,EAAE,OAAO,CAAC,sCAAsC,EAAE,EAAE,CAAC;cAMhE,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7E,SAAS,CAAC,UAAU,IAAI,MAAM;IAQ9B,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,YAAY,CAAC,aAAa,CAAC;IAQzF,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI;IAI1F,SAAS,CAAC,YAAY,CACpB,OAAO,EAAE,uBAAuB,CAAC,4BAA4B,CAAC,EAC9D,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,GACnC,OAAO;IAcV,SAAS,CAAC,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAc9D,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;YAKlC,uBAAuB;CAiBtC"}

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

@@ -0,0 +1,79 @@
+import { resolve } from 'node:path';
+import fs from 'fs-extra';
+import { Factory, OpenApiServicesGenerationProviderBase, } from '@goast/core';
+import { getAssetFileContent } from '../../../assets.js';
+import { defaultKotlinSpringReactiveWebClientsGeneratorConfig, } from './models.js';
+import { getReferenceFactories } from './refs.js';
+import { DefaultKotlinSpringReactiveWebClientGenerator, } from './spring-reactive-web-client-generator.js';
+export class KotlinSpringReactiveWebClientsGenerator extends OpenApiServicesGenerationProviderBase {
+    constructor(serviceGeneratorFactory) {
+        super();
+        Object.defineProperty(this, "_serviceGeneratorFactory", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this._serviceGeneratorFactory = serviceGeneratorFactory !== null && serviceGeneratorFactory !== void 0 ? serviceGeneratorFactory : Factory.fromValue(new DefaultKotlinSpringReactiveWebClientGenerator());
+    }
+    async generateAdditionalFiles(ctx) {
+        await this.copyInfrastructureFiles(ctx);
+    }
+    initResult() {
+        return {
+            kotlin: {
+                clients: {},
+            },
+        };
+    }
+    generateService(ctx, service) {
+        const serviceGenerator = this._serviceGeneratorFactory.create();
+        return serviceGenerator.generate({
+            ...ctx,
+            service,
+        });
+    }
+    addServiceResult(ctx, service, result) {
+        ctx.output.kotlin.clients[service.id] = result;
+    }
+    buildContext(context, config) {
+        context.data.services = context.data.services.filter((x) => x.name !== 'exclude-from-generation');
+        const providerContext = this.getProviderContext(context, config, defaultKotlinSpringReactiveWebClientsGeneratorConfig);
+        const infrastructurePackageName = this.getInfrastructurePackageName(providerContext.config);
+        return Object.assign(providerContext, {
+            infrastructurePackageName,
+            refs: getReferenceFactories(infrastructurePackageName),
+        });
+    }
+    getInfrastructurePackageName(config) {
+        if (typeof config.infrastructurePackageName === 'string') {
+            return config.infrastructurePackageName;
+        }
+        if (config.infrastructurePackageName.mode === 'append-package-name') {
+            return config.packageName + config.infrastructurePackageName.value;
+        }
+        if (config.infrastructurePackageName.mode === 'append-full-package-name') {
+            return this.getPackageName(config) + config.infrastructurePackageName.value;
+        }
+        return config.infrastructurePackageName.value;
+    }
+    getPackageName(config) {
+        const packageSuffix = typeof config.packageSuffix === 'string' ? config.packageSuffix : config.packageSuffix();
+        return config.packageName + packageSuffix;
+    }
+    async copyInfrastructureFiles(ctx) {
+        const targetDir = resolve(ctx.config.outputDir, ctx.infrastructurePackageName.replace(/\./g, '/'));
+        await fs.ensureDir(targetDir);
+        const files = [
+            'ApiRequestFile.kt',
+        ];
+        for (const file of files) {
+            const sourcePath = `client/spring-reactive-web-clients/${file}`;
+            const targetPath = resolve(targetDir, file);
+            console.log(`Copying asset file "${sourcePath}" to "${targetPath}"`);
+            const fileContent = (await getAssetFileContent(sourcePath))
+                .replace(/@PACKAGE_NAME@/g, ctx.infrastructurePackageName);
+            fs.writeFileSync(targetPath, fileContent);
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.4.18",
+  "version": "0.4.20",
   "description": "Provides gOAst generators for generating Kotlin code from OpenAPI specifications.",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",
@@ -26,7 +26,7 @@
     "tslib": "^2.6.2",
     "fs-extra": "^11.2.0",
     "http-status-codes": "^2.3.0",
-    "@goast/core": "0.4.1"
+    "@goast/core": "0.4.2"
   },
   "devDependencies": {
     "@types/node": "^20.9.0",

package/script/src/ast/nodes/call.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"call.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/nodes/call.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,cAAc,EAEnB,KAAK,QAAQ,EACb,KAAK,QAAQ,EACb,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAe,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,KAAK,UAAU,EAAc,MAAM,eAAe,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAElD,KAAK,OAAO,GAAG,KAAK,CAAC;AAErB,KAAK,OAAO,CAAC,QAAQ,SAAS,aAAa,EAAE,QAAQ,SAAS,MAAM,GAAG,KAAK,IAAI,cAAc,CAC5F,OAAO,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,EAC3C;IACE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;IACvD,SAAS,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IAC3E,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CACF,CAAC;AAEF,qBAAa,MAAM,CAAC,QAAQ,SAAS,aAAa,EAAE,QAAQ,SAAS,MAAM,GAAG,KAAK,CAAE,SAAQ,MAAM,CACjG,QAAQ,EACR,QAAQ,GAAG,OAAO,CACnB;IACQ,IAAI,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;IAC/C,SAAS,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC;IAC/D,KAAK,EAAE,OAAO,CAAC;gBAEV,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC;cAO7B,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;CAepD;AAED,QAAA,MAAM,UAAU,GAAI,QAAQ,SAAS,aAAa,QAC1C,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,SAC/D,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,YAC3B,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,KAChE,MAAM,CAAC,QAAQ,CAAqG,CAAC;AAExH,eAAO,MAAM,MAAM,EAAE,OAAO,UAAU,GAAG;IAAE,KAAK,EAAE,OAAO,YAAY,CAAA;CAEnE,CAAC"}
+{"version":3,"file":"call.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/nodes/call.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,cAAc,EAEnB,KAAK,QAAQ,EACb,KAAK,QAAQ,EACb,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAe,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,KAAK,UAAU,EAAc,MAAM,eAAe,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAElD,KAAK,OAAO,GAAG,KAAK,CAAC;AAErB,KAAK,OAAO,CAAC,QAAQ,SAAS,aAAa,EAAE,QAAQ,SAAS,MAAM,GAAG,KAAK,IAAI,cAAc,CAC5F,OAAO,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,EAC3C;IACE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;IACvD,SAAS,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IAC3E,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CACF,CAAC;AAEF,qBAAa,MAAM,CAAC,QAAQ,SAAS,aAAa,EAAE,QAAQ,SAAS,MAAM,GAAG,KAAK,CAAE,SAAQ,MAAM,CACjG,QAAQ,EACR,QAAQ,GAAG,OAAO,CACnB;IACQ,IAAI,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;IAC/C,SAAS,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC;IAC/D,KAAK,EAAE,OAAO,CAAC;gBAEV,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC;cAO7B,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;CAwBpD;AAED,QAAA,MAAM,UAAU,GAAI,QAAQ,SAAS,aAAa,QAC1C,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,SAC/D,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,YAC3B,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,KAChE,MAAM,CAAC,QAAQ,CAAqG,CAAC;AAExH,eAAO,MAAM,MAAM,EAAE,OAAO,UAAU,GAAG;IAAE,KAAK,EAAE,OAAO,YAAY,CAAA;CAEnE,CAAC"}

package/script/src/ast/nodes/call.js

@@ -41,7 +41,17 @@ class KtCall extends node_js_1.KtNode {
             (0, write_kt_node_js_1.writeKtNode)(builder, this.arguments[0]);
         }
         else {
-            (0, write_kt_node_js_1.writeKtNodes)(builder, this.path, { separator: '.' });
+            if (this.path.length > 2) {
+                (0, write_kt_node_js_1.writeKtNode)(builder, this.path[0]);
+                builder.ensureCurrentLineEmpty();
+                builder.indent((builder) => {
+                    builder.append('.');
+                    (0, write_kt_node_js_1.writeKtNodes)(builder, this.path.slice(1), { separator: '\n.' });
+                });
+            }
+            else {
+                (0, write_kt_node_js_1.writeKtNodes)(builder, this.path, { separator: '.' });
+            }
             if (this.arguments) {
                 argument_js_1.ktArgument.write(builder, this.arguments);
             }

package/script/src/ast/nodes/lambda-type.d.ts

@@ -7,11 +7,13 @@ type Options<TBuilder extends SourceBuilder, TInjects extends string = never> =
     extensionFor?: Nullable<KtType<TBuilder>>;
     parameters?: Nullable<Nullable<KtType<TBuilder>>[]>;
     returnType: KtType<TBuilder>;
+    suspend?: boolean;
 }>;
 export declare class KtLambdaType<TBuilder extends SourceBuilder, TInjects extends string = never> extends KtNode<TBuilder, TInjects | Injects> {
     extensionFor: KtType<TBuilder> | null;
     parameters: KtType<TBuilder>[];
     returnType: KtType<TBuilder>;
+    suspend: boolean;
     constructor(options: Options<TBuilder, TInjects>);
     protected onWrite(builder: TBuilder): void;
 }

package/script/src/ast/nodes/lambda-type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lambda-type.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/nodes/lambda-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAc,KAAK,QAAQ,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjG,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAe,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,KAAK,OAAO,GAAG,cAAc,GAAG,QAAQ,GAAG,YAAY,CAAC;AAExD,KAAK,OAAO,CAAC,QAAQ,SAAS,aAAa,EAAE,QAAQ,SAAS,MAAM,GAAG,KAAK,IAAI,cAAc,CAC5F,OAAO,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,EAC3C;IACE,YAAY,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IACpD,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;CAC9B,CACF,CAAC;AAEF,qBAAa,YAAY,CAAC,QAAQ,SAAS,aAAa,EAAE,QAAQ,SAAS,MAAM,GAAG,KAAK,CAAE,SAAQ,MAAM,CACvG,QAAQ,EACR,QAAQ,GAAG,OAAO,CACnB;IACQ,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAExB,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC;cAO7B,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;CAwBpD;AAED,QAAA,MAAM,gBAAgB,GAAI,QAAQ,SAAS,aAAa,cAC1C,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,cAC/B,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,YACjC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,YAAY,GAAG,YAAY,CAAC,KAC7D,YAAY,CAAC,QAAQ,CAAuE,CAAC;AAEhG,eAAO,MAAM,YAAY,EAAE,OAAO,gBAAgB,GAAG;IAAE,KAAK,EAAE,OAAO,YAAY,CAAA;CAE/E,CAAC"}
+{"version":3,"file":"lambda-type.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/nodes/lambda-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAc,KAAK,QAAQ,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjG,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAe,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,KAAK,OAAO,GAAG,cAAc,GAAG,QAAQ,GAAG,YAAY,CAAC;AAExD,KAAK,OAAO,CAAC,QAAQ,SAAS,aAAa,EAAE,QAAQ,SAAS,MAAM,GAAG,KAAK,IAAI,cAAc,CAC5F,OAAO,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,EAC3C;IACE,YAAY,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IACpD,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CACF,CAAC;AAEF,qBAAa,YAAY,CAAC,QAAQ,SAAS,aAAa,EAAE,QAAQ,SAAS,MAAM,GAAG,KAAK,CAAE,SAAQ,MAAM,CACvG,QAAQ,EACR,QAAQ,GAAG,OAAO,CACnB;IACQ,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;gBAEZ,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC;cAQ7B,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;CA0BpD;AAED,QAAA,MAAM,gBAAgB,GAAI,QAAQ,SAAS,aAAa,cAC1C,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,cAC/B,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,YACjC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,YAAY,GAAG,YAAY,CAAC,KAC7D,YAAY,CAAC,QAAQ,CAAuE,CAAC;AAEhG,eAAO,MAAM,YAAY,EAAE,OAAO,gBAAgB,GAAG;IAAE,KAAK,EAAE,OAAO,YAAY,CAAA;CAE/E,CAAC"}