@goast/kotlin 0.5.9-beta.2 → 0.5.9

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

@@ -8,6 +8,7 @@ const index_js_1 = require("../../../ast/index.js");
 const file_builder_js_1 = require("../../../file-builder.js");
 const utils_js_1 = require("../../../utils.js");
 const file_generator_js_1 = require("../../file-generator.js");
+const strictResponseCustomProperty = 'strict-response';
 class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinFileGenerator {
     generate(ctx) {
         const packageName = this.getPackageName(ctx, {});
@@ -85,9 +86,9 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
         ctx.service.endpoints.forEach((endpoint) => {
             members.push(this.getApiInterfaceEndpointMethod(ctx, { endpoint }));
         });
-        if (ctx.config.strictResponseEntities) {
-            members.push(...ctx.service.endpoints.map((endpoint) => this.getApiResponseEntityClass(ctx, { endpoint })));
-        }
+        members.push(...ctx.service.endpoints
+            .filter((endpoint) => { var _a; return (_a = endpoint.custom[strictResponseCustomProperty]) !== null && _a !== void 0 ? _a : ctx.config.strictResponseEntities; })
+            .map((endpoint) => this.getApiResponseEntityClass(ctx, { endpoint })));
         return members;
     }
     getApiInterfaceEndpointMethod(ctx, args) {
@@ -260,28 +261,24 @@ 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;
     }
     getApiResponseEntityClass(ctx, args) {
         const { endpoint } = args;
         const name = this.getApiResponseEntityName(ctx, { endpoint });
-        // Spring 7's `ResponseEntity<T>` carries an `Any` upper bound (JSpecify), so the subclass must bound `T`.
-        // The body parameter is then made nullable (`T?`) to keep null-body ("no response body") responses legal
-        // while staying wire-identical, since Spring's super constructor accepts a `@Nullable T body`.
-        const springBoot4 = ctx.config.springBootVersion === 4;
         return index_js_1.kt.class(name, {
             doc: index_js_1.kt.doc(`Response entity for ${endpoint.name}.`),
-            generics: [index_js_1.kt.genericParameter('T', springBoot4 ? { constraint: index_js_1.kt.refs.any() } : undefined)],
+            generics: [index_js_1.kt.genericParameter('T')],
             primaryConstructor: index_js_1.kt.constructor([
-                index_js_1.kt.parameter.class('body', index_js_1.kt.reference('T', null, springBoot4 ? { nullable: true } : undefined)),
+                index_js_1.kt.parameter.class('body', index_js_1.kt.reference('T')),
                 index_js_1.kt.parameter.class('rawStatus', index_js_1.kt.refs.int()),
                 index_js_1.kt.parameter.class('headers', index_js_1.kt.refs.spring.multiValueMap([index_js_1.kt.refs.string(), index_js_1.kt.refs.string()], {
                     nullable: true,
@@ -317,22 +314,18 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
                         body: index_js_1.kt.call([
                             index_js_1.kt.reference(this.getApiResponseEntityName(ctx, { endpoint }), null, {
                                 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 ? index_js_1.kt.refs.unit() : index_js_1.kt.refs.unit({ nullable: true })),
+                                    hasResponseBody ? responseType : index_js_1.kt.refs.unit({ nullable: true }),
                                 ],
                             }),
                         ], [
                             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'),
                         ]),
@@ -471,6 +464,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
         return members;
     }
     getApiDelegateInterfaceEndpointMethod(ctx, args) {
+        var _a;
         const { endpoint } = args;
         const parameters = this.getAllParameters(ctx, { endpoint });
         const fn = index_js_1.kt.function((0, core_1.toCasing)(endpoint.name, ctx.config.functionNameCasing), {
@@ -480,7 +474,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
                 return index_js_1.kt.parameter((0, core_1.toCasing)(parameter.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter }));
             }),
         });
-        if (ctx.config.strictResponseEntities) {
+        if ((_a = endpoint.custom[strictResponseCustomProperty]) !== null && _a !== void 0 ? _a : ctx.config.strictResponseEntities) {
             const responseEntity = index_js_1.kt.reference.genericFactory(this.getApiResponseEntityName(ctx, { endpoint }), `${this.getPackageName(ctx, {})}.${this.getApiInterfaceName(ctx, {})}`);
             fn.returnType = responseEntity(['*']);
             fn.body = (0, core_1.appendValueGroup)([
@@ -536,9 +530,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
             return index_js_1.kt.refs.unit();
         }
         else {
-            // Under Spring Boot 4, this type flows into `ResponseEntity<T : Any>` (e.g. the delegate default methods),
-            // so the ambiguous/unknown-body fallback must be non-null `Any` rather than `Any?`.
-            return ctx.config.springBootVersion === 4 ? index_js_1.kt.refs.any() : index_js_1.kt.refs.any({ nullable: true });
+            return index_js_1.kt.refs.any({ nullable: true });
         }
     }
     getTypeUsage(ctx, args) {

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,10 +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.
-            generics: [
-                index_js_1.kt.genericParameter('T', ctx.config.springBootVersion === 4 ? { constraint: index_js_1.kt.refs.any() } : undefined),
-            ],
+            generics: [index_js_1.kt.genericParameter('T')],
             receiverType: index_js_1.kt.refs.springReactive.webClient(),
             parameters: [
                 ...parameters.map((parameter) => index_js_1.kt.parameter((0, core_1.toCasing)(parameter.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter }), { default: this.getParameterDefaultValue(ctx, { endpoint, parameter }) })),

package/src/mod.ts

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,66 @@
+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

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

package/src/src/ast/index.ts

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

package/src/src/ast/node.ts

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,79 @@
+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

@@ -0,0 +1,62 @@
+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

@@ -0,0 +1,75 @@
+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,
+});

package/src/src/ast/nodes/class.ts

@@ -0,0 +1,178 @@
+import {
+  type AppendValue,
+  type AstNodeOptions,
+  type BasicAppendValue,
+  createOverwriteProxy,
+  notNullish,
+  type Nullable,
+  type Prettify,
+  type SourceBuilder,
+} from '@goast/core';
+
+import type { KtAccessModifier } from '../common.js';
+import { KtNode } from '../node.js';
+import { writeKtMembers } from '../utils/write-kt-members.js';
+import { writeKtNode, writeKtNodes } from '../utils/write-kt-node.js';
+import { type KtAnnotation, ktAnnotation } from './annotation.js';
+import { ktArgument } from './argument.js';
+import type { KtConstructor } from './constructor.js';
+import { type KtDoc, ktDoc } from './doc.js';
+import type { KtEnum } from './enum.js';
+import type { KtFunction } from './function.js';
+import { type KtGenericParameter, ktGenericParameter } from './generic-parameter.js';
+import { type KtInitBlock, ktInitBlock } from './init-block.js';
+import type { KtInterface } from './interface.js';
+import type { KtObject } from './object.js';
+import type { KtProperty } from './property.js';
+import type { KtType } from './types.js';
+
+type Injects =
+  | 'doc'
+  | 'annotations'
+  | 'modifiers'
+  | 'name'
+  | 'generics'
+  | 'primaryConstructor'
+  | 'inheritList'
+  | 'body'
+  | 'members';
+
+type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
+  typeof KtNode<TBuilder, TInjects | Injects>,
+  {
+    doc?: Nullable<KtDoc<TBuilder>>;
+    annotations?: Nullable<Nullable<KtAnnotation<TBuilder>>[]>;
+    accessModifier?: Nullable<KtAccessModifier>;
+    open?: Nullable<boolean>;
+    abstract?: Nullable<boolean>;
+    classKind?: Nullable<KtClassKind>;
+    name: string;
+    generics?: Nullable<Nullable<KtGenericParameter<TBuilder> | BasicAppendValue<TBuilder>>[]>;
+    primaryConstructor?: Nullable<KtConstructor<TBuilder>>;
+    extends?: Nullable<KtType<TBuilder>>;
+    implements?: Nullable<Nullable<KtType<TBuilder>>[]>;
+    companionObject?: Nullable<KtObject<TBuilder>>;
+    members?: Nullable<Nullable<KtClassMember<TBuilder>>[]>;
+  }
+>;
+
+export type KtClassKind = 'data' | 'value' | 'annotation' | 'sealed';
+export type KtClassMember<TBuilder extends SourceBuilder> =
+  | KtConstructor<TBuilder>
+  | KtEnum<TBuilder>
+  | KtInitBlock<TBuilder>
+  | KtInterface<TBuilder>
+  | KtProperty<TBuilder>
+  | KtFunction<TBuilder>
+  | KtClass<TBuilder>
+  | AppendValue<TBuilder>;
+
+export class KtClass<TBuilder extends SourceBuilder, TInjects extends string = never> extends KtNode<
+  TBuilder,
+  TInjects | Injects
+> {
+  public doc: KtDoc<TBuilder> | null;
+  public annotations: KtAnnotation<TBuilder>[];
+  public accessModifier: KtAccessModifier | null;
+  public open: boolean;
+  public abstract: boolean;
+  public classKind: KtClassKind | null;
+  public name: string;
+  public generics: (KtGenericParameter<TBuilder> | BasicAppendValue<TBuilder>)[];
+  public primaryConstructor: KtConstructor<TBuilder> | null;
+  public extends: KtType<TBuilder> | null;
+  public implements: KtType<TBuilder>[];
+  public members: KtClassMember<TBuilder>[];
+  public companionObject: Nullable<KtObject<TBuilder>>;
+
+  constructor(options: Options<TBuilder, TInjects>) {
+    super(options);
+    this.doc = options.doc ?? null;
+    this.annotations = options.annotations?.filter(notNullish) ?? [];
+    this.accessModifier = options.accessModifier ?? null;
+    this.open = options.open ?? false;
+    this.abstract = options.abstract ?? false;
+    this.classKind = options.classKind ?? null;
+    this.name = options.name;
+    this.generics = options.generics?.filter(notNullish) ?? [];
+    this.primaryConstructor = options.primaryConstructor ?? null;
+    this.extends = options.extends ?? null;
+    this.implements = options.implements?.filter(notNullish) ?? [];
+    this.members = options.members?.filter(notNullish) ?? [];
+    this.companionObject = options.companionObject;
+  }
+
+  protected override onWrite(builder: TBuilder): void {
+    builder.append(this.inject.beforeDoc);
+    ktDoc.get(this.doc, { generics: this.generics, parameters: this.primaryConstructor?.parameters })?.write(builder);
+    builder.append(this.inject.afterDoc);
+
+    builder.append(this.inject.beforeAnnotations);
+    ktAnnotation.write(builder, this.annotations, { multiline: true });
+    builder.append(this.inject.afterAnnotations);
+
+    builder.append(this.inject.beforeModifiers);
+    if (this.accessModifier) builder.append(this.accessModifier, ' ');
+    if (this.open) builder.append('open ');
+    if (this.abstract) builder.append('abstract ');
+    if (this.classKind) builder.append(this.classKind, ' ');
+    builder.append(this.inject.afterModifiers);
+
+    builder.append('class ');
+    builder.append(this.inject.beforeName, this.name, this.inject.afterName);
+
+    builder.append(this.inject.beforeGenerics);
+    ktGenericParameter.write(builder, this.generics);
+    builder.append(this.inject.afterGenerics);
+
+    if (this.primaryConstructor) {
+      builder.append(this.inject.beforePrimaryConstructor);
+      this.primaryConstructor.writeAsPrimary(builder);
+      builder.append(this.inject.afterPrimaryConstructor);
+    }
+
+    if (this.extends || this.implements.length > 0) {
+      builder.append(' : ');
+      builder.append(this.inject.beforeInheritList);
+      writeKtNode(builder, this.extends);
+      if (this.extends && this.primaryConstructor?.delegateTarget === 'super') {
+        ktArgument.write(builder, this.primaryConstructor.delegateArguments);
+      }
+      if (this.extends && this.implements.length > 0) {
+        builder.append(', ');
+      }
+      writeKtNodes(builder, this.implements, { separator: ', ' });
+      builder.append(this.inject.afterInheritList);
+    }
+
+    if (this.members.length > 0 || this.primaryConstructor?.body || this.companionObject) {
+      builder.append(' ');
+      builder.append(this.inject.beforeBody);
+      builder.parenthesize(
+        '{}',
+        (b) => {
+          b.append(this.inject.beforeMembers);
+          writeKtMembers(b, [
+            this.companionObject ? createOverwriteProxy(this.companionObject, { companion: true }) : null,
+            this.primaryConstructor?.body ? ktInitBlock(this.primaryConstructor?.body) : null,
+            ...this.members,
+          ]);
+          b.append(this.inject.afterMembers);
+        },
+        { multiline: true },
+      );
+      builder.append(this.inject.afterBody);
+    }
+
+    builder.appendLine();
+  }
+}
+
+const createClass = <TBuilder extends SourceBuilder>(
+  name: Options<TBuilder>['name'],
+  options?: Prettify<Omit<Options<TBuilder>, 'name'>>,
+): KtClass<TBuilder> => new KtClass<TBuilder>({ ...options, name });
+
+export const ktClass: typeof createClass & { write: typeof writeKtNodes } = Object.assign(createClass, {
+  write: writeKtNodes,
+});