@goast/typescript 0.7.5 → 0.8.0-beta.1

package/script/src/generators/services/angular-services/angular-service-generator.js

@@ -238,13 +238,13 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_js_1.TypeS
                     ], '\n'), { multiline: true })
                     : null,
                 '',
-                (0, core_1.builderTemplate) `return ${ctx.refs.waitForResponse([responseModelType])}(${core_1.builderTemplate.indent `
-              this.http.request(rb.build({${core_1.builderTemplate.indent `
-                responseType: ${index_js_1.ts.string(responseType)},
-                accept: ${index_js_1.ts.string(accept)},
-                context,`}
-              })),
-              {${core_1.builderTemplate.indent `
+                (0, core_1.builderTemplate) `return ${ctx.refs.waitForResponse([responseModelType])}(${core_1.builderTemplate.indent `
+              this.http.request(rb.build({${core_1.builderTemplate.indent `
+                responseType: ${index_js_1.ts.string(responseType)},
+                accept: ${index_js_1.ts.string(accept)},
+                context,`}
+              })),
+              {${core_1.builderTemplate.indent `
                 errorResponseTypes: ${index_js_1.ts.object({
                     members: [
                         ...Object.entries(this.getEndpointStatusCodes(ctx, endpoint))
@@ -253,8 +253,8 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_js_1.TypeS
                             return index_js_1.ts.property(key, { value: index_js_1.ts.string(value.parser) });
                         }),
                     ],
-                })}`}
-              }`}
+                })}`}
+              }`}
             )`,
             ], '\n'),
         });

package/script/src/generators/services/easy-network-stub/easy-network-stub-generator.js

@@ -102,15 +102,15 @@ class DefaultTypeScriptEasyNetworkStubGenerator extends file_generator_js_1.Type
             ],
             returnType: 'this',
             body: (0, core_1.appendValueGroup)([
-                (0, core_1.builderTemplate) `this.stubWrapper.stub2<${requestType}>()(${core_1.builderTemplate.indent `
-              ${index_js_1.ts.string(endpoint.method.toUpperCase())},
-              ${this.getStubClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)},
-              async (request) => {${core_1.builderTemplate.indent `
-                if (this.stubWrapper.options.rememberRequests) {${core_1.builderTemplate.indent `
-                  this.${this.getEndpointRequestsFieldName(ctx, endpoint)}.push(request);`}
-                }
-                throw await response(${this.getResponderVariableName(ctx, endpoint)}, request);`}
-              }`}
+                (0, core_1.builderTemplate) `this.stubWrapper.stub2<${requestType}>()(${core_1.builderTemplate.indent `
+              ${index_js_1.ts.string(endpoint.method.toUpperCase())},
+              ${this.getStubClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)},
+              async (request) => {${core_1.builderTemplate.indent `
+                if (this.stubWrapper.options.rememberRequests) {${core_1.builderTemplate.indent `
+                  this.${this.getEndpointRequestsFieldName(ctx, endpoint)}.push(request);`}
+                }
+                throw await response(${this.getResponderVariableName(ctx, endpoint)}, request);`}
+              }`}
             );`,
                 'return this;',
             ], '\n'),

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

@@ -143,7 +143,7 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_js_1.TypeScri
         const method = this.getInterfaceEndpointMethod(ctx, endpoint);
         method.accessModifier = 'public';
         method.body = (0, core_1.appendValueGroup)([
-            (0, core_1.builderTemplate) `const url = new ${ctx.refs.urlBuilder()}(this.options.baseUrl)${core_1.builderTemplate.indent `
+            (0, core_1.builderTemplate) `const url = new ${ctx.refs.urlBuilder()}(this.options.baseUrl)${core_1.builderTemplate.indent `
           .withPath(${index_js_1.ts.string(endpoint.path)})${(b) => b.forEach(endpoint.parameters, (b, p) => {
                 switch (p.target) {
                     case 'path':
@@ -153,11 +153,11 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_js_1.TypeScri
                         b.append((0, core_1.builderTemplate) `\n.withQueryParam(${index_js_1.ts.string(p.name)}, params.${(0, core_1.toCasing)(p.name, ctx.config.paramNameCasing)})`);
                         break;
                 }
-            })}
+            })}
           .build();`}`,
             'const headers = { ...this.options.headers };',
-            ...endpoint.parameters.filter((x) => x.target === 'header').map((p) => (0, core_1.builderTemplate) `if (params && params.${(0, core_1.toCasing)(p.name, ctx.config.paramNameCasing)} !== undefined) {${core_1.builderTemplate.indent `
-            headers[${index_js_1.ts.string(p.name)}] = String(params.${(0, core_1.toCasing)(p.name, ctx.config.paramNameCasing)});`}
+            ...endpoint.parameters.filter((x) => x.target === 'header').map((p) => (0, core_1.builderTemplate) `if (params && params.${(0, core_1.toCasing)(p.name, ctx.config.paramNameCasing)} !== undefined) {${core_1.builderTemplate.indent `
+            headers[${index_js_1.ts.string(p.name)}] = String(params.${(0, core_1.toCasing)(p.name, ctx.config.paramNameCasing)});`}
           }`),
             (0, core_1.builderTemplate) `const response = (this.options.fetch ?? fetch)(url, ${index_js_1.ts.object({
                 members: [

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

@@ -248,7 +248,7 @@ class DefaultTypeScriptK6ClientGenerator extends file_generator_js_1.TypeScriptF
                         index_js_1.ts.constructorParameter('rootUrl', { type: isJs ? undefined : rootUrlType }),
                         index_js_1.ts.constructorParameter('defaultK6ParamsFactory', { type: isJs ? undefined : paramType, optional: true }),
                     ],
-                    body: (0, core_1.builderTemplate) `this.rootUrl = rootUrl;
+                    body: (0, core_1.builderTemplate) `this.rootUrl = rootUrl;
                   this._defaultK6ParamsFactory = defaultK6ParamsFactory;`,
                 }),
                 ...ctx.service.endpoints.map((e) => this.getEndpointMethod(ctx, e)),
@@ -310,17 +310,17 @@ class DefaultTypeScriptK6ClientGenerator extends file_generator_js_1.TypeScriptF
                     : null,
                 '',
                 ctx.config.language === 'javascript'
-                    ? (0, core_1.builderTemplate) `return /** @type {${returnType}} */ (${core_1.builderTemplate.indent `
-                ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${core_1.builderTemplate.indent `
-                  accept: ${index_js_1.ts.string(accept)},
-                  params: this.getK6Params(k6Params),`}
-                })`}
+                    ? (0, core_1.builderTemplate) `return /** @type {${returnType}} */ (${core_1.builderTemplate.indent `
+                ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${core_1.builderTemplate.indent `
+                  accept: ${index_js_1.ts.string(accept)},
+                  params: this.getK6Params(k6Params),`}
+                })`}
               );`
-                    : (0, core_1.builderTemplate) `return (${core_1.builderTemplate.indent `
-                ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${core_1.builderTemplate.indent `
-                  accept: ${index_js_1.ts.string(accept)},
-                  params: this.getK6Params(k6Params),`}
-                })`}
+                    : (0, core_1.builderTemplate) `return (${core_1.builderTemplate.indent `
+                ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${core_1.builderTemplate.indent `
+                  accept: ${index_js_1.ts.string(accept)},
+                  params: this.getK6Params(k6Params),`}
+                })`}
               ) as unknown as ${returnType};`,
             ], '\n'),
         });

package/src/mod.ts

@@ -1,7 +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/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,54 +0,0 @@
-export { type TsAccessModifier as AccessModifier } from './common.js';
-export { TsNode as Node } from './node.js';
-export { TsArgument as Argument, tsArgument as argument } from './nodes/argument.js';
-export { TsArrayType as ArrayType, tsArrayType as arrayType } from './nodes/array-type.js';
-export { TsArrowFunction as ArrowFunction, tsArrowFunction as arrowFunction } from './nodes/arrow-function.js';
-export { TsCall as Call, tsCall as call } from './nodes/call.js';
-export { TsClass as Class, tsClass as class } from './nodes/class.js';
-export {
-  TsConstructorParameter as ConstructorParameter,
-  tsConstructorParameter as constructorParameter,
-} from './nodes/constructor-parameter.js';
-export { TsConstructor as Constructor, tsConstructor as constructor } from './nodes/constructor.js';
-export { TsDecorator as Decorator, tsDecorator as decorator } from './nodes/decorator.js';
-export { TsDocTag as DocTag, tsDocTag as docTag } from './nodes/doc-tag.js';
-export { TsDoc as Doc, tsDoc as doc } from './nodes/doc.js';
-export { TsEnumValue as EnumValue, tsEnumValue as enumValue } from './nodes/enum-value.js';
-export { TsEnum as Enum, tsEnum as enum } from './nodes/enum.js';
-export { TsExport as Export, tsExport as export } from './nodes/export.js';
-export { TsFunctionType as FunctionType, tsFunctionType as functionType } from './nodes/function-type.js';
-export { TsFunction as Function, tsFunction as function } from './nodes/function.js';
-export {
-  TsGenericParameter as GenericParameter,
-  tsGenericParameter as genericParameter,
-} from './nodes/generic-parameter.js';
-export { TsIndexer as Indexer, tsIndexer as indexer } from './nodes/indexer.js';
-export { TsInterface as Interface, tsInterface as interface } from './nodes/interface.js';
-export {
-  TsIntersectionType as IntersectionType,
-  tsIntersectionType as intersectionType,
-} from './nodes/intersection-type.js';
-export { TsLookupType as LookupType, tsLookupType as lookupType } from './nodes/lookup-type.js';
-export { TsMethod as Method, tsMethod as method } from './nodes/method.js';
-export { TsObjectType as ObjectType, tsObjectType as objectType } from './nodes/object-type.js';
-export { TsObject as Object, tsObject as object } from './nodes/object.js';
-export { TsParameter as Parameter, tsParameter as parameter } from './nodes/parameter.js';
-export { TsProperty as Property, tsProperty as property } from './nodes/property.js';
-export {
-  type TsGenericModuleReferenceFactory as GenericModuleReferenceFactory,
-  type TsGenericReferenceFactory as GenericReferenceFactory,
-  type TsModuleReferenceFactory as ModuleReferenceFactory,
-  TsReference as Reference,
-  tsReference as reference,
-  type TsReferenceFactory as ReferenceFactory,
-} from './nodes/reference.js';
-export { TsString as String, tsString as string } from './nodes/string.js';
-export { TsTuple as Tuple, tsTuple as tuple } from './nodes/tuple.js';
-export { TsTypeAlias as TypeAlias, tsTypeAlias as typeAlias } from './nodes/type-alias.js';
-export { TsTypeof as Typeof, tsTypeof as typeof } from './nodes/typeof.js';
-export { type TsType as Type, type TsValue as Value } from './nodes/types.js';
-export { TsUnionType as UnionType, tsUnionType as unionType } from './nodes/union-type.js';
-export { TsVariable as Variable, tsVariable as variable } from './nodes/variable.js';
-export * as refs from './references/index.js';
-export { getTypeScriptBuilderOptions as getBuilderOptions } from './utils/get-type-script-builder-options.js';
-export { toTsNode as toNode } from './utils/to-ts-node.js';

package/src/src/ast/common.ts

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

package/src/src/ast/index.ts

@@ -1 +0,0 @@
-export * as ts 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 TsNode<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/argument.ts

@@ -1,40 +0,0 @@
-import type { AstNodeOptions, Prettify, SourceBuilder } from '@goast/core';
-
-import { TsNode } from '../node.js';
-import { writeTsNode } from '../utils/write-ts-nodes.js';
-import { writeTsParameters } from '../utils/write-ts-parameters.js';
-import type { TsValue } from './types.js';
-
-type Injects = never;
-
-type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
-  typeof TsNode<TBuilder, TInjects | Injects>,
-  {
-    value: TsValue<TBuilder>;
-  }
->;
-
-export class TsArgument<TBuilder extends SourceBuilder, TInjects extends string = never> extends TsNode<
-  TBuilder,
-  TInjects | Injects
-> {
-  public value: TsValue<TBuilder>;
-
-  constructor(options: Options<TBuilder, TInjects>) {
-    super(options);
-    this.value = options.value;
-  }
-
-  protected override onWrite(builder: TBuilder): void {
-    writeTsNode(builder, this.value);
-  }
-}
-
-const createArgument = <TBuilder extends SourceBuilder>(
-  value: Options<TBuilder>['value'],
-  options?: Prettify<Omit<Options<TBuilder>, 'value'>>,
-): TsArgument<TBuilder> => new TsArgument<TBuilder>({ ...options, value });
-
-export const tsArgument: typeof createArgument & { write: typeof writeTsParameters } = Object.assign(createArgument, {
-  write: writeTsParameters,
-});

package/src/src/ast/nodes/array-type.ts

@@ -1,49 +0,0 @@
-import type { AstNodeOptions, Nullable, Prettify, SourceBuilder } from '@goast/core';
-
-import { TsNode } from '../node.js';
-import { writeTsNode, writeTsNodes } from '../utils/write-ts-nodes.js';
-import type { TsType } from './types.js';
-
-type Injects = 'type';
-
-type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
-  typeof TsNode<TBuilder, TInjects | Injects>,
-  {
-    readonly?: Nullable<boolean>;
-    type: TsType<TBuilder>;
-  }
->;
-
-export class TsArrayType<TBuilder extends SourceBuilder, TInjects extends string = never> extends TsNode<
-  TBuilder,
-  TInjects | Injects
-> {
-  public readonly: boolean;
-  public type: TsType<TBuilder>;
-
-  constructor(options: Options<TBuilder, TInjects>) {
-    super(options);
-    this.readonly = options.readonly ?? false;
-    this.type = options.type;
-  }
-
-  protected override onWrite(builder: TBuilder): void {
-    if (this.readonly) builder.append('readonly ');
-
-    builder
-      .append(this.inject.beforeType)
-      .parenthesize('()', (b) => writeTsNode(b, this.type))
-      .append(this.inject.afterType);
-
-    builder.append('[]');
-  }
-}
-
-const createArrayType = <TBuilder extends SourceBuilder>(
-  type: Options<TBuilder>['type'],
-  options?: Prettify<Omit<Options<TBuilder>, 'type'>>,
-): TsArrayType<TBuilder> => new TsArrayType<TBuilder>({ ...options, type });
-
-export const tsArrayType: typeof createArrayType & { write: typeof writeTsNodes } = Object.assign(createArrayType, {
-  write: writeTsNodes,
-});

package/src/src/ast/nodes/arrow-function.ts

@@ -1,91 +0,0 @@
-import {
-  type AppendValue,
-  type AstNodeOptions,
-  type BasicAppendValue,
-  notNullish,
-  type Nullable,
-  type SourceBuilder,
-} from '@goast/core';
-
-import { TsNode } from '../node.js';
-import { writeTsNode, writeTsNodes } from '../utils/write-ts-nodes.js';
-import { type TsGenericParameter, tsGenericParameter } from './generic-parameter.js';
-import { type TsParameter, tsParameter } from './parameter.js';
-import type { TsType } from './types.js';
-
-type Injects = 'generics' | 'params' | 'returnType' | 'body';
-
-type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
-  typeof TsNode<TBuilder, TInjects | Injects>,
-  {
-    async?: Nullable<boolean>;
-    generics?: Nullable<Nullable<TsGenericParameter<TBuilder> | BasicAppendValue<TBuilder>>[]>;
-    parameters?: Nullable<Nullable<TsParameter<TBuilder> | BasicAppendValue<TBuilder>>[]>;
-    returnType?: Nullable<TsType<TBuilder>>;
-    singleExpression?: Nullable<boolean>;
-    body?: Nullable<AppendValue<TBuilder>>;
-  }
->;
-
-export class TsArrowFunction<TBuilder extends SourceBuilder, TInjects extends string = never> extends TsNode<
-  TBuilder,
-  TInjects | Injects
-> {
-  public async: boolean;
-  public generics: (TsGenericParameter<TBuilder> | BasicAppendValue<TBuilder>)[];
-  public parameters: (TsParameter<TBuilder> | BasicAppendValue<TBuilder>)[];
-  public returnType: TsType<TBuilder> | null;
-  public singleExpression: boolean;
-  public body: AppendValue<TBuilder> | null;
-
-  constructor(options: Options<TBuilder, TInjects>) {
-    super(options);
-    this.async = options.async ?? false;
-    this.generics = options.generics?.filter(notNullish) ?? [];
-    this.parameters = options.parameters?.filter(notNullish) ?? [];
-    this.returnType = options.returnType ?? null;
-    this.singleExpression = options.singleExpression ?? false;
-    this.body = options.body ?? null;
-  }
-
-  protected override onWrite(builder: TBuilder): void {
-    if (this.async) {
-      builder.append('async ');
-    }
-
-    builder.append(this.inject.beforeGenerics);
-    tsGenericParameter.write(builder, this.generics);
-    builder.append(this.inject.afterGenerics);
-
-    builder.append(this.inject.beforeParams);
-    tsParameter.write(builder, this.parameters);
-    builder.append(this.inject.afterParams);
-
-    if (this.returnType) {
-      builder.append(': ');
-      builder.append(this.inject.beforeReturnType);
-      writeTsNode(builder, this.returnType);
-      builder.append(this.inject.afterReturnType);
-    }
-
-    builder.append(' => ');
-
-    builder.append(this.inject.beforeBody);
-    if (this.singleExpression && this.body) {
-      builder.append(this.body);
-    } else {
-      builder.parenthesize('{}', this.body, { multiline: !!this.body });
-    }
-    builder.append(this.inject.afterBody);
-  }
-}
-
-const createArrowFunction = <TBuilder extends SourceBuilder>(options?: Options<TBuilder>): TsArrowFunction<TBuilder> =>
-  new TsArrowFunction<TBuilder>(options ?? {});
-
-export const tsArrowFunction: typeof createArrowFunction & { write: typeof writeTsNodes } = Object.assign(
-  createArrowFunction,
-  {
-    write: writeTsNodes,
-  },
-);

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

@@ -1,55 +0,0 @@
-import {
-  type ArrayItem,
-  type AstNodeOptions,
-  notNullish,
-  type Nullable,
-  type Prettify,
-  type SourceBuilder,
-} from '@goast/core';
-
-import { TsNode } from '../node.js';
-import { writeTsNodes } from '../utils/write-ts-nodes.js';
-import { type TsArgument, tsArgument } from './argument.js';
-import type { TsType, TsValue } from './types.js';
-
-type Injects = never;
-
-type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
-  typeof TsNode<TBuilder, TInjects | Injects>,
-  {
-    path: Nullable<TsType<TBuilder> | TsValue<TBuilder>>[];
-    arguments?: Nullable<Nullable<TsArgument<TBuilder> | TsValue<TBuilder>>[]>;
-  }
->;
-
-export class TsCall<TBuilder extends SourceBuilder, TInjects extends string = never> extends TsNode<
-  TBuilder,
-  TInjects | Injects
-> {
-  public path: (TsType<TBuilder> | TsValue<TBuilder>)[];
-  public arguments: (TsArgument<TBuilder> | TsValue<TBuilder>)[] | null;
-
-  constructor(options: Options<TBuilder, TInjects>) {
-    super(options);
-    this.path = options.path.filter(notNullish);
-    this.arguments = options.arguments?.filter(notNullish) ?? null;
-  }
-
-  protected override onWrite(builder: TBuilder): void {
-    writeTsNodes(builder, this.path, { separator: '.' });
-
-    if (this.arguments) {
-      tsArgument.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'>>,
-): TsCall<TBuilder> => new TsCall<TBuilder>({ ...options, path: Array.isArray(path) ? path : [path], arguments: args });
-
-export const tsCall: typeof createCall & { write: typeof writeTsNodes } = Object.assign(createCall, {
-  write: writeTsNodes,
-});

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

@@ -1,133 +0,0 @@
-import {
-  type AstNodeOptions,
-  type BasicAppendValue,
-  notNullish,
-  type Nullable,
-  type Prettify,
-  type SourceBuilder,
-} from '@goast/core';
-
-import { TsNode } from '../node.js';
-import { writeTsMembers } from '../utils/write-ts-members.js';
-import { writeTsNode, writeTsNodes } from '../utils/write-ts-nodes.js';
-import type { TsConstructor } from './constructor.js';
-import { type TsDecorator, tsDecorator } from './decorator.js';
-import { type TsDoc, tsDoc } from './doc.js';
-import { type TsGenericParameter, tsGenericParameter } from './generic-parameter.js';
-import type { TsIndexer } from './indexer.js';
-import type { TsMethod } from './method.js';
-import type { TsProperty } from './property.js';
-import type { TsReference } from './reference.js';
-
-type Injects = 'doc' | 'decorators' | 'modifiers' | 'name' | 'generics' | 'extends' | 'implements' | 'body' | 'members';
-
-type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
-  typeof TsNode<TBuilder, TInjects | Injects>,
-  {
-    doc?: Nullable<TsDoc<TBuilder>>;
-    decorators?: Nullable<Nullable<TsDecorator<TBuilder>>[]>;
-    export?: Nullable<boolean>;
-    abstract?: Nullable<boolean>;
-    name: string;
-    generics?: Nullable<Nullable<TsGenericParameter<TBuilder> | BasicAppendValue<TBuilder>>[]>;
-    extends?: Nullable<TsReference<TBuilder> | BasicAppendValue<TBuilder>>;
-    implements?: Nullable<Nullable<TsReference<TBuilder> | BasicAppendValue<TBuilder>>[]>;
-    members?: Nullable<Nullable<Member<TBuilder>>[]>;
-  }
->;
-
-type Member<TBuilder extends SourceBuilder> =
-  | TsProperty<TBuilder>
-  | TsMethod<TBuilder>
-  | TsIndexer<TBuilder>
-  | TsConstructor<TBuilder>
-  | BasicAppendValue<TBuilder>;
-
-export class TsClass<TBuilder extends SourceBuilder, TInjects extends string = never> extends TsNode<
-  TBuilder,
-  TInjects | Injects
-> {
-  public doc: TsDoc<TBuilder> | null;
-  public decorators: TsDecorator<TBuilder>[];
-  public export: boolean;
-  public abstract: boolean;
-  public name: string;
-  public generics: (TsGenericParameter<TBuilder> | BasicAppendValue<TBuilder>)[];
-  public extends: TsReference<TBuilder> | BasicAppendValue<TBuilder> | null;
-  public implements: (TsReference<TBuilder> | BasicAppendValue<TBuilder>)[];
-  public members: Member<TBuilder>[];
-
-  constructor(options: Options<TBuilder, TInjects>) {
-    super(options);
-    this.doc = options.doc ?? null;
-    this.decorators = options.decorators?.filter(notNullish) ?? [];
-    this.export = options.export ?? false;
-    this.abstract = options.abstract ?? false;
-    this.name = options.name;
-    this.generics = options.generics?.filter(notNullish) ?? [];
-    this.extends = options.extends ?? null;
-    this.implements = options.implements?.filter(notNullish) ?? [];
-    this.members = options.members?.filter(notNullish) ?? [];
-  }
-
-  protected override onWrite(builder: TBuilder): void {
-    builder.append(this.inject.beforeDoc);
-    tsDoc.write(builder, tsDoc.get(this.doc, { generics: this.generics }));
-    builder.append(this.inject.afterDoc);
-
-    builder.append(this.inject.beforeDecorators);
-    tsDecorator.write(builder, this.decorators, { multiline: true });
-    builder.append(this.inject.afterDecorators);
-
-    builder.append(this.inject.beforeModifiers);
-    if (this.export) builder.append('export ');
-    if (this.abstract) builder.append('abstract ');
-    builder.append(this.inject.afterModifiers);
-
-    builder.append('class ');
-    builder.append(this.inject.beforeName, this.name, this.inject.afterName);
-
-    builder.append(this.inject.beforeGenerics);
-    tsGenericParameter.write(builder, this.generics);
-    builder.append(this.inject.afterGenerics);
-
-    if (this.extends) {
-      builder.append(' extends ');
-      builder.append(this.inject.beforeExtends);
-      writeTsNode(builder, this.extends);
-      builder.append(this.inject.afterExtends);
-    }
-
-    if (this.implements.length > 0) {
-      builder.append(' implements ');
-      builder.append(this.inject.beforeImplements);
-      writeTsNodes(builder, this.implements, { separator: ', ' });
-      builder.append(this.inject.afterImplements);
-    }
-
-    builder.append(' ');
-
-    builder.append(this.inject.beforeBody);
-    builder.parenthesize(
-      '{}',
-      (b) => {
-        b.append(this.inject.beforeMembers);
-        writeTsMembers(b, this.members);
-        b.append(this.inject.afterMembers);
-      },
-      { multiline: this.members.length > 0 },
-    );
-    builder.append(this.inject.afterBody);
-
-    builder.appendLine();
-  }
-}
-
-const createClass = <TBuilder extends SourceBuilder>(
-  name: Options<TBuilder>['name'],
-  options?: Prettify<Omit<Options<TBuilder>, 'name'>>,
-): TsClass<TBuilder> => new TsClass<TBuilder>({ ...options, name });
-
-export const tsClass: typeof createClass & { write: typeof writeTsNodes } = Object.assign(createClass, {
-  write: writeTsNodes,
-});

package/src/src/ast/nodes/constructor-parameter.ts

@@ -1,70 +0,0 @@
-import type { AstNodeOptions, Nullable, Prettify, SourceBuilder } from '@goast/core';
-
-import type { TsAccessModifier } from '../common.js';
-import { writeTsNode } from '../utils/write-ts-nodes.js';
-import { writeTsParameters } from '../utils/write-ts-parameters.js';
-import { tsDecorator } from './decorator.js';
-import { TsParameter } from './parameter.js';
-
-type Injects = 'modifiers';
-
-type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
-  typeof TsParameter<TBuilder, TInjects | Injects>,
-  {
-    accessModifier?: Nullable<TsAccessModifier>;
-    readonly?: Nullable<boolean>;
-  }
->;
-
-export class TsConstructorParameter<TBuilder extends SourceBuilder, TInjects extends string = never>
-  extends TsParameter<
-    TBuilder,
-    TInjects | Injects
-  > {
-  public accessModifier: TsAccessModifier | null;
-  public readonly: boolean;
-
-  constructor(options: Options<TBuilder, TInjects>) {
-    super(options);
-    this.accessModifier = options.accessModifier ?? null;
-    this.readonly = options.readonly ?? false;
-  }
-
-  protected override onWrite(builder: TBuilder): void {
-    builder.append(this.inject.beforeDecorators);
-    tsDecorator.write(builder, this.decorators);
-    builder.append(this.inject.afterDecorators);
-
-    builder.append(this.inject.beforeModifiers);
-    if (this.accessModifier) builder.append(this.accessModifier, ' ');
-    if (this.readonly) builder.append('readonly ');
-    builder.append(this.inject.afterModifiers);
-
-    builder.append(this.inject.beforeName, this.name, this.inject.afterName);
-    if (this.optional) builder.append('?');
-
-    if (this.type) {
-      builder.append(': ');
-      builder.append(this.inject.beforeType);
-      writeTsNode(builder, this.type);
-      builder.append(this.inject.afterType);
-    }
-
-    if (this.default) {
-      builder.append(' = ');
-      builder.append(this.inject.beforeDefault);
-      writeTsNode(builder, this.default);
-      builder.append(this.inject.afterDefault);
-    }
-  }
-}
-
-const createConstructorParameter = <TBuilder extends SourceBuilder>(
-  name: Options<TBuilder>['name'],
-  options?: Prettify<Omit<Options<TBuilder>, 'name'>>,
-): TsConstructorParameter<TBuilder> => new TsConstructorParameter<TBuilder>({ ...options, name });
-
-export const tsConstructorParameter: typeof createConstructorParameter & { write: typeof writeTsParameters } = Object
-  .assign(createConstructorParameter, {
-    write: writeTsParameters,
-  });