hey-api · mrlubos · Nov 8, 2025 · Nov 8, 2025
diff --git a/.changeset/chilled-wolves-pump.md b/.changeset/chilled-wolves-pump.md
@@ -2,4 +2,4 @@
 "@hey-api/openapi-ts": patch
 ---
 
-parser: merge `default` keyword with `$ref` in OpenAPI 3.1
+**parser**: merge `default` keyword with `$ref` in OpenAPI 3.1
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
@@ -392,13 +392,13 @@ export const generateClassSdk = ({
               g
                 .$if(!plugin.config.instance, (g) => g.public().static())
                 .do(
-                  plugin.config.instance
-                    ? $.return(
-                        $.new(refChildClass.placeholder).args(
+                  $.return(
+                    plugin.config.instance
+                      ? $.new(refChildClass.placeholder).args(
                           $.object().prop('client', $('this').attr('client')),
-                        ),
-                      )
-                    : $.return(refChildClass.placeholder),
+                        )
+                      : refChildClass.placeholder,
+                  ),
                 ),
             );
 

diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/queryOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/queryOptions.ts
@@ -131,7 +131,7 @@ export const createQueryOptions = ({
         .param(optionsParamName, (p) =>
           p.optional(!isRequiredOptions).type(typeData),
         )
-        .do($.return($(symbolQueryOptions.placeholder).call(queryOptionsObj))),
+        .do($(symbolQueryOptions.placeholder).call(queryOptionsObj).return()),
     );
   plugin.setSymbolValue(symbolQueryOptionsFn, statement);
 };
diff --git a/packages/openapi-ts/src/plugins/arktype/v2/api.ts b/packages/openapi-ts/src/plugins/arktype/v2/api.ts
@@ -35,12 +35,11 @@ export const createRequestValidatorV2 = ({
     .async()
     .param(dataParameterName)
     .do(
-      $.return(
-        $(symbol.placeholder)
-          .attr('parseAsync')
-          .call($(dataParameterName))
-          .await(),
-      ),
+      $(symbol.placeholder)
+        .attr('parseAsync')
+        .call(dataParameterName)
+        .await()
+        .return(),
     );
 };
 
@@ -62,11 +61,10 @@ export const createResponseValidatorV2 = ({
     .async()
     .param(dataParameterName)
     .do(
-      $.return(
-        $(symbol.placeholder)
-          .attr('parseAsync')
-          .call($(dataParameterName))
-          .await(),
-      ),
+      $(symbol.placeholder)
+        .attr('parseAsync')
+        .call(dataParameterName)
+        .await()
+        .return(),
     );
 };
diff --git a/packages/openapi-ts/src/plugins/swr/v2/useSwr.ts b/packages/openapi-ts/src/plugins/swr/v2/useSwr.ts
@@ -56,14 +56,14 @@ export const createUseSwr = ({
     )
     .assign(
       $.func().do(
-        $.return(
-          $(symbolUseSwr.placeholder).call(
+        $(symbolUseSwr.placeholder)
+          .call(
             $.literal(operation.path),
             $.func()
               .async()
               .do(...statements),
-          ),
-        ),
+          )
+          .return(),
       ),
     );
   plugin.setSymbolValue(symbolUseQueryFn, statement);

diff --git a/packages/openapi-ts/src/plugins/valibot/v1/api.ts b/packages/openapi-ts/src/plugins/valibot/v1/api.ts
@@ -25,12 +25,11 @@ export const createRequestValidatorV1 = ({
     .async()
     .param(dataParameterName)
     .do(
-      $.return(
-        $(v.placeholder)
-          .attr(identifiers.async.parseAsync)
-          .call($(symbol.placeholder), $(dataParameterName))
-          .await(),
-      ),
+      $(v.placeholder)
+        .attr(identifiers.async.parseAsync)
+        .call(symbol.placeholder, dataParameterName)
+        .await()
+        .return(),
     );
 };
 
@@ -56,11 +55,10 @@ export const createResponseValidatorV1 = ({
     .async()
     .param(dataParameterName)
     .do(
-      $.return(
-        $(v.placeholder)
-          .attr(identifiers.async.parseAsync)
-          .call($(symbol.placeholder), $(dataParameterName))
-          .await(),
-      ),
+      $(v.placeholder)
+        .attr(identifiers.async.parseAsync)
+        .call(symbol.placeholder, dataParameterName)
+        .await()
+        .return(),
     );
 };
diff --git a/packages/openapi-ts/src/plugins/zod/mini/api.ts b/packages/openapi-ts/src/plugins/zod/mini/api.ts
@@ -22,12 +22,11 @@ export const createRequestValidatorMini = ({
     .async()
     .param(dataParameterName)
     .do(
-      $.return(
-        $(symbol.placeholder)
-          .attr(identifiers.parseAsync)
-          .call($(dataParameterName))
-          .await(),
-      ),
+      $(symbol.placeholder)
+        .attr(identifiers.parseAsync)
+        .call(dataParameterName)
+        .await()
+        .return(),
     );
 };
 
@@ -49,11 +48,10 @@ export const createResponseValidatorMini = ({
     .async()
     .param(dataParameterName)
     .do(
-      $.return(
-        $(symbol.placeholder)
-          .attr(identifiers.parseAsync)
-          .call($(dataParameterName))
-          .await(),
-      ),
+      $(symbol.placeholder)
+        .attr(identifiers.parseAsync)
+        .call(dataParameterName)
+        .await()
+        .return(),
     );
 };
diff --git a/packages/openapi-ts/src/plugins/zod/v3/api.ts b/packages/openapi-ts/src/plugins/zod/v3/api.ts
@@ -22,12 +22,11 @@ export const createRequestValidatorV3 = ({
     .async()
     .param(dataParameterName)
     .do(
-      $.return(
-        $(symbol.placeholder)
-          .attr(identifiers.parseAsync)
-          .call($(dataParameterName))
-          .await(),
-      ),
+      $(symbol.placeholder)
+        .attr(identifiers.parseAsync)
+        .call(dataParameterName)
+        .await()
+        .return(),
     );
 };
 
@@ -49,11 +48,10 @@ export const createResponseValidatorV3 = ({
     .async()
     .param(dataParameterName)
     .do(
-      $.return(
-        $(symbol.placeholder)
-          .attr(identifiers.parseAsync)
-          .call($(dataParameterName))
-          .await(),
-      ),
+      $(symbol.placeholder)
+        .attr(identifiers.parseAsync)
+        .call(dataParameterName)
+        .await()
+        .return(),
     );
 };
diff --git a/packages/openapi-ts/src/plugins/zod/v4/api.ts b/packages/openapi-ts/src/plugins/zod/v4/api.ts
@@ -22,12 +22,11 @@ export const createRequestValidatorV4 = ({
     .async()
     .param(dataParameterName)
     .do(
-      $.return(
-        $(symbol.placeholder)
-          .attr(identifiers.parseAsync)
-          .call(dataParameterName)
-          .await(),
-      ),
+      $(symbol.placeholder)
+        .attr(identifiers.parseAsync)
+        .call(dataParameterName)
+        .await()
+        .return(),
     );
 };
 
@@ -49,11 +48,10 @@ export const createResponseValidatorV4 = ({
     .async()
     .param(dataParameterName)
     .do(
-      $.return(
-        $(symbol.placeholder)
-          .attr(identifiers.parseAsync)
-          .call(dataParameterName)
-          .await(),
-      ),
+      $(symbol.placeholder)
+        .attr(identifiers.parseAsync)
+        .call(dataParameterName)
+        .await()
+        .return(),
     );
 };
diff --git a/packages/openapi-ts/src/ts-dsl/attr.ts b/packages/openapi-ts/src/ts-dsl/attr.ts
@@ -3,7 +3,7 @@ import ts from 'typescript';
 
 import type { MaybeTsDsl, WithString } from './base';
 import { TsDsl } from './base';
-import { AccessMixin } from './mixins/access';
+import { AccessMixin, registerLazyAccessAttrFactory } from './mixins/access';
 import { mixin } from './mixins/apply';
 import { AssignmentMixin } from './mixins/assignment';
 import { OperatorMixin } from './mixins/operator';
@@ -59,3 +59,5 @@ export interface AttrTsDsl
     OperatorMixin,
     OptionalMixin {}
 mixin(AttrTsDsl, AccessMixin, AssignmentMixin, OperatorMixin, OptionalMixin);
+
+registerLazyAccessAttrFactory((expr, name) => new AttrTsDsl(expr, name));
diff --git a/packages/openapi-ts/src/ts-dsl/await.ts b/packages/openapi-ts/src/ts-dsl/await.ts
@@ -1,18 +1,25 @@
+/* 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 { AccessMixin, registerLazyAccessAwaitFactory } from './mixins/access';
+import { mixin } from './mixins/apply';
 
 export class AwaitTsDsl extends TsDsl<ts.AwaitExpression> {
-  private exprNode: MaybeTsDsl<WithString>;
+  private _awaitExpr: MaybeTsDsl<WithString>;
 
   constructor(expr: MaybeTsDsl<WithString>) {
     super();
-    this.exprNode = expr;
+    this._awaitExpr = expr;
   }
 
   $render(): ts.AwaitExpression {
-    const expr = this.$node(this.exprNode);
-    return ts.factory.createAwaitExpression(expr);
+    return ts.factory.createAwaitExpression(this.$node(this._awaitExpr));
   }
 }
+
+export interface AwaitTsDsl extends AccessMixin {}
+mixin(AwaitTsDsl, AccessMixin);
+
+registerLazyAccessAwaitFactory((expr) => new AwaitTsDsl(expr));
diff --git a/packages/openapi-ts/src/ts-dsl/call.ts b/packages/openapi-ts/src/ts-dsl/call.ts
@@ -1,37 +1,34 @@
-/* eslint-disable @typescript-eslint/no-empty-object-type, @typescript-eslint/no-unsafe-declaration-merging */
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import ts from 'typescript';
 
-import { AwaitTsDsl } from './await';
 import type { MaybeTsDsl, WithString } from './base';
 import { TsDsl } from './base';
+import { AccessMixin, registerLazyAccessCallFactory } from './mixins/access';
 import { mixin } from './mixins/apply';
 import { ArgsMixin } from './mixins/args';
 
 export class CallTsDsl extends TsDsl<ts.CallExpression> {
-  private callee: MaybeTsDsl<WithString>;
+  private _callee: MaybeTsDsl<WithString>;
 
   constructor(
     callee: MaybeTsDsl<WithString>,
     ...args: ReadonlyArray<MaybeTsDsl<WithString>>
   ) {
     super();
-    this.callee = callee;
+    this._callee = callee;
     this.args(...args);
   }
 
-  /** Await the result of the call expression. */
-  await(): AwaitTsDsl {
-    return new AwaitTsDsl(this);
-  }
-
   $render(): ts.CallExpression {
     return ts.factory.createCallExpression(
-      this.$node(this.callee),
+      this.$node(this._callee),
       undefined,
       this.$args(),
     );
   }
 }
 
-export interface CallTsDsl extends ArgsMixin {}
-mixin(CallTsDsl, ArgsMixin);
+export interface CallTsDsl extends AccessMixin, ArgsMixin {}
+mixin(CallTsDsl, AccessMixin, ArgsMixin);
+
+registerLazyAccessCallFactory((expr, args) => new CallTsDsl(expr, ...args));
diff --git a/packages/openapi-ts/src/ts-dsl/expr.ts b/packages/openapi-ts/src/ts-dsl/expr.ts
@@ -8,15 +8,15 @@ import { mixin } from './mixins/apply';
 import { OperatorMixin } from './mixins/operator';
 
 export class ExprTsDsl extends TsDsl<ts.Expression> {
-  private input: MaybeTsDsl<WithString>;
+  private _exprInput: MaybeTsDsl<WithString>;
 
   constructor(id: MaybeTsDsl<WithString>) {
     super();
-    this.input = id;
+    this._exprInput = id;
   }
 
   $render(): ts.Expression {
-    return this.$node(this.input);
+    return this.$node(this._exprInput);
   }
 }