diff --git a/packages/openapi-ts/src/ts-dsl/base.ts b/packages/openapi-ts/src/ts-dsl/base.ts
index 329537f58..f826f909e 100644
--- a/packages/openapi-ts/src/ts-dsl/base.ts
+++ b/packages/openapi-ts/src/ts-dsl/base.ts
@@ -101,6 +101,11 @@ export abstract class TsDsl<T extends ts.Node = ts.Node> implements ITsDsl<T> {
     if (typeof input === 'string') {
       return this.$expr(input) as NodeOfMaybe<I>;
     }
+    if (typeof input === 'boolean') {
+      return (
+        input ? ts.factory.createTrue() : ts.factory.createFalse()
+      ) as NodeOfMaybe<I>;
+    }
     if (input instanceof Array) {
       return input.map((item) => this._render(item)) as NodeOfMaybe<I>;
     }
@@ -122,20 +127,26 @@ export abstract class TsDsl<T extends ts.Node = ts.Node> implements ITsDsl<T> {
     });
   }
 
-  protected $type<I>(type: I): TypeOfMaybe<I> {
-    if (type === undefined) {
+  protected $type<I>(
+    input: I,
+    args?: ReadonlyArray<ts.TypeNode>,
+  ): TypeOfMaybe<I> {
+    if (input === undefined) {
       return undefined as TypeOfMaybe<I>;
     }
-    if (typeof type === 'string') {
-      return ts.factory.createTypeReferenceNode(
-        type,
-      ) as unknown as TypeOfMaybe<I>;
+    if (typeof input === 'string') {
+      return ts.factory.createTypeReferenceNode(input, args) as TypeOfMaybe<I>;
     }
-    if (typeof type === 'boolean') {
-      const literal = type ? ts.factory.createTrue() : ts.factory.createFalse();
+    if (typeof input === 'boolean') {
+      const literal = input
+        ? ts.factory.createTrue()
+        : ts.factory.createFalse();
       return ts.factory.createLiteralTypeNode(literal) as TypeOfMaybe<I>;
     }
-    return this._render(type as any) as TypeOfMaybe<I>;
+    if (input instanceof Array) {
+      return input.map((item) => this.$type(item, args)) as TypeOfMaybe<I>;
+    }
+    return this._render(input as any) as TypeOfMaybe<I>;
   }
 
   private _render<T extends ts.Node>(value: MaybeTsDsl<T>): T {
@@ -152,25 +163,30 @@ type NodeOf<I> =
     ? ReadonlyArray<U extends TsDsl<infer N> ? N : U>
     : I extends string
       ? ts.Expression
-      : I extends TsDsl<infer N>
-        ? N
-        : I extends ts.Node
-          ? I
-          : never;
+      : I extends boolean
+        ? ts.Expression
+        : I extends TsDsl<infer N>
+          ? N
+          : I extends ts.Node
+            ? I
+            : never;
 
 type TypeOfMaybe<I> = undefined extends I
   ? TypeOf<NonNullable<I>> | undefined
   : TypeOf<I>;
 
-type TypeOf<I> = I extends string
-  ? ts.TypeNode
-  : I extends boolean
-    ? ts.LiteralTypeNode
-    : I extends TsDsl<infer N>
-      ? N
-      : I extends ts.TypeNode
-        ? I
-        : never;
+type TypeOf<I> =
+  I extends ReadonlyArray<infer U>
+    ? ReadonlyArray<TypeOf<U>>
+    : I extends string
+      ? ts.TypeNode
+      : I extends boolean
+        ? ts.LiteralTypeNode
+        : I extends TsDsl<infer N>
+          ? N
+          : I extends ts.TypeNode
+            ? I
+            : never;
 
 export type MaybeTsDsl<T> =
   // if T includes string in the union
@@ -182,3 +198,5 @@ export type MaybeTsDsl<T> =
       T extends ts.Node
       ? T | TsDsl<T>
       : never;
+
+export type TypeOfTsDsl<T> = T extends TsDsl<infer U> ? U : never;
diff --git a/packages/openapi-ts/src/ts-dsl/mixins/type.ts b/packages/openapi-ts/src/ts-dsl/mixins/type.ts
index ff0708d22..5e837b1b3 100644
--- a/packages/openapi-ts/src/ts-dsl/mixins/type.ts
+++ b/packages/openapi-ts/src/ts-dsl/mixins/type.ts
@@ -23,6 +23,7 @@ export function createTypeAccessor<Parent extends TsDsl>(
   function fn(type: TypeInput): Parent;
   function fn(type?: TypeInput): ReturnType<typeof TypeTsDsl> | Parent {
     if (type === undefined) {
+      // @ts-expect-error --- overload resolution
       if (!_type) _type = TypeTsDsl();
       return _type;
     }
diff --git a/packages/openapi-ts/src/ts-dsl/type.ts b/packages/openapi-ts/src/ts-dsl/type.ts
index 865a3ea0d..a0ada32f5 100644
--- a/packages/openapi-ts/src/ts-dsl/type.ts
+++ b/packages/openapi-ts/src/ts-dsl/type.ts
@@ -7,32 +7,10 @@ import { LiteralTsDsl } from './literal';
 import { mixin } from './mixins/apply';
 import { GenericsMixin } from './mixins/generics';
 import { OptionalMixin } from './mixins/optional';
+import { TypeExprTsDsl } from './type/expr';
 
 export type TypeInput = WithString<boolean | MaybeTsDsl<ts.TypeNode>>;
 
-export abstract class BaseTypeTsDsl<
-  T extends ts.TypeNode | ts.TypeParameterDeclaration,
-> extends TsDsl<T> {
-  protected base?: ts.EntityName;
-  protected constraint?: TypeInput;
-  protected defaultValue?: TypeInput;
-
-  constructor(base?: WithString<ts.Identifier>) {
-    super();
-    if (base) this.base = this.$expr(base);
-  }
-
-  default(value: TypeInput): this {
-    this.defaultValue = value;
-    return this;
-  }
-
-  extends(constraint: TypeInput): this {
-    this.constraint = constraint;
-    return this;
-  }
-}
-
 export class TypeLiteralTsDsl extends TsDsl<ts.LiteralTypeNode> {
   private literal: LiteralTsDsl;
 
@@ -67,15 +45,30 @@ export class TypeObjectTsDsl extends TsDsl<ts.TypeLiteralNode> {
   }
 }
 
-export class TypeParamTsDsl extends BaseTypeTsDsl<ts.TypeParameterDeclaration> {
+export class TypeParamTsDsl extends TsDsl<ts.TypeParameterDeclaration> {
+  protected base?: ts.EntityName;
+  protected constraint?: TypeInput;
+  protected defaultValue?: TypeInput;
+
   constructor(
     name?: WithString<ts.Identifier>,
     fn?: (base: TypeParamTsDsl) => void,
   ) {
-    super(name);
+    super();
+    if (name) this.base = this.$expr(name);
     fn?.(this);
   }
 
+  default(value: TypeInput): this {
+    this.defaultValue = value;
+    return this;
+  }
+
+  extends(constraint: TypeInput): this {
+    this.constraint = constraint;
+    return this;
+  }
+
   $render(): ts.TypeParameterDeclaration {
     if (!this.base) throw new Error('Missing type name');
     return ts.factory.createTypeParameterDeclaration(
@@ -127,49 +120,20 @@ export class TypePropTsDsl extends TsDsl<ts.TypeElement> {
 export interface TypePropTsDsl extends OptionalMixin {}
 mixin(TypePropTsDsl, OptionalMixin);
 
-export class TypeReferenceTsDsl extends BaseTypeTsDsl<ts.TypeNode> {
-  private _object?: TypeObjectTsDsl;
-
-  constructor(
-    name?: WithString<ts.Identifier>,
-    fn?: (base: TypeReferenceTsDsl) => void,
-  ) {
-    super(name);
-    fn?.(this);
-  }
-
-  /** Starts an object type literal (e.g. `{ foo: string }`). */
-  object(fn?: (o: TypeObjectTsDsl) => void): this {
-    this._object = new TypeObjectTsDsl(fn);
-    return this;
-  }
-
-  $render(): ts.TypeNode {
-    if (this._object) return this.$node(this._object);
-    if (!this.base) throw new Error('Missing base type');
-    const types = this._generics?.map((arg) => this.$type(arg));
-    return ts.factory.createTypeReferenceNode(
-      this.base,
-      // @ts-expect-error --- generics are not officially supported on type references yet
-      types,
-    );
-  }
-}
-
-export interface TypeReferenceTsDsl extends GenericsMixin {}
-mixin(TypeReferenceTsDsl, GenericsMixin);
-
+const base = {
+  literal: (...args: ConstructorParameters<typeof TypeLiteralTsDsl>) =>
+    new TypeLiteralTsDsl(...args),
+  object: (...args: ConstructorParameters<typeof TypeObjectTsDsl>) =>
+    new TypeObjectTsDsl(...args),
+  param: (...args: ConstructorParameters<typeof TypeParamTsDsl>) =>
+    new TypeParamTsDsl(...args),
+  ref: (...args: ConstructorParameters<typeof TypeExprTsDsl>) =>
+    new TypeExprTsDsl(...args),
+};
+
+/** Creates a general expression node. */
 export const TypeTsDsl = Object.assign(
-  (...args: ConstructorParameters<typeof TypeReferenceTsDsl>) =>
-    new TypeReferenceTsDsl(...args),
-  {
-    literal: (...args: ConstructorParameters<typeof TypeLiteralTsDsl>) =>
-      new TypeLiteralTsDsl(...args),
-    object: (...args: ConstructorParameters<typeof TypeObjectTsDsl>) =>
-      new TypeObjectTsDsl(...args),
-    param: (...args: ConstructorParameters<typeof TypeParamTsDsl>) =>
-      new TypeParamTsDsl(...args),
-    ref: (...args: ConstructorParameters<typeof TypeReferenceTsDsl>) =>
-      new TypeReferenceTsDsl(...args),
-  },
+  (...args: ConstructorParameters<typeof TypeExprTsDsl>) =>
+    new TypeExprTsDsl(...args),
+  base,
 );
diff --git a/packages/openapi-ts/src/ts-dsl/type/expr.ts b/packages/openapi-ts/src/ts-dsl/type/expr.ts
new file mode 100644
index 000000000..83eb34c80
--- /dev/null
+++ b/packages/openapi-ts/src/ts-dsl/type/expr.ts
@@ -0,0 +1,36 @@
+/* eslint-disable @typescript-eslint/no-empty-object-type, @typescript-eslint/no-unsafe-declaration-merging */
+import ts from 'typescript';
+
+import { TsDsl, type WithString } from '../base';
+import { mixin } from '../mixins/apply';
+import { GenericsMixin } from '../mixins/generics';
+import { TypeObjectTsDsl } from '../type';
+
+export class TypeExprTsDsl extends TsDsl<ts.TypeNode> {
+  private _exprInput: WithString<ts.Identifier>;
+  private _object?: TypeObjectTsDsl;
+
+  constructor(id: WithString<ts.Identifier>) {
+    super();
+    this._exprInput = id;
+  }
+
+  /** Starts an object type literal (e.g. `{ foo: string }`). */
+  object(fn?: (o: TypeObjectTsDsl) => void): this {
+    this._object = new TypeObjectTsDsl(fn);
+    return this;
+  }
+
+  $render(): ts.TypeNode {
+    if (this._object) return this.$node(this._object);
+    const types = this._generics?.map((arg) => this.$type(arg));
+    return ts.factory.createTypeReferenceNode(
+      this.$expr(this._exprInput),
+      // @ts-expect-error --- generics are not officially supported on type references yet
+      types,
+    );
+  }
+}
+
+export interface TypeExprTsDsl extends GenericsMixin {}
+mixin(TypeExprTsDsl, GenericsMixin);
-- 
2.51.2


From 870b19d3de13feb00da11dd81df24a0d5c6a177d Mon Sep 17 00:00:00 2001
From: Lubos <lubos@heyapi.dev>
Date: Tue, 11 Nov 2025 20:30:30 +0800
Subject: [PATCH 2/2] refactor: type dsl

---
 docs/.vitepress/theme/components/Layout.vue   |  14 +-
 .../src/plugins/@hey-api/sdk/shared/class.ts  |  31 ++--
 .../src/plugins/valibot/shared/export.ts      |  30 ++--
 .../src/plugins/valibot/shared/pipesToAst.ts  |  14 +-
 packages/openapi-ts/src/ts-dsl/base.ts        |  41 ++++--
 packages/openapi-ts/src/ts-dsl/class.ts       |   2 +-
 packages/openapi-ts/src/ts-dsl/field.ts       |  19 ++-
 packages/openapi-ts/src/ts-dsl/func.ts        |  24 +--
 packages/openapi-ts/src/ts-dsl/index.ts       |  85 ++++++++++-
 packages/openapi-ts/src/ts-dsl/method.ts      |  19 ++-
 .../openapi-ts/src/ts-dsl/mixins/generics.ts  |  17 ++-
 packages/openapi-ts/src/ts-dsl/mixins/type.ts |  42 ------
 packages/openapi-ts/src/ts-dsl/param.ts       |  17 ++-
 packages/openapi-ts/src/ts-dsl/type.ts        | 139 ------------------
 packages/openapi-ts/src/ts-dsl/type/attr.ts   |  45 ++++++
 packages/openapi-ts/src/ts-dsl/type/expr.ts   |  44 ++++--
 .../openapi-ts/src/ts-dsl/type/literal.ts     |  19 +++
 packages/openapi-ts/src/ts-dsl/type/object.ts |  69 +++++++++
 packages/openapi-ts/src/ts-dsl/type/param.ts  |  39 +++++
 packages/openapi-ts/src/ts-dsl/var.ts         |  12 +-
 20 files changed, 410 insertions(+), 312 deletions(-)
 delete mode 100644 packages/openapi-ts/src/ts-dsl/mixins/type.ts
 delete mode 100644 packages/openapi-ts/src/ts-dsl/type.ts
 create mode 100644 packages/openapi-ts/src/ts-dsl/type/attr.ts
 create mode 100644 packages/openapi-ts/src/ts-dsl/type/literal.ts
 create mode 100644 packages/openapi-ts/src/ts-dsl/type/object.ts
 create mode 100644 packages/openapi-ts/src/ts-dsl/type/param.ts

diff --git a/docs/.vitepress/theme/components/Layout.vue b/docs/.vitepress/theme/components/Layout.vue
index 4c9acda0d..7eb058bca 100644
--- a/docs/.vitepress/theme/components/Layout.vue
+++ b/docs/.vitepress/theme/components/Layout.vue
@@ -8,7 +8,7 @@ const { Layout } = DefaultTheme;
   <Layout>
     <template #layout-top>
       <div class="announcement">
-        <span> Build better APIs with Hey API Platform </span>
+        <span>Build better APIs with Hey API Platform</span>
         <a
           href="https://app.heyapi.dev/"
           rel="noopener noreferrer"
@@ -16,18 +16,6 @@ const { Layout } = DefaultTheme;
           >Dashboard</a
         >
       </div>
-      <!-- <div class="announcement">
-        <span>
-          Request a feature<span class="hide-sm"> for your business</span>
-        </span>
-        <a
-          aria-label="Send an email to Lubos"
-          href="mailto:lubos@heyapi.dev?subject=Priority%20Feature%20Request"
-          target="_blank"
-        >
-          Let's Talk
-        </a>
-      </div> -->
     </template>
     <!-- <template #home-features-before>
       <a
diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/class.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/class.ts
index 5a01884cb..b06ce1eac 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/class.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/class.ts
@@ -132,11 +132,12 @@ const createClientClass = ({
         .param('args', (p) =>
           p
             .optional(optionalClient)
-            .type()
-            .object((o) =>
-              o.prop('client', (p) =>
-                p.optional(optionalClient).type(symbolClient.placeholder),
-              ),
+            .type(
+              $.type
+                .object()
+                .prop('client', (p) =>
+                  p.optional(optionalClient).type(symbolClient.placeholder),
+                ),
             ),
         )
         .do(
@@ -445,18 +446,14 @@ export const generateClassSdk = ({
       const ctor = $.init((i) =>
         i
           .param('args', (p) =>
-            p
-              .optional(!isClientRequired)
-              .type()
-              .object((o) =>
-                o
-                  .prop('client', (p) =>
-                    p
-                      .optional(!isClientRequired)
-                      .type(symbolClient.placeholder),
-                  )
-                  .prop('key', (p) => p.optional().type('string')),
-              ),
+            p.optional(!isClientRequired).type(
+              $.type
+                .object()
+                .prop('client', (p) =>
+                  p.optional(!isClientRequired).type(symbolClient.placeholder),
+                )
+                .prop('key', (p) => p.optional().type('string')),
+            ),
           )
           .do(
             $('super').call('args'),
diff --git a/packages/openapi-ts/src/plugins/valibot/shared/export.ts b/packages/openapi-ts/src/plugins/valibot/shared/export.ts
index f19f2c536..614a701aa 100644
--- a/packages/openapi-ts/src/plugins/valibot/shared/export.ts
+++ b/packages/openapi-ts/src/plugins/valibot/shared/export.ts
@@ -1,9 +1,8 @@
 import type { Symbol } from '@hey-api/codegen-core';
-import type ts from 'typescript';
 
 import type { IR } from '~/ir/types';
 import { createSchemaComment } from '~/plugins/shared/utils/schema';
-import { tsc } from '~/tsc';
+import { $ } from '~/ts-dsl';
 
 import { identifiers } from '../v1/constants';
 import { pipesToAst } from './pipesToAst';
@@ -25,19 +24,18 @@ export const exportAst = ({
     resource: 'valibot.v',
   });
 
-  const statement = tsc.constVariable({
-    comment: plugin.config.comments
-      ? createSchemaComment({ schema })
-      : undefined,
-    exportConst: symbol.exported,
-    expression: pipesToAst({ pipes: ast.pipes, plugin }),
-    name: symbol.placeholder,
-    typeName: state.hasLazyExpression.value
-      ? (tsc.propertyAccessExpression({
-          expression: v.placeholder,
-          name: ast.typeName || identifiers.types.GenericSchema.text,
-        }) as unknown as ts.TypeNode)
-      : undefined,
-  });
+  const statement = $.const(symbol.placeholder)
+    .export(symbol.exported)
+    .$if(plugin.config.comments && createSchemaComment({ schema }), (c, v) =>
+      c.describe(v as Array<string>),
+    )
+    .$if(state.hasLazyExpression.value, (c) =>
+      c.type(
+        $.type(v.placeholder).attr(
+          ast.typeName || identifiers.types.GenericSchema.text,
+        ),
+      ),
+    )
+    .assign(pipesToAst({ pipes: ast.pipes, plugin }));
   plugin.setSymbolValue(symbol, statement);
 };
diff --git a/packages/openapi-ts/src/plugins/valibot/shared/pipesToAst.ts b/packages/openapi-ts/src/plugins/valibot/shared/pipesToAst.ts
index dabc1682c..d629fe9d1 100644
--- a/packages/openapi-ts/src/plugins/valibot/shared/pipesToAst.ts
+++ b/packages/openapi-ts/src/plugins/valibot/shared/pipesToAst.ts
@@ -1,6 +1,6 @@
 import type ts from 'typescript';
 
-import { tsc } from '~/tsc';
+import { $ } from '~/ts-dsl';
 
 import type { ValibotPlugin } from '../types';
 import { identifiers } from '../v1/constants';
@@ -20,12 +20,8 @@ export const pipesToAst = ({
     category: 'external',
     resource: 'valibot.v',
   });
-  const expression = tsc.callExpression({
-    functionName: tsc.propertyAccessExpression({
-      expression: v.placeholder,
-      name: identifiers.methods.pipe,
-    }),
-    parameters: pipes,
-  });
-  return expression;
+  return $(v.placeholder)
+    .attr(identifiers.methods.pipe)
+    .call(...pipes)
+    .$render();
 };
diff --git a/packages/openapi-ts/src/ts-dsl/base.ts b/packages/openapi-ts/src/ts-dsl/base.ts
index f826f909e..e4a2ae16a 100644
--- a/packages/openapi-ts/src/ts-dsl/base.ts
+++ b/packages/openapi-ts/src/ts-dsl/base.ts
@@ -118,9 +118,7 @@ export abstract class TsDsl<T extends ts.Node = ts.Node> implements ITsDsl<T> {
     const arr = input instanceof Array ? input : [input];
     return arr.map((item) => {
       const node =
-        typeof item === 'string'
-          ? ts.factory.createIdentifier(item)
-          : this._render(item as any);
+        typeof item === 'string' ? this.$expr(item) : this._render(item as any);
       return ts.isExpression(node)
         ? ts.factory.createExpressionStatement(node)
         : (node as ts.Statement);
@@ -171,6 +169,30 @@ type NodeOf<I> =
             ? I
             : never;
 
+export type MaybeTsDsl<T> =
+  // if T includes string
+  string extends T
+    ? Exclude<T, string> extends ts.Node
+      ? string | Exclude<T, string> | TsDsl<Exclude<T, string>>
+      : string
+    : // if it's a DSL itself
+      T extends TsDsl<any>
+      ? T
+      : // otherwise if it’s a Node
+        T extends ts.Node
+        ? T | TsDsl<T>
+        : never;
+
+export type TypeOfTsDsl<T> = T extends TsDsl<infer U> ? U : never;
+
+export abstract class TypeTsDsl<
+  T extends
+    | ts.TypeNode
+    | ts.TypeElement
+    | ts.LiteralTypeNode
+    | ts.TypeParameterDeclaration = ts.TypeNode,
+> extends TsDsl<T> {}
+
 type TypeOfMaybe<I> = undefined extends I
   ? TypeOf<NonNullable<I>> | undefined
   : TypeOf<I>;
@@ -187,16 +209,3 @@ type TypeOf<I> =
           : I extends ts.TypeNode
             ? I
             : never;
-
-export type MaybeTsDsl<T> =
-  // if T includes string in the union
-  string extends T
-    ? Exclude<T, string> extends ts.Node
-      ? string | Exclude<T, string> | TsDsl<Exclude<T, string>>
-      : string
-    : // otherwise only node or DSL
-      T extends ts.Node
-      ? T | TsDsl<T>
-      : never;
-
-export type TypeOfTsDsl<T> = T extends TsDsl<infer U> ? U : never;
diff --git a/packages/openapi-ts/src/ts-dsl/class.ts b/packages/openapi-ts/src/ts-dsl/class.ts
index e1317e4c5..6f3a47540 100644
--- a/packages/openapi-ts/src/ts-dsl/class.ts
+++ b/packages/openapi-ts/src/ts-dsl/class.ts
@@ -82,7 +82,7 @@ export class ClassTsDsl extends TsDsl<ts.ClassDeclaration> {
     const body = this.$node(this.body) as ReadonlyArray<ts.ClassElement>;
     return ts.factory.createClassDeclaration(
       [...this.$decorators(), ...this.modifiers.list()],
-      ts.factory.createIdentifier(this.name),
+      this.$expr(this.name),
       this.$generics(),
       this.heritageClauses,
       body,
diff --git a/packages/openapi-ts/src/ts-dsl/field.ts b/packages/openapi-ts/src/ts-dsl/field.ts
index 12832ad89..8a541ee0a 100644
--- a/packages/openapi-ts/src/ts-dsl/field.ts
+++ b/packages/openapi-ts/src/ts-dsl/field.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import ts from 'typescript';
 
-import { TsDsl } from './base';
+import { TsDsl, TypeTsDsl } from './base';
 import { mixin } from './mixins/apply';
 import { DecoratorMixin } from './mixins/decorator';
 import { DescribeMixin } from './mixins/describe';
@@ -13,16 +13,13 @@ import {
   ReadonlyMixin,
   StaticMixin,
 } from './mixins/modifiers';
-import { createTypeAccessor, type TypeAccessor } from './mixins/type';
 import { ValueMixin } from './mixins/value';
+import { TypeExprTsDsl } from './type/expr';
 
 export class FieldTsDsl extends TsDsl<ts.PropertyDeclaration> {
   private modifiers = createModifierAccessor(this);
   private name: string;
-  private _type: TypeAccessor<FieldTsDsl> = createTypeAccessor(this);
-
-  /** Sets the property's type. */
-  type: TypeAccessor<FieldTsDsl>['fn'] = this._type.fn;
+  private _type?: TypeTsDsl;
 
   constructor(name: string, fn?: (f: FieldTsDsl) => void) {
     super();
@@ -30,13 +27,19 @@ export class FieldTsDsl extends TsDsl<ts.PropertyDeclaration> {
     fn?.(this);
   }
 
+  /** Sets the field type. */
+  type(type: string | TypeTsDsl): this {
+    this._type = type instanceof TypeTsDsl ? type : new TypeExprTsDsl(type);
+    return this;
+  }
+
   /** Builds the `PropertyDeclaration` node. */
   $render(): ts.PropertyDeclaration {
     return ts.factory.createPropertyDeclaration(
       [...this.$decorators(), ...this.modifiers.list()],
-      ts.factory.createIdentifier(this.name),
+      this.$expr(this.name),
       undefined,
-      this._type.$render(),
+      this.$type(this._type),
       this.$value(),
     );
   }
diff --git a/packages/openapi-ts/src/ts-dsl/func.ts b/packages/openapi-ts/src/ts-dsl/func.ts
index d89a16cc8..84095ac3c 100644
--- a/packages/openapi-ts/src/ts-dsl/func.ts
+++ b/packages/openapi-ts/src/ts-dsl/func.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import ts from 'typescript';
 
-import { TsDsl } from './base';
+import { TsDsl, TypeTsDsl } from './base';
 import { mixin } from './mixins/apply';
 import { DecoratorMixin } from './mixins/decorator';
 import { DescribeMixin } from './mixins/describe';
@@ -18,7 +18,7 @@ import {
 } from './mixins/modifiers';
 import { OptionalMixin } from './mixins/optional';
 import { ParamMixin } from './mixins/param';
-import { createTypeAccessor, type TypeAccessor } from './mixins/type';
+import { TypeExprTsDsl } from './type/expr';
 
 type FuncMode = 'arrow' | 'decl' | 'expr';
 
@@ -32,10 +32,7 @@ class ImplFuncTsDsl<M extends FuncMode = 'arrow'> extends TsDsl<
   private mode: FuncMode;
   private modifiers = createModifierAccessor(this);
   private name?: string;
-  private _returns: TypeAccessor<ImplFuncTsDsl<M>> = createTypeAccessor(this);
-
-  /** Sets the return type. */
-  returns: TypeAccessor<ImplFuncTsDsl<M>>['fn'] = this._returns.fn;
+  private _returns?: TypeTsDsl;
 
   constructor();
   constructor(fn: (f: ImplFuncTsDsl<'arrow'>) => void);
@@ -70,6 +67,13 @@ class ImplFuncTsDsl<M extends FuncMode = 'arrow'> extends TsDsl<
     this.mode = 'expr';
     return this as unknown as FuncTsDsl<'expr'>;
   }
+
+  /** Sets the return type. */
+  returns(type: string | TypeTsDsl): this {
+    this._returns = type instanceof TypeTsDsl ? type : new TypeExprTsDsl(type);
+    return this;
+  }
+
   $render(): M extends 'decl'
     ? ts.FunctionDeclaration
     : M extends 'expr'
@@ -83,7 +87,7 @@ class ImplFuncTsDsl<M extends FuncMode = 'arrow'> extends TsDsl<
         this.name,
         this.$generics(),
         this.$params(),
-        this._returns.$render(),
+        this.$type(this._returns),
         ts.factory.createBlock(this.$do(), true),
       ) as any;
     }
@@ -92,10 +96,10 @@ class ImplFuncTsDsl<M extends FuncMode = 'arrow'> extends TsDsl<
       return ts.factory.createFunctionExpression(
         [...this.modifiers.list()],
         undefined,
-        this.name ? ts.factory.createIdentifier(this.name) : undefined,
+        this.$expr(this.name),
         this.$generics(),
         this.$params(),
-        this._returns.$render(),
+        this.$type(this._returns),
         ts.factory.createBlock(this.$do(), true),
       ) as any;
     }
@@ -110,7 +114,7 @@ class ImplFuncTsDsl<M extends FuncMode = 'arrow'> extends TsDsl<
       [...this.modifiers.list()],
       this.$generics(),
       this.$params(),
-      this._returns.$render(),
+      this.$type(this._returns),
       undefined,
       exprBody,
     ) as any;
diff --git a/packages/openapi-ts/src/ts-dsl/index.ts b/packages/openapi-ts/src/ts-dsl/index.ts
index 40ff9137f..473c5d774 100644
--- a/packages/openapi-ts/src/ts-dsl/index.ts
+++ b/packages/openapi-ts/src/ts-dsl/index.ts
@@ -23,30 +23,54 @@ import { ReturnTsDsl } from './return';
 import { SetterTsDsl } from './setter';
 import { TemplateTsDsl } from './template';
 import { ThrowTsDsl } from './throw';
-import { TypeTsDsl } from './type';
+import { TypeAttrTsDsl } from './type/attr';
+import { TypeExprTsDsl } from './type/expr';
+import { TypeLiteralTsDsl } from './type/literal';
+import { TypeObjectTsDsl } from './type/object';
 import { VarTsDsl } from './var';
 
 const base = {
+  /** Creates a property access expression (e.g. `obj.foo`). */
   attr: (...args: ConstructorParameters<typeof AttrTsDsl>) =>
     new AttrTsDsl(...args),
+
+  /** Creates an await expression (e.g. `await promise`). */
   await: (...args: ConstructorParameters<typeof AwaitTsDsl>) =>
     new AwaitTsDsl(...args),
+
+  /** Creates a binary expression (e.g. `a + b`). */
   binary: (...args: ConstructorParameters<typeof BinaryTsDsl>) =>
     new BinaryTsDsl(...args),
+
+  /** Creates a function or method call expression (e.g. `fn(arg)`). */
   call: (...args: ConstructorParameters<typeof CallTsDsl>) =>
     new CallTsDsl(...args),
+
+  /** Creates a class declaration or expression. */
   class: (...args: ConstructorParameters<typeof ClassTsDsl>) =>
     new ClassTsDsl(...args),
+
+  /** Creates a constant variable declaration (`const`). */
   const: (...args: ConstructorParameters<typeof VarTsDsl>) =>
     new VarTsDsl(...args).const(),
+
+  /** Creates a decorator expression (e.g. `@decorator`). */
   decorator: (...args: ConstructorParameters<typeof DecoratorTsDsl>) =>
     new DecoratorTsDsl(...args),
+
+  /** Creates a describe block (used for tests or descriptions). */
   describe: (...args: ConstructorParameters<typeof DescribeTsDsl>) =>
     new DescribeTsDsl(...args),
+
+  /** Creates a general expression node. */
   expr: (...args: ConstructorParameters<typeof ExprTsDsl>) =>
     new ExprTsDsl(...args),
+
+  /** Creates a field declaration in a class or object. */
   field: (...args: ConstructorParameters<typeof FieldTsDsl>) =>
     new FieldTsDsl(...args),
+
+  /** Creates a function expression or declaration. */
   func: ((nameOrFn?: any, fn?: any) => {
     if (nameOrFn === undefined) return new FuncTsDsl();
     if (typeof nameOrFn !== 'string') return new FuncTsDsl(nameOrFn);
@@ -58,42 +82,99 @@ const base = {
     (name: string): FuncTsDsl<'decl'>;
     (name: string, fn: (f: FuncTsDsl<'decl'>) => void): FuncTsDsl<'decl'>;
   },
+
+  /** Creates a getter method declaration. */
   getter: (...args: ConstructorParameters<typeof GetterTsDsl>) =>
     new GetterTsDsl(...args),
+
+  /** Creates an if statement. */
   if: (...args: ConstructorParameters<typeof IfTsDsl>) => new IfTsDsl(...args),
+
+  /** Creates an initialization block or statement. */
   init: (...args: ConstructorParameters<typeof InitTsDsl>) =>
     new InitTsDsl(...args),
+
+  /** Creates a let variable declaration (`let`). */
   let: (...args: ConstructorParameters<typeof VarTsDsl>) =>
     new VarTsDsl(...args).let(),
+
+  /** Creates a literal value (e.g. string, number, boolean). */
   literal: (...args: ConstructorParameters<typeof LiteralTsDsl>) =>
     new LiteralTsDsl(...args),
+
+  /** Creates a method declaration inside a class or object. */
   method: (...args: ConstructorParameters<typeof MethodTsDsl>) =>
     new MethodTsDsl(...args),
+
+  /** Creates a new expression (e.g. `new ClassName()`). */
   new: (...args: ConstructorParameters<typeof NewTsDsl>) =>
     new NewTsDsl(...args),
+
+  /** Creates a newline (for formatting purposes). */
   newline: (...args: ConstructorParameters<typeof NewlineTsDsl>) =>
     new NewlineTsDsl(...args),
+
+  /** Creates a logical NOT expression (e.g. `!expr`). */
   not: (...args: ConstructorParameters<typeof NotTsDsl>) =>
     new NotTsDsl(...args),
+
+  /** Creates an object literal expression. */
   object: (...args: ConstructorParameters<typeof ObjectTsDsl>) =>
     new ObjectTsDsl(...args),
+
+  /** Creates a parameter declaration for functions or methods. */
   param: (...args: ConstructorParameters<typeof ParamTsDsl>) =>
     new ParamTsDsl(...args),
+
+  /** Creates a pattern for destructuring or matching. */
   pattern: (...args: ConstructorParameters<typeof PatternTsDsl>) =>
     new PatternTsDsl(...args),
+
+  /** Creates a return statement. */
   return: (...args: ConstructorParameters<typeof ReturnTsDsl>) =>
     new ReturnTsDsl(...args),
+
+  /** Creates a setter method declaration. */
   setter: (...args: ConstructorParameters<typeof SetterTsDsl>) =>
     new SetterTsDsl(...args),
+
+  /** Creates a template literal expression. */
   template: (...args: ConstructorParameters<typeof TemplateTsDsl>) =>
     new TemplateTsDsl(...args),
+
+  /** Creates a throw statement. */
   throw: (...args: ConstructorParameters<typeof ThrowTsDsl>) =>
     new ThrowTsDsl(...args),
-  type: TypeTsDsl,
+
+  /** Creates a basic type reference or type expression (e.g. Foo or Foo<T>). */
+  type: Object.assign(
+    (...args: ConstructorParameters<typeof TypeExprTsDsl>) =>
+      new TypeExprTsDsl(...args),
+    {
+      /** Creates a qualified type reference (e.g. Foo.Bar). */
+      attr: (...args: ConstructorParameters<typeof TypeAttrTsDsl>) =>
+        new TypeAttrTsDsl(...args),
+
+      /** Creates a basic type reference or type expression (e.g. Foo or Foo<T>). */
+      expr: (...args: ConstructorParameters<typeof TypeExprTsDsl>) =>
+        new TypeExprTsDsl(...args),
+
+      /** Creates a literal type node (e.g. 'foo', 42, or true). */
+      literal: (...args: ConstructorParameters<typeof TypeLiteralTsDsl>) =>
+        new TypeLiteralTsDsl(...args),
+
+      /** Creates a type literal node (e.g. { foo: string }). */
+      object: (...args: ConstructorParameters<typeof TypeObjectTsDsl>) =>
+        new TypeObjectTsDsl(...args),
+    },
+  ),
+
+  /** Creates a variable declaration (var). */
   var: (...args: ConstructorParameters<typeof VarTsDsl>) =>
     new VarTsDsl(...args),
 };
 
+/** Creates a general expression node. */
 export const $ = Object.assign(
   (...args: ConstructorParameters<typeof ExprTsDsl>) => new ExprTsDsl(...args),
   base,
diff --git a/packages/openapi-ts/src/ts-dsl/method.ts b/packages/openapi-ts/src/ts-dsl/method.ts
index a0dc238d0..c3ef046b7 100644
--- a/packages/openapi-ts/src/ts-dsl/method.ts
+++ b/packages/openapi-ts/src/ts-dsl/method.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import ts from 'typescript';
 
-import { TsDsl } from './base';
+import { TsDsl, TypeTsDsl } from './base';
 import { mixin } from './mixins/apply';
 import { DecoratorMixin } from './mixins/decorator';
 import { DescribeMixin } from './mixins/describe';
@@ -18,15 +18,12 @@ import {
 } from './mixins/modifiers';
 import { OptionalMixin } from './mixins/optional';
 import { ParamMixin } from './mixins/param';
-import { createTypeAccessor, type TypeAccessor } from './mixins/type';
+import { TypeExprTsDsl } from './type/expr';
 
 export class MethodTsDsl extends TsDsl<ts.MethodDeclaration> {
   private modifiers = createModifierAccessor(this);
   private name: string;
-  private _returns: TypeAccessor<MethodTsDsl> = createTypeAccessor(this);
-
-  /** Sets the return type. */
-  returns: TypeAccessor<MethodTsDsl>['fn'] = this._returns.fn;
+  private _returns?: TypeTsDsl;
 
   constructor(name: string, fn?: (m: MethodTsDsl) => void) {
     super();
@@ -34,16 +31,22 @@ export class MethodTsDsl extends TsDsl<ts.MethodDeclaration> {
     fn?.(this);
   }
 
+  /** Sets the return type. */
+  returns(type: string | TypeTsDsl): this {
+    this._returns = type instanceof TypeTsDsl ? type : new TypeExprTsDsl(type);
+    return this;
+  }
+
   /** Builds the `MethodDeclaration` node. */
   $render(): ts.MethodDeclaration {
     return ts.factory.createMethodDeclaration(
       [...this.$decorators(), ...this.modifiers.list()],
       undefined,
-      ts.factory.createIdentifier(this.name),
+      this.$expr(this.name),
       this.questionToken,
       this.$generics(),
       this.$params(),
-      this._returns.$render(),
+      this.$type(this._returns),
       ts.factory.createBlock(this.$do(), true),
     );
   }
diff --git a/packages/openapi-ts/src/ts-dsl/mixins/generics.ts b/packages/openapi-ts/src/ts-dsl/mixins/generics.ts
index 34f814b9d..24e4f938c 100644
--- a/packages/openapi-ts/src/ts-dsl/mixins/generics.ts
+++ b/packages/openapi-ts/src/ts-dsl/mixins/generics.ts
@@ -1,34 +1,35 @@
 import ts from 'typescript';
 
-import { type MaybeTsDsl, TsDsl } from '../base';
-import { TypeParamTsDsl } from '../type';
+import type { MaybeTsDsl, TypeOfTsDsl } from '../base';
+import { TsDsl } from '../base';
+import { TypeParamTsDsl } from '../type/param';
 
 export class GenericsMixin extends TsDsl {
-  protected _generics?: Array<string | MaybeTsDsl<ts.TypeParameterDeclaration>>;
+  protected _generics?: Array<string | MaybeTsDsl<TypeOfTsDsl<TypeParamTsDsl>>>;
 
   /** Adds a single generic type argument (e.g. `T` in `Array<T>`). */
-  generic(name: string, fn?: (t: TypeParamTsDsl) => void): this {
-    const g = new TypeParamTsDsl(name, fn);
+  generic(...args: ConstructorParameters<typeof TypeParamTsDsl>): this {
+    const g = new TypeParamTsDsl(...args);
     (this._generics ??= []).push(g);
     return this;
   }
 
   /** Adds generic type arguments (e.g. `Map<string, T>`). */
   generics(
-    ...args: ReadonlyArray<string | MaybeTsDsl<ts.TypeParameterDeclaration>>
+    ...args: ReadonlyArray<string | MaybeTsDsl<TypeOfTsDsl<TypeParamTsDsl>>>
   ): this {
     this._generics = [...args];
     return this;
   }
 
   protected $generics():
-    | ReadonlyArray<ts.TypeParameterDeclaration>
+    | ReadonlyArray<TypeOfTsDsl<TypeParamTsDsl>>
     | undefined {
     return this._generics?.map((g) => {
       if (typeof g === 'string') {
         return ts.factory.createTypeParameterDeclaration(
           undefined,
-          ts.factory.createIdentifier(g),
+          this.$expr(g),
           undefined,
           undefined,
         );
diff --git a/packages/openapi-ts/src/ts-dsl/mixins/type.ts b/packages/openapi-ts/src/ts-dsl/mixins/type.ts
deleted file mode 100644
index 5e837b1b3..000000000
--- a/packages/openapi-ts/src/ts-dsl/mixins/type.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import type ts from 'typescript';
-
-import type { TsDsl } from '../base';
-import type { TypeInput } from '../type';
-import { TypeTsDsl } from '../type';
-
-export interface TypeAccessor<Parent extends TsDsl> {
-  $render(): ts.TypeNode | undefined;
-  fn(): ReturnType<typeof TypeTsDsl>;
-  fn(type: TypeInput): Parent;
-}
-
-/** Provides `.type()`-like access with internal state management. */
-export function createTypeAccessor<Parent extends TsDsl>(
-  parent: Parent,
-): TypeAccessor<Parent> {
-  const $type = parent['$type'].bind(parent);
-
-  let _type: ReturnType<typeof TypeTsDsl> | undefined;
-  let input: TypeInput | undefined;
-
-  function fn(): ReturnType<typeof TypeTsDsl>;
-  function fn(type: TypeInput): Parent;
-  function fn(type?: TypeInput): ReturnType<typeof TypeTsDsl> | Parent {
-    if (type === undefined) {
-      // @ts-expect-error --- overload resolution
-      if (!_type) _type = TypeTsDsl();
-      return _type;
-    }
-    input = type;
-    return parent;
-  }
-
-  function $render(): ts.TypeNode | undefined {
-    return _type?.$render() ?? $type(input);
-  }
-
-  return {
-    $render,
-    fn,
-  };
-}
diff --git a/packages/openapi-ts/src/ts-dsl/param.ts b/packages/openapi-ts/src/ts-dsl/param.ts
index 466270498..56bbd5bc4 100644
--- a/packages/openapi-ts/src/ts-dsl/param.ts
+++ b/packages/openapi-ts/src/ts-dsl/param.ts
@@ -1,20 +1,17 @@
 /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import ts from 'typescript';
 
-import { TsDsl } from './base';
+import { TsDsl, TypeTsDsl } from './base';
 import { mixin } from './mixins/apply';
 import { DecoratorMixin } from './mixins/decorator';
 import { OptionalMixin } from './mixins/optional';
 import { PatternMixin } from './mixins/pattern';
-import { createTypeAccessor, type TypeAccessor } from './mixins/type';
 import { ValueMixin } from './mixins/value';
+import { TypeExprTsDsl } from './type/expr';
 
 export class ParamTsDsl extends TsDsl<ts.ParameterDeclaration> {
   private name?: string;
-  private _type: TypeAccessor<ParamTsDsl> = createTypeAccessor(this);
-
-  /** Sets the parameter's type. */
-  type: TypeAccessor<ParamTsDsl>['fn'] = this._type.fn;
+  private _type?: TypeTsDsl;
 
   constructor(
     name: string | ((p: ParamTsDsl) => void),
@@ -29,6 +26,12 @@ export class ParamTsDsl extends TsDsl<ts.ParameterDeclaration> {
     }
   }
 
+  /** Sets the parameter type. */
+  type(type: string | TypeTsDsl): this {
+    this._type = type instanceof TypeTsDsl ? type : new TypeExprTsDsl(type);
+    return this;
+  }
+
   $render(): ts.ParameterDeclaration {
     const name = this.$pattern() ?? this.name;
     if (!name)
@@ -40,7 +43,7 @@ export class ParamTsDsl extends TsDsl<ts.ParameterDeclaration> {
       undefined,
       name,
       this.questionToken,
-      this._type.$render(),
+      this.$type(this._type),
       this.$value(),
     );
   }
diff --git a/packages/openapi-ts/src/ts-dsl/type.ts b/packages/openapi-ts/src/ts-dsl/type.ts
deleted file mode 100644
index a0ada32f5..000000000
--- a/packages/openapi-ts/src/ts-dsl/type.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-/* eslint-disable @typescript-eslint/no-empty-object-type, @typescript-eslint/no-unsafe-declaration-merging */
-import ts from 'typescript';
-
-import type { MaybeTsDsl, WithString } from './base';
-import { TsDsl } from './base';
-import { LiteralTsDsl } from './literal';
-import { mixin } from './mixins/apply';
-import { GenericsMixin } from './mixins/generics';
-import { OptionalMixin } from './mixins/optional';
-import { TypeExprTsDsl } from './type/expr';
-
-export type TypeInput = WithString<boolean | MaybeTsDsl<ts.TypeNode>>;
-
-export class TypeLiteralTsDsl extends TsDsl<ts.LiteralTypeNode> {
-  private literal: LiteralTsDsl;
-
-  constructor(value: string | number | boolean) {
-    super();
-    this.literal = new LiteralTsDsl(value);
-  }
-
-  $render(): ts.LiteralTypeNode {
-    const expr = this.$node(this.literal);
-    return ts.factory.createLiteralTypeNode(expr);
-  }
-}
-
-export class TypeObjectTsDsl extends TsDsl<ts.TypeLiteralNode> {
-  private props: Array<TypePropTsDsl> = [];
-
-  constructor(fn?: (o: TypeObjectTsDsl) => void) {
-    super();
-    fn?.(this);
-  }
-
-  /** Adds a property signature (returns property builder). */
-  prop(name: string, fn: (p: TypePropTsDsl) => void): this {
-    const propTsDsl = new TypePropTsDsl(name, fn);
-    this.props.push(propTsDsl);
-    return this;
-  }
-
-  $render(): ts.TypeLiteralNode {
-    return ts.factory.createTypeLiteralNode(this.$node(this.props));
-  }
-}
-
-export class TypeParamTsDsl extends TsDsl<ts.TypeParameterDeclaration> {
-  protected base?: ts.EntityName;
-  protected constraint?: TypeInput;
-  protected defaultValue?: TypeInput;
-
-  constructor(
-    name?: WithString<ts.Identifier>,
-    fn?: (base: TypeParamTsDsl) => void,
-  ) {
-    super();
-    if (name) this.base = this.$expr(name);
-    fn?.(this);
-  }
-
-  default(value: TypeInput): this {
-    this.defaultValue = value;
-    return this;
-  }
-
-  extends(constraint: TypeInput): this {
-    this.constraint = constraint;
-    return this;
-  }
-
-  $render(): ts.TypeParameterDeclaration {
-    if (!this.base) throw new Error('Missing type name');
-    return ts.factory.createTypeParameterDeclaration(
-      undefined,
-      this.base as ts.Identifier,
-      this.$type(this.constraint),
-      this.$type(this.defaultValue),
-    );
-  }
-}
-
-export interface TypeParamTsDsl extends GenericsMixin {}
-mixin(TypeParamTsDsl, GenericsMixin);
-
-export class TypePropTsDsl extends TsDsl<ts.TypeElement> {
-  private name: string;
-  private typeInput?: TypeInput;
-
-  constructor(name: string, fn: (p: TypePropTsDsl) => void) {
-    super();
-    this.name = name;
-    fn(this);
-  }
-
-  /** Sets the property type. */
-  type(type: TypeInput): this {
-    this.typeInput = type;
-    return this;
-  }
-
-  /** Builds and returns the property signature. */
-  $render(): ts.TypeElement {
-    if (!this.typeInput) {
-      throw new Error(`Type not specified for property '${this.name}'`);
-    }
-    const typeNode =
-      typeof this.typeInput === 'string'
-        ? ts.factory.createTypeReferenceNode(this.typeInput)
-        : (this.typeInput as ts.TypeNode);
-    return ts.factory.createPropertySignature(
-      undefined,
-      ts.factory.createIdentifier(this.name),
-      this.questionToken,
-      typeNode,
-    );
-  }
-}
-
-export interface TypePropTsDsl extends OptionalMixin {}
-mixin(TypePropTsDsl, OptionalMixin);
-
-const base = {
-  literal: (...args: ConstructorParameters<typeof TypeLiteralTsDsl>) =>
-    new TypeLiteralTsDsl(...args),
-  object: (...args: ConstructorParameters<typeof TypeObjectTsDsl>) =>
-    new TypeObjectTsDsl(...args),
-  param: (...args: ConstructorParameters<typeof TypeParamTsDsl>) =>
-    new TypeParamTsDsl(...args),
-  ref: (...args: ConstructorParameters<typeof TypeExprTsDsl>) =>
-    new TypeExprTsDsl(...args),
-};
-
-/** Creates a general expression node. */
-export const TypeTsDsl = Object.assign(
-  (...args: ConstructorParameters<typeof TypeExprTsDsl>) =>
-    new TypeExprTsDsl(...args),
-  base,
-);
diff --git a/packages/openapi-ts/src/ts-dsl/type/attr.ts b/packages/openapi-ts/src/ts-dsl/type/attr.ts
new file mode 100644
index 000000000..1a3bcaad4
--- /dev/null
+++ b/packages/openapi-ts/src/ts-dsl/type/attr.ts
@@ -0,0 +1,45 @@
+import ts from 'typescript';
+
+import type { MaybeTsDsl, WithString } from '../base';
+import { TsDsl } from '../base';
+
+export class TypeAttrTsDsl extends TsDsl<ts.QualifiedName> {
+  private _base?: WithString<MaybeTsDsl<ts.EntityName>>;
+  private right: WithString<ts.Identifier>;
+
+  constructor(
+    base: WithString<MaybeTsDsl<ts.EntityName>>,
+    right: WithString<ts.Identifier>,
+  );
+  constructor(right: WithString<ts.Identifier>);
+  constructor(
+    baseOrRight: WithString<MaybeTsDsl<ts.EntityName>>,
+    maybeRight?: WithString<ts.Identifier>,
+  ) {
+    super();
+    if (maybeRight) {
+      this.base(baseOrRight);
+      this.right = maybeRight;
+    } else {
+      this.base(undefined);
+      this.right = baseOrRight as WithString<ts.Identifier>;
+    }
+  }
+
+  base(base?: WithString<MaybeTsDsl<ts.EntityName>>): this {
+    this._base = base;
+    return this;
+  }
+
+  $render(): ts.QualifiedName {
+    if (!this._base) {
+      throw new Error('TypeAttrTsDsl: missing base for qualified name');
+    }
+    const left = this.$node(this._base);
+    if (!ts.isEntityName(left)) {
+      throw new Error('TypeAttrTsDsl: base must be an EntityName');
+    }
+    const right = this.$expr(this.right);
+    return ts.factory.createQualifiedName(left, right);
+  }
+}
diff --git a/packages/openapi-ts/src/ts-dsl/type/expr.ts b/packages/openapi-ts/src/ts-dsl/type/expr.ts
index 83eb34c80..d55ab48b8 100644
--- a/packages/openapi-ts/src/ts-dsl/type/expr.ts
+++ b/packages/openapi-ts/src/ts-dsl/type/expr.ts
@@ -1,32 +1,48 @@
 /* eslint-disable @typescript-eslint/no-empty-object-type, @typescript-eslint/no-unsafe-declaration-merging */
 import ts from 'typescript';
 
-import { TsDsl, type WithString } from '../base';
+import type { WithString } from '../base';
+import { TypeTsDsl } from '../base';
 import { mixin } from '../mixins/apply';
 import { GenericsMixin } from '../mixins/generics';
-import { TypeObjectTsDsl } from '../type';
+import { TypeAttrTsDsl } from './attr';
 
-export class TypeExprTsDsl extends TsDsl<ts.TypeNode> {
-  private _exprInput: WithString<ts.Identifier>;
-  private _object?: TypeObjectTsDsl;
+export class TypeExprTsDsl extends TypeTsDsl<ts.TypeReferenceNode> {
+  private _exprInput?: WithString<ts.Identifier> | TypeAttrTsDsl;
 
-  constructor(id: WithString<ts.Identifier>) {
+  constructor();
+  constructor(fn: (t: TypeExprTsDsl) => void);
+  constructor(name: string);
+  constructor(name: string, fn?: (t: TypeExprTsDsl) => void);
+  constructor(
+    nameOrFn?: string | ((t: TypeExprTsDsl) => void),
+    fn?: (t: TypeExprTsDsl) => void,
+  ) {
     super();
-    this._exprInput = id;
+    if (typeof nameOrFn === 'string') {
+      this._exprInput = nameOrFn;
+      fn?.(this);
+    } else {
+      nameOrFn?.(this);
+    }
   }
 
-  /** Starts an object type literal (e.g. `{ foo: string }`). */
-  object(fn?: (o: TypeObjectTsDsl) => void): this {
-    this._object = new TypeObjectTsDsl(fn);
+  /** Accesses a nested type (e.g. `Foo.Bar`). */
+  attr(right: WithString<ts.Identifier> | TypeAttrTsDsl): this {
+    this._exprInput =
+      right instanceof TypeAttrTsDsl
+        ? right.base(this._exprInput)
+        : new TypeAttrTsDsl(this._exprInput!, right);
     return this;
   }
 
-  $render(): ts.TypeNode {
-    if (this._object) return this.$node(this._object);
+  $render(): ts.TypeReferenceNode {
+    if (!this._exprInput)
+      throw new Error('TypeExpr must have either an expression or an object');
     const types = this._generics?.map((arg) => this.$type(arg));
     return ts.factory.createTypeReferenceNode(
-      this.$expr(this._exprInput),
-      // @ts-expect-error --- generics are not officially supported on type references yet
+      // @ts-expect-error --- need to fix types
+      this.$type(this._exprInput),
       types,
     );
   }
diff --git a/packages/openapi-ts/src/ts-dsl/type/literal.ts b/packages/openapi-ts/src/ts-dsl/type/literal.ts
new file mode 100644
index 000000000..a6f706241
--- /dev/null
+++ b/packages/openapi-ts/src/ts-dsl/type/literal.ts
@@ -0,0 +1,19 @@
+import ts from 'typescript';
+
+import { TypeTsDsl } from '../base';
+import { LiteralTsDsl } from '../literal';
+
+export class TypeLiteralTsDsl extends TypeTsDsl<ts.LiteralTypeNode> {
+  private value: string | number | boolean;
+
+  constructor(value: string | number | boolean) {
+    super();
+    this.value = value;
+  }
+
+  $render(): ts.LiteralTypeNode {
+    return ts.factory.createLiteralTypeNode(
+      this.$node(new LiteralTsDsl(this.value)),
+    );
+  }
+}
diff --git a/packages/openapi-ts/src/ts-dsl/type/object.ts b/packages/openapi-ts/src/ts-dsl/type/object.ts
new file mode 100644
index 000000000..cb9a69af4
--- /dev/null
+++ b/packages/openapi-ts/src/ts-dsl/type/object.ts
@@ -0,0 +1,69 @@
+/* eslint-disable @typescript-eslint/no-empty-object-type, @typescript-eslint/no-unsafe-declaration-merging */
+import ts from 'typescript';
+
+import type { WithString } from '../base';
+import { TypeTsDsl } from '../base';
+import { mixin } from '../mixins/apply';
+import { OptionalMixin } from '../mixins/optional';
+
+export class TypeObjectTsDsl extends TypeTsDsl<ts.TypeNode> {
+  private props: Array<TypePropTsDsl> = [];
+  private merges: Array<WithString<ts.Identifier>> = [];
+
+  /** Adds a property signature (returns property builder). */
+  prop(name: string, fn: (p: TypePropTsDsl) => void): this {
+    const propTsDsl = new TypePropTsDsl(name, fn);
+    this.props.push(propTsDsl);
+    return this;
+  }
+
+  /** Adds a type to merge (intersect) with the object literal. */
+  merge(type: WithString<ts.Identifier>): this {
+    this.merges.push(type);
+    return this;
+  }
+
+  $render(): ts.TypeNode {
+    const literal = ts.factory.createTypeLiteralNode(this.$node(this.props));
+    if (this.merges.length > 0) {
+      return ts.factory.createIntersectionTypeNode([
+        ...this.merges.map((m) => this.$type(m)),
+        literal,
+      ]);
+    }
+    return literal;
+  }
+}
+
+class TypePropTsDsl extends TypeTsDsl<ts.TypeElement> {
+  private name: string;
+  private typeInput?: WithString<ts.TypeNode>;
+
+  constructor(name: string, fn: (p: TypePropTsDsl) => void) {
+    super();
+    this.name = name;
+    fn(this);
+  }
+
+  /** Sets the property type. */
+  type(type: WithString<ts.TypeNode>): this {
+    this.typeInput = type;
+    return this;
+  }
+
+  /** Builds and returns the property signature. */
+  $render(): ts.TypeElement {
+    if (!this.typeInput) {
+      throw new Error(`Type not specified for property '${this.name}'`);
+    }
+    return ts.factory.createPropertySignature(
+      undefined,
+      this.$expr(this.name),
+      this.questionToken,
+      this.$type(this.typeInput),
+    );
+  }
+}
+
+interface TypePropTsDsl extends OptionalMixin {}
+mixin(TypePropTsDsl, OptionalMixin);
diff --git a/packages/openapi-ts/src/ts-dsl/type/param.ts b/packages/openapi-ts/src/ts-dsl/type/param.ts
new file mode 100644
index 000000000..7c02ffe8c
--- /dev/null
+++ b/packages/openapi-ts/src/ts-dsl/type/param.ts
@@ -0,0 +1,39 @@
+import ts from 'typescript';
+
+import type { MaybeTsDsl, WithString } from '../base';
+import { TypeTsDsl } from '../base';
+
+export class TypeParamTsDsl extends TypeTsDsl<ts.TypeParameterDeclaration> {
+  protected name?: WithString<ts.Identifier>;
+  protected constraint?: WithString<MaybeTsDsl<TypeTsDsl>> | boolean;
+  protected defaultValue?: WithString<MaybeTsDsl<TypeTsDsl>> | boolean;
+
+  constructor(
+    name?: WithString<ts.Identifier>,
+    fn?: (name: TypeParamTsDsl) => void,
+  ) {
+    super();
+    this.name = name;
+    fn?.(this);
+  }
+
+  default(value: WithString<MaybeTsDsl<TypeTsDsl>> | boolean): this {
+    this.defaultValue = value;
+    return this;
+  }
+
+  extends(constraint: WithString<MaybeTsDsl<TypeTsDsl>> | boolean): this {
+    this.constraint = constraint;
+    return this;
+  }
+
+  $render(): ts.TypeParameterDeclaration {
+    if (!this.name) throw new Error('Missing type name');
+    return ts.factory.createTypeParameterDeclaration(
+      undefined,
+      this.$expr(this.name),
+      this.$type(this.constraint),
+      this.$type(this.defaultValue),
+    );
+  }
+}
diff --git a/packages/openapi-ts/src/ts-dsl/var.ts b/packages/openapi-ts/src/ts-dsl/var.ts
index 97db066e0..515633bfa 100644
--- a/packages/openapi-ts/src/ts-dsl/var.ts
+++ b/packages/openapi-ts/src/ts-dsl/var.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import ts from 'typescript';
 
-import { TsDsl } from './base';
+import { TsDsl, TypeTsDsl } from './base';
 import { mixin } from './mixins/apply';
 import { DescribeMixin } from './mixins/describe';
 import {
@@ -11,11 +11,13 @@ import {
 } from './mixins/modifiers';
 import { PatternMixin } from './mixins/pattern';
 import { ValueMixin } from './mixins/value';
+import { TypeExprTsDsl } from './type/expr';
 
 export class VarTsDsl extends TsDsl<ts.VariableStatement> {
   private kind: ts.NodeFlags = ts.NodeFlags.None;
   private modifiers = createModifierAccessor(this);
   private name?: string;
+  private _type?: TypeTsDsl;
 
   constructor(name?: string) {
     super();
@@ -32,6 +34,12 @@ export class VarTsDsl extends TsDsl<ts.VariableStatement> {
     return this;
   }
 
+  /** Sets the variable type. */
+  type(type: string | TypeTsDsl): this {
+    this._type = type instanceof TypeTsDsl ? type : new TypeExprTsDsl(type);
+    return this;
+  }
+
   var(): this {
     this.kind = ts.NodeFlags.None;
     return this;
@@ -48,7 +56,7 @@ export class VarTsDsl extends TsDsl<ts.VariableStatement> {
           ts.factory.createVariableDeclaration(
             name,
             undefined,
-            undefined,
+            this.$type(this._type),
             this.$value(),
           ),
         ],