@goast/kotlin 0.5.10 → 0.5.11-beta.2

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

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

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

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

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

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

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

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

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

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

package/src/mod.ts

@@ -1,8 +0,0 @@
-export * from './src/ast/index.js';
-export * from './src/common-results.js';
-export * from './src/config.js';
-export * from './src/file-builder.js';
-export * from './src/generators/index.js';
-export * from './src/import-collection.js';
-export * from './src/types.js';
-export * from './src/utils.js';

package/src/src/assets.ts

@@ -1,9 +0,0 @@
-import { AssetManager } from '@goast/core';
-import { pathToFileURL, URL } from 'node:url';
-
-declare const __filename: string | undefined;
-const scriptUrl = typeof __filename === 'undefined' ? import.meta.url : pathToFileURL(__filename);
-
-const manager = new AssetManager(new URL('../assets/', scriptUrl));
-export const getAssetFileContent = manager.getAssetFileContent.bind(manager);
-export const copyAssetFile = manager.copyAssetFile.bind(manager);

package/src/src/ast/_index.ts

@@ -1,66 +0,0 @@
-export { type KtAccessModifier as AccessModifier } from './common.js';
-export { KtNode as Node } from './node.js';
-export {
-  KtAnnotation as Annotation,
-  ktAnnotation as annotation,
-  type KtAnnotationTarget as AnnotationTarget,
-} from './nodes/annotation.js';
-export { KtArgument as Argument, ktArgument as argument } from './nodes/argument.js';
-export { KtCall as Call, ktCall as call } from './nodes/call.js';
-export {
-  KtClass as Class,
-  ktClass as class,
-  type KtClassKind as ClassKind,
-  type KtClassMember as ClassMember,
-} from './nodes/class.js';
-export {
-  KtCollectionLiteral as CollectionLiteral,
-  ktCollectionLiteral as collectionLiteral,
-} from './nodes/collection-literal.js';
-export {
-  KtConstructor as Constructor,
-  ktConstructor as constructor,
-  type KtDelegateTarget as DelegateTarget,
-} from './nodes/constructor.js';
-export { KtDocTag as DocTag, ktDocTag as docTag } from './nodes/doc-tag.js';
-export { KtDoc as Doc, ktDoc as doc } from './nodes/doc.js';
-export {
-  KtEnumValue as EnumValue,
-  ktEnumValue as enumValue,
-  type KtEnumValueMember as EnumValueMember,
-} from './nodes/enum-value.js';
-export { KtEnum as Enum, ktEnum as enum, type KtEnumMember as EnumMember } from './nodes/enum.js';
-export { KtFunction as Function, ktFunction as function } from './nodes/function.js';
-export {
-  KtGenericParameter as GenericParameter,
-  ktGenericParameter as genericParameter,
-} from './nodes/generic-parameter.js';
-export { KtInitBlock as InitBlock, ktInitBlock as initBlock } from './nodes/init-block.js';
-export {
-  KtInterface as Interface,
-  ktInterface as interface,
-  type KtInterfaceMember as InterfaceMember,
-} from './nodes/interface.js';
-export { KtLambdaType as LambdaType, ktLambdaType as lambdaType } from './nodes/lambda-type.js';
-export { KtLambda as Lambda, ktLambda as lambda } from './nodes/lambda.js';
-export { KtObject as Object, ktObject as object, type KtObjectMember as ObjectMember } from './nodes/object.js';
-export { KtParameter as Parameter, ktParameter as parameter } from './nodes/parameter.js';
-export {
-  KtProperty as Property,
-  ktProperty as property,
-  KtPropertyAccessor as PropertyAccessor,
-  KtPropertyGetter as PropertyGetter,
-  KtPropertySetter as PropertySetter,
-} from './nodes/property.js';
-export {
-  type KtGenericReferenceFactory as GenericReferenceFactory,
-  KtReference as Reference,
-  ktReference as reference,
-  type KtReferenceFactory as ReferenceFactory,
-} from './nodes/reference.js';
-export { KtString as String, ktString as string } from './nodes/string.js';
-export { type KtType as Type, type KtValue as Value } from './nodes/types.js';
-export * as refs from './references/index.js';
-export { getKotlinBuilderOptions as getBuilderOptions } from './utils/get-kotlin-builder-options.js';
-export { toKtNode as toNode } from './utils/to-kt-node.js';
-export { writeKtNode as writeNode, writeKtNodes as writeNodes } from './utils/write-kt-node.js';

package/src/src/ast/common.ts

@@ -1 +0,0 @@
-export type KtAccessModifier = 'public' | 'protected' | 'internal' | 'private';

package/src/src/ast/index.ts

@@ -1 +0,0 @@
-export * as kt from './_index.js';

package/src/src/ast/node.ts

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

package/src/src/ast/nodes/annotation.ts

@@ -1,79 +0,0 @@
-import { type AstNodeOptions, notNullish, type Nullable, type Prettify, type SourceBuilder } from '@goast/core';
-
-import { KtNode } from '../node.js';
-import { writeKtAnnotations } from '../utils/write-kt-annotations.js';
-import { writeKtNode } from '../utils/write-kt-node.js';
-import { type KtArgument, ktArgument } from './argument.js';
-import type { KtType, KtValue } from './types.js';
-
-type Injects = 'class' | 'target' | 'arguments';
-
-type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
-  typeof KtNode<TBuilder, TInjects | Injects>,
-  {
-    class: KtType<TBuilder>;
-    arguments?: Nullable<Nullable<KtArgument<TBuilder> | KtValue<TBuilder>>[]>;
-    target?: Nullable<KtAnnotationTarget>;
-  }
->;
-
-export type KtAnnotationTarget =
-  | 'file'
-  | 'property'
-  | 'field'
-  | 'get'
-  | 'set'
-  | 'receiver'
-  | 'param'
-  | 'setparam'
-  | 'delegate';
-
-export class KtAnnotation<TBuilder extends SourceBuilder, TInjects extends string = never> extends KtNode<
-  TBuilder,
-  TInjects | Injects
-> {
-  public class: KtType<TBuilder>;
-  public arguments: (KtArgument<TBuilder> | KtValue<TBuilder>)[];
-  public target: KtAnnotationTarget | null;
-
-  constructor(options: Options<TBuilder, TInjects>) {
-    super(options);
-    this.class = options.class;
-    this.arguments = options.arguments?.filter(notNullish) ?? [];
-    this.target = options.target ?? null;
-  }
-
-  protected override onWrite(builder: TBuilder): void {
-    builder.append('@');
-
-    if (this.target) {
-      builder.append(this.inject.beforeTarget);
-      builder.append(this.target);
-      builder.append(this.inject.afterTarget);
-      builder.append(':');
-    }
-
-    builder.append(this.inject.beforeClass);
-    writeKtNode(builder, this.class);
-    builder.append(this.inject.afterClass);
-
-    if (this.arguments.length > 0) {
-      builder.append(this.inject.beforeArguments);
-      ktArgument.write(builder, this.arguments);
-      builder.append(this.inject.afterArguments);
-    }
-  }
-}
-
-const createAnnotation = <TBuilder extends SourceBuilder>(
-  $class: Options<TBuilder>['class'],
-  $arguments?: Options<TBuilder>['arguments'],
-  options?: Prettify<Omit<Options<TBuilder>, 'class' | 'arguments'>>,
-): KtAnnotation<TBuilder> => new KtAnnotation<TBuilder>({ ...options, class: $class, arguments: $arguments });
-
-export const ktAnnotation: typeof createAnnotation & { write: typeof writeKtAnnotations } = Object.assign(
-  createAnnotation,
-  {
-    write: writeKtAnnotations,
-  },
-);

package/src/src/ast/nodes/argument.ts

@@ -1,62 +0,0 @@
-import type { AstNodeOptions, Nullable, Prettify, SourceBuilder } from '@goast/core';
-
-import { KtNode } from '../node.js';
-import { writeKtArguments } from '../utils/write-kt-arguments.js';
-import { writeKtNode } from '../utils/write-kt-node.js';
-import type { KtValue } from './types.js';
-
-type Injects = 'name' | 'value';
-
-type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
-  typeof KtNode<TBuilder, TInjects | Injects>,
-  {
-    name?: Nullable<string>;
-    value: KtValue<TBuilder>;
-  }
->;
-
-export class KtArgument<TBuilder extends SourceBuilder, TInjects extends string = never> extends KtNode<
-  TBuilder,
-  TInjects | Injects
-> {
-  public name: string | null;
-  public value: KtValue<TBuilder>;
-
-  constructor(options: Options<TBuilder, TInjects>) {
-    super(options);
-    this.name = options?.name ?? null;
-    this.value = options.value;
-  }
-
-  protected override onWrite(builder: TBuilder): void {
-    if (this.name) {
-      builder.append(this.inject.beforeName);
-      builder.append(this.name);
-      builder.append(this.inject.afterName);
-      builder.append(' = ');
-    }
-
-    builder.append(this.inject.beforeValue);
-    writeKtNode(builder, this.value);
-    builder.append(this.inject.afterValue);
-  }
-}
-
-const createArgument = <TBuilder extends SourceBuilder>(
-  value: Options<TBuilder>['value'],
-  options?: Prettify<Omit<Options<TBuilder>, 'value'>>,
-): KtArgument<TBuilder> => new KtArgument<TBuilder>({ ...options, value });
-
-const createNamedArgument = <TBuilder extends SourceBuilder>(
-  name: Options<TBuilder>['name'],
-  value: Options<TBuilder>['value'],
-  options?: Prettify<Omit<Options<TBuilder>, 'value' | 'name'>>,
-): KtArgument<TBuilder> => new KtArgument<TBuilder>({ ...options, value, name });
-
-export const ktArgument: typeof createArgument & {
-  named: typeof createNamedArgument;
-  write: typeof writeKtArguments;
-} = Object.assign(createArgument, {
-  named: createNamedArgument,
-  write: writeKtArguments,
-});

package/src/src/ast/nodes/call.ts

@@ -1,75 +0,0 @@
-import {
-  type ArrayItem,
-  type AstNodeOptions,
-  notNullish,
-  type Nullable,
-  type Prettify,
-  type SourceBuilder,
-} from '@goast/core';
-
-import { KtNode } from '../node.js';
-import { writeKtNode, writeKtNodes } from '../utils/write-kt-node.js';
-import { type KtArgument, ktArgument } from './argument.js';
-import type { KtType, KtValue } from './types.js';
-
-type Injects = never;
-
-type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
-  typeof KtNode<TBuilder, TInjects | Injects>,
-  {
-    path: Nullable<KtType<TBuilder> | KtValue<TBuilder>>[];
-    arguments?: Nullable<Nullable<KtArgument<TBuilder> | KtValue<TBuilder>>[]>;
-    infix?: boolean;
-  }
->;
-
-export class KtCall<TBuilder extends SourceBuilder, TInjects extends string = never> extends KtNode<
-  TBuilder,
-  TInjects | Injects
-> {
-  public path: (KtType<TBuilder> | KtValue<TBuilder>)[];
-  public arguments: (KtArgument<TBuilder> | KtValue<TBuilder>)[] | null;
-  public infix: boolean;
-
-  constructor(options: Options<TBuilder, TInjects>) {
-    super(options);
-    this.path = options.path.filter(notNullish);
-    this.arguments = options.arguments?.filter(notNullish) ?? null;
-    this.infix = options.infix ?? false;
-  }
-
-  protected override onWrite(builder: TBuilder): void {
-    if (this.infix && this.arguments?.length === 1 && this.path.length > 1) {
-      writeKtNodes(builder, this.path.slice(0, 1), { separator: '.' });
-      builder.append(' ');
-      writeKtNode(builder, this.path.at(-1));
-      builder.append(' ');
-      writeKtNode(builder, this.arguments[0]);
-    } else {
-      if (this.path.length > 2) {
-        writeKtNode(builder, this.path[0]);
-        builder.ensureCurrentLineEmpty();
-        builder.indent((builder) => {
-          builder.append('.');
-          writeKtNodes(builder, this.path.slice(1), { separator: '\n.' });
-        });
-      } else {
-        writeKtNodes(builder, this.path, { separator: '.' });
-      }
-
-      if (this.arguments) {
-        ktArgument.write(builder, this.arguments);
-      }
-    }
-  }
-}
-
-const createCall = <TBuilder extends SourceBuilder>(
-  path: Options<TBuilder>['path'] | ArrayItem<Options<TBuilder>['path']>,
-  args?: Options<TBuilder>['arguments'],
-  options?: Prettify<Omit<Options<TBuilder>, 'path' | 'arguments'>>,
-): KtCall<TBuilder> => new KtCall<TBuilder>({ ...options, path: Array.isArray(path) ? path : [path], arguments: args });
-
-export const ktCall: typeof createCall & { write: typeof writeKtNodes } = Object.assign(createCall, {
-  write: writeKtNodes,
-});