@goast/kotlin 0.6.0 → 0.7.0-beta.2

package/{esm → dist}/src/generators/models/model-generator.js

@@ -55,15 +55,13 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             classKind: parameters.length === 0 ? null : 'data',
             implements: inheritedSchemas.map((schema) => this.getType(ctx, { schema, nullable: false })),
             primaryConstructor: kt.constructor(parameters.map((property) => this.getClassParameter(ctx, { ...args, inheritedSchemas, parameters, property }))),
-            members: [
-                ...(schema.additionalProperties !== undefined && schema.additionalProperties !== false
-                    ? [
-                        this.getAdditionalPropertiesProperty(ctx, { schema }),
-                        this.getAdditionalPropertiesSetter(ctx, { schema }),
-                        this.getAdditionalPropertiesGetter(ctx, { schema }),
-                    ]
-                    : []),
-            ],
+            members: schema.additionalProperties !== undefined && schema.additionalProperties !== false
+                ? [
+                    this.getAdditionalPropertiesProperty(ctx, { schema }),
+                    this.getAdditionalPropertiesSetter(ctx, { schema }),
+                    this.getAdditionalPropertiesGetter(ctx, { schema }),
+                ]
+                : [],
         });
     }
     getInterface(ctx, args) {
@@ -80,15 +78,14 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         });
     }
     getEnum(ctx, args) {
-        var _a, _b, _c;
         const { schema } = args;
         const name = this.getDeclarationTypeName(ctx, { schema });
         // One set of names for both generation sites below, so the constant and its `when` branch agree.
         const valueNames = this.toEnumValueNames(ctx, schema.enum);
-        return kt.enum(name, (_b = (_a = schema.enum) === null || _a === void 0 ? void 0 : _a.map((x, i) => kt.enumValue(valueNames[i], {
+        return kt.enum(name, schema.enum?.map((x, i) => kt.enumValue(valueNames[i], {
             annotations: [kt.annotation(kt.refs.jackson.jsonProperty(), [kt.argument(kt.string(String(x)))])],
             arguments: [kt.argument(kt.string(String(x)))],
-        }))) !== null && _b !== void 0 ? _b : [], {
+        })) ?? [], {
             doc: kt.doc(this.getSchemaDocDescription(ctx, { schema })),
             annotations: [schema.deprecated ? kt.annotation(kt.refs.deprecated(), [kt.argument(kt.string(''))]) : null],
             primaryConstructor: kt.constructor([
@@ -102,9 +99,11 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
                         parameters: [kt.parameter('value', kt.refs.string())],
                         returnType: kt.reference(name, null, { nullable: true }),
                         singleExpression: true,
-                        body: !((_c = schema.enum) === null || _c === void 0 ? void 0 : _c.length) ? 'null' : s `\nwhen(value) {${s.indent `${appendValueGroup([
-                            schema.enum.map((x, i) => s `\n${kt.string(String(x))} -> ${valueNames[i]}`),
-                        ])}
+                        body: !schema.enum?.length
+                            ? 'null'
+                            : s `\nwhen(value) {${s.indent `${appendValueGroup([
+                                schema.enum.map((x, i) => s `\n${kt.string(String(x))} -> ${valueNames[i]}`),
+                            ])}
                 else -> null`}
               }`,
                     }),
@@ -113,8 +112,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         });
     }
     getSchemaDocDescription(ctx, args) {
-        var _a;
-        const docSegments = [(_a = args.schema.description) === null || _a === void 0 ? void 0 : _a.trim()];
+        const docSegments = [args.schema.description?.trim()];
         if (ctx.config.includeSourceInDocs) {
             docSegments.push(getSourceDocLine(args.schema));
         }
@@ -126,14 +124,14 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             const nonNullSchema = schema.oneOf.find((x) => x.kind !== 'null');
             if (nonNullSchema) {
                 schema = nonNullSchema;
-                nullable !== null && nullable !== void 0 ? nullable : (nullable = true);
+                nullable ??= true;
             }
         }
         const generatedType = this.getGeneratedType(ctx, { schema, nullable });
         if (generatedType) {
             return generatedType;
         }
-        nullable !== null && nullable !== void 0 ? nullable : (nullable = schema.nullable);
+        nullable ??= schema.nullable;
         switch (schema.kind) {
             case 'boolean':
                 return kt.refs.boolean({ nullable });
@@ -183,11 +181,10 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         }
     }
     getGeneratedType(ctx, args) {
-        var _a;
         const schema = getSchemaReference(args.schema, DEFAULT_IGNORED_SCHEMA_PROPERTIES);
         if (this.shouldGenerateTypeDeclaration(ctx, { schema })) {
             return kt.reference(this.getDeclarationTypeName(ctx, { schema }), this.getPackageName(ctx, { schema }), {
-                nullable: (_a = args.nullable) !== null && _a !== void 0 ? _a : schema.nullable,
+                nullable: args.nullable ?? schema.nullable,
             });
         }
         return null;
@@ -232,10 +229,9 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
     }
     // #region Members
     getClassParameter(ctx, args) {
-        var _a;
         const { schema, inheritedSchemas, property } = args;
         return kt.parameter.class(toCasing(property.name, ctx.config.propertyNameCasing), this.getType(ctx, { schema: property.schema, nullable: schema.required.has(property.name) ? undefined : true }), {
-            description: (_a = property.schema.description) === null || _a === void 0 ? void 0 : _a.trim(),
+            description: property.schema.description?.trim(),
             annotations: [
                 ...this.getJakartaValidationAnnotations(ctx, { schema, property }),
                 this.getSwaggerSchemaAnnotation(ctx, { schema, property }),
@@ -329,9 +325,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
     getJacksonJsonClassDescriptionAnnotation(ctx, args) {
         const { schema } = args;
         return ctx.config.addJacksonAnnotations && schema.description
-            ? kt.annotation(kt.refs.jackson.jsonClassDescription(), [
-                kt.argument(kt.string(schema.description)),
-            ])
+            ? kt.annotation(kt.refs.jackson.jsonClassDescription(), [kt.argument(kt.string(schema.description))])
             : null;
     }
     getJacksonJsonPropertyAnnotation(ctx, args) {
@@ -346,9 +340,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
     getJacksonJsonPropertyDescriptionAnnotation(ctx, args) {
         const { property } = args;
         return ctx.config.addJacksonAnnotations && property.schema.description
-            ? kt.annotation(kt.refs.jackson.jsonPropertyDescription(), [
-                kt.argument(kt.string(property.schema.description)),
-            ])
+            ? kt.annotation(kt.refs.jackson.jsonPropertyDescription(), [kt.argument(kt.string(property.schema.description))])
             : null;
     }
     getJacksonJsonIncludeAnnotation(ctx, args) {
@@ -424,9 +416,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
     // #endregion
     getPackageName(ctx, args) {
         const { schema } = args;
-        const packageSuffix = typeof ctx.config.packageSuffix === 'string'
-            ? ctx.config.packageSuffix
-            : ctx.config.packageSuffix(schema);
+        const packageSuffix = typeof ctx.config.packageSuffix === 'string' ? ctx.config.packageSuffix : ctx.config.packageSuffix(schema);
         return ctx.config.packageName + packageSuffix;
     }
     shouldGenerateTypeDeclaration(ctx, args) {
@@ -458,11 +448,16 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         // legal and leaves the base with no properties of its own.
         const isDiscriminatedBase = schema.kind === 'object' && schema.discriminator !== undefined;
         // Schemas representable by a simple Map type do not need its own type declaration
-        if (!isDiscriminatedBase && schema.kind === 'object' && schema.properties.size === 0 && schema.additionalProperties) {
+        if (!isDiscriminatedBase &&
+            schema.kind === 'object' &&
+            schema.properties.size === 0 &&
+            schema.additionalProperties) {
             return false;
         }
-        if (!isDiscriminatedBase && schema.kind === 'object' &&
-            ctx.config.emptyObjectTypeBehavior === 'use-any' && schema.properties.size === 0) {
+        if (!isDiscriminatedBase &&
+            schema.kind === 'object' &&
+            ctx.config.emptyObjectTypeBehavior === 'use-any' &&
+            schema.properties.size === 0) {
             return false;
         }
         // Dynamically generated schemas do not have its own type declaration
@@ -484,13 +479,12 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             .filter((item, index, self) => self.indexOf(item) === index);
     }
     getClassProperties(ctx, args) {
-        var _a;
         const { schema } = args;
         const inheritedSchemas = this.getInheritedSchemas(ctx, { schema });
         const properties = [];
         const appendedProperties = [];
         for (const property of schema.properties.values()) {
-            const discriminator = (_a = inheritedSchemas.find((x) => { var _a; return ((_a = x.discriminator) === null || _a === void 0 ? void 0 : _a.propertyName) === property.name; })) === null || _a === void 0 ? void 0 : _a.discriminator;
+            const discriminator = inheritedSchemas.find((x) => x.discriminator?.propertyName === property.name)?.discriminator;
             if (discriminator) {
                 const schemaMappings = Object.entries(discriminator.mapping).filter(([_, v]) => v.id === schema.id);
                 if (schemaMappings.length === 1) {
@@ -520,11 +514,10 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         let { schema } = args;
         schema = this.normalizeDiscriminatedBases(ctx, { schema });
         if (schema.kind === 'oneOf') {
-            schema = ctx.config.oneOfBehavior === 'treat-as-any-of'
-                // deno-lint-ignore no-explicit-any
-                ? { ...schema, kind: 'combined', anyOf: schema.oneOf, allOf: [], oneOf: undefined }
-                // deno-lint-ignore no-explicit-any
-                : { ...schema, kind: 'combined', allOf: schema.oneOf, anyOf: [], oneOf: undefined };
+            schema =
+                ctx.config.oneOfBehavior === 'treat-as-any-of'
+                    ? { ...schema, kind: 'combined', anyOf: schema.oneOf, allOf: [], oneOf: undefined }
+                    : { ...schema, kind: 'combined', allOf: schema.oneOf, anyOf: [], oneOf: undefined };
             ctx.schema = schema;
         }
         if (schema.kind === 'object' || schema.kind === 'combined') {
@@ -583,7 +576,6 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
                 return schema;
             }
             // Registered before descending, so a branch composing back to one of its own ancestors terminates.
-            // deno-lint-ignore no-explicit-any
             const copy = { ...schema };
             rewritten.set(schema, copy);
             if (isBase) {
@@ -603,9 +595,9 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             if (isDiscriminatedBase(schema))
                 return true;
             const contains = (x) => containsDiscriminatedBase(x, visited);
-            return branches(schema, 'allOf').some(contains) ||
+            return (branches(schema, 'allOf').some(contains) ||
                 branches(schema, 'anyOf').some(contains) ||
-                branches(schema, 'oneOf').some(contains);
+                branches(schema, 'oneOf').some(contains));
         }
         function isDiscriminatedBase(schema) {
             return schema.kind === 'oneOf' && schema.discriminator !== undefined;
@@ -615,9 +607,8 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
          * `oneOf: undefined` behind when it rewrites a `oneOf` holder, so a keyword can be present with no value.
          */
         function branches(schema, keyword) {
-            var _a;
             const values = schema;
-            return (_a = values[keyword]) !== null && _a !== void 0 ? _a : [];
+            return values[keyword] ?? [];
         }
     }
     hasProperty(ctx, args) {
@@ -635,7 +626,8 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             // Only an undiscriminated `oneOf` composes into the schema that references it, matching which `oneOf`
             // branches `resolveAnyOfAndAllOf` merges. A discriminated one lists subtypes, whose properties are not
             // the referencing schema's, so an inherited property never comes from there.
-            ('oneOf' in schema && !schema.discriminator &&
+            ('oneOf' in schema &&
+                !schema.discriminator &&
                 schema.oneOf.some((schema) => this.hasProperty(ctx, { schema, propertyName, visited }))));
     }
 }

package/{script → dist}/src/generators/models/models-generator.d.ts

@@ -1,6 +1,6 @@
 import { type ApiSchema, Factory, type MaybePromise, type OpenApiGeneratorContext, OpenApiSchemasGenerationProviderBase } from '@goast/core';
-import { type KotlinModelGenerator } from './model-generator.js';
-import { type KotlinModelGeneratorOutput, type KotlinModelsGeneratorConfig, type KotlinModelsGeneratorContext, type KotlinModelsGeneratorInput, type KotlinModelsGeneratorOutput } from './models.js';
+import { type KotlinModelGenerator } from './model-generator.ts';
+import { type KotlinModelGeneratorOutput, type KotlinModelsGeneratorConfig, type KotlinModelsGeneratorContext, type KotlinModelsGeneratorInput, type KotlinModelsGeneratorOutput } from './models.ts';
 type Input = KotlinModelsGeneratorInput;
 type Output = KotlinModelsGeneratorOutput;
 type Config = KotlinModelsGeneratorConfig;
@@ -15,4 +15,3 @@ export declare class KotlinModelsGenerator extends OpenApiSchemasGenerationProvi
     protected addSchemaResult(ctx: Context, schema: ApiSchema, result: SchemaOutput): void;
 }
 export {};
-//# sourceMappingURL=models-generator.d.ts.map

package/{esm → dist}/src/generators/models/models-generator.js

@@ -2,15 +2,10 @@ import { Factory, OpenApiSchemasGenerationProviderBase, } from '@goast/core';
 import { DefaultKotlinModelGenerator } from './model-generator.js';
 import { defaultKotlinModelsGeneratorConfig, } from './models.js';
 export class KotlinModelsGenerator extends OpenApiSchemasGenerationProviderBase {
+    _modelGeneratorFactory;
     constructor(modelGeneratorFactory) {
         super();
-        Object.defineProperty(this, "_modelGeneratorFactory", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this._modelGeneratorFactory = modelGeneratorFactory !== null && modelGeneratorFactory !== void 0 ? modelGeneratorFactory : Factory.fromValue(new DefaultKotlinModelGenerator());
+        this._modelGeneratorFactory = modelGeneratorFactory ?? Factory.fromValue(new DefaultKotlinModelGenerator());
     }
     initResult() {
         return {

package/{script → dist}/src/generators/models/models.d.ts

@@ -1,6 +1,6 @@
 import type { ApiSchema, DefaultGenerationProviderConfig, OpenApiSchemasGenerationProviderContext, SourceBuilder } from '@goast/core';
-import type { kt } from '../../ast/index.js';
-import { type KotlinGeneratorConfig } from '../../config.js';
+import type { kt } from '../../ast/index.ts';
+import { type KotlinGeneratorConfig } from '../../config.ts';
 export type KotlinModelsGeneratorConfig = KotlinGeneratorConfig & {
     /**
      * The package name for generated models.
@@ -58,4 +58,3 @@ export type KotlinModelsGeneratorContext = OpenApiSchemasGenerationProviderConte
 export type KotlinModelGeneratorContext = KotlinModelsGeneratorContext & {
     schema: ApiSchema;
 };
-//# sourceMappingURL=models.d.ts.map

package/{esm → dist}/src/generators/services/okhttp3-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 GetClientClass = object;
 export type GetClientCompanionObject = object;
@@ -84,4 +84,3 @@ export type GetFilePath = {
     packageName: string;
 };
 export type GetApiClientName = object;
-//# sourceMappingURL=args.d.ts.map

package/dist/src/generators/services/okhttp3-clients/index.d.ts

@@ -0,0 +1,4 @@
+export * as DefaultKotlinOkHttp3GeneratorArgs from './args.ts';
+export * from './models.ts';
+export * from './okhttp3-client-generator.ts';
+export * from './okhttp3-clients-generator.ts';

package/{esm → dist}/src/generators/services/okhttp3-clients/models.d.ts

@@ -1,9 +1,9 @@
 import type { ApiEndpoint, ApiService, AppendValue, DefaultGenerationProviderConfig, OpenApiServicesGenerationProviderContext } from '@goast/core';
-import type { KotlinImport } from '../../../common-results.js';
-import { type KotlinGeneratorConfig } from '../../../config.js';
-import type { KotlinFileBuilder } from '../../../file-builder.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 { KotlinFileBuilder } from '../../../file-builder.ts';
+import type { KotlinModelsGeneratorOutput } from '../../models/index.ts';
+import type { getReferenceFactories } from './refs.ts';
 export type KotlinOkHttp3ClientsGeneratorConfig = KotlinGeneratorConfig & {
     packageName: string;
     packageSuffix: string | ((service?: ApiService) => string);
@@ -43,4 +43,3 @@ export type KotlinOkHttp3ClientsGeneratorContext = OpenApiServicesGenerationProv
 export type KotlinOkHttp3ClientGeneratorContext = KotlinOkHttp3ClientsGeneratorContext & {
     service: ApiService;
 };
-//# sourceMappingURL=models.d.ts.map

package/{script → dist}/src/generators/services/okhttp3-clients/okhttp3-client-generator.d.ts

@@ -1,10 +1,10 @@
 import { type ApiSchema, type AppendValueGroup, type BasicAppendValue, 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 { DefaultKotlinOkHttp3GeneratorArgs as Args } from './index.js';
-import type { KotlinOkHttp3ClientGeneratorContext, KotlinOkHttp3ClientGeneratorOutput } from './models.js';
+import { kt } from '../../../ast/index.ts';
+import { KotlinFileBuilder } from '../../../file-builder.ts';
+import type { ApiParameterWithMultipartInfo } from '../../../types.ts';
+import { KotlinFileGenerator } from '../../file-generator.ts';
+import type { DefaultKotlinOkHttp3GeneratorArgs as Args } from './index.ts';
+import type { KotlinOkHttp3ClientGeneratorContext, KotlinOkHttp3ClientGeneratorOutput } from './models.ts';
 type Context = KotlinOkHttp3ClientGeneratorContext;
 type Output = KotlinOkHttp3ClientGeneratorOutput;
 type Builder = KotlinFileBuilder;
@@ -52,4 +52,3 @@ export declare class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator<C
     private createApiParameter;
 }
 export {};
-//# sourceMappingURL=okhttp3-client-generator.d.ts.map

package/{esm → dist}/src/generators/services/okhttp3-clients/okhttp3-client-generator.js

@@ -202,19 +202,17 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         });
     }
     getEndpointClientRequestConfigMethodBody(ctx, args) {
-        var _a, _b, _c;
         const { endpoint, parameters } = args;
         const queryParameters = parameters.filter((x) => x.target === 'query');
         const headerParameters = parameters.filter((x) => x.target === 'header');
         const result = appendValueGroup([], '\n');
         if (endpoint.requestBody) {
-            if (((_a = endpoint.requestBody.content[0]) === null || _a === void 0 ? void 0 : _a.type) === 'multipart/form-data') {
+            if (endpoint.requestBody.content[0]?.type === 'multipart/form-data') {
                 const partConfigs = parameters
                     .filter((x) => x.multipart)
                     .map((param) => {
-                    var _a, _b;
                     const paramName = toCasing(param.name, ctx.config.parameterNameCasing);
-                    return s `"${(_b = (_a = param.multipart) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : ''}" to ${ctx.refs.partConfig.infer()}(body = ${paramName})`;
+                    return s `"${param.multipart?.name ?? ''}" to ${ctx.refs.partConfig.infer()}(body = ${paramName})`;
                 });
                 result.values.push(s `val localVariableBody = ${kt.call(kt.refs.mapOf([kt.refs.string(), ctx.refs.partConfig(['*'])]), partConfigs)}`);
             }
@@ -223,20 +221,24 @@ 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 `
+        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 `
+                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}`}
                       }`;
-        }), '\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) {
-            result.values.push(`localVariableHeaders["Content-Type"] = "${(_c = endpoint.requestBody) === null || _c === void 0 ? void 0 : _c.content[0].type}"`);
+        if (endpoint.requestBody?.content[0] !== undefined) {
+            result.values.push(`localVariableHeaders["Content-Type"] = "${endpoint.requestBody?.content[0].type}"`);
         }
         for (const header of headerParameters) {
             const paramName = toCasing(header.name, ctx.config.parameterNameCasing);
@@ -256,9 +258,8 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         return result;
     }
     getParameterToString(ctx, args) {
-        var _a;
         const { parameter } = args;
-        if (((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.kind) === 'array') {
+        if (parameter.schema?.kind === 'array') {
             const itemEnumSchema = getArrayItemStringEnumSchema(parameter.schema);
             const itemEnumType = itemEnumSchema && this.getSchemaType(ctx, { schema: itemEnumSchema });
             return itemEnumType ? s `.joinToString(",", transform = ${itemEnumType}::value)` : '.joinToString(",")';
@@ -282,9 +283,8 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         ];
     }
     getParameterType(ctx, args) {
-        var _a;
         const { parameter } = args;
-        if ((_a = parameter.multipart) === null || _a === void 0 ? void 0 : _a.isFile) {
+        if (parameter.multipart?.isFile) {
             return kt.refs.java.file();
         }
         return this.getTypeUsage(ctx, {
@@ -293,39 +293,36 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         });
     }
     getRequestBodyType(ctx, args) {
-        var _a;
         const { endpoint } = args;
-        const content = (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0];
-        return (content === null || content === void 0 ? void 0 : content.type) === 'multipart/form-data'
+        const content = endpoint.requestBody?.content[0];
+        return content?.type === 'multipart/form-data'
             ? kt.refs.map([kt.refs.string(), ctx.refs.partConfig(['*'])])
-            : this.getTypeUsage(ctx, { schema: content === null || content === void 0 ? void 0 : content.schema, fallback: kt.refs.unit() });
+            : this.getTypeUsage(ctx, { schema: content?.schema, fallback: kt.refs.unit() });
     }
     getParameterDefaultValue(ctx, args) {
         const { schema } = args.parameter;
         if (args.parameter.required) {
             return null;
         }
-        if (getStringEnumSchema(schema) && (schema === null || schema === void 0 ? void 0 : schema.default)) {
+        if (getStringEnumSchema(schema) && schema?.default) {
             return s `${this.getTypeUsage(ctx, { schema, nullable: false })}.${this.toEnumValueName(ctx, schema.enum, schema.default)}`;
         }
         const itemEnumSchema = getArrayItemStringEnumSchema(schema);
-        if (itemEnumSchema && Array.isArray(schema === null || schema === void 0 ? void 0 : schema.default)) {
+        if (itemEnumSchema && Array.isArray(schema?.default)) {
             const itemType = this.getTypeUsage(ctx, { schema: itemEnumSchema, nullable: false });
             return kt.call(kt.refs.listOf.infer(), schema.default.map((x) => s `${itemType}.${this.toEnumValueName(ctx, itemEnumSchema.enum, x)}`));
         }
-        return kt.toNode(schema === null || schema === void 0 ? void 0 : schema.default);
+        return kt.toNode(schema?.default);
     }
     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 }));
+            ? createOverwriteProxy(type, { nullable: nullable ?? type.nullable })
+            : (fallback ?? kt.refs.any({ nullable }));
     }
     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;
     }
     getPathWithInterpolation(ctx, args) {
@@ -334,21 +331,23 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         endpoint.parameters
             .filter((x) => x.target === 'path')
             .forEach((parameter) => {
-            path = path.replace(`{${parameter.name}}`, `\${encodeURIComponent(${toCasing(parameter.name, 'camel')}${this.getParameterToString(ctx, { endpoint, parameter })})}`);
+            path = path.replace(`{${parameter.name}}`, `\${encodeURIComponent(${toCasing(parameter.name, 'camel')}${this.getParameterToString(ctx, {
+                endpoint,
+                parameter,
+            })})}`);
         });
         return path;
     }
     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;
+        return endpoint.responses.find((x) => !x.statusCode || (x.statusCode >= 200 && x.statusCode < 300))
+            ?.contentOptions[0]?.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) {
@@ -356,8 +355,8 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             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}`,
@@ -389,23 +388,20 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         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 schema = endpoint.requestBody?.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);
     }
     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));
         }
         return docSegments.filter(notNullish).join('\n\n');
     }
     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;

package/{script → dist}/src/generators/services/okhttp3-clients/okhttp3-clients-generator.d.ts

@@ -1,7 +1,7 @@
 import { type ApiService, Factory, type MaybePromise, type OpenApiGeneratorContext, OpenApiServicesGenerationProviderBase } from '@goast/core';
-import type { KotlinServicesGeneratorInput } from '../spring-controllers/index.js';
-import { type KotlinOkHttp3ClientGeneratorOutput, type KotlinOkHttp3ClientsGeneratorConfig, type KotlinOkHttp3ClientsGeneratorContext, type KotlinOkHttp3ClientsGeneratorInput, type KotlinOkHttp3ClientsGeneratorOutput } from './models.js';
-import { type KotlinOkHttp3Generator } from './okhttp3-client-generator.js';
+import type { KotlinServicesGeneratorInput } from '../spring-controllers/index.ts';
+import { type KotlinOkHttp3ClientGeneratorOutput, type KotlinOkHttp3ClientsGeneratorConfig, type KotlinOkHttp3ClientsGeneratorContext, type KotlinOkHttp3ClientsGeneratorInput, type KotlinOkHttp3ClientsGeneratorOutput } from './models.ts';
+import { type KotlinOkHttp3Generator } from './okhttp3-client-generator.ts';
 type Input = KotlinOkHttp3ClientsGeneratorInput;
 type Output = KotlinOkHttp3ClientsGeneratorOutput;
 type Config = KotlinOkHttp3ClientsGeneratorConfig;
@@ -20,4 +20,3 @@ export declare class KotlinOkHttp3ClientsGenerator extends OpenApiServicesGenera
     private copyInfrastructureFiles;
 }
 export {};
-//# sourceMappingURL=okhttp3-clients-generator.d.ts.map

package/{esm → dist}/src/generators/services/okhttp3-clients/okhttp3-clients-generator.js

@@ -7,15 +7,10 @@ import { defaultKotlinOkHttp3ClientsGeneratorConfig, } from './models.js';
 import { DefaultKotlinOkHttp3Generator } from './okhttp3-client-generator.js';
 import { getReferenceFactories } from './refs.js';
 export class KotlinOkHttp3ClientsGenerator 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 DefaultKotlinOkHttp3Generator());
+        this._serviceGeneratorFactory = serviceGeneratorFactory ?? Factory.fromValue(new DefaultKotlinOkHttp3Generator());
     }
     async generateAdditionalFiles(ctx) {
         await this.copyInfrastructureFiles(ctx);
@@ -78,8 +73,7 @@ export class KotlinOkHttp3ClientsGenerator extends OpenApiServicesGenerationProv
             const sourcePath = `client/okhttp3/${file}`;
             const targetPath = resolve(targetDir, file);
             console.log(`Copying asset file "${sourcePath}" to "${targetPath}"`);
-            let fileContent = (await getAssetFileContent(sourcePath))
-                .replace(/@PACKAGE_NAME@/g, ctx.infrastructurePackageName);
+            let fileContent = (await getAssetFileContent(sourcePath)).replace(/@PACKAGE_NAME@/g, ctx.infrastructurePackageName);
             if (file === 'ApiClient.kt') {
                 // This order is positional and must agree with the delegate call's own argument order —
                 // `getClientDelegateArguments` in okhttp3-client-generator.ts is the other side of that agreement.
@@ -95,14 +89,14 @@ export class KotlinOkHttp3ClientsGenerator extends OpenApiServicesGenerationProv
             writeGeneratedFile(ctx.config, targetPath, fileContent);
         }
         if (ctx.config.serializer === 'static' ||
-            typeof ctx.config.serializer === 'object' && ctx.config.serializer.mode === 'static') {
+            (typeof ctx.config.serializer === 'object' && ctx.config.serializer.mode === 'static')) {
             const filePath = resolve(targetDir, 'Serializer.kt');
             console.log(`Generating Serializer to ${filePath}...`);
             const springBootVersion = ctx.config.springBootVersion;
             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 `
+                ? // 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.dateTimeFeature()}.WRITE_DATES_AS_TIMESTAMPS, false)
@@ -113,9 +107,7 @@ export class KotlinOkHttp3ClientsGenerator extends OpenApiServicesGenerationProv
             .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
-                : defaultFactory;
+            const factory = typeof ctx.config.serializer === 'object' ? ctx.config.serializer.factory : defaultFactory;
             const builder = new KotlinFileBuilder(ctx.infrastructurePackageName, ctx.config);
             builder.append(kt.object({
                 name: 'Serializer',

package/{script → dist}/src/generators/services/okhttp3-clients/refs.d.ts

@@ -1,4 +1,4 @@
-import { kt } from '../../../ast/index.js';
+import { kt } from '../../../ast/index.ts';
 export declare function getReferenceFactories(infrastructurePackageName: string): {
     multiValueMap: kt.ReferenceFactory;
     collectionDelimiter: kt.ReferenceFactory;
@@ -19,4 +19,3 @@ export declare function getReferenceFactories(infrastructurePackageName: string)
     requestMethod: kt.ReferenceFactory;
     serializer: kt.ReferenceFactory;
 };
-//# sourceMappingURL=refs.d.ts.map

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

@@ -1,6 +1,6 @@
 import type { ApiEndpoint, ApiResponse, 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 GenerateApiResponseEntitiesFile = {
     dirPath: string;
     packageName: string;
@@ -92,4 +92,3 @@ export type GetApiControllerName = object;
 export type GetAllParameters = {
     endpoint: ApiEndpoint;
 };
-//# sourceMappingURL=args.d.ts.map