@goast/kotlin 0.6.0 → 0.7.0-beta.2

package/dist/src/generators/services/spring-controllers/index.d.ts

@@ -0,0 +1,4 @@
+export * as DefaultKotlinSpringControllerGeneratorArgs from './args.ts';
+export * from './models.ts';
+export * from './spring-controller-generator.ts';
+export * from './spring-controllers-generator.ts';

package/{script → dist}/src/generators/services/spring-controllers/models.d.ts

@@ -1,8 +1,8 @@
 import type { ApiEndpoint, ApiService, DefaultGenerationProviderConfig, OpenApiServicesGenerationProviderContext } from '@goast/core';
-import type { KotlinImport } from '../../../common-results.js';
-import { type KotlinGeneratorConfig } from '../../../config.js';
-import type { KotlinModelsGeneratorOutput } from '../../models/index.js';
-import type { getReferenceFactories } from './refs.js';
+import type { KotlinImport } from '../../../common-results.ts';
+import { type KotlinGeneratorConfig } from '../../../config.ts';
+import type { KotlinModelsGeneratorOutput } from '../../models/index.ts';
+import type { getReferenceFactories } from './refs.ts';
 export type KotlinServicesGeneratorConfig = KotlinGeneratorConfig & {
     packageName: string;
     packageSuffix: string | ((service: ApiService | null) => string);
@@ -35,4 +35,3 @@ export type KotlinServicesGeneratorContext = OpenApiServicesGenerationProviderCo
 export type KotlinServiceGeneratorContext = KotlinServicesGeneratorContext & {
     service: ApiService;
 };
-//# sourceMappingURL=models.d.ts.map

package/dist/src/generators/services/spring-controllers/refs.d.ts

@@ -0,0 +1,5 @@
+import { kt } from '../../../ast/index.ts';
+import type { KotlinServicesGeneratorConfig } from './models.ts';
+export declare function getReferenceFactories(options: KotlinServicesGeneratorConfig): {
+    apiExceptionHandler: kt.ReferenceFactory;
+};

package/{script → dist}/src/generators/services/spring-controllers/spring-controller-generator.d.ts

@@ -1,11 +1,11 @@
 import { type ApiEndpoint, type AppendValueGroup, type BasicAppendValue, type MaybePromise, SourceBuilder } from '@goast/core';
-import { kt } from '../../../ast/index.js';
-import type { KotlinImport } from '../../../common-results.js';
-import { KotlinFileBuilder } from '../../../file-builder.js';
-import type { ApiParameterWithMultipartInfo } from '../../../types.js';
-import { KotlinFileGenerator } from '../../file-generator.js';
-import type { DefaultKotlinSpringControllerGeneratorArgs as Args } from './index.js';
-import type { KotlinServiceGeneratorContext, KotlinServiceGeneratorOutput } from './models.js';
+import { kt } from '../../../ast/index.ts';
+import type { KotlinImport } from '../../../common-results.ts';
+import { KotlinFileBuilder } from '../../../file-builder.ts';
+import type { ApiParameterWithMultipartInfo } from '../../../types.ts';
+import { KotlinFileGenerator } from '../../file-generator.ts';
+import type { DefaultKotlinSpringControllerGeneratorArgs as Args } from './index.ts';
+import type { KotlinServiceGeneratorContext, KotlinServiceGeneratorOutput } from './models.ts';
 type Context = KotlinServiceGeneratorContext;
 type Output = KotlinServiceGeneratorOutput;
 type Builder = KotlinFileBuilder;
@@ -55,4 +55,3 @@ export declare class DefaultKotlinSpringControllerGenerator extends KotlinFileGe
 }
 export declare function adjustListType<T>(ctx: Context, type: T): T;
 export {};
-//# sourceMappingURL=spring-controller-generator.d.ts.map

package/{esm → dist}/src/generators/services/spring-controllers/spring-controller-generator.js

@@ -83,7 +83,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
             members.push(this.getApiInterfaceEndpointMethod(ctx, { endpoint }));
         });
         members.push(...ctx.service.endpoints
-            .filter((endpoint) => { var _a; return (_a = endpoint.custom[strictResponseCustomProperty]) !== null && _a !== void 0 ? _a : ctx.config.strictResponseEntities; })
+            .filter((endpoint) => endpoint.custom[strictResponseCustomProperty] ?? ctx.config.strictResponseEntities)
             .map((endpoint) => this.getApiResponseEntityClass(ctx, { endpoint })));
         return members;
     }
@@ -100,107 +100,83 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         });
     }
     getApiInterfaceEndpointMethodAnnnotations(ctx, endpoint) {
-        var _a, _b, _c;
         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,
+                endpoint.summary ? kt.argument.named('summary', kt.string(endpoint.summary?.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.description ? kt.argument.named('description', kt.string(endpoint.description?.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;
-                        return kt.call(kt.refs.swagger.apiResponse(), [
-                            kt.argument.named('responseCode', 
-                            // The spec's own response key, not `statusCode`: that field is `undefined` for
-                            // `default` and every range code, and `kt.string(undefined)` renders the bare token
-                            // `null`, which is not assignable to this non-nullable annotation element.
-                            kt.string(response.statusKey)),
-                            response.description
-                                ? kt.argument.named('description', kt.string((_a = response.description) === null || _a === void 0 ? void 0 : _a.trim()))
-                                : null,
-                            kt.argument.named('content', kt.collectionLiteral((response.contentOptions.length === 0
-                                ? [{ schema: undefined, type: undefined }]
-                                : response.contentOptions).map((content) => {
-                                var _a;
-                                let schemaType = (_a = this.getSchemaType(ctx, {
-                                    schema: content.schema,
-                                })) !== null && _a !== void 0 ? _a : kt.refs.any();
-                                let isArray = false;
-                                if (kt.refs.list.matches(schemaType)) {
-                                    isArray = true;
-                                    schemaType = schemaType.generics[0];
-                                }
-                                let ktSchema = kt.call(kt.refs.swagger.schema(), [
-                                    kt.argument.named('implementation', s `${schemaType}::class`),
-                                ]);
-                                if (isArray) {
-                                    ktSchema = kt.call(kt.refs.swagger.arraySchema(), [
-                                        kt.argument.named('schema', ktSchema),
-                                    ]);
-                                }
-                                return kt.call(kt.refs.swagger.content(), [
-                                    content.type
-                                        ? kt.argument.named('mediaType', kt.string(content.type))
-                                        : null,
-                                    content.schema
-                                        ? kt.argument.named(isArray ? 'array' : 'schema', ktSchema)
-                                        : null,
-                                ]);
-                            }))),
-                        ]);
-                    }))),
+                    kt.argument.named('value', kt.collectionLiteral(endpoint.responses.map((response) => kt.call(kt.refs.swagger.apiResponse(), [
+                        kt.argument.named('responseCode', 
+                        // The spec's own response key, not `statusCode`: that field is `undefined` for
+                        // `default` and every range code, and `kt.string(undefined)` renders the bare token
+                        // `null`, which is not assignable to this non-nullable annotation element.
+                        kt.string(response.statusKey)),
+                        response.description
+                            ? kt.argument.named('description', kt.string(response.description?.trim()))
+                            : null,
+                        kt.argument.named('content', kt.collectionLiteral((response.contentOptions.length === 0
+                            ? [{ schema: undefined, type: undefined }]
+                            : response.contentOptions).map((content) => {
+                            let schemaType = this.getSchemaType(ctx, {
+                                schema: content.schema,
+                            }) ?? kt.refs.any();
+                            let isArray = false;
+                            if (kt.refs.list.matches(schemaType)) {
+                                isArray = true;
+                                schemaType = schemaType.generics[0];
+                            }
+                            let ktSchema = kt.call(kt.refs.swagger.schema(), [
+                                kt.argument.named('implementation', s `${schemaType}::class`),
+                            ]);
+                            if (isArray) {
+                                ktSchema = kt.call(kt.refs.swagger.arraySchema(), [kt.argument.named('schema', ktSchema)]);
+                            }
+                            return kt.call(kt.refs.swagger.content(), [
+                                content.type ? kt.argument.named('mediaType', kt.string(content.type)) : null,
+                                content.schema ? kt.argument.named(isArray ? 'array' : 'schema', ktSchema) : 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('method', kt.collectionLiteral([kt.call([kt.refs.spring.requestMethod(), endpoint.method.toUpperCase()])])),
             kt.argument.named('value', kt.collectionLiteral([this.getPathConstantName(ctx, { endpoint })])),
         ]);
         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)))));
+            requestMapping.arguments.push(kt.argument.named('consumes', kt.collectionLiteral(endpoint.requestBody?.content.map((x) => kt.string(x.type)))));
         }
         annotations.push(requestMapping);
         return annotations;
     }
     getApiInterfaceEndpointMethodParameter(ctx, endpoint, parameter) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         const enumItemSchema = parameter.multipart ? undefined : getArrayItemStringEnumSchema(parameter.schema);
         const enumSchema = parameter.multipart ? undefined : getStringEnumSchema(parameter.schema);
-        const enumValueSchema = enumSchema !== null && enumSchema !== void 0 ? enumSchema : enumItemSchema;
+        const enumValueSchema = enumSchema ?? enumItemSchema;
         const actualType = this.getSchemaType(ctx, { schema: parameter.schema });
-        const isEnumSchema = !!enumValueSchema && !!actualType &&
-            !!this.getSchemaType(ctx, { schema: enumValueSchema });
+        const isEnumSchema = !!enumValueSchema && !!actualType && !!this.getSchemaType(ctx, { schema: enumValueSchema });
         const schemaType = !isEnumSchema
             ? actualType
             : enumItemSchema
-                ? kt.refs.list([kt.refs.string()], { nullable: actualType === null || actualType === void 0 ? void 0 : actualType.nullable })
-                : kt.refs.string({ nullable: actualType === null || actualType === void 0 ? void 0 : actualType.nullable });
+                ? kt.refs.list([kt.refs.string()], { nullable: actualType?.nullable })
+                : kt.refs.string({ nullable: actualType?.nullable });
         const result = kt.parameter(toCasing(parameter.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, {
             endpoint,
             parameter,
             type: isEnumSchema ? schemaType : undefined,
         }), {
-            default: parameter.multipart && ((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.default) !== undefined
-                ? kt.toNode((_b = parameter.schema) === null || _b === void 0 ? void 0 : _b.default)
-                : null,
+            default: parameter.multipart && parameter.schema?.default !== undefined ? kt.toNode(parameter.schema?.default) : null,
         });
         if (ctx.config.addSwaggerAnnotations) {
             const annotation = kt.annotation(kt.refs.swagger.parameter(), [
                 parameter.multipart ? kt.argument.named('name', kt.string(parameter.multipart.name)) : null,
-                parameter.description
-                    ? kt.argument.named('description', kt.string((_c = parameter.description) === null || _c === void 0 ? void 0 : _c.trim()))
-                    : null,
+                parameter.description ? kt.argument.named('description', kt.string(parameter.description?.trim())) : null,
                 kt.argument.named('required', parameter.required),
                 // Only emitted when set, matching how the model generator marks a deprecated property on `@Schema`.
                 // `@Operation` always states `deprecated`, but doing that for every parameter of every endpoint
@@ -209,19 +185,18 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
                 parameter.target === 'header' ? kt.argument.named('hidden', kt.toNode(true)) : null,
             ]);
             const schemaArgs = [];
-            if (((_d = parameter.schema) === null || _d === void 0 ? void 0 : _d.default) !== undefined) {
-                schemaArgs.push(kt.argument.named('defaultValue', kt.string(String((_e = parameter.schema) === null || _e === void 0 ? void 0 : _e.default))));
+            if (parameter.schema?.default !== undefined) {
+                schemaArgs.push(kt.argument.named('defaultValue', kt.string(String(parameter.schema?.default))));
             }
             if (isEnumSchema) {
-                schemaArgs.push(kt.argument.named('allowableValues', kt.collectionLiteral((_f = enumValueSchema === null || enumValueSchema === void 0 ? void 0 : enumValueSchema.enum) === null || _f === void 0 ? void 0 : _f.map((x) => kt.string(x === null || x === void 0 ? void 0 : x.toString())))));
+                schemaArgs.push(kt.argument.named('allowableValues', kt.collectionLiteral(enumValueSchema?.enum?.map((x) => kt.string(x?.toString())))));
             }
             if (schemaArgs.length) {
                 annotation.arguments.push(kt.argument.named('schema', kt.call([kt.refs.swagger.schema()], schemaArgs)));
             }
             result.annotations.push(annotation);
         }
-        const isCorePackage = !(schemaType === null || schemaType === void 0 ? void 0 : schemaType.packageName) ||
-            /^(kotlin|java)(\..*|$)/.test(schemaType.packageName);
+        const isCorePackage = !schemaType?.packageName || /^(kotlin|java)(\..*|$)/.test(schemaType.packageName);
         if (!isCorePackage && ctx.config.addJakartaValidationAnnotations) {
             result.annotations.push(kt.annotation(kt.refs.jakarta.valid()));
         }
@@ -235,20 +210,16 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
                 kt.argument.named('value', kt.string(parameter.name)),
                 kt.argument.named('required', parameter.required),
             ]);
-            if (((_g = parameter.schema) === null || _g === void 0 ? void 0 : _g.default) !== undefined) {
-                annotation.arguments.push(kt.argument.named('defaultValue', kt.string(String((_h = parameter.schema) === null || _h === void 0 ? void 0 : _h.default))));
+            if (parameter.schema?.default !== undefined) {
+                annotation.arguments.push(kt.argument.named('defaultValue', kt.string(String(parameter.schema?.default))));
             }
             result.annotations.push(annotation);
         }
         if (parameter.target === 'path') {
-            result.annotations.push(kt.annotation(kt.refs.spring.pathVariable(), [
-                kt.string(parameter.name),
-            ]));
+            result.annotations.push(kt.annotation(kt.refs.spring.pathVariable(), [kt.string(parameter.name)]));
         }
         if (parameter.target === 'header') {
-            result.annotations.push(kt.annotation(kt.refs.spring.requestHeader(), [
-                kt.string(parameter.name),
-            ]));
+            result.annotations.push(kt.annotation(kt.refs.spring.requestHeader(), [kt.string(parameter.name)]));
         }
         if (parameter.multipart) {
             result.annotations.push(kt.annotation(kt.refs.spring.requestPart(), [
@@ -261,25 +232,21 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     getApiInterfaceEndpointMethodBody(ctx, endpoint, parameters) {
         const body = appendValueGroup([], '\n');
         parameters.forEach((x) => {
-            var _a, _b;
             const paramName = toCasing(x.name, ctx.config.parameterNameCasing);
             if (x.multipart)
                 return;
             const enumItemSchema = getArrayItemStringEnumSchema(x.schema);
-            const enumValueSchema = (_a = getStringEnumSchema(x.schema)) !== null && _a !== void 0 ? _a : enumItemSchema;
+            const enumValueSchema = getStringEnumSchema(x.schema) ?? enumItemSchema;
             if (!enumValueSchema)
                 return;
             const schemaType = this.getSchemaType(ctx, { schema: x.schema });
             const enumType = this.getSchemaType(ctx, { schema: enumValueSchema });
             if (schemaType && enumType) {
-                body.values.push(s `val ${paramName} = ${paramName}${schemaType.nullable || (!x.required && !((_b = x.schema) === null || _b === void 0 ? void 0 : _b.default)) ? '?' : ''}.${enumItemSchema ? 'map' : 'let'} { ${enumType}.fromValue(it) ?: return ${kt.refs.spring.responseEntity.infer()}.status(${kt.refs.spring.httpStatus()}.BAD_REQUEST).body(${kt.string(`Invalid value for parameter ${x.name}`)}) }`);
+                body.values.push(s `val ${paramName} = ${paramName}${schemaType.nullable || (!x.required && !x.schema?.default) ? '?' : ''}.${enumItemSchema ? 'map' : 'let'} { ${enumType}.fromValue(it) ?: return ${kt.refs.spring.responseEntity.infer()}.status(${kt.refs.spring.httpStatus()}.BAD_REQUEST).body(${kt.string(`Invalid value for parameter ${x.name}`)}) }`);
             }
         });
         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)))}`}
+          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`}
         }`);
@@ -304,24 +271,15 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
             ], null, {
                 accessModifier: endpoint.responses.length > 0 ? 'private' : null,
                 delegateTarget: 'super',
-                delegateArguments: [
-                    kt.argument('body'),
-                    kt.argument('headers'),
-                    kt.argument('rawStatus'),
-                ],
+                delegateArguments: [kt.argument('body'), kt.argument('headers'), kt.argument('rawStatus')],
             }),
             extends: kt.refs.spring.responseEntity([kt.reference('T')]),
             companionObject: kt.object({
-                members: Array.from(new Set([
-                    ...ctx.config.defaultStatusCodes,
-                    501,
-                    ...endpoint.responses.map((x) => x.statusCode),
-                ].filter(notNullish))).map((code) => {
-                    var _a;
+                members: Array.from(new Set([...ctx.config.defaultStatusCodes, 501, ...endpoint.responses.map((x) => x.statusCode)].filter(notNullish))).map((code) => {
                     const fnName = toCasing(getReasonPhrase(code), ctx.config.functionNameCasing);
                     const response = endpoint.responses.find((x) => x.statusCode === code);
                     const responseType = response ? this.getResponseType(ctx, { endpoint, response }) : undefined;
-                    const contentType = (_a = response === null || response === void 0 ? void 0 : response.contentOptions.find((x) => x.schema)) === null || _a === void 0 ? void 0 : _a.type;
+                    const contentType = response?.contentOptions.find((x) => x.schema)?.type;
                     const hasResponseBody = responseType && !kt.refs.unit.matches(responseType);
                     return kt.function(fnName, {
                         parameters: [
@@ -334,9 +292,11 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
                                 generics: [
                                     hasResponseBody
                                         ? responseType
-                                        // `Unit?` violates the `T : Any` bound under Spring Boot 4; the `null` body argument
-                                        // below stays (now legal because the subclass body parameter is nullable).
-                                        : (springBoot4 ? kt.refs.unit() : kt.refs.unit({ nullable: true })),
+                                        : // `Unit?` violates the `T : Any` bound under Spring Boot 4; the `null` body argument
+                                            // below stays (now legal because the subclass body parameter is nullable).
+                                            springBoot4
+                                                ? kt.refs.unit()
+                                                : kt.refs.unit({ nullable: true }),
                                 ],
                             }),
                         ], [
@@ -381,18 +341,10 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
                 kt.parameter.class('delegate', kt.reference(this.getApiDelegateInterfaceName(ctx, {}), null, {
                     nullable: true,
                 }), {
-                    annotations: [
-                        kt.annotation(kt.refs.spring.autowired(), [
-                            kt.argument.named('required', 'false'),
-                        ]),
-                    ],
+                    annotations: [kt.annotation(kt.refs.spring.autowired(), [kt.argument.named('required', 'false')])],
                 }),
                 kt.parameter.class('exceptionHandler', ctx.refs.apiExceptionHandler({ nullable: true }), {
-                    annotations: [
-                        kt.annotation(kt.refs.spring.autowired(), [
-                            kt.argument.named('required', 'false'),
-                        ]),
-                    ],
+                    annotations: [kt.annotation(kt.refs.spring.autowired(), [kt.argument.named('required', 'false')])],
                     accessModifier: 'private',
                     property: 'readonly',
                 }),
@@ -405,15 +357,11 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         const annotations = [];
         if (ctx.config.addJakartaValidationAnnotations) {
             annotations.push(kt.annotation(kt.refs.jakarta.generated(), [
-                kt.argument.named('value', kt.collectionLiteral([
-                    kt.string('com.goast.kotlin.spring-service-generator'),
-                ])),
+                kt.argument.named('value', kt.collectionLiteral([kt.string('com.goast.kotlin.spring-service-generator')])),
             ]));
         }
         annotations.push(kt.annotation(kt.refs.spring.controller()));
-        annotations.push(kt.annotation(kt.refs.spring.requestMapping(), [
-            this.getControllerRequestMapping(ctx, {}),
-        ]));
+        annotations.push(kt.annotation(kt.refs.spring.requestMapping(), [this.getControllerRequestMapping(ctx, {})]));
         return annotations;
     }
     getApiControllerMembers(ctx) {
@@ -466,9 +414,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         const annotations = [];
         if (ctx.config.addJakartaValidationAnnotations) {
             annotations.push(kt.annotation(kt.refs.jakarta.generated(), [
-                kt.argument.named('value', kt.collectionLiteral([
-                    kt.string('com.goast.kotlin.spring-service-generator'),
-                ])),
+                kt.argument.named('value', kt.collectionLiteral([kt.string('com.goast.kotlin.spring-service-generator')])),
             ]));
         }
         return annotations;
@@ -486,7 +432,6 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         return members;
     }
     getApiDelegateInterfaceEndpointMethod(ctx, args) {
-        var _a;
         const { endpoint } = args;
         const parameters = this.getAllParameters(ctx, { endpoint });
         const fn = kt.function(toCasing(endpoint.name, ctx.config.functionNameCasing), {
@@ -496,37 +441,28 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
                 return kt.parameter(toCasing(parameter.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter }));
             }),
         });
-        if ((_a = endpoint.custom[strictResponseCustomProperty]) !== null && _a !== void 0 ? _a : ctx.config.strictResponseEntities) {
+        if (endpoint.custom[strictResponseCustomProperty] ?? ctx.config.strictResponseEntities) {
             const responseEntity = kt.reference.genericFactory(this.getApiResponseEntityName(ctx, { endpoint }), `${this.getPackageName(ctx, {})}.${this.getApiInterfaceName(ctx, {})}`);
             fn.returnType = responseEntity(['*']);
             fn.body = appendValueGroup([
-                s `return ${kt.call([
-                    responseEntity.infer(),
-                    toCasing(getReasonPhrase(501), ctx.config.functionNameCasing),
-                ], [])}`,
+                s `return ${kt.call([responseEntity.infer(), toCasing(getReasonPhrase(501), ctx.config.functionNameCasing)], [])}`,
             ], '\n');
         }
         else {
-            fn.returnType = kt.refs.spring.responseEntity([
-                this.getResponseType(ctx, { endpoint }),
-            ]);
-            fn.body = appendValueGroup([
-                s `return ${kt.refs.spring.responseEntity.infer()}(${kt.refs.spring.httpStatus()}.NOT_IMPLEMENTED)`,
-            ], '\n');
+            fn.returnType = kt.refs.spring.responseEntity([this.getResponseType(ctx, { endpoint })]);
+            fn.body = appendValueGroup([s `return ${kt.refs.spring.responseEntity.infer()}(${kt.refs.spring.httpStatus()}.NOT_IMPLEMENTED)`], '\n');
         }
         return fn;
     }
     // #endregion
     getParameterType(ctx, args) {
-        var _a, _b;
         const { parameter } = args;
-        if ((_a = parameter.multipart) === null || _a === void 0 ? void 0 : _a.isFile) {
+        if (parameter.multipart?.isFile) {
             return kt.refs.spring.filePart();
         }
         const type = this.getTypeUsage(ctx, {
             schema: parameter.schema,
-            nullable: (!parameter.required && ((_b = parameter.schema) === null || _b === void 0 ? void 0 : _b.default) === undefined) ||
-                undefined,
+            nullable: (!parameter.required && parameter.schema?.default === undefined) || undefined,
             type: args.type,
         });
         return parameter.target === 'body' ? adjustListType(ctx, type) : type;
@@ -539,8 +475,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
             .filter((x, i, a) => a.findIndex((y) => {
             const xType = this.getSchemaType(ctx, { schema: x });
             const yType = this.getSchemaType(ctx, { schema: y });
-            return ((xType === null || xType === void 0 ? void 0 : xType.name) === (yType === null || yType === void 0 ? void 0 : yType.name) &&
-                (xType === null || xType === void 0 ? void 0 : xType.packageName) === (yType === null || yType === void 0 ? void 0 : yType.packageName));
+            return xType?.name === yType?.name && xType?.packageName === yType?.packageName;
         }) === i);
         if (responseSchemas.length === 1) {
             return adjustListType(ctx, this.getTypeUsage(ctx, {
@@ -558,20 +493,18 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         }
     }
     getTypeUsage(ctx, args) {
-        var _a;
         const { schema, nullable, fallback } = args;
-        const type = (_a = args.type) !== null && _a !== void 0 ? _a : this.getSchemaType(ctx, { schema });
+        const type = args.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 }));
+            ? createOverwriteProxy(type, { nullable: nullable ?? type.nullable })
+            : (fallback ?? kt.refs.any({ nullable }));
     }
     getSchemaType(ctx, args) {
         const { schema } = args;
         return schema && ctx.input.kotlin.models[schema.id].type;
     }
     getEndpointDocDescription(ctx, args) {
-        var _a;
-        const docSegments = [(_a = args.endpoint.description) === null || _a === void 0 ? void 0 : _a.trim()];
+        const docSegments = [args.endpoint.description?.trim()];
         if (ctx.config.includeSourceInDocs) {
             docSegments.push(getSourceDocLine(args.endpoint));
         }
@@ -580,12 +513,11 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     getControllerRequestMapping(ctx, args) {
         let { prefix } = args;
         const basePath = this.getBasePath(ctx, {});
-        prefix !== null && prefix !== void 0 ? prefix : (prefix = `openapi.${toCasing(ctx.service.name, ctx.config.propertyNameCasing)}`);
+        prefix ??= `openapi.${toCasing(ctx.service.name, ctx.config.propertyNameCasing)}`;
         return kt.string(`\${${prefix}.base-path:${basePath}}`);
     }
     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);
+        return modifyString((ctx.service.$src ?? ctx.service.endpoints[0]?.$src)?.document.servers?.[0]?.url ?? '/', ctx.config.basePath, ctx.service);
     }
     getEndpointPath(ctx, args) {
         const { endpoint } = args;
@@ -600,9 +532,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         return toCasing(`${endpoint.name}_path`, ctx.config.constantNameCasing);
     }
     getPackageName(ctx, _args) {
-        const packageSuffix = typeof ctx.config.packageSuffix === 'string'
-            ? ctx.config.packageSuffix
-            : ctx.config.packageSuffix(ctx.service);
+        const packageSuffix = typeof ctx.config.packageSuffix === 'string' ? ctx.config.packageSuffix : ctx.config.packageSuffix(ctx.service);
         return ctx.config.packageName + packageSuffix;
     }
     getApiResponseEntityName(ctx, args) {
@@ -619,18 +549,15 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         return toCasing(ctx.service.name + '_ApiDelegate', ctx.config.typeNameCasing);
     }
     getAllParameters(ctx, args) {
-        var _a, _b;
         const { endpoint } = args;
-        const parameters = endpoint.parameters.filter((parameter) => parameter.target === 'query' ||
-            parameter.target === 'path' ||
-            parameter.target === 'header');
+        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 : {};
+                    schema = resolveAnyOfAndAllOf(schema, true) ?? schema;
+                    const properties = schema.properties ?? {};
                     for (const [name, property] of properties.entries()) {
                         parameters.push(Object.assign(this.createApiParameter({
                             id: `multipart-${name}`,
@@ -642,8 +569,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
                         }), {
                             multipart: {
                                 name,
-                                isFile: property.schema.kind === 'string' &&
-                                    property.schema.format === 'binary',
+                                isFile: property.schema.kind === 'string' && property.schema.format === 'binary',
                             },
                         }));
                     }

package/{script → dist}/src/generators/services/spring-controllers/spring-controllers-generator.d.ts

@@ -1,8 +1,8 @@
 import { type ApiService, type AppendValueGroup, Factory, type MaybePromise, type OpenApiGeneratorContext, OpenApiServicesGenerationProviderBase } from '@goast/core';
-import { kt } from '../../../ast/index.js';
-import { KotlinFileBuilder } from '../../../file-builder.js';
-import { type KotlinServiceGeneratorOutput, type KotlinServicesGeneratorConfig, type KotlinServicesGeneratorContext, type KotlinServicesGeneratorInput, type KotlinServicesGeneratorOutput } from './models.js';
-import { type KotlinSpringControllerGenerator } from './spring-controller-generator.js';
+import { kt } from '../../../ast/index.ts';
+import { KotlinFileBuilder } from '../../../file-builder.ts';
+import { type KotlinServiceGeneratorOutput, type KotlinServicesGeneratorConfig, type KotlinServicesGeneratorContext, type KotlinServicesGeneratorInput, type KotlinServicesGeneratorOutput } from './models.ts';
+import { type KotlinSpringControllerGenerator } from './spring-controller-generator.ts';
 type Input = KotlinServicesGeneratorInput;
 type Output = KotlinServicesGeneratorOutput;
 type Config = KotlinServicesGeneratorConfig;
@@ -21,4 +21,3 @@ export declare class KotlinSpringControllersGenerator extends OpenApiServicesGen
     protected getApiExceptionHandlerInterface(ctx: Context): kt.Interface<KotlinFileBuilder>;
 }
 export {};
-//# sourceMappingURL=spring-controllers-generator.d.ts.map

package/{esm → dist}/src/generators/services/spring-controllers/spring-controllers-generator.js

@@ -5,15 +5,11 @@ import { defaultKotlinServicesGeneratorConfig, } from './models.js';
 import { getReferenceFactories } from './refs.js';
 import { DefaultKotlinSpringControllerGenerator, } from './spring-controller-generator.js';
 export class KotlinSpringControllersGenerator extends OpenApiServicesGenerationProviderBase {
+    _serviceGeneratorFactory;
     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 DefaultKotlinSpringControllerGenerator());
+        this._serviceGeneratorFactory =
+            serviceGeneratorFactory ?? Factory.fromValue(new DefaultKotlinSpringControllerGenerator());
     }
     initResult() {
         return {
@@ -43,8 +39,7 @@ export class KotlinSpringControllersGenerator extends OpenApiServicesGenerationP
         this.generateApiExceptionHandler(ctx);
     }
     generateApiExceptionHandler(ctx) {
-        var _a;
-        const packageName = (_a = ctx.refs.apiExceptionHandler.packageName) !== null && _a !== void 0 ? _a : ctx.config.packageName;
+        const packageName = ctx.refs.apiExceptionHandler.packageName ?? ctx.config.packageName;
         const dir = `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}`;
         const fileName = `${ctx.refs.apiExceptionHandler.refName}.kt`;
         console.log(`Generating Api Exception Handler to ${fileName}...`);
@@ -59,9 +54,7 @@ export class KotlinSpringControllersGenerator extends OpenApiServicesGenerationP
         return kt.interface(ctx.refs.apiExceptionHandler.refName, {
             members: [
                 kt.function('handleApiException', {
-                    doc: kt.doc('Handler for API exceptions.', [
-                        kt.docTag('return', 'Response entity.'),
-                    ]),
+                    doc: kt.doc('Handler for API exceptions.', [kt.docTag('return', 'Response entity.')]),
                     suspend: ctx.config.suspendingFunctions,
                     parameters: [
                         kt.parameter('exception', kt.refs.throwable(), {

package/{esm → dist}/src/generators/services/spring-reactive-web-clients/args.d.ts

@@ -1,6 +1,6 @@
 import type { ApiEndpoint, ApiParameter, ApiSchema, SourceBuilder } from '@goast/core';
-import type { kt } from '../../../ast/index.js';
-import type { ApiParameterWithMultipartInfo } from '../../../types.js';
+import type { kt } from '../../../ast/index.ts';
+import type { ApiParameterWithMultipartInfo } from '../../../types.ts';
 export type GetClientFileContent = object;
 export type GetRequestsObject = object;
 export type GetEndpointMembers = {
@@ -112,4 +112,3 @@ export type GetFilePath = {
     packageName: string;
 };
 export type GetRequestsObjectName = object;
-//# sourceMappingURL=args.d.ts.map

package/dist/src/generators/services/spring-reactive-web-clients/index.d.ts

@@ -0,0 +1,4 @@
+export * as DefaultKotlinSpringReactiveWebClientGeneratorArgs from './args.ts';
+export * from './models.ts';
+export * from './spring-reactive-web-client-generator.ts';
+export * from './spring-reactive-web-clients-generator.ts';