@goast/typescript 0.4.3 → 0.4.4

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

@@ -0,0 +1,85 @@
+import {
+  type AstNodeOptions,
+  type BasicAppendValue,
+  notNullish,
+  type Nullable,
+  type Prettify,
+  type 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 TsDecorator, tsDecorator } from './decorator.js';
+import type { TsType, TsValue } from './types.js';
+
+type Injects = 'decorators' | 'name' | 'type' | 'default';
+
+type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
+  typeof TsNode<TBuilder, TInjects | Injects>,
+  {
+    name: string;
+    description?: Nullable<BasicAppendValue<TBuilder>>;
+    decorators?: Nullable<Nullable<TsDecorator<TBuilder>>[]>;
+    type?: Nullable<TsType<TBuilder>>;
+    optional?: Nullable<boolean>;
+    default?: Nullable<TsValue<TBuilder>>;
+  }
+>;
+
+export class TsParameter<TBuilder extends SourceBuilder, TInjects extends string = never> extends TsNode<
+  TBuilder,
+  TInjects | Injects
+> {
+  public name: string;
+  public description: BasicAppendValue<TBuilder> | null;
+  public decorators: TsDecorator<TBuilder>[];
+  public type: TsType<TBuilder> | null;
+  public optional: boolean;
+  public default: TsValue<TBuilder> | null;
+
+  constructor(options: Options<TBuilder, TInjects>) {
+    super(options);
+    this.name = options.name;
+    this.description = options.description ?? null;
+    this.decorators = options.decorators?.filter(notNullish) ?? [];
+    this.type = options.type ?? null;
+    this.optional = options.optional ?? false;
+    this.default = options.default ?? null;
+  }
+
+  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.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 createParameter = <TBuilder extends SourceBuilder>(
+  name: Options<TBuilder>['name'],
+  options?: Prettify<Omit<Options<TBuilder>, 'name'>>,
+): TsParameter<TBuilder> => new TsParameter<TBuilder>({ ...options, name });
+
+export const tsParameter: typeof createParameter & { write: typeof writeTsParameters } = Object.assign(
+  createParameter,
+  {
+    write: writeTsParameters,
+  },
+);

package/src/src/ast/nodes/property-accessor.test.ts

@@ -0,0 +1,132 @@
+import "../../../_dnt.test_polyfills.js";
+import { EOL } from 'node:os';
+
+import { expect } from '../../../deps/jsr.io/@std/expect/1.0.12/expect.js';
+import { beforeEach, describe, it } from '../../../deps/jsr.io/@std/testing/1.0.9/bdd.js';
+
+import { TypeScriptFileBuilder } from '../../file-builder.js';
+import { createPropertyGetter, createPropertySetter } from './property-accessor.js';
+
+let builder: TypeScriptFileBuilder;
+
+beforeEach(() => {
+  builder = new TypeScriptFileBuilder();
+});
+
+describe('TsPropertySetter', () => {
+  it('should write the name of the method', () => {
+    builder.append(createPropertySetter({ propertyName: 'x' }));
+    expect(builder.toString(false)).toBe('set x(value);' + EOL);
+  });
+
+  it('should write the type if it exists', () => {
+    builder.append(createPropertySetter({ propertyName: 'x', type: 'number' }));
+    expect(builder.toString(false)).toBe('set x(value: number);' + EOL);
+  });
+
+  it('should write the body if it exists', () => {
+    builder.append(createPropertySetter({ propertyName: 'x', body: 'this.x = value;' }));
+    expect(builder.toString(false)).toBe(`set x(value) {${EOL}  this.x = value;${EOL}}${EOL}`);
+  });
+
+  it('should write the accessibility if it exists', () => {
+    builder.append(createPropertySetter({ propertyName: 'x', accessModifier: 'public' }));
+    expect(builder.toString(false)).toBe('public set x(value);' + EOL);
+  });
+
+  it('should write the static keyword if the method is static', () => {
+    builder.append(createPropertySetter({ propertyName: 'x', static: true }));
+    expect(builder.toString(false)).toBe('static set x(value);' + EOL);
+  });
+
+  it('should write the abstract keyword if the method is abstract', () => {
+    builder.append(createPropertySetter({ propertyName: 'x', abstract: true }));
+    expect(builder.toString(false)).toBe('abstract set x(value);' + EOL);
+  });
+
+  it('should write the override keyword if the method is override', () => {
+    builder.append(createPropertySetter({ propertyName: 'x', override: true }));
+    expect(builder.toString(false)).toBe('override set x(value);' + EOL);
+  });
+
+  it('should write all the parts of the method', () => {
+    builder.append(
+      createPropertySetter({
+        propertyName: 'x',
+        type: 'number',
+        body: 'this.x = value;',
+        accessModifier: 'public',
+        static: true,
+        abstract: true,
+        override: true,
+      }),
+    );
+    expect(builder.toString(false)).toBe(
+      `public static abstract override set x(value: number) {${EOL}  this.x = value;${EOL}}${EOL}`,
+    );
+  });
+
+  it('should render injections', () => {
+    builder.append(createPropertySetter({ propertyName: 'x', inject: { before: ['before'], after: ['after'] } }));
+    expect(builder.toString(false)).toBe(`beforeset x(value);${EOL}after`);
+  });
+});
+
+describe('TsPropertyGetter', () => {
+  it('should write the name of the method', () => {
+    builder.append(createPropertyGetter({ propertyName: 'x' }));
+    expect(builder.toString(false)).toBe('get x();' + EOL);
+  });
+
+  it('should write the type if it exists', () => {
+    builder.append(createPropertyGetter({ propertyName: 'x', type: 'number' }));
+    expect(builder.toString(false)).toBe('get x(): number;' + EOL);
+  });
+
+  it('should write the body if it exists', () => {
+    builder.append(createPropertyGetter({ propertyName: 'x', body: 'return this.x;' }));
+    expect(builder.toString(false)).toBe(`get x() {${EOL}  return this.x;${EOL}}${EOL}`);
+  });
+
+  it('should write the accessibility if it exists', () => {
+    builder.append(createPropertyGetter({ propertyName: 'x', accessModifier: 'public' }));
+    expect(builder.toString(false)).toBe('public get x();' + EOL);
+  });
+
+  it('should write the static keyword if the method is static', () => {
+    builder.append(createPropertyGetter({ propertyName: 'x', static: true }));
+    expect(builder.toString(false)).toBe('static get x();' + EOL);
+  });
+
+  it('should write the abstract keyword if the method is abstract', () => {
+    builder.append(createPropertyGetter({ propertyName: 'x', abstract: true }));
+    expect(builder.toString(false)).toBe('abstract get x();' + EOL);
+  });
+
+  it('should write the override keyword if the method is override', () => {
+    builder.append(createPropertyGetter({ propertyName: 'x', override: true }));
+    expect(builder.toString(false)).toBe('override get x();' + EOL);
+  });
+
+  it('should write all the parts of the method', () => {
+    builder.append(
+      createPropertyGetter({
+        propertyName: 'x',
+        type: 'number',
+        body: 'return this.x;',
+        accessModifier: 'public',
+        static: true,
+        abstract: true,
+        override: true,
+      }),
+    );
+    expect(builder.toString(false)).toBe(
+      `public static abstract override get x(): number {${EOL}  return this.x;${EOL}}${EOL}`,
+    );
+  });
+
+  it('should render injections', () => {
+    builder.append(createPropertyGetter({ propertyName: 'x', inject: { before: ['before'], after: ['after'] } }));
+    expect(builder.toString(false)).toBe(`beforeget x();${EOL}after`);
+  });
+});

package/src/src/ast/nodes/property-accessor.ts

@@ -0,0 +1,173 @@
+import { type AppendValue, type AstNodeOptions, notNullish, type Nullable, type SourceBuilder } from '@goast/core';
+
+import type { TsAccessModifier } from '../common.js';
+import { TsNode } from '../node.js';
+import { writeTsNode } from '../utils/write-ts-nodes.js';
+import { type TsDecorator, tsDecorator } from './decorator.js';
+import { type TsDoc, tsDoc } from './doc.js';
+import type { TsProperty } from './property.js';
+import type { TsType } from './types.js';
+
+type Injects = never;
+
+type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
+  typeof TsNode<TBuilder, TInjects | Injects>,
+  {
+    propertyName?: Nullable<string>;
+    doc?: Nullable<TsDoc<TBuilder>>;
+    type?: Nullable<TsType<TBuilder>>;
+    decorators?: Nullable<Nullable<TsDecorator<TBuilder>>[]>;
+    body?: Nullable<AppendValue<TBuilder>>;
+    accessModifier?: Nullable<TsAccessModifier>;
+    static?: Nullable<boolean>;
+    abstract?: Nullable<boolean>;
+    override?: Nullable<boolean>;
+  }
+>;
+
+abstract class TsPropertyAccessor<TBuilder extends SourceBuilder, TInjects extends string = never> extends TsNode<
+  TBuilder,
+  TInjects | Injects
+> {
+  private _propertyName: string | null;
+  private _type: TsType<TBuilder> | null;
+  private _accessModifier: TsAccessModifier | null;
+  private _static: boolean;
+  private _abstract: boolean;
+  private _override: boolean;
+
+  public doc: TsDoc<TBuilder> | null;
+  public decorators: TsDecorator<TBuilder>[];
+  public body: AppendValue<TBuilder> | null;
+
+  public get propertyName(): string {
+    return this.property?.name ?? this._propertyName ?? 'someProperty';
+  }
+  public set propertyName(value: string | null) {
+    this._propertyName = value;
+  }
+
+  public get type(): TsType<TBuilder> | null {
+    return this.property?.type ?? this._type;
+  }
+  public set type(value: TsType<TBuilder> | null) {
+    this._type = value;
+  }
+
+  public get accessModifier(): TsAccessModifier | null {
+    return this.property?.accessModifier ?? this._accessModifier;
+  }
+  public set accessModifier(value: TsAccessModifier | null) {
+    this._accessModifier = value;
+  }
+
+  public get static(): boolean {
+    return this.property?.static ?? this._static;
+  }
+  public set static(value: boolean) {
+    this._static = value;
+  }
+
+  public get abstract(): boolean {
+    return this.property?.abstract ?? this._abstract;
+  }
+  public set abstract(value: boolean) {
+    this._abstract = value;
+  }
+
+  public get override(): boolean {
+    return this.property?.override ?? this._override;
+  }
+  public set override(value: boolean) {
+    this._override = value;
+  }
+
+  protected property?: TsProperty<TBuilder>;
+
+  constructor(options: Options<TBuilder, TInjects>) {
+    super(options);
+    this._propertyName = options.propertyName ?? null;
+    this.doc = options.doc ?? null;
+    this._type = options.type ?? null;
+    this.decorators = options.decorators?.filter(notNullish) ?? [];
+    this.body = options.body ?? null;
+    this._accessModifier = options.accessModifier ?? null;
+    this._static = options.static ?? false;
+    this._abstract = options.abstract ?? false;
+    this._override = options.override ?? false;
+  }
+}
+
+export class TsPropertySetter<TBuilder extends SourceBuilder, TInjects extends string = never>
+  extends TsPropertyAccessor<
+    TBuilder,
+    TInjects
+  > {
+  protected override onWrite(builder: TBuilder): void {
+    tsDoc.write(builder, this.doc);
+    tsDecorator.write(builder, this.decorators);
+
+    if (this.accessModifier) builder.append(this.accessModifier, ' ');
+    if (this.static) builder.append('static ');
+    if (this.abstract) builder.append('abstract ');
+    if (this.override) builder.append('override ');
+
+    builder.append('set ', this.propertyName);
+    builder.parenthesize('()', (b) => {
+      b.append('value');
+      if (this.type !== null) {
+        b.append(': ');
+        writeTsNode(b, this.type);
+      }
+    });
+
+    if (this.body !== null) {
+      builder.append(' ');
+      builder.parenthesize('{}', this.body, { multiline: true });
+    } else {
+      builder.append(';');
+    }
+
+    builder.appendLine();
+  }
+}
+
+export class TsPropertyGetter<TBuilder extends SourceBuilder, TInjects extends string = never>
+  extends TsPropertyAccessor<
+    TBuilder,
+    TInjects
+  > {
+  protected override onWrite(builder: TBuilder): void {
+    tsDoc.write(builder, this.doc);
+    tsDecorator.write(builder, this.decorators);
+
+    if (this.accessModifier) builder.append(this.accessModifier, ' ');
+    if (this.static) builder.append('static ');
+    if (this.abstract) builder.append('abstract ');
+    if (this.override) builder.append('override ');
+
+    builder.append('get ', this.propertyName, '()');
+
+    if (this.type) {
+      builder.append(': ');
+      writeTsNode(builder, this.type);
+    }
+
+    if (this.body !== null) {
+      builder.append(' ');
+      builder.parenthesize('{}', this.body, { multiline: true });
+    } else {
+      builder.append(';');
+    }
+
+    builder.appendLine();
+  }
+}
+
+export const createPropertySetter = <TBuilder extends SourceBuilder>(
+  options?: Options<TBuilder>,
+): TsPropertySetter<TBuilder> => new TsPropertySetter<TBuilder>(options ?? {});
+
+export const createPropertyGetter = <TBuilder extends SourceBuilder>(
+  options?: Options<TBuilder>,
+): TsPropertyGetter<TBuilder> => new TsPropertyGetter<TBuilder>(options ?? {});

package/src/src/ast/nodes/property.test.ts

@@ -0,0 +1,113 @@
+import "../../../_dnt.test_polyfills.js";
+import { EOL } from 'node:os';
+
+import { expect } from '../../../deps/jsr.io/@std/expect/1.0.12/expect.js';
+import { beforeEach, describe, it } from '../../../deps/jsr.io/@std/testing/1.0.9/bdd.js';
+
+import { TypeScriptFileBuilder } from '../../file-builder.js';
+import { tsProperty } from './property.js';
+
+let builder: TypeScriptFileBuilder;
+
+beforeEach(() => {
+  builder = new TypeScriptFileBuilder();
+});
+
+describe('tsProperty', () => {
+  it('should write the name of the property', () => {
+    builder.append(tsProperty('x'));
+    expect(builder.toString(false)).toBe('x;' + EOL);
+  });
+
+  it('should put name in quotes if needed', () => {
+    builder.append(tsProperty('x y'));
+    expect(builder.toString(false)).toBe("'x y';" + EOL);
+  });
+
+  it('should write the type if it exists', () => {
+    builder.append(tsProperty('x', { type: 'number' }));
+    expect(builder.toString(false)).toBe('x: number;' + EOL);
+  });
+
+  it('should write the value if it exists', () => {
+    builder.append(tsProperty('x', { value: '42' }));
+    expect(builder.toString(false)).toBe('x = 42;' + EOL);
+  });
+
+  it('should write the readonly keyword if the property is readonly', () => {
+    builder.append(tsProperty('x', { readonly: true }));
+    expect(builder.toString(false)).toBe('readonly x;' + EOL);
+  });
+
+  it('should write the accessibility if it exists', () => {
+    builder.append(tsProperty('x', { accessModifier: 'public' }));
+    expect(builder.toString(false)).toBe('public x;' + EOL);
+  });
+
+  it('should write the static keyword if the property is static', () => {
+    builder.append(tsProperty('x', { static: true }));
+    expect(builder.toString(false)).toBe('static x;' + EOL);
+  });
+
+  it('should write the abstract keyword if the property is abstract', () => {
+    builder.append(tsProperty('x', { abstract: true }));
+    expect(builder.toString(false)).toBe('abstract x;' + EOL);
+  });
+
+  it('should write the override keyword if the property is override', () => {
+    builder.append(tsProperty('x', { override: true }));
+    expect(builder.toString(false)).toBe('override x;' + EOL);
+  });
+
+  it('should write the optional symbol if the property is optional', () => {
+    builder.append(tsProperty('x', { optional: true }));
+    expect(builder.toString(false)).toBe('x?;' + EOL);
+  });
+
+  it('should write all the parts of the property', () => {
+    builder.append(
+      tsProperty('x', {
+        type: 'number',
+        value: 42,
+        readonly: true,
+        accessModifier: 'public',
+        static: true,
+        abstract: true,
+        override: true,
+        optional: true,
+      }),
+    );
+    expect(builder.toString(false)).toBe('public static abstract override readonly x?: number = 42;' + EOL);
+  });
+
+  it('should write getter and setter', () => {
+    builder.append(tsProperty('x', { get: tsProperty.getter(), set: tsProperty.setter() }));
+    expect(builder.toString(false)).toBe('get x();' + EOL + 'set x(value);' + EOL);
+  });
+
+  it('should write getter only', () => {
+    builder.append(tsProperty('x', { get: tsProperty.getter() }));
+    expect(builder.toString(false)).toBe('get x();' + EOL);
+  });
+
+  it('should write setter only', () => {
+    builder.append(tsProperty('x', { set: tsProperty.setter() }));
+    expect(builder.toString(false)).toBe('set x(value);' + EOL);
+  });
+
+  it('should render injections', () => {
+    builder.append(tsProperty('x', { inject: { before: ['before'], after: ['after'] } }));
+    expect(builder.toString(false)).toBe(`beforex;${EOL}after`);
+  });
+
+  it('should render injections with getter and setter', () => {
+    builder.append(
+      tsProperty('x', {
+        get: tsProperty.getter(),
+        set: tsProperty.setter(),
+        inject: { before: ['before'], after: ['after'] },
+      }),
+    );
+    expect(builder.toString(false)).toBe(`beforeget x();${EOL}set x(value);${EOL}after`);
+  });
+});

package/src/src/ast/nodes/property.ts

@@ -0,0 +1,192 @@
+import { type AstNodeOptions, notNullish, type Nullable, type Prettify, type SourceBuilder } from '@goast/core';
+
+import type { TsAccessModifier } from '../common.js';
+import { TsNode } from '../node.js';
+import { writeTsNode, writeTsNodes } from '../utils/write-ts-nodes.js';
+import { type TsDecorator, tsDecorator } from './decorator.js';
+import { type TsDoc, tsDoc } from './doc.js';
+import { TsObject } from './object.js';
+import {
+  createPropertyGetter,
+  createPropertySetter,
+  type TsPropertyGetter,
+  type TsPropertySetter,
+} from './property-accessor.js';
+import { tsString } from './string.js';
+import type { TsType, TsValue } from './types.js';
+
+type BaseInjects = never;
+
+type BaseOptions<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
+  typeof TsNode<TBuilder, TInjects | BaseInjects>,
+  {
+    name: string;
+    doc?: Nullable<TsDoc<TBuilder>>;
+    decorators?: Nullable<Nullable<TsDecorator<TBuilder>>[]>;
+    type?: Nullable<TsType<TBuilder>>;
+    accessModifier?: Nullable<TsAccessModifier>;
+    static?: Nullable<boolean>;
+    abstract?: Nullable<boolean>;
+    override?: Nullable<boolean>;
+  }
+>;
+
+type SimpleOptions<TBuilder extends SourceBuilder, TInjects extends string = never> =
+  & BaseOptions<TBuilder, TInjects>
+  & {
+    value?: Nullable<TsValue<TBuilder>>;
+    readonly?: Nullable<boolean>;
+    optional?: Nullable<boolean>;
+  };
+
+type AccessorOptions<TBuilder extends SourceBuilder, TInjects extends string = never> =
+  & BaseOptions<TBuilder, TInjects>
+  & {
+    get?: Nullable<TsPropertyGetter<TBuilder>>;
+    set?: Nullable<TsPropertySetter<TBuilder>>;
+  };
+
+export abstract class TsProperty<TBuilder extends SourceBuilder, TInjects extends string = never> extends TsNode<
+  TBuilder,
+  TInjects | BaseInjects
+> {
+  public name: string;
+  public doc: TsDoc<TBuilder> | null;
+  public decorators: TsDecorator<TBuilder>[];
+  public type: TsType<TBuilder> | null;
+  public accessModifier: TsAccessModifier | null;
+  public static: boolean | null;
+  public abstract: boolean | null;
+  public override: boolean | null;
+
+  constructor(options: BaseOptions<TBuilder, TInjects>) {
+    super(options);
+    this.name = options.name;
+    this.doc = options.doc ?? null;
+    this.decorators = options.decorators?.filter(notNullish) ?? [];
+    this.type = options.type ?? null;
+    this.accessModifier = options.accessModifier ?? null;
+    this.static = options.static ?? null;
+    this.abstract = options.abstract ?? null;
+    this.override = options.override ?? null;
+  }
+}
+
+export class TsSimpleProperty<TBuilder extends SourceBuilder, TInjects extends string = never> extends TsProperty<
+  TBuilder,
+  TInjects
+> {
+  public value: TsValue<TBuilder> | null;
+  public readonly: boolean;
+  public optional: boolean;
+
+  constructor(options: SimpleOptions<TBuilder, TInjects>) {
+    super(options);
+    this.value = options.value ?? null;
+    this.readonly = options.readonly ?? false;
+    this.optional = options.optional ?? false;
+  }
+
+  protected override onWrite(builder: TBuilder): void {
+    const isInObjectDeclaration = this.getParentNode(builder) instanceof TsObject;
+
+    tsDoc.write(builder, this.doc);
+    tsDecorator.write(builder, this.decorators);
+
+    if (this.accessModifier) builder.append(this.accessModifier, ' ');
+    if (this.static) builder.append('static ');
+    if (this.abstract) builder.append('abstract ');
+    if (this.override) builder.append('override ');
+    if (this.readonly) builder.append('readonly ');
+
+    writeTsNode(builder, /^([a-zA-Z_$][a-zA-Z_$0-9]*|[0-9]+)$/.test(this.name) ? this.name : tsString(this.name));
+    if (this.optional) builder.append('?');
+
+    if (this.type && !isInObjectDeclaration) {
+      builder.append(': ');
+      writeTsNode(builder, this.type);
+    }
+
+    if (this.value) {
+      builder.append(isInObjectDeclaration ? ': ' : ' = ');
+      writeTsNode(builder, this.value);
+    }
+
+    builder.append(isInObjectDeclaration ? ',' : ';');
+
+    builder.appendLine();
+  }
+}
+
+export class TsAccessorProperty<TBuilder extends SourceBuilder, TInjects extends string = never> extends TsProperty<
+  TBuilder,
+  TInjects
+> {
+  private _get: TsPropertyGetter<TBuilder> | null = null;
+  private _set: TsPropertySetter<TBuilder> | null = null;
+
+  public get get(): TsPropertyGetter<TBuilder> | null {
+    return this._get;
+  }
+  public set get(value: TsPropertyGetter<TBuilder> | null) {
+    if (value) {
+      value['property'] = this;
+    }
+    if (this._get) {
+      this._get['property'] = undefined;
+    }
+    this._get = value;
+  }
+
+  public get set(): TsPropertySetter<TBuilder> | null {
+    return this._set;
+  }
+  public set set(value: TsPropertySetter<TBuilder> | null) {
+    if (value) {
+      value['property'] = this;
+    }
+    if (this._set) {
+      this._set['property'] = undefined;
+    }
+    this._set = value;
+  }
+
+  constructor(options: AccessorOptions<TBuilder, TInjects>) {
+    super(options);
+    this.get = options.get ?? null;
+    this.set = options.set ?? null;
+  }
+
+  protected override onWrite(builder: TBuilder): void {
+    builder.append(
+      (b) => tsDoc.write(b, this.doc),
+      (b) => tsDecorator.write(b, this.decorators),
+    );
+    if (this.get) {
+      this.get.write(builder);
+    }
+    if (this.set) {
+      this.set.write(builder);
+    }
+  }
+}
+
+const createProperty = <TBuilder extends SourceBuilder>(
+  name: BaseOptions<TBuilder>['name'],
+  options?: Prettify<Omit<SimpleOptions<TBuilder>, 'name'>> | Prettify<Omit<AccessorOptions<TBuilder>, 'name'>>,
+): TsProperty<TBuilder> => {
+  if (options && ('get' in options || 'set' in options)) {
+    return new TsAccessorProperty({ ...options, name });
+  }
+  return new TsSimpleProperty({ ...options, name });
+};
+
+export const tsProperty: typeof createProperty & {
+  write: typeof writeTsNodes;
+  getter: typeof createPropertyGetter;
+  setter: typeof createPropertySetter;
+} = Object.assign(createProperty, {
+  write: writeTsNodes,
+  getter: createPropertyGetter,
+  setter: createPropertySetter,
+});