@hey-api/openapi-ts 0.89.0 → 0.89.2

package/dist/{config-CBa-XLy8.d.cts → config-CREHWzRd.d.cts}

@@ -1,6 +1,6 @@
-import { AnalysisContext, File, FromRef, IProject, Language, NameConflictResolver, Node, Project, Ref, Refs, RenderContext, Renderer, Symbol, SymbolIdentifier, SymbolIn, SymbolMeta } from "@hey-api/codegen-core";
+import * as _hey_api_codegen_core0 from "@hey-api/codegen-core";
+import { AnalysisContext, AstContext, File, FromRef, IProject, Language, NameConflictResolver, Node, Project, Ref, Refs, RenderContext, Renderer, Symbol, SymbolIdentifier, SymbolIn, SymbolMeta } from "@hey-api/codegen-core";
 import { RangeOptions, SemVer } from "semver";
-import * as typescript0 from "typescript";
 import ts from "typescript";
 
 //#region src/openApi/shared/types/openapi-spec-extensions.d.ts
@@ -31,12 +31,20 @@ type LazyOrAsync<T> = T | (() => T) | (() => Promise<T>);
 type MaybeArray<T> = T | ReadonlyArray<T>;
 //#endregion
 //#region src/openApi/3.1.x/types/spec.d.ts
+/**
+ * OpenAPI Specification Extensions.
+ *
+ * See {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#specification-extensions Specification Extensions}.
+ */
+interface SpecificationExtensions$2 {
+  [extension: `x-${string}`]: unknown;
+}
 /**
  * This is the root object of the {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#openapi-document OpenAPI document}.
  *
  * This object MAY be extended with {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#specification-extensions Specification Extensions}.
  */
-interface OpenApiV3_1_X {
+interface OpenApiV3_1_X extends SpecificationExtensions$2 {
   /**
    * An element to hold various schemas for the document.
    */
@@ -159,11 +167,11 @@ interface OpenApiV3_1_X {
  *           description: callback successfully processed
  * ```
  */
-interface CallbackObject$1 {
+interface CallbackObject$1 extends SpecificationExtensions$2 {
   /**
    * A Path Item Object, or a reference to one, used to define a callback request and expected responses. A {@link https://github.com/OAI/OpenAPI-Specification/blob/main/examples/v3.0/callback-example.yaml complete example} is available.
    */
-  [expression: string]: PathItemObject$2 | ReferenceObject$1;
+  [expression: string]: PathItemObject$2 | ReferenceObject$1 | unknown;
 }
 /**
  * Holds a set of reusable objects for different aspects of the OAS. All objects defined within the components object will have no effect on the API unless they are explicitly referenced from properties outside the components object.
@@ -254,7 +262,7 @@ interface CallbackObject$1 {
  *             read:pets: read your pets
  * ```
  */
-interface ComponentsObject$1 {
+interface ComponentsObject$1 extends SpecificationExtensions$2 {
   /**
    * An object to hold reusable {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#callback-object Callback Objects}.
    */
@@ -308,7 +316,7 @@ interface ComponentsObject$1 {
  * email: support@example.com
  * ```
  */
-interface ContactObject$2 {
+interface ContactObject$2 extends SpecificationExtensions$2 {
   /**
    * The email address of the contact person/organization. This MUST be in the form of an email address.
    */
@@ -448,7 +456,7 @@ interface ContactObject$2 {
  *
  * will map to `Dog` because of the definition in the `mapping` element.
  */
-interface DiscriminatorObject$1 {
+interface DiscriminatorObject$1 extends SpecificationExtensions$2 {
   /**
    * An object to hold mappings between payload values and schema names or references.
    */
@@ -499,7 +507,7 @@ interface DiscriminatorObject$1 {
  *                 type: integer
  * ```
  */
-interface EncodingObject$1 {
+interface EncodingObject$1 extends SpecificationExtensions$2 {
   /**
    * Determines whether the parameter value SHOULD allow reserved characters, as defined by {@link https://tools.ietf.org/html/rfc3986#section-2.2 RFC3986} `:/?#[]@!$&'()*+,;=` to be included without percent-encoding. The default value is `false`. This property SHALL be ignored if the request body media type is not `application/x-www-form-urlencoded` or `multipart/form-data`. If a value is explicitly defined, then the value of {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#encodingContentType `contentType`} (implicit or explicit) SHALL be ignored.
    */
@@ -587,7 +595,7 @@ interface EncodingObject$1 {
  *             $ref: '#/components/examples/confirmation-success'
  * ```
  */
-interface ExampleObject$2 {
+interface ExampleObject$2 extends SpecificationExtensions$2 {
   /**
    * Long description for the example. {@link https://spec.commonmark.org/ CommonMark syntax} MAY be used for rich text representation.
    */
@@ -616,7 +624,7 @@ interface ExampleObject$2 {
  * url: https://example.com
  * ```
  */
-interface ExternalDocumentationObject$2 {
+interface ExternalDocumentationObject$2 extends SpecificationExtensions$2 {
   /**
    * A description of the target documentation. {@link https://spec.commonmark.org/ CommonMark syntax} MAY be used for rich text representation.
    */
@@ -662,7 +670,7 @@ type HeaderObject$2 = Omit<ParameterObject, 'in' | 'name'>;
  * version: 1.0.1
  * ```
  */
-interface InfoObject {
+interface InfoObject extends SpecificationExtensions$2 {
   /**
    * The contact information for the exposed API.
    */
@@ -703,7 +711,7 @@ interface InfoObject {
  * identifier: Apache-2.0
  * ```
  */
-interface LicenseObject$2 {
+interface LicenseObject$2 extends SpecificationExtensions$2 {
   /**
    * An {@link https://spdx.org/licenses/ SPDX} license expression for the API. The `identifier` field is mutually exclusive of the `url` field.
    */
@@ -864,7 +872,7 @@ interface LicenseObject$2 {
  *
  * Runtime expressions preserve the type of the referenced value. Expressions can be embedded into string values by surrounding the expression with `{}` curly braces.
  */
-interface LinkObject$1 {
+interface LinkObject$1 extends SpecificationExtensions$2 {
   /**
    * A description of the link. {@link https://spec.commonmark.org/ CommonMark syntax} MAY be used for rich text representation.
    */
@@ -923,7 +931,7 @@ interface LinkObject$1 {
  *       $ref: "#/components/examples/frog-example"
  * ```
  */
-interface MediaTypeObject$1 {
+interface MediaTypeObject$1 extends SpecificationExtensions$2 {
   /**
    * A map between a property name and its encoding information. The key, being the property name, MUST exist in the schema as a property. The encoding object SHALL only apply to `requestBody` objects when the media type is `multipart` or `application/x-www-form-urlencoded`.
    */
@@ -964,7 +972,7 @@ interface MediaTypeObject$1 {
  *       read:pets: read your pets
  * ```
  */
-interface OAuthFlowObject$1 {
+interface OAuthFlowObject$1 extends SpecificationExtensions$2 {
   /**
    * **REQUIRED (`"implicit"`, `"authorizationCode"`)**. The authorization URL to be used for this flow. This MUST be in the form of a URL. The OAuth2 standard requires the use of TLS.
    */
@@ -987,7 +995,7 @@ interface OAuthFlowObject$1 {
  *
  * This object MAY be extended with {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#specification-extensions Specification Extensions}.
  */
-interface OAuthFlowsObject$1 {
+interface OAuthFlowsObject$1 extends SpecificationExtensions$2 {
   /**
    * Configuration for the OAuth Authorization Code flow. Previously called `accessCode` in OpenAPI 2.0.
    */
@@ -1054,7 +1062,7 @@ interface OAuthFlowsObject$1 {
  *   - read:pets
  * ```
  */
-interface OperationObject {
+interface OperationObject extends SpecificationExtensions$2 {
   /**
    * A map of possible out-of band callbacks related to the parent operation. The key is a unique identifier for the Callback Object. Each value in the map is a {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#callback-object Callback Object} that describes a request that may be initiated by the API provider and the expected responses.
    */
@@ -1201,7 +1209,7 @@ interface OperationObject {
  *           type: number
  * ```
  */
-interface ParameterObject {
+interface ParameterObject extends SpecificationExtensions$2 {
   /**
    * Sets the ability to pass empty-valued parameters. This is valid only for `query` parameters and allows sending a parameter with an empty value. Default value is `false`. If {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#parameterStyle `style`} is used, and if behavior is `n/a` (cannot be serialized), the value of `allowEmptyValue` SHALL be ignored. Use of this property is NOT RECOMMENDED, as it is likely to be removed in a later revision.
    */
@@ -1296,7 +1304,7 @@ interface ParameterObject {
  *   style: simple
  * ```
  */
-interface PathItemObject$2 {
+interface PathItemObject$2 extends SpecificationExtensions$2 {
   /**
    * Allows for a referenced definition of this path item. The referenced structure MUST be in the form of a {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#path-item-object Path Item Object}. In case a Path Item Object field appears both in the defined object and the referenced object, the behavior is undefined. See the rules for resolving {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#relative-references-in-uris Relative References}.
    */
@@ -1395,7 +1403,7 @@ interface PathItemObject$2 {
  *                 $ref: '#/components/schemas/pet'
  * ```
  */
-interface PathsObject$2 {
+interface PathsObject$2 extends SpecificationExtensions$2 {
   /**
    * A relative path to an individual endpoint. The field name MUST begin with a forward slash (`/`). The path is **appended** (no relative URL resolution) to the expanded URL from the {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#server-object `Server Object`}'s `url` field in order to construct the full URL. {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#path-templating Path templating} is allowed. When matching URLs, concrete (non-templated) paths would be matched before their templated counterparts. Templated paths with the same hierarchy but different templated names MUST NOT exist as they are identical. In case of ambiguous matching, it's up to the tooling to decide which one to use.
    */
@@ -1498,7 +1506,7 @@ interface ReferenceObject$1 {
  *         type: string
  * ```
  */
-interface RequestBodyObject {
+interface RequestBodyObject extends SpecificationExtensions$2 {
   /**
    * **REQUIRED**. The content of the request body. The key is a media type or {@link https://tools.ietf.org/html/rfc7231#appendix-D media type range} and the value describes it. For requests that match multiple keys, only the most specific key is applicable. e.g. text/plain overrides text/*
    */
@@ -1573,7 +1581,7 @@ interface RequestBodyObject {
  * description: object created
  * ```
  */
-interface ResponseObject {
+interface ResponseObject extends SpecificationExtensions$2 {
   /**
    * A map containing descriptions of potential response payloads. The key is a media type or {@link https://datatracker.ietf.org/doc/html/rfc7231#appendix-D media type range} and the value describes it. For responses that match multiple keys, only the most specific key is applicable. e.g. text/plain overrides text/*
    */
@@ -1620,11 +1628,11 @@ interface ResponseObject {
  *         $ref: '#/components/schemas/ErrorModel'
  * ```
  */
-interface ResponsesObject$2 {
+interface ResponsesObject$2 extends SpecificationExtensions$2 {
   /**
    * Any {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#http-status-codes HTTP status code} can be used as the property name, but only one property per code, to describe the expected response for that HTTP status code. This field MUST be enclosed in quotation marks (for example, "200") for compatibility between JSON and YAML. To define a range of response codes, this field MAY contain the uppercase wildcard character `X`. For example, `2XX` represents all response codes between `[200-299]`. Only the following range definitions are allowed: `1XX`, `2XX`, `3XX`, `4XX`, and `5XX`. If a response is defined using an explicit code, the explicit code definition takes precedence over the range definition for that code.
    */
-  [httpStatusCode: string]: ResponseObject | ReferenceObject$1 | undefined;
+  [httpStatusCode: string]: ResponseObject | ReferenceObject$1 | undefined | unknown;
   /**
    * The documentation of responses other than the ones declared for specific HTTP response codes. Use this field to cover undeclared responses.
    */
@@ -1654,7 +1662,7 @@ interface ResponsesObject$2 {
  *
  * This object MAY be extended with {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#specification-extensions Specification Extensions}, though as noted, additional properties MAY omit the `x-` prefix within this object.
  */
-type SchemaObject = JsonSchemaDraft2020_12;
+type SchemaObject = JsonSchemaDraft2020_12 & SpecificationExtensions$2;
 /**
  * Lists the required security schemes to execute this operation. The name used for each property MUST correspond to a security scheme declared in the {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#componentsSecuritySchemes Security Schemes} under the {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#components-object Components Object}.
  *
@@ -1739,7 +1747,7 @@ interface SecurityRequirementObject$2 {
  *       read:pets: read your pets
  * ```
  */
-type SecuritySchemeObject$2 = {
+type SecuritySchemeObject$2 = SpecificationExtensions$2 & {
   /**
    * A description for security scheme. {@link https://spec.commonmark.org/ CommonMark syntax} MAY be used for rich text representation.
    */
@@ -1805,7 +1813,7 @@ type SecuritySchemeObject$2 = {
  * description: Development server
  * ```
  */
-interface ServerObject$1 {
+interface ServerObject$1 extends SpecificationExtensions$2 {
   /**
    * An optional string describing the host designated by the URL. {@link https://spec.commonmark.org/ CommonMark syntax} MAY be used for rich text representation.
    */
@@ -1824,7 +1832,7 @@ interface ServerObject$1 {
  *
  * This object MAY be extended with {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#specification-extensions Specification Extensions}.
  */
-interface ServerVariableObject$1 {
+interface ServerVariableObject$1 extends SpecificationExtensions$2 {
   /**
    * **REQUIRED**. The default value to use for substitution, which SHALL be sent if an alternate value is _not_ supplied. Note this behavior is different than the {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#schema-object Schema Object's} treatment of default values, because in those cases parameter values are optional. If the {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#serverVariableEnum `enum`} is defined, the value MUST exist in the enum's values.
    */
@@ -1849,7 +1857,7 @@ interface ServerVariableObject$1 {
  * description: Pets operations
  * ```
  */
-interface TagObject$2 {
+interface TagObject$2 extends SpecificationExtensions$2 {
   /**
    * A description for the tag. {@link https://spec.commonmark.org/ CommonMark syntax} MAY be used for rich text representation.
    */
@@ -2055,7 +2063,7 @@ interface TagObject$2 {
  * </aliens>
  * ```
  */
-interface XMLObject$2 {
+interface XMLObject$2 extends SpecificationExtensions$2 {
   /**
    * Declares whether the property definition translates to an attribute instead of an element. Default value is `false`.
    */
@@ -2102,7 +2110,7 @@ interface OpenApiSchemaExtensions {
 //#endregion
 //#region src/openApi/3.1.x/types/json-schema-draft-2020-12.d.ts
 // TODO: left out some keywords related to structuring a complex schema and declaring a dialect
-interface JsonSchemaDraft2020_12 extends ArrayKeywords, NumberKeywords, ObjectKeywords, StringKeywords, EnumExtensions, OpenApiSchemaExtensions {
+interface JsonSchemaDraft2020_12 extends ArrayKeywords, NumberKeywords, ObjectKeywords, StringKeywords, EnumExtensions, OpenApiSchemaExtensions, SpecificationExtensions$2 {
   /**
    * The `$comment` {@link https://json-schema.org/learn/glossary#keyword keyword} is strictly intended for adding comments to a schema. Its value must always be a string. Unlike the annotations `title`, `description`, and `examples`, JSON schema {@link https://json-schema.org/learn/glossary#implementation implementations} aren't allowed to attach any meaning or behavior to it whatsoever, and may even strip them at any time. Therefore, they are useful for leaving notes to future editors of a JSON schema, but should not be used to communicate to users of the schema.
    */
@@ -2427,6 +2435,14 @@ type JsonSchemaTypes$1 = 'array' | 'boolean' | 'integer' | 'null' | 'number' | '
 type IRMediaType = 'form-data' | 'json' | 'text' | 'url-search-params' | 'octet-stream';
 //#endregion
 //#region src/ir/types.d.ts
+/**
+ * OpenAPI Specification Extensions.
+ *
+ * See {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#specification-extensions Specification Extensions}.
+ */
+interface SpecificationExtensions$1 {
+  [extension: `x-${string}`]: unknown;
+}
 interface IRBodyObject {
   mediaType: string;
   /**
@@ -2443,7 +2459,7 @@ interface IRComponentsObject {
   requestBodies?: Record<string, IRRequestBodyObject>;
   schemas?: Record<string, IRSchemaObject>;
 }
-interface IROperationObject {
+interface IROperationObject extends SpecificationExtensions$1 {
   body?: IRBodyObject;
   deprecated?: boolean;
   description?: string;
@@ -2464,7 +2480,7 @@ interface IRParametersObject {
   path?: Record<string, IRParameterObject>;
   query?: Record<string, IRParameterObject>;
 }
-interface IRParameterObject extends Pick<JsonSchemaDraft2020_12, 'deprecated' | 'description'> {
+interface IRParameterObject extends Pick<JsonSchemaDraft2020_12, 'deprecated' | 'description'>, SpecificationExtensions$1 {
   /**
    * Determines whether the parameter value SHOULD allow reserved characters, as defined by RFC3986 `:/?#[]@!$&'()*+,;=` to be included without percent-encoding. The default value is `false`. This property SHALL be ignored if the request body media type is not `application/x-www-form-urlencoded` or `multipart/form-data`. If a value is explicitly defined, then the value of `contentType` (implicit or explicit) SHALL be ignored.
    */
@@ -2522,7 +2538,7 @@ interface IRResponseObject {
   mediaType?: string;
   schema: IRSchemaObject;
 }
-interface IRSchemaObject extends Pick<JsonSchemaDraft2020_12, '$ref' | 'const' | 'default' | 'deprecated' | 'description' | 'exclusiveMaximum' | 'exclusiveMinimum' | 'maximum' | 'maxItems' | 'maxLength' | 'minimum' | 'minItems' | 'minLength' | 'pattern' | 'required' | 'title' | 'example'> {
+interface IRSchemaObject extends Pick<JsonSchemaDraft2020_12, '$ref' | 'const' | 'default' | 'deprecated' | 'description' | 'exclusiveMaximum' | 'exclusiveMinimum' | 'maximum' | 'maxItems' | 'maxLength' | 'minimum' | 'minItems' | 'minLength' | 'pattern' | 'required' | 'title' | 'example'>, SpecificationExtensions$1 {
   /**
    * If the schema is intended to be used as an object property, it can be
    * marked as read-only or write-only. This value controls whether the schema
@@ -2551,6 +2567,11 @@ interface IRSchemaObject extends Pick<JsonSchemaDraft2020_12, '$ref' | 'const' |
    * @default 'or'
    */
   logicalOperator?: 'and' | 'or';
+  /**
+   * When used with `$ref` or `symbolRef`, specifies properties to omit from the referenced schema.
+   * Useful for handling discriminator property conflicts in allOf compositions.
+   */
+  omit?: ReadonlyArray<string>;
   /**
    * When type is `object`, `patternProperties` can be used to define a schema
    * for properties that match a specific regex pattern.
@@ -4746,12 +4767,20 @@ interface OpenApiV2_0_XTypes {
 }
 //#endregion
 //#region src/openApi/3.0.x/types/spec.d.ts
+/**
+ * OpenAPI Specification Extensions.
+ *
+ * See {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#specification-extensions Specification Extensions}.
+ */
+interface SpecificationExtensions {
+  [extension: `x-${string}`]: unknown;
+}
 /**
  * This is the root object of the {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#openapi-description OpenAPI Description}.
  *
  * This object MAY be extended with {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#specification-extensions Specification Extensions}.
  */
-interface OpenApiV3_0_X {
+interface OpenApiV3_0_X extends SpecificationExtensions {
   /**
    * An element to hold various Objects for the OpenAPI Description.
    */
@@ -4792,11 +4821,11 @@ interface OpenApiV3_0_X {
  *
  * TODO: examples
  */
-interface CallbackObject {
+interface CallbackObject extends SpecificationExtensions {
   /**
    * A Path Item Object used to define a callback request and expected responses. A {@link https://learn.openapis.org/examples/v3.0/callback-example.html complete example} is available.
    */
-  [expression: string]: PathItemObject | ReferenceObject$2;
+  [expression: string]: PathItemObject | ReferenceObject$2 | unknown;
 }
 /**
  * Holds a set of reusable objects for different aspects of the OAS. All objects defined within the Components Object will have no effect on the API unless they are explicitly referenced from outside the Components Object.
@@ -4807,7 +4836,7 @@ interface CallbackObject {
  *
  * TODO: examples
  */
-interface ComponentsObject {
+interface ComponentsObject extends SpecificationExtensions {
   /**
    * An object to hold reusable {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#callback-object Callback Objects}.
    */
@@ -4856,7 +4885,7 @@ interface ComponentsObject {
  * email: support@example.com
  * ```
  */
-interface ContactObject {
+interface ContactObject extends SpecificationExtensions {
   /**
    * The email address of the contact person/organization. This MUST be in the form of an email address.
    */
@@ -4901,7 +4930,7 @@ interface DiscriminatorObject {
  * TODO: default values examples
  * TODO: examples
  */
-interface EncodingObject {
+interface EncodingObject extends SpecificationExtensions {
   /**
    * When this is true, parameter values are serialized using reserved expansion, as defined by {@link https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.3 RFC6570}, which allows {@link https://datatracker.ietf.org/doc/html/rfc3986#section-2.2 RFC3986's reserved character set}, as well as percent-encoded triples, to pass through unchanged, while still percent-encoding all other disallowed characters (including `%` outside of percent-encoded triples). Applications are still responsible for percent-encoding reserved characters that are {@link https://datatracker.ietf.org/doc/html/rfc3986#section-3.4 not allowed in the query string} (`[`, `]`, `#`), or have a special meaning in `application/x-www-form-urlencoded` (`-`, `&`, `+`); see Appendices {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#appendix-c-using-rfc6570-based-serialization C} and {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#appendix-e-percent-encoding-and-form-media-types E} for details. The default value is `false`. This field SHALL be ignored if the request body media type is not `application/x-www-form-urlencoded`.
    */
@@ -4934,7 +4963,7 @@ interface EncodingObject {
  *
  * TODO: examples
  */
-interface ExampleObject {
+interface ExampleObject extends SpecificationExtensions {
   /**
    * Long description for the example. {@link https://spec.commonmark.org/ CommonMark syntax} MAY be used for rich text representation.
    */
@@ -4964,7 +4993,7 @@ interface ExampleObject {
  * url: https://example.com
  * ```
  */
-interface ExternalDocumentationObject {
+interface ExternalDocumentationObject extends SpecificationExtensions {
   /**
    * A description of the target documentation. {@link https://spec.commonmark.org/ CommonMark syntax} MAY be used for rich text representation.
    */
@@ -5006,7 +5035,7 @@ type HeaderObject = Omit<ParameterObject$1, 'in' | 'name'>;
  * version: 1.0.1
  * ```
  */
-interface InfoObject$1 {
+interface InfoObject$1 extends SpecificationExtensions {
   /**
    * The contact information for the exposed API.
    */
@@ -5042,7 +5071,7 @@ interface InfoObject$1 {
  * url: https://www.apache.org/licenses/LICENSE-2.0.html
  * ```
  */
-interface LicenseObject {
+interface LicenseObject extends SpecificationExtensions {
   /**
    * **REQUIRED**. The license name used for the API.
    */
@@ -5067,7 +5096,7 @@ interface LicenseObject {
  *
  * TODO: examples
  */
-interface LinkObject {
+interface LinkObject extends SpecificationExtensions {
   /**
    * A description of the link. {@link https://spec.commonmark.org/ CommonMark syntax} MAY be used for rich text representation.
    */
@@ -5102,7 +5131,7 @@ interface LinkObject {
  *
  * TODO: examples
  */
-interface MediaTypeObject {
+interface MediaTypeObject extends SpecificationExtensions {
   /**
    * A map between a property name and its encoding information. The key, being the property name, MUST exist in the schema as a property. The `encoding` field SHALL only apply to {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#request-body-object Request Body Objects}, and only when the media type is `multipart` or `application/x-www-form-urlencoded`. If no Encoding Object is provided for a property, the behavior is determined by the default values documented for the Encoding Object.
    */
@@ -5127,7 +5156,7 @@ interface MediaTypeObject {
  *
  * TODO: examples
  */
-interface OAuthFlowObject {
+interface OAuthFlowObject extends SpecificationExtensions {
   /**
    * **REQUIRED (`"implicit"`, `"authorizationCode"`)**. The authorization URL to be used for this flow. This MUST be in the form of a URL. The OAuth2 standard requires the use of TLS.
    */
@@ -5150,7 +5179,7 @@ interface OAuthFlowObject {
  *
  * This object MAY be extended with {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#specification-extensions Specification Extensions}.
  */
-interface OAuthFlowsObject {
+interface OAuthFlowsObject extends SpecificationExtensions {
   /**
    * Configuration for the OAuth Authorization Code flow. Previously called `accessCode` in OpenAPI 2.0.
    */
@@ -5175,7 +5204,7 @@ interface OAuthFlowsObject {
  *
  * TODO: examples
  */
-interface OperationObject$1 {
+interface OperationObject$1 extends SpecificationExtensions {
   /**
    * A map of possible out-of band callbacks related to the parent operation. The key is a unique identifier for the Callback Object. Each value in the map is a {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#callback-object Callback Object} that describes a request that may be initiated by the API provider and the expected responses.
    */
@@ -5269,7 +5298,7 @@ interface OperationObject$1 {
  *
  * TODO: examples
  */
-interface ParameterObject$1 {
+interface ParameterObject$1 extends SpecificationExtensions {
   /**
    * If `true`, clients MAY pass a zero-length string value in place of parameters that would otherwise be omitted entirely, which the server SHOULD interpret as the parameter being unused. Default value is `false`. If {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#parameter-style `style`} is used, and if {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#style-examples behavior is _n/a_ (cannot be serialized)}, the value of `allowEmptyValue` SHALL be ignored. Interactions between this field and the parameter's {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#schema-object Schema Object} are implementation-defined. This field is valid only for `query` parameters. Use of this field is NOT RECOMMENDED, and it is likely to be removed in a later revision.
    */
@@ -5333,7 +5362,7 @@ interface ParameterObject$1 {
  *
  * TODO: examples
  */
-interface PathItemObject {
+interface PathItemObject extends SpecificationExtensions {
   /**
    * Allows for a referenced definition of this path item. The value MUST be in the form of a URL, and the referenced structure MUST be in the form of a {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#path-item-object Path Item Object}. In case a Path Item Object field appears both in the defined object and the referenced object, the behavior is undefined. See the rules for resolving {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#relative-references-in-urls Relative References}.
    */
@@ -5394,7 +5423,7 @@ interface PathItemObject {
  *
  * TODO: examples
  */
-interface PathsObject {
+interface PathsObject extends SpecificationExtensions {
   /**
    * A relative path to an individual endpoint. The field name MUST begin with a forward slash (`/`). The path is **appended** (no relative URL resolution) to the expanded URL from the {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#server-object Server Object}'s `url` field in order to construct the full URL. {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#path-templating Path templating} is allowed. When matching URLs, concrete (non-templated) paths would be matched before their templated counterparts. Templated paths with the same hierarchy but different templated names MUST NOT exist as they are identical. In case of ambiguous matching, it's up to the tooling to decide which one to use.
    */
@@ -5440,7 +5469,7 @@ interface ReferenceObject$2 {
  *
  * TODO: examples
  */
-interface RequestBodyObject$1 {
+interface RequestBodyObject$1 extends SpecificationExtensions {
   /**
    * **REQUIRED**. The content of the request body. The key is a media type or {@link https://tools.ietf.org/html/rfc7231#appendix-D media type range} and the value describes it. For requests that match multiple keys, only the most specific key is applicable. e.g. `"text/plain"` overrides `"text/*"`
    */
@@ -5461,7 +5490,7 @@ interface RequestBodyObject$1 {
  *
  * TODO: examples
  */
-interface ResponseObject$1 {
+interface ResponseObject$1 extends SpecificationExtensions {
   /**
    * A map containing descriptions of potential response payloads. The key is a media type or {@link https://tools.ietf.org/html/rfc7231#appendix-D media type range} and the value describes it. For responses that match multiple keys, only the most specific key is applicable. e.g. `"text/plain"` overrides `"text/*"`
    */
@@ -5492,11 +5521,11 @@ interface ResponseObject$1 {
  *
  * TODO: examples
  */
-interface ResponsesObject {
+interface ResponsesObject extends SpecificationExtensions {
   /**
    * Any {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#http-status-codes HTTP status code} can be used as the property name, but only one property per code, to describe the expected response for that HTTP status code. A {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#reference-object Reference Object} can link to a response that is defined in the {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#components-responses OpenAPI Object's `components.responses`} section. This field MUST be enclosed in quotation marks (for example, "200") for compatibility between JSON and YAML. To define a range of response codes, this field MAY contain the uppercase wildcard character `X`. For example, `2XX` represents all response codes between `200` and `299`. Only the following range definitions are allowed: `1XX`, `2XX`, `3XX`, `4XX`, and `5XX`. If a response is defined using an explicit code, the explicit code definition takes precedence over the range definition for that code.
    */
-  [httpStatusCode: string]: ResponseObject$1 | ReferenceObject$2 | undefined;
+  [httpStatusCode: string]: ResponseObject$1 | ReferenceObject$2 | undefined | unknown;
   /**
    * The documentation of responses other than the ones declared for specific HTTP response codes. Use this field to cover undeclared responses. A {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#reference-object Reference Object} can link to a response that the {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#components-responses OpenAPI Object's `components.responses`} section defines.
    */
@@ -5553,7 +5582,7 @@ interface ResponsesObject {
  *
  * TODO: content, examples
  */
-interface SchemaObject$1 extends EnumExtensions {
+interface SchemaObject$1 extends EnumExtensions, SpecificationExtensions {
   /**
    * The value of "additionalProperties" MUST be a boolean or a schema.
    *
@@ -5804,7 +5833,7 @@ interface SecurityRequirementObject {
  *
  * TODO: examples
  */
-type SecuritySchemeObject = {
+type SecuritySchemeObject = SpecificationExtensions & {
   /**
    * A description for security scheme. {@link https://spec.commonmark.org/ CommonMark syntax} MAY be used for rich text representation.
    */
@@ -5861,7 +5890,7 @@ type SecuritySchemeObject = {
  *
  * TODO: examples
  */
-interface ServerObject {
+interface ServerObject extends SpecificationExtensions {
   /**
    * An optional string describing the host designated by the URL. {@link https://spec.commonmark.org/ CommonMark syntax} MAY be used for rich text representation.
    */
@@ -5880,7 +5909,7 @@ interface ServerObject {
  *
  * This object MAY be extended with {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#specification-extensions Specification Extensions}.
  */
-interface ServerVariableObject {
+interface ServerVariableObject extends SpecificationExtensions {
   /**
    * **REQUIRED**. The default value to use for substitution, which SHALL be sent if an alternate value is _not_ supplied. If the {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#server-variable-enum `enum`} is defined, the value SHOULD exist in the enum's values. Note that this behavior is different from the {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.4.md#schema-object Schema Object}'s `default` keyword, which documents the receiver's behavior rather than inserting the value into the data.
    */
@@ -5906,7 +5935,7 @@ interface ServerVariableObject {
  * description: Pets operations
  * ```
  */
-interface TagObject {
+interface TagObject extends SpecificationExtensions {
   /**
    * A description for the tag. {@link https://spec.commonmark.org/ CommonMark syntax} MAY be used for rich text representation.
    */
@@ -5934,7 +5963,7 @@ interface TagObject {
  *
  * TODO: examples
  */
-interface XMLObject {
+interface XMLObject extends SpecificationExtensions {
   /**
    * Declares whether the property definition translates to an attribute instead of an element. Default value is `false`.
    */
@@ -6250,10 +6279,8 @@ type Config$13 = Plugin.Name<'@hey-api/sdk'> & Plugin.Hooks & {
    * Set `instance` to create an instantiable SDK. Using `true` will use the
    * default instance name; in practice, you want to define your own by passing
    * a string value.
-   *
-   * @default false
    */
-  instance: string | boolean;
+  instance: string;
   /**
    * Customise the name of methods within the service. By default,
    * {@link IR.OperationObject.id} is used.
@@ -6353,8 +6380,8 @@ declare abstract class TsDsl<T extends ts.Node = ts.Node> implements Node<T> {
   parent?: Node;
   root?: Node;
   symbol?: Symbol;
-  toAst(): T;
-  readonly '~brand': any;
+  toAst(_: AstContext): T;
+  readonly '~brand' = "heyapi.node";
   /** Branding property to identify the DSL class at runtime. */
   abstract readonly '~dsl': string;
   /** Conditionally applies a callback to this builder. */
@@ -6362,8 +6389,8 @@ declare abstract class TsDsl<T extends ts.Node = ts.Node> implements Node<T> {
   $if<T extends TsDsl, V, R extends TsDsl = T>(this: T, value: V, ifTrue: (v: Exclude<V, false | null | undefined>) => R | void, ifFalse?: (v: Extract<V, false | null | undefined>) => R | void): R | T;
   $if<T extends TsDsl, V, R extends TsDsl = T>(this: T, value: V, ifTrue: () => R | void, ifFalse?: () => R | void): R | T;
   protected $maybeId<T extends string | ts.Expression>(expr: T): T extends string ? ts.Identifier : T;
-  protected $node<I>(value: I): NodeOfMaybe<I>;
-  protected $type<I>(value: I, args?: ReadonlyArray<ts.TypeNode>): TypeOfMaybe<I>;
+  protected $node<I>(ctx: AstContext, value: I): NodeOfMaybe<I>;
+  protected $type<I>(ctx: AstContext, value: I, args?: ReadonlyArray<ts.TypeNode>): TypeOfMaybe<I>;
   /** Unwraps nested nodes into raw TypeScript AST. */
   private unwrap;
 }
@@ -6375,19 +6402,9 @@ type TypeOfMaybe<I> = undefined extends I ? TypeOf<NonNullable<FromRef<I>>> | un
 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;
 //#endregion
 //#region src/ts-dsl/mixins/types.d.ts
-type BaseCtor<T> = abstract new (...args: any[]) => TsDsl<T>;
-type MixinCtor<T extends BaseCtor<any>, K$1> = abstract new (...args: any[]) => InstanceType<T> & K$1;
-//#endregion
-//#region src/ts-dsl/mixins/type-args.d.ts
-type Arg$1 = Symbol | string | MaybeTsDsl<TypeTsDsl>;
-interface TypeArgsMethods extends Node {
-  /** Returns the type arguments as an array of ts.TypeNode nodes. */
-  $generics(): ReadonlyArray<ts.TypeNode> | undefined;
-  /** Adds a single type argument (e.g. `string` in `Foo<string>`). */
-  generic(arg: Arg$1): this;
-  /** Adds type arguments (e.g. `Map<string, number>`). */
-  generics(...args: ReadonlyArray<Arg$1>): this;
-}
+type BaseCtor<T> = abstract new (...args: Array<any>) => TsDsl<T>;
+type DropFirst<T extends Array<any>> = T extends [any, ...infer Rest] ? Rest : never;
+type MixinCtor<T extends BaseCtor<any>, K$1> = abstract new (...args: Array<any>) => InstanceType<T> & K$1;
 //#endregion
 //#region src/ts-dsl/mixins/optional.d.ts
 interface OptionalMethods extends Node {
@@ -6398,31 +6415,18 @@ interface OptionalMethods extends Node {
   required(condition?: boolean): this;
 }
 //#endregion
-//#region src/ts-dsl/expr/as.d.ts
-type AsExpr = Symbol | string | MaybeTsDsl<ts.Expression>;
-type AsType = Symbol | string | TypeTsDsl;
-declare const Mixed$52: MixinCtor<MixinCtor<abstract new () => TsDsl<ts.AsExpression>, ExprMethods>, AsMethods>;
-declare class AsTsDsl extends Mixed$52 {
-  readonly '~dsl' = "AsTsDsl";
-  protected expr: Ref<AsExpr>;
-  protected type: Ref<AsType>;
-  constructor(expr: AsExpr, type: AsType);
-  analyze(ctx: AnalysisContext): void;
-  toAst(): ts.AsExpression;
-}
-//#endregion
 //#region src/ts-dsl/mixins/as.d.ts
 interface AsMethods extends Node {
   /** Creates an `as` type assertion expression (e.g. `value as Type`). */
-  as(type: AsType): AsTsDsl;
+  as(...args: DropFirst<Parameters<typeof f.as>>): ReturnType<typeof f.as>;
 }
 //#endregion
 //#region src/ts-dsl/expr/binary.d.ts
 type Expr$3 = Symbol | string | MaybeTsDsl<ts.Expression>;
 type Op$1 = Operator | ts.BinaryOperator;
-type Operator = '!=' | '!==' | '&&' | '*' | '+' | '-' | '/' | '<' | '<=' | '=' | '==' | '===' | '>' | '>=' | '??' | '||';
-declare const Mixed$51: MixinCtor<MixinCtor<abstract new () => TsDsl<ts.BinaryExpression>, ExprMethods>, AsMethods>;
-declare class BinaryTsDsl extends Mixed$51 {
+type Operator = '!=' | '!==' | '&&' | '*' | '+' | '-' | '/' | '<' | '<=' | '=' | '==' | '===' | '>' | '>=' | '??' | '??=' | '||';
+declare const Mixed$52: MixinCtor<MixinCtor<abstract new () => TsDsl<ts.BinaryExpression>, ExprMethods>, AsMethods>;
+declare class BinaryTsDsl extends Mixed$52 {
   readonly '~dsl' = "BinaryTsDsl";
   protected _base: Ref<Expr$3>;
   protected _expr?: Ref<Expr$3>;
@@ -6455,13 +6459,15 @@ declare class BinaryTsDsl extends Mixed$51 {
   minus(expr: Expr$3): this;
   /** Strict inequality — `this !== expr` */
   neq(expr: Expr$3): this;
+  /** Nullish assignment — `this ??= expr` */
+  nullishAssign(expr: Expr$3): this;
   /** Logical OR — `this || expr` */
   or(expr: Expr$3): this;
   /** Addition — `this + expr` */
   plus(expr: Expr$3): this;
   /** Multiplication — `this * expr` */
   times(expr: Expr$3): this;
-  toAst(): ts.BinaryExpression;
+  toAst(ctx: AstContext): ts.BinaryExpression;
   /** Sets the binary operator and right-hand operand for this expression. */
   private opAndExpr;
   private opToToken;
@@ -6496,6 +6502,8 @@ interface OperatorMethods extends Node {
   minus(expr: Expr$2): BinaryTsDsl;
   /** Strict inequality — `this !== expr` */
   neq(expr: Expr$2): BinaryTsDsl;
+  /** Nullish assignment — `this ??= expr` */
+  nullishAssign(expr: Expr$2): BinaryTsDsl;
   /** Logical OR — `this || expr` */
   or(expr: Expr$2): BinaryTsDsl;
   /** Addition — `this + expr` */
@@ -6507,55 +6515,45 @@ interface OperatorMethods extends Node {
 //#region src/ts-dsl/expr/attr.d.ts
 type AttrLeft = Symbol | string | MaybeTsDsl<ts.Expression>;
 type AttrRight = Symbol | string | ts.MemberName | number;
-declare const Mixed$50: MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.PropertyAccessExpression | ts.ElementAccessExpression>, OptionalMethods>, OperatorMethods>, ExprMethods>, AsMethods>;
-declare class AttrTsDsl extends Mixed$50 {
+type AttrCtor = (left: AttrLeft, right: AttrRight) => AttrTsDsl;
+declare const Mixed$51: MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.PropertyAccessExpression | ts.ElementAccessExpression>, OptionalMethods>, OperatorMethods>, ExprMethods>, AsMethods>;
+declare class AttrTsDsl extends Mixed$51 {
   readonly '~dsl' = "AttrTsDsl";
   protected left: Ref<AttrLeft>;
   protected right: Ref<AttrRight>;
   constructor(left: AttrLeft, right: AttrRight);
   analyze(ctx: AnalysisContext): void;
-  toAst(): ts.PropertyAccessExpression | ts.ElementAccessExpression;
+  toAst(ctx: AstContext): ts.PropertyAccessExpression | ts.ElementAccessExpression;
 }
 //#endregion
 //#region src/ts-dsl/expr/await.d.ts
 type AwaitExpr = Symbol | string | MaybeTsDsl<ts.Expression>;
-declare const Mixed$49: MixinCtor<abstract new () => TsDsl<ts.AwaitExpression>, ExprMethods>;
-declare class AwaitTsDsl extends Mixed$49 {
+type AwaitCtor = (expr: AwaitExpr) => AwaitTsDsl;
+declare const Mixed$50: MixinCtor<abstract new () => TsDsl<ts.AwaitExpression>, ExprMethods>;
+declare class AwaitTsDsl extends Mixed$50 {
   readonly '~dsl' = "AwaitTsDsl";
   protected _awaitExpr: Ref<AwaitExpr>;
   constructor(expr: AwaitExpr);
   analyze(ctx: AnalysisContext): void;
-  toAst(): ts.AwaitExpression;
-}
-//#endregion
-//#region src/ts-dsl/stmt/return.d.ts
-type ReturnExpr = Symbol | string | MaybeTsDsl<ts.Expression>;
-declare const Mixed$48: abstract new () => TsDsl<ts.ReturnStatement>;
-declare class ReturnTsDsl extends Mixed$48 {
-  readonly '~dsl' = "ReturnTsDsl";
-  protected _returnExpr?: Ref<ReturnExpr>;
-  constructor(expr?: ReturnExpr);
-  analyze(ctx: AnalysisContext): void;
-  toAst(): ts.ReturnStatement;
+  toAst(ctx: AstContext): ts.AwaitExpression;
 }
 //#endregion
-//#region src/ts-dsl/mixins/expr.d.ts
-interface ExprMethods extends Node {
-  /** Accesses a property on the current expression (e.g. `this.foo`). */
-  attr(name: AttrRight): AttrTsDsl;
-  /** Awaits the current expression (e.g. `await expr`). */
-  await(): AwaitTsDsl;
-  /** Calls the current expression (e.g. `fn(arg1, arg2)`). */
-  call(...args: CallArgs): CallTsDsl;
-  /** Produces a `return` statement returning the current expression. */
-  return(): ReturnTsDsl;
+//#region src/ts-dsl/mixins/type-args.d.ts
+type Arg$1 = Symbol | string | MaybeTsDsl<TypeTsDsl>;
+interface TypeArgsMethods extends Node {
+  /** Returns the type arguments as an array of ts.TypeNode nodes. */
+  $generics(ctx: AstContext): ReadonlyArray<ts.TypeNode> | undefined;
+  /** Adds a single type argument (e.g. `string` in `Foo<string>`). */
+  generic(arg: Arg$1): this;
+  /** Adds type arguments (e.g. `Map<string, number>`). */
+  generics(...args: ReadonlyArray<Arg$1>): this;
 }
 //#endregion
 //#region src/ts-dsl/mixins/args.d.ts
 type Arg = Symbol | string | MaybeTsDsl<ts.Expression>;
 interface ArgsMethods extends Node {
   /** Renders the arguments into an array of `Expression`s. */
-  $args(): ReadonlyArray<ts.Expression>;
+  $args(ctx: AstContext): ReadonlyArray<ts.Expression>;
   /** Adds a single expression argument. */
   arg(arg: Arg | undefined): this;
   /** Adds one or more expression arguments. */
@@ -6566,13 +6564,259 @@ interface ArgsMethods extends Node {
 type CallCallee = string | MaybeTsDsl<ts.Expression>;
 type CallArg = Symbol | string | MaybeTsDsl<ts.Expression>;
 type CallArgs = ReadonlyArray<CallArg | undefined>;
-declare const Mixed$47: MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.CallExpression>, TypeArgsMethods>, ExprMethods>, AsMethods>, ArgsMethods>;
-declare class CallTsDsl extends Mixed$47 {
+type CallCtor = (callee: CallCallee, ...args: CallArgs) => CallTsDsl;
+declare const Mixed$49: MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.CallExpression>, TypeArgsMethods>, ExprMethods>, AsMethods>, ArgsMethods>;
+declare class CallTsDsl extends Mixed$49 {
   readonly '~dsl' = "CallTsDsl";
   protected _callee: CallCallee;
   constructor(callee: CallCallee, ...args: CallArgs);
   analyze(ctx: AnalysisContext): void;
-  toAst(): ts.CallExpression;
+  toAst(ctx: AstContext): ts.CallExpression;
+}
+//#endregion
+//#region src/ts-dsl/expr/typeof.d.ts
+type TypeOfExpr = string | MaybeTsDsl<ts.Expression>;
+type TypeOfExprCtor = (expr: TypeOfExpr) => TypeOfExprTsDsl;
+declare const Mixed$48: MixinCtor<abstract new () => TsDsl<ts.TypeOfExpression>, OperatorMethods>;
+declare class TypeOfExprTsDsl extends Mixed$48 {
+  readonly '~dsl' = "TypeOfExprTsDsl";
+  protected _expr: TypeOfExpr;
+  constructor(expr: TypeOfExpr);
+  analyze(ctx: AnalysisContext): void;
+  toAst(ctx: AstContext): ts.TypeOfExpression;
+}
+//#endregion
+//#region src/ts-dsl/stmt/return.d.ts
+type ReturnExpr = Symbol | string | MaybeTsDsl<ts.Expression>;
+type ReturnCtor = (expr?: ReturnExpr) => ReturnTsDsl;
+declare const Mixed$47: abstract new () => TsDsl<ts.ReturnStatement>;
+declare class ReturnTsDsl extends Mixed$47 {
+  readonly '~dsl' = "ReturnTsDsl";
+  protected _returnExpr?: Ref<ReturnExpr>;
+  constructor(expr?: ReturnExpr);
+  analyze(ctx: AnalysisContext): void;
+  toAst(ctx: AstContext): ts.ReturnStatement;
+}
+//#endregion
+//#region src/ts-dsl/mixins/type-expr.d.ts
+interface TypeExprMethods extends Node {
+  /** Creates an indexed-access type (e.g. `Foo<T>[K]`). */
+  idx(this: Parameters<typeof f.type.idx>[0], ...args: DropFirst<Parameters<typeof f.type.idx>>): ReturnType<typeof f.type.idx>;
+  /** Shorthand: builds `keyof T`. */
+  keyof(this: MaybeTsDsl<TypeTsDsl>): ReturnType<typeof f.type.operator>;
+  /** Shorthand: builds `readonly T`. */
+  readonly(this: MaybeTsDsl<TypeTsDsl>): ReturnType<typeof f.type.operator>;
+  /** Create a TypeExpr node representing ReturnType<this>. */
+  returnType(this: Parameters<typeof f.type.query>[0], ...args: DropFirst<Parameters<typeof f.type.query>>): ReturnType<typeof f.type.expr>;
+  /** Create a TypeOfExpr node representing typeof this. */
+  typeofExpr(this: Parameters<typeof f.typeofExpr>[0], ...args: DropFirst<Parameters<typeof f.typeofExpr>>): ReturnType<typeof f.typeofExpr>;
+  /** Create a TypeQuery node representing typeof this. */
+  typeofType(this: Parameters<typeof f.type.query>[0], ...args: DropFirst<Parameters<typeof f.type.query>>): ReturnType<typeof f.type.query>;
+  /** Shorthand: builds `unique T`. */
+  unique(this: MaybeTsDsl<TypeTsDsl>): ReturnType<typeof f.type.operator>;
+}
+//#endregion
+//#region src/ts-dsl/type/attr.d.ts
+type Base$2 = Symbol | string | MaybeTsDsl<ts.EntityName>;
+type Right = Symbol | string | ts.Identifier;
+declare const Mixed$46: MixinCtor<abstract new () => TsDsl<ts.QualifiedName>, TypeExprMethods>;
+declare class TypeAttrTsDsl extends Mixed$46 {
+  readonly '~dsl' = "TypeAttrTsDsl";
+  protected _base?: Ref<Base$2>;
+  protected _right: Ref<Right>;
+  constructor(base: Base$2 | Ref<Base$2>, right: string | ts.Identifier);
+  constructor(right: Right);
+  analyze(ctx: AnalysisContext): void;
+  base(base?: Base$2 | Ref<Base$2>): this;
+  right(right: Right): this;
+  toAst(ctx: AstContext): ts.QualifiedName;
+}
+//#endregion
+//#region src/ts-dsl/type/expr.d.ts
+type TypeExprName = Symbol | string;
+type TypeExprExpr = TypeExprName | TypeAttrTsDsl;
+type TypeExprFn = (t: TypeExprTsDsl) => void;
+type TypeExprCtor = (nameOrFn?: TypeExprName | TypeExprFn, fn?: TypeExprFn) => TypeExprTsDsl;
+declare const Mixed$45: MixinCtor<MixinCtor<abstract new () => TsDsl<ts.TypeReferenceNode>, TypeExprMethods>, TypeArgsMethods>;
+declare class TypeExprTsDsl extends Mixed$45 {
+  readonly '~dsl' = "TypeExprTsDsl";
+  protected _exprInput?: Ref<TypeExprExpr>;
+  constructor();
+  constructor(fn: TypeExprFn);
+  constructor(name: TypeExprName);
+  constructor(name: TypeExprName, fn?: TypeExprFn);
+  analyze(ctx: AnalysisContext): void;
+  /** Accesses a nested type (e.g. `Foo.Bar`). */
+  attr(right: string | ts.Identifier | TypeAttrTsDsl): this;
+  toAst(ctx: AstContext): ts.TypeReferenceNode;
+}
+//#endregion
+//#region src/ts-dsl/type/idx.d.ts
+type Base$1 = string | MaybeTsDsl<ts.TypeNode>;
+type Index = string | number | MaybeTsDsl<ts.TypeNode>;
+type TypeIdxCtor = (base: Base$1, index: Index) => TypeIdxTsDsl;
+declare const Mixed$44: MixinCtor<abstract new () => TsDsl<ts.IndexedAccessTypeNode>, TypeExprMethods>;
+declare class TypeIdxTsDsl extends Mixed$44 {
+  readonly '~dsl' = "TypeIdxTsDsl";
+  protected _base: Base$1;
+  protected _index: Index;
+  constructor(base: Base$1, index: Index);
+  analyze(ctx: AnalysisContext): void;
+  base(base: Base$1): this;
+  index(index: Index): this;
+  toAst(ctx: AstContext): ts.IndexedAccessTypeNode;
+}
+//#endregion
+//#region src/ts-dsl/type/operator.d.ts
+type Op = ts.SyntaxKind.KeyOfKeyword | ts.SyntaxKind.ReadonlyKeyword | ts.SyntaxKind.UniqueKeyword;
+type Type$2 = string | MaybeTsDsl<ts.TypeNode>;
+type TypeOperatorCtor = () => TypeOperatorTsDsl;
+declare const Mixed$43: abstract new () => TsDsl<ts.TypeOperatorNode>;
+/**
+ * Builds a TypeScript `TypeOperatorNode`, such as:
+ *
+ * - `keyof T`
+ * - `readonly U`
+ * - `unique V`
+ *
+ * This DSL provides both a generic `.operator()` API and convenient
+ * shorthand methods (`.keyof()`, `.readonly()`, `.unique()`).
+ *
+ * The node will throw during render if required fields are missing.
+ */
+declare class TypeOperatorTsDsl extends Mixed$43 {
+  readonly '~dsl' = "TypeOperatorTsDsl";
+  protected _op?: Op;
+  protected _type?: Type$2;
+  analyze(ctx: AnalysisContext): void;
+  /** Shorthand: builds `keyof T`. */
+  keyof(type: Type$2): this;
+  /** Sets the operator explicitly. */
+  operator(op: Op): this;
+  /** Shorthand: builds `readonly T`. */
+  readonly(type: Type$2): this;
+  /** Sets the target type of the operator. */
+  type(type: Type$2): this;
+  /** Shorthand: builds `unique T`. */
+  unique(type: Type$2): this;
+  toAst(ctx: AstContext): ts.TypeOperatorNode;
+  /** Throws if required fields are not set. */
+  $validate(): asserts this is this & {
+    _op: Op;
+    _type: Type$2;
+  };
+  private missingRequiredCalls;
+}
+//#endregion
+//#region src/ts-dsl/type/query.d.ts
+type TypeQueryExpr = string | MaybeTsDsl<TypeTsDsl | ts.Expression>;
+type TypeQueryCtor = (expr: TypeQueryExpr) => TypeQueryTsDsl;
+declare const Mixed$42: MixinCtor<abstract new () => TsDsl<ts.TypeQueryNode>, TypeExprMethods>;
+declare class TypeQueryTsDsl extends Mixed$42 {
+  readonly '~dsl' = "TypeQueryTsDsl";
+  protected _expr: TypeQueryExpr;
+  constructor(expr: TypeQueryExpr);
+  analyze(ctx: AnalysisContext): void;
+  toAst(ctx: AstContext): ts.TypeQueryNode;
+}
+//#endregion
+//#region src/ts-dsl/utils/factories.d.ts
+type Ctor = (...args: Array<any>) => any;
+type Factory<T extends Ctor> = {
+  (...args: Parameters<T>): ReturnType<T>;
+  /** Sets the implementation of this factory. */
+  set(fn: T): void;
+};
+declare const f: {
+  /** Factory for creating `as` type assertion expressions (e.g. `value as Type`). */
+  as: Factory<AsCtor>;
+  /** Factory for creating property access expressions (e.g. `obj.foo`). */
+  attr: Factory<AttrCtor>;
+  /** Factory for creating await expressions (e.g. `await promise`). */
+  await: Factory<AwaitCtor>;
+  /** Factory for creating function or method call expressions (e.g. `fn(arg)`). */
+  call: Factory<CallCtor>;
+  /** Factory for creating return statements. */
+  return: Factory<ReturnCtor>;
+  /** Factories for creating type nodes. */
+  type: {
+    /** Factory for creating basic type references or type expressions (e.g. Foo or Foo<T>). */
+    expr: Factory<TypeExprCtor>;
+    /** Factory for creating indexed-access types (e.g. `Foo<T>[K]`). */
+    idx: Factory<TypeIdxCtor>;
+    /** Factory for creating type operator nodes (e.g. `readonly T`, `keyof T`, `unique T`). */
+    operator: Factory<TypeOperatorCtor>;
+    /** Factory for creating type query nodes (e.g. `typeof Foo`). */
+    query: Factory<TypeQueryCtor>;
+  };
+  /** Factory for creating `typeof` expressions (e.g. `typeof value`). */
+  typeofExpr: Factory<TypeOfExprCtor>;
+};
+//#endregion
+//#region src/ts-dsl/mixins/expr.d.ts
+interface ExprMethods extends Node {
+  /** Accesses a property on the current expression (e.g. `this.foo`). */
+  attr(...args: DropFirst<Parameters<typeof f.attr>>): ReturnType<typeof f.attr>;
+  /** Awaits the current expression (e.g. `await expr`). */
+  await(): ReturnType<typeof f.await>;
+  /** Calls the current expression (e.g. `fn(arg1, arg2)`). */
+  call(...args: DropFirst<Parameters<typeof f.call>>): ReturnType<typeof f.call>;
+  /** Produces a `return` statement returning the current expression. */
+  return(): ReturnType<typeof f.return>;
+}
+//#endregion
+//#region src/ts-dsl/expr/as.d.ts
+type AsExpr = Symbol | string | MaybeTsDsl<ts.Expression>;
+type AsType = Symbol | string | TypeTsDsl;
+type AsCtor = (expr: AsExpr, type: AsType) => AsTsDsl;
+declare const Mixed$41: MixinCtor<MixinCtor<abstract new () => TsDsl<ts.AsExpression>, ExprMethods>, AsMethods>;
+declare class AsTsDsl extends Mixed$41 {
+  readonly '~dsl' = "AsTsDsl";
+  protected expr: Ref<AsExpr>;
+  protected type: Ref<AsType>;
+  constructor(expr: AsExpr, type: AsType);
+  analyze(ctx: AnalysisContext): void;
+  toAst(ctx: AstContext): ts.AsExpression;
+}
+//#endregion
+//#region src/ts-dsl/mixins/value.d.ts
+type ValueExpr = string | MaybeTsDsl<ts.Expression>;
+interface ValueMethods extends Node {
+  $value(ctx: AstContext): ts.Expression | undefined;
+  /** Sets the initializer expression (e.g. `= expr`). */
+  assign(expr: ValueExpr): this;
+}
+//#endregion
+//#region src/ts-dsl/mixins/pattern.d.ts
+interface PatternMethods extends Node {
+  /** Renders the pattern into a `BindingName`. */
+  $pattern(ctx: AstContext): ts.BindingName | undefined;
+  /** Defines an array binding pattern. */
+  array(...props: ReadonlyArray<string> | [ReadonlyArray<string>]): this;
+  /** Defines an object binding pattern. */
+  object(...props: ReadonlyArray<MaybeArray$1<string> | Record<string, string>>): this;
+  /** Adds a spread element (e.g. `...args`, `...options`) to the pattern. */
+  spread(name: string): this;
+}
+//#endregion
+//#region src/ts-dsl/layout/hint.d.ts
+type HintMaybeLazy<T> = ((ctx: AstContext) => T) | T;
+type HintFn = (d: HintTsDsl) => void;
+type HintLines = HintMaybeLazy<MaybeArray$1<string>>;
+declare class HintTsDsl extends TsDsl<ts.Node> {
+  readonly '~dsl' = "HintTsDsl";
+  protected _lines: Array<HintLines>;
+  constructor(lines?: HintLines, fn?: HintFn);
+  analyze(ctx: AnalysisContext): void;
+  add(lines: HintLines): this;
+  apply<T extends ts.Node>(ctx: AstContext, node: T): T;
+  toAst(ctx: AstContext): ts.Node;
+}
+//#endregion
+//#region src/ts-dsl/mixins/hint.d.ts
+interface HintMethods extends Node {
+  $hint<T extends ts.Node>(ctx: AstContext, node: T): T;
+  hint(lines?: HintLines, fn?: HintFn): this;
 }
 //#endregion
 //#region src/ts-dsl/mixins/modifiers.d.ts
@@ -6670,39 +6914,124 @@ interface StaticMethods extends Modifiers {
   static(condition?: boolean): this;
 }
 //#endregion
-//#region src/ts-dsl/mixins/value.d.ts
-type ValueExpr = string | MaybeTsDsl<ts.Expression>;
-interface ValueMethods extends Node {
-  $value(): ts.Expression | undefined;
-  /** Sets the initializer expression (e.g. `= expr`). */
-  assign(expr: ValueExpr): this;
+//#region src/ts-dsl/layout/doc.d.ts
+type DocMaybeLazy<T> = ((ctx: AstContext) => T) | T;
+type DocFn = (d: DocTsDsl) => void;
+type DocLines = DocMaybeLazy<MaybeArray$1<string>>;
+declare class DocTsDsl extends TsDsl<ts.Node> {
+  readonly '~dsl' = "DocTsDsl";
+  protected _lines: Array<DocLines>;
+  constructor(lines?: DocLines, fn?: DocFn);
+  analyze(ctx: AnalysisContext): void;
+  add(lines: DocLines): this;
+  apply<T extends ts.Node>(ctx: AstContext, node: T): T;
+  toAst(ctx: AstContext): ts.Node;
 }
 //#endregion
-//#region src/ts-dsl/mixins/pattern.d.ts
-interface PatternMethods extends Node {
-  /** Renders the pattern into a `BindingName`. */
-  $pattern(): ts.BindingName | undefined;
-  /** Defines an array binding pattern. */
-  array(...props: ReadonlyArray<string> | [ReadonlyArray<string>]): this;
-  /** Defines an object binding pattern. */
-  object(...props: ReadonlyArray<MaybeArray$1<string> | Record<string, string>>): this;
-  /** Adds a spread element (e.g. `...args`, `...options`) to the pattern. */
-  spread(name: string): this;
+//#region src/ts-dsl/mixins/doc.d.ts
+interface DocMethods extends Node {
+  $docs<T extends ts.Node>(ctx: AstContext, node: T): T;
+  doc(lines?: DocLines, fn?: DocFn): this;
+}
+//#endregion
+//#region src/ts-dsl/stmt/var.d.ts
+type VarName = Symbol | string;
+declare const Mixed$40: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.VariableStatement>, ValueMethods>, PatternMethods>, HintMethods>, ExportMethods>, DocMethods>, DefaultMethods>;
+declare class VarTsDsl extends Mixed$40 {
+  readonly '~dsl' = "VarTsDsl";
+  protected kind: ts.NodeFlags;
+  protected name?: Ref<VarName>;
+  protected _type?: TypeTsDsl;
+  constructor(name?: VarName);
+  analyze(ctx: AnalysisContext): void;
+  const(): this;
+  let(): this;
+  /** Sets the variable type. */
+  type(type: string | TypeTsDsl): this;
+  var(): this;
+  toAst(ctx: AstContext): ts.VariableStatement;
+}
+//#endregion
+//#region src/ts-dsl/decl/decorator.d.ts
+type DecoratorName = Symbol | string | MaybeTsDsl<ts.Expression>;
+declare const Mixed$39: MixinCtor<abstract new () => TsDsl<ts.Decorator>, ArgsMethods>;
+declare class DecoratorTsDsl extends Mixed$39 {
+  readonly '~dsl' = "DecoratorTsDsl";
+  protected name: Ref<DecoratorName>;
+  constructor(name: DecoratorName, ...args: ReadonlyArray<string | MaybeTsDsl<ts.Expression>>);
+  analyze(ctx: AnalysisContext): void;
+  toAst(ctx: AstContext): ts.Decorator;
+}
+//#endregion
+//#region src/ts-dsl/decl/member.d.ts
+type Value$2 = string | number | MaybeTsDsl<ts.Expression>;
+type ValueFn$1 = Value$2 | ((m: EnumMemberTsDsl) => void);
+declare const Mixed$38: MixinCtor<abstract new () => TsDsl<ts.EnumMember>, DocMethods>;
+declare class EnumMemberTsDsl extends Mixed$38 {
+  readonly '~dsl' = "EnumMemberTsDsl";
+  private _name;
+  private _value?;
+  constructor(name: string, value?: ValueFn$1);
+  analyze(ctx: AnalysisContext): void;
+  /** Sets the enum member value. */
+  value(value?: Value$2): this;
+  toAst(ctx: AstContext): ts.EnumMember;
+}
+//#endregion
+//#region src/ts-dsl/decl/enum.d.ts
+type EnumName = Symbol | string;
+type Value$1 = string | number | MaybeTsDsl<ts.Expression>;
+type ValueFn = Value$1 | ((m: EnumMemberTsDsl) => void);
+declare const Mixed$37: MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.EnumDeclaration>, ExportMethods>, DocMethods>, ConstMethods>;
+declare class EnumTsDsl extends Mixed$37 {
+  readonly '~dsl' = "EnumTsDsl";
+  private _members;
+  private _name;
+  constructor(name: EnumName, fn?: (e: EnumTsDsl) => void);
+  analyze(ctx: AnalysisContext): void;
+  /** Adds an enum member. */
+  member(name: string, value?: ValueFn): this;
+  /** Adds multiple enum members. */
+  members(...members: ReadonlyArray<EnumMemberTsDsl>): this;
+  toAst(ctx: AstContext): ts.EnumDeclaration;
 }
 //#endregion
 //#region src/ts-dsl/mixins/decorator.d.ts
 interface DecoratorMethods extends Node {
   /** Renders the decorators into an array of `ts.Decorator`s. */
-  $decorators(): ReadonlyArray<ts.Decorator>;
+  $decorators(ctx: AstContext): ReadonlyArray<ts.Decorator>;
   /** Adds a decorator (e.g. `@sealed({ in: 'root' })`). */
   decorator(name: Symbol | string | MaybeTsDsl<ts.Expression>, ...args: ReadonlyArray<string | MaybeTsDsl<ts.Expression>>): this;
 }
 //#endregion
+//#region src/ts-dsl/decl/field.d.ts
+type FieldName = Symbol | string;
+type FieldType = TypeExprName | TypeTsDsl;
+declare const Mixed$36: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.PropertyDeclaration>, ValueMethods>, StaticMethods>, ReadonlyMethods>, PublicMethods>, ProtectedMethods>, PrivateMethods>, OptionalMethods>, DocMethods>, DecoratorMethods>;
+declare class FieldTsDsl extends Mixed$36 {
+  readonly '~dsl' = "FieldTsDsl";
+  protected name: FieldName;
+  protected _type?: TypeTsDsl;
+  constructor(name: FieldName, fn?: (f: FieldTsDsl) => void);
+  analyze(ctx: AnalysisContext): void;
+  /** Sets the field type. */
+  type(type: FieldType): this;
+  toAst(ctx: AstContext): ts.PropertyDeclaration;
+}
+//#endregion
+//#region src/ts-dsl/mixins/type-returns.d.ts
+interface TypeReturnsMethods extends Node {
+  /** Returns the return type node. */
+  $returns(ctx: AstContext): ts.TypeNode | undefined;
+  /** Sets the return type. */
+  returns(type: TypeExprName | TypeTsDsl): this;
+}
+//#endregion
 //#region src/ts-dsl/decl/param.d.ts
 type ParamName = Symbol | string;
 type ParamCtor = (name: ParamName | ((p: ParamTsDsl) => void), fn?: (p: ParamTsDsl) => void) => ParamTsDsl;
-declare const Mixed$46: MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.ParameterDeclaration>, ValueMethods>, PatternMethods>, OptionalMethods>, DecoratorMethods>;
-declare class ParamTsDsl extends Mixed$46 {
+declare const Mixed$35: MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.ParameterDeclaration>, ValueMethods>, PatternMethods>, OptionalMethods>, DecoratorMethods>;
+declare class ParamTsDsl extends Mixed$35 {
   readonly '~dsl' = "ParamTsDsl";
   protected name?: Ref<ParamName>;
   protected _type?: TypeTsDsl;
@@ -6710,41 +7039,24 @@ declare class ParamTsDsl extends Mixed$46 {
   analyze(ctx: AnalysisContext): void;
   /** Sets the parameter type. */
   type(type: string | TypeTsDsl): this;
-  toAst(): ts.ParameterDeclaration;
+  toAst(ctx: AstContext): ts.ParameterDeclaration;
 }
 //#endregion
 //#region src/ts-dsl/mixins/param.d.ts
 interface ParamMethods extends Node {
   /** Renders the parameters into an array of `ParameterDeclaration`s. */
-  $params(): ReadonlyArray<ts.ParameterDeclaration>;
+  $params(ast: AstContext): ReadonlyArray<ts.ParameterDeclaration>;
   /** Adds a parameter. */
   param(...args: Parameters<ParamCtor>): this;
   /** Adds multiple parameters. */
   params(...params: ReadonlyArray<MaybeTsDsl<ts.ParameterDeclaration>>): this;
 }
 //#endregion
-//#region src/ts-dsl/layout/doc.d.ts
-declare class DocTsDsl extends TsDsl<ts.Node> {
-  readonly '~dsl' = "DocTsDsl";
-  protected _lines: Array<string>;
-  constructor(lines?: MaybeArray$1<string>, fn?: (d: DocTsDsl) => void);
-  analyze(ctx: AnalysisContext): void;
-  add(...lines: ReadonlyArray<string>): this;
-  apply<T extends ts.Node>(node: T): T;
-  toAst(): ts.Node;
-}
-//#endregion
-//#region src/ts-dsl/mixins/doc.d.ts
-interface DocMethods extends Node {
-  $docs<T extends ts.Node>(node: T): T;
-  doc(lines?: MaybeArray$1<string>, fn?: (d: DocTsDsl) => void): this;
-}
-//#endregion
 //#region src/ts-dsl/mixins/do.d.ts
 type DoExpr = MaybeTsDsl<ts.Expression | ts.Statement>;
 interface DoMethods extends Node {
   /** Renders the collected `.do()` calls into an array of `Statement` nodes. */
-  $do(): ReadonlyArray<ts.Statement>;
+  $do(ctx: AstContext): ReadonlyArray<ts.Statement>;
   _do: Array<DoExpr>;
   /** Adds one or more expressions/statements to the body. */
   do(...items: ReadonlyArray<DoExpr>): this;
@@ -6752,19 +7064,19 @@ interface DoMethods extends Node {
 //#endregion
 //#region src/ts-dsl/decl/getter.d.ts
 type GetterName = string | ts.PropertyName;
-declare const Mixed$45: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.GetAccessorDeclaration>, StaticMethods>, PublicMethods>, ProtectedMethods>, PrivateMethods>, ParamMethods>, DocMethods>, DoMethods>, DecoratorMethods>, AsyncMethods>, AbstractMethods>;
-declare class GetterTsDsl extends Mixed$45 {
+declare const Mixed$34: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.GetAccessorDeclaration>, TypeReturnsMethods>, StaticMethods>, PublicMethods>, ProtectedMethods>, PrivateMethods>, ParamMethods>, DocMethods>, DoMethods>, DecoratorMethods>, AsyncMethods>, AbstractMethods>;
+declare class GetterTsDsl extends Mixed$34 {
   readonly '~dsl' = "GetterTsDsl";
   protected name: GetterName;
   constructor(name: GetterName, fn?: (g: GetterTsDsl) => void);
   analyze(ctx: AnalysisContext): void;
-  toAst(): ts.GetAccessorDeclaration;
+  toAst(ctx: AstContext): ts.GetAccessorDeclaration;
 }
 //#endregion
 //#region src/ts-dsl/stmt/if.d.ts
 type IfCondition = string | MaybeTsDsl<ts.Expression>;
-declare const Mixed$44: MixinCtor<abstract new () => TsDsl<ts.IfStatement>, DoMethods>;
-declare class IfTsDsl extends Mixed$44 {
+declare const Mixed$33: MixinCtor<abstract new () => TsDsl<ts.IfStatement>, DoMethods>;
+declare class IfTsDsl extends Mixed$33 {
   readonly '~dsl' = "IfTsDsl";
   protected _condition?: IfCondition;
   protected _else?: Array<DoExpr>;
@@ -6772,25 +7084,72 @@ declare class IfTsDsl extends Mixed$44 {
   analyze(ctx: AnalysisContext): void;
   condition(condition: IfCondition): this;
   otherwise(...items: Array<DoExpr>): this;
-  toAst(): ts.IfStatement;
+  toAst(ctx: AstContext): ts.IfStatement;
+}
+//#endregion
+//#region src/ts-dsl/utils/lazy.d.ts
+type LazyThunk<T extends ts.Node> = (ctx: AstContext) => TsDsl<T>;
+declare class LazyTsDsl<T extends ts.Node = ts.Node> extends TsDsl<T> {
+  readonly '~dsl' = "LazyTsDsl";
+  private _thunk;
+  constructor(thunk: LazyThunk<T>);
+  analyze(ctx: AnalysisContext): void;
+  toAst(ctx: AstContext): T;
+}
+//#endregion
+//#region src/ts-dsl/expr/new.d.ts
+type NewExpr = Symbol | string | MaybeTsDsl<ts.Expression>;
+declare const Mixed$32: MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.NewExpression>, TypeArgsMethods>, ExprMethods>, ArgsMethods>;
+declare class NewTsDsl extends Mixed$32 {
+  readonly '~dsl' = "NewTsDsl";
+  protected classExpr: Ref<NewExpr>;
+  constructor(classExpr: NewExpr, ...args: ReadonlyArray<NewExpr>);
+  analyze(ctx: AnalysisContext): void;
+  toAst(ctx: AstContext): ts.NewExpression;
+}
+//#endregion
+//#region src/ts-dsl/layout/note.d.ts
+type NoteMaybeLazy<T> = ((ctx: AstContext) => T) | T;
+type NoteFn = (d: NoteTsDsl) => void;
+type NoteLines = NoteMaybeLazy<MaybeArray$1<string>>;
+declare class NoteTsDsl extends TsDsl<ts.Node> {
+  readonly '~dsl' = "NoteTsDsl";
+  protected _lines: Array<NoteLines>;
+  constructor(lines?: NoteLines, fn?: NoteFn);
+  analyze(ctx: AnalysisContext): void;
+  add(lines: NoteLines): this;
+  apply<T extends ts.Node>(ctx: AstContext, node: T): T;
+  toAst(ctx: AstContext): ts.Node;
 }
 //#endregion
 //#region src/ts-dsl/decl/setter.d.ts
 type SetterName = string | ts.PropertyName;
-declare const Mixed$43: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.SetAccessorDeclaration>, StaticMethods>, PublicMethods>, ProtectedMethods>, PrivateMethods>, ParamMethods>, DocMethods>, DoMethods>, DecoratorMethods>, AsyncMethods>, AbstractMethods>;
-declare class SetterTsDsl extends Mixed$43 {
+declare const Mixed$31: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.SetAccessorDeclaration>, StaticMethods>, PublicMethods>, ProtectedMethods>, PrivateMethods>, ParamMethods>, DocMethods>, DoMethods>, DecoratorMethods>, AsyncMethods>, AbstractMethods>;
+declare class SetterTsDsl extends Mixed$31 {
   readonly '~dsl' = "SetterTsDsl";
   protected name: SetterName;
   constructor(name: SetterName, fn?: (s: SetterTsDsl) => void);
   analyze(ctx: AnalysisContext): void;
-  toAst(): ts.SetAccessorDeclaration;
+  toAst(ctx: AstContext): ts.SetAccessorDeclaration;
+}
+//#endregion
+//#region src/ts-dsl/expr/template.d.ts
+type TemplatePart = Symbol | string | MaybeTsDsl<ts.Expression>;
+declare const Mixed$30: abstract new () => TsDsl<ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression>;
+declare class TemplateTsDsl extends Mixed$30 {
+  readonly '~dsl' = "TemplateTsDsl";
+  protected parts: Array<Ref<TemplatePart>>;
+  constructor(value?: TemplatePart);
+  analyze(ctx: AnalysisContext): void;
+  add(value: TemplatePart): this;
+  toAst(ctx: AstContext): ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression;
 }
 //#endregion
 //#region src/ts-dsl/type/param.d.ts
 type TypeParamName = Symbol | string;
 type TypeParamExpr = Symbol | string | boolean | MaybeTsDsl<TypeTsDsl>;
-declare const Mixed$42: abstract new () => TypeTsDsl<ts.TypeParameterDeclaration>;
-declare class TypeParamTsDsl extends Mixed$42 {
+declare const Mixed$29: abstract new () => TsDsl<ts.TypeParameterDeclaration>;
+declare class TypeParamTsDsl extends Mixed$29 {
   readonly '~dsl' = "TypeParamTsDsl";
   protected constraint?: Ref<TypeParamExpr>;
   protected defaultValue?: Ref<TypeParamExpr>;
@@ -6799,187 +7158,44 @@ declare class TypeParamTsDsl extends Mixed$42 {
   analyze(ctx: AnalysisContext): void;
   default(value: TypeParamExpr): this;
   extends(constraint: TypeParamExpr): this;
-  toAst(): ts.TypeParameterDeclaration;
+  toAst(ctx: AstContext): ts.TypeParameterDeclaration;
 }
 //#endregion
 //#region src/ts-dsl/mixins/type-params.d.ts
 interface TypeParamsMethods extends Node {
   /** Returns the type parameters as an array of ts.TypeParameterDeclaration nodes. */
-  $generics(): ReadonlyArray<ts.TypeParameterDeclaration> | undefined;
+  $generics(ast: AstContext): ReadonlyArray<ts.TypeParameterDeclaration> | undefined;
   /** Adds a single type parameter (e.g. `T` in `Array<T>`). */
   generic(...args: ConstructorParameters<typeof TypeParamTsDsl>): this;
   /** Adds type parameters (e.g. `Map<string, T>`). */
   generics(...args: ReadonlyArray<Symbol | string | MaybeTsDsl<TypeParamTsDsl>>): this;
 }
 //#endregion
-//#region src/ts-dsl/expr/typeof.d.ts
-declare const Mixed$41: MixinCtor<abstract new () => TsDsl<ts.TypeOfExpression>, OperatorMethods>;
-declare class TypeOfExprTsDsl extends Mixed$41 {
-  readonly '~dsl' = "TypeOfExprTsDsl";
-  protected _expr: string | MaybeTsDsl<ts.Expression>;
-  constructor(expr: string | MaybeTsDsl<ts.Expression>);
-  analyze(ctx: AnalysisContext): void;
-  toAst(): ts.TypeOfExpression;
-}
-//#endregion
-//#region src/ts-dsl/type/idx.d.ts
-type Base$2 = string | MaybeTsDsl<ts.TypeNode>;
-type Index = string | number | MaybeTsDsl<ts.TypeNode>;
-declare const Mixed$40: MixinCtor<abstract new () => TypeTsDsl<ts.IndexedAccessTypeNode>, TypeExprMethods>;
-declare class TypeIdxTsDsl extends Mixed$40 {
-  readonly '~dsl' = "TypeIdxTsDsl";
-  protected _base: Base$2;
-  protected _index: Index;
-  constructor(base: Base$2, index: Index);
-  analyze(ctx: AnalysisContext): void;
-  base(base: Base$2): this;
-  index(index: Index): this;
-  toAst(): ts.IndexedAccessTypeNode;
-}
-//#endregion
-//#region src/ts-dsl/type/operator.d.ts
-type Op = ts.SyntaxKind.KeyOfKeyword | ts.SyntaxKind.ReadonlyKeyword | ts.SyntaxKind.UniqueKeyword;
-type Type$2 = string | MaybeTsDsl<ts.TypeNode>;
-declare const Mixed$39: abstract new () => TypeTsDsl<ts.TypeOperatorNode>;
-/**
- * Builds a TypeScript `TypeOperatorNode`, such as:
- *
- * - `keyof T`
- * - `readonly U`
- * - `unique V`
- *
- * This DSL provides both a generic `.operator()` API and convenient
- * shorthand methods (`.keyof()`, `.readonly()`, `.unique()`).
- *
- * The node will throw during render if required fields are missing.
- */
-declare class TypeOperatorTsDsl extends Mixed$39 {
-  readonly '~dsl' = "TypeOperatorTsDsl";
-  protected _op?: Op;
-  protected _type?: Type$2;
-  analyze(ctx: AnalysisContext): void;
-  /** Shorthand: builds `keyof T`. */
-  keyof(type: Type$2): this;
-  /** Sets the operator explicitly. */
-  operator(op: Op): this;
-  /** Shorthand: builds `readonly T`. */
-  readonly(type: Type$2): this;
-  /** Sets the target type of the operator. */
-  type(type: Type$2): this;
-  /** Shorthand: builds `unique T`. */
-  unique(type: Type$2): this;
-  toAst(): ts.TypeOperatorNode;
-  /** Throws if required fields are not set. */
-  $validate(): asserts this is this & {
-    _op: Op;
-    _type: Type$2;
-  };
-  private missingRequiredCalls;
-}
-//#endregion
-//#region src/ts-dsl/type/query.d.ts
-declare const Mixed$38: MixinCtor<abstract new () => TypeTsDsl<ts.TypeQueryNode>, TypeExprMethods>;
-declare class TypeQueryTsDsl extends Mixed$38 {
-  readonly '~dsl' = "TypeQueryTsDsl";
-  protected _expr: string | MaybeTsDsl<TypeTsDsl | ts.Expression>;
-  constructor(expr: string | MaybeTsDsl<TypeTsDsl | ts.Expression>);
-  analyze(ctx: AnalysisContext): void;
-  toAst(): ts.TypeQueryNode;
-}
-//#endregion
-//#region src/ts-dsl/mixins/type-expr.d.ts
-interface TypeExprMethods extends Node {
-  /** Creates an indexed-access type (e.g. `Foo<T>[K]`). */
-  idx(this: MaybeTsDsl<TypeTsDsl>, index: string | number | MaybeTsDsl<ts.TypeNode>): TypeIdxTsDsl;
-  /** Shorthand: builds `keyof T`. */
-  keyof(this: MaybeTsDsl<TypeTsDsl>): TypeOperatorTsDsl;
-  /** Shorthand: builds `readonly T`. */
-  readonly(this: MaybeTsDsl<TypeTsDsl>): TypeOperatorTsDsl;
-  /** Create a TypeExpr node representing ReturnType<this>. */
-  returnType(this: MaybeTsDsl<ts.Expression>): TypeExprTsDsl;
-  /** Create a TypeOfExpr node representing typeof this. */
-  typeofExpr(this: MaybeTsDsl<ts.Expression>): TypeOfExprTsDsl;
-  /** Create a TypeQuery node representing typeof this. */
-  typeofType(this: MaybeTsDsl<TypeTsDsl | ts.Expression>): TypeQueryTsDsl;
-  /** Shorthand: builds `unique T`. */
-  unique(this: MaybeTsDsl<TypeTsDsl>): TypeOperatorTsDsl;
-}
-//#endregion
-//#region src/ts-dsl/type/attr.d.ts
-type Base$1 = Symbol | string | MaybeTsDsl<ts.EntityName>;
-type Right = Symbol | string | ts.Identifier;
-declare const Mixed$37: MixinCtor<abstract new () => TypeTsDsl<ts.QualifiedName>, TypeExprMethods>;
-declare class TypeAttrTsDsl extends Mixed$37 {
-  readonly '~dsl' = "TypeAttrTsDsl";
-  protected _base?: Ref<Base$1>;
-  protected _right: Ref<Right>;
-  constructor(base: Base$1 | Ref<Base$1>, right: string | ts.Identifier);
-  constructor(right: Right);
-  analyze(ctx: AnalysisContext): void;
-  base(base?: Base$1 | Ref<Base$1>): this;
-  right(right: Right): this;
-  toAst(): ts.QualifiedName;
-}
-//#endregion
-//#region src/ts-dsl/type/expr.d.ts
-type TypeExprName = Symbol | string;
-type TypeExprExpr = TypeExprName | TypeAttrTsDsl;
-declare const Mixed$36: MixinCtor<MixinCtor<abstract new () => TypeTsDsl<ts.TypeReferenceNode>, TypeExprMethods>, TypeArgsMethods>;
-declare class TypeExprTsDsl extends Mixed$36 {
-  readonly '~dsl' = "TypeExprTsDsl";
-  protected _exprInput?: Ref<TypeExprExpr>;
-  constructor();
-  constructor(fn: (t: TypeExprTsDsl) => void);
-  constructor(name: TypeExprName);
-  constructor(name: TypeExprName, fn?: (t: TypeExprTsDsl) => void);
-  analyze(ctx: AnalysisContext): void;
-  /** Accesses a nested type (e.g. `Foo.Bar`). */
-  attr(right: string | ts.Identifier | TypeAttrTsDsl): this;
-  toAst(): ts.TypeReferenceNode;
-}
-//#endregion
-//#region src/ts-dsl/decl/field.d.ts
-type FieldType = TypeExprName | TypeTsDsl;
-declare const Mixed$35: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.PropertyDeclaration>, ValueMethods>, StaticMethods>, ReadonlyMethods>, PublicMethods>, ProtectedMethods>, PrivateMethods>, DocMethods>, DecoratorMethods>;
-declare class FieldTsDsl extends Mixed$35 {
-  readonly '~dsl' = "FieldTsDsl";
-  protected name: string;
-  protected _type?: TypeTsDsl;
-  constructor(name: string, fn?: (f: FieldTsDsl) => void);
-  analyze(ctx: AnalysisContext): void;
-  /** Sets the field type. */
-  type(type: FieldType): this;
-  toAst(): ts.PropertyDeclaration;
-}
-//#endregion
 //#region src/ts-dsl/decl/init.d.ts
-declare const Mixed$34: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.ConstructorDeclaration>, PublicMethods>, ProtectedMethods>, PrivateMethods>, ParamMethods>, DocMethods>, DoMethods>, DecoratorMethods>;
-declare class InitTsDsl extends Mixed$34 {
+declare const Mixed$28: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.ConstructorDeclaration>, PublicMethods>, ProtectedMethods>, PrivateMethods>, ParamMethods>, DocMethods>, DoMethods>, DecoratorMethods>;
+declare class InitTsDsl extends Mixed$28 {
   readonly '~dsl' = "InitTsDsl";
   constructor(fn?: (i: InitTsDsl) => void);
   analyze(ctx: AnalysisContext): void;
-  toAst(): ts.ConstructorDeclaration;
+  toAst(ctx: AstContext): ts.ConstructorDeclaration;
 }
 //#endregion
 //#region src/ts-dsl/decl/method.d.ts
-declare const Mixed$33: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.MethodDeclaration>, TypeParamsMethods>, StaticMethods>, PublicMethods>, ProtectedMethods>, PrivateMethods>, ParamMethods>, OptionalMethods>, DocMethods>, DoMethods>, DecoratorMethods>, AsyncMethods>, AbstractMethods>;
-declare class MethodTsDsl extends Mixed$33 {
+declare const Mixed$27: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.MethodDeclaration>, TypeReturnsMethods>, TypeParamsMethods>, StaticMethods>, PublicMethods>, ProtectedMethods>, PrivateMethods>, ParamMethods>, OptionalMethods>, DocMethods>, DoMethods>, DecoratorMethods>, AsyncMethods>, AbstractMethods>;
+declare class MethodTsDsl extends Mixed$27 {
   readonly '~dsl' = "MethodTsDsl";
   protected name: string;
-  protected _returns?: TypeTsDsl;
   constructor(name: string, fn?: (m: MethodTsDsl) => void);
   analyze(ctx: AnalysisContext): void;
-  /** Sets the return type. */
-  returns(type: string | TypeTsDsl): this;
-  toAst(): ts.MethodDeclaration;
+  toAst(ctx: AstContext): ts.MethodDeclaration;
 }
 //#endregion
 //#region src/ts-dsl/decl/class.d.ts
 type Base = Symbol | string;
 type Name$1 = Symbol | string;
 type Body = Array<MaybeTsDsl<ts.ClassElement | ts.Node>>;
-declare const Mixed$32: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.ClassDeclaration>, TypeParamsMethods>, ExportMethods>, DocMethods>, DefaultMethods>, DecoratorMethods>, AbstractMethods>;
-declare class ClassTsDsl extends Mixed$32 {
+declare const Mixed$26: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.ClassDeclaration>, TypeParamsMethods>, ExportMethods>, DocMethods>, DefaultMethods>, DecoratorMethods>, AbstractMethods>;
+declare class ClassTsDsl extends Mixed$26 {
   readonly '~dsl' = "ClassTsDsl";
   protected baseClass?: Ref<Base>;
   protected body: Body;
@@ -6991,71 +7207,26 @@ declare class ClassTsDsl extends Mixed$32 {
   /** Records a base class to extend from. */
   extends(base?: Base): this;
   /** Adds a class field. */
-  field(name: string, fn?: (f: FieldTsDsl) => void): this;
+  field(name: FieldName, fn?: (f: FieldTsDsl) => void): this;
   /** Adds a class constructor. */
   init(fn?: (i: InitTsDsl) => void): this;
   /** Adds a class method. */
   method(name: string, fn?: (m: MethodTsDsl) => void): this;
   /** Inserts an empty line between members for formatting. */
   newline(): this;
-  toAst(): ts.ClassDeclaration;
+  toAst(ctx: AstContext): ts.ClassDeclaration;
   /** Builds heritage clauses (extends). */
   private _heritage;
 }
 //#endregion
-//#region src/ts-dsl/decl/decorator.d.ts
-type DecoratorName = Symbol | string | MaybeTsDsl<ts.Expression>;
-declare const Mixed$31: MixinCtor<abstract new () => TsDsl<ts.Decorator>, ArgsMethods>;
-declare class DecoratorTsDsl extends Mixed$31 {
-  readonly '~dsl' = "DecoratorTsDsl";
-  protected name: Ref<DecoratorName>;
-  constructor(name: DecoratorName, ...args: ReadonlyArray<string | MaybeTsDsl<ts.Expression>>);
-  analyze(ctx: AnalysisContext): void;
-  toAst(): ts.Decorator;
-}
-//#endregion
-//#region src/ts-dsl/decl/member.d.ts
-type Value$2 = string | number | MaybeTsDsl<ts.Expression>;
-type ValueFn$1 = Value$2 | ((m: EnumMemberTsDsl) => void);
-declare const Mixed$30: MixinCtor<abstract new () => TsDsl<ts.EnumMember>, DocMethods>;
-declare class EnumMemberTsDsl extends Mixed$30 {
-  readonly '~dsl' = "EnumMemberTsDsl";
-  private _name;
-  private _value?;
-  constructor(name: string, value?: ValueFn$1);
-  analyze(ctx: AnalysisContext): void;
-  /** Sets the enum member value. */
-  value(value?: Value$2): this;
-  toAst(): ts.EnumMember;
-}
-//#endregion
-//#region src/ts-dsl/decl/enum.d.ts
-type EnumName = Symbol | string;
-type Value$1 = string | number | MaybeTsDsl<ts.Expression>;
-type ValueFn = Value$1 | ((m: EnumMemberTsDsl) => void);
-declare const Mixed$29: MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.EnumDeclaration>, ExportMethods>, DocMethods>, ConstMethods>;
-declare class EnumTsDsl extends Mixed$29 {
-  readonly '~dsl' = "EnumTsDsl";
-  private _members;
-  private _name;
-  constructor(name: EnumName, fn?: (e: EnumTsDsl) => void);
-  analyze(ctx: AnalysisContext): void;
-  /** Adds an enum member. */
-  member(name: string, value?: ValueFn): this;
-  /** Adds multiple enum members. */
-  members(...members: ReadonlyArray<EnumMemberTsDsl>): this;
-  toAst(): ts.EnumDeclaration;
-}
-//#endregion
 //#region src/ts-dsl/decl/func.d.ts
 type FuncMode = 'arrow' | 'decl' | 'expr';
 type FuncName = Symbol | string;
-declare const Mixed$28: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.ArrowFunction>, TypeParamsMethods>, StaticMethods>, PublicMethods>, ProtectedMethods>, PrivateMethods>, ParamMethods>, DocMethods>, DoMethods>, DecoratorMethods>, AsyncMethods>, AsMethods>, AbstractMethods>;
-declare class ImplFuncTsDsl<M extends FuncMode = 'arrow'> extends Mixed$28 {
+declare const Mixed$25: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.ArrowFunction>, TypeReturnsMethods>, TypeParamsMethods>, StaticMethods>, PublicMethods>, ProtectedMethods>, PrivateMethods>, ParamMethods>, DocMethods>, DoMethods>, DecoratorMethods>, AsyncMethods>, AsMethods>, AbstractMethods>;
+declare class ImplFuncTsDsl<M extends FuncMode = 'arrow'> extends Mixed$25 {
   readonly '~dsl' = "FuncTsDsl";
   protected mode?: FuncMode;
   protected name?: Ref<FuncName>;
-  protected _returns?: TypeTsDsl;
   constructor();
   constructor(fn: (f: ImplFuncTsDsl<'arrow'>) => void);
   constructor(name: FuncName);
@@ -7067,9 +7238,7 @@ declare class ImplFuncTsDsl<M extends FuncMode = 'arrow'> extends Mixed$28 {
   decl(): FuncTsDsl<'decl'>;
   /** Switches the function to a function expression form. */
   expr(): FuncTsDsl<'expr'>;
-  /** Sets the return type. */
-  returns(type: string | TypeTsDsl): this;
-  toAst(): M extends 'decl' ? ts.FunctionDeclaration : M extends 'expr' ? ts.FunctionExpression : ts.ArrowFunction;
+  toAst(ctx: AstContext): M extends 'decl' ? ts.FunctionDeclaration : M extends 'expr' ? ts.FunctionExpression : ts.ArrowFunction;
 }
 declare const FuncTsDsl: {
   new (): FuncTsDsl<"arrow">;
@@ -7080,11 +7249,11 @@ declare const FuncTsDsl: {
 type FuncTsDsl<M extends FuncMode = 'arrow'> = ImplFuncTsDsl<M>;
 //#endregion
 //#region src/ts-dsl/decl/pattern.d.ts
-declare const Mixed$27: abstract new () => TsDsl<ts.BindingName>;
+declare const Mixed$24: abstract new () => TsDsl<ts.BindingName>;
 /**
  * Builds binding patterns (e.g. `{ foo, bar }`, `[a, b, ...rest]`).
  */
-declare class PatternTsDsl extends Mixed$27 {
+declare class PatternTsDsl extends Mixed$24 {
   readonly '~dsl' = "PatternTsDsl";
   protected pattern?: {
     kind: 'array';
@@ -7101,7 +7270,7 @@ declare class PatternTsDsl extends Mixed$27 {
   object(...props: ReadonlyArray<MaybeArray$1<string> | Record<string, string>>): this;
   /** Adds a spread element (e.g. `...rest`, `...options`, `...args`). */
   spread(name: string): this;
-  toAst(): ts.ObjectBindingPattern | ts.ArrayBindingPattern;
+  toAst(ctx: AstContext): ts.ObjectBindingPattern | ts.ArrayBindingPattern;
   private createSpread;
 }
 //#endregion
@@ -7118,8 +7287,8 @@ interface LayoutMethods extends Node {
 }
 //#endregion
 //#region src/ts-dsl/expr/array.d.ts
-declare const Mixed$26: MixinCtor<MixinCtor<abstract new () => TsDsl<ts.ArrayLiteralExpression>, LayoutMethods>, AsMethods>;
-declare class ArrayTsDsl extends Mixed$26 {
+declare const Mixed$23: MixinCtor<MixinCtor<abstract new () => TsDsl<ts.ArrayLiteralExpression>, LayoutMethods>, AsMethods>;
+declare class ArrayTsDsl extends Mixed$23 {
   readonly '~dsl' = "ArrayTsDsl";
   protected _elements: Array<{
     expr: MaybeTsDsl<ts.Expression>;
@@ -7136,23 +7305,23 @@ declare class ArrayTsDsl extends Mixed$26 {
   elements(...exprs: ReadonlyArray<string | number | boolean | MaybeTsDsl<ts.Expression>>): this;
   /** Adds a spread element (`...expr`). */
   spread(expr: MaybeTsDsl<ts.Expression>): this;
-  toAst(): ts.ArrayLiteralExpression;
+  toAst(ctx: AstContext): ts.ArrayLiteralExpression;
 }
 //#endregion
 //#region src/ts-dsl/expr/expr.d.ts
 type Id = Symbol | string | MaybeTsDsl<ts.Expression>;
-declare const Mixed$25: MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.Expression>, TypeExprMethods>, OperatorMethods>, ExprMethods>, AsMethods>;
-declare class ExprTsDsl extends Mixed$25 {
+declare const Mixed$22: MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.Expression>, TypeExprMethods>, OperatorMethods>, ExprMethods>, AsMethods>;
+declare class ExprTsDsl extends Mixed$22 {
   readonly '~dsl' = "ExprTsDsl";
   protected _exprInput: Ref<Id>;
   constructor(id: Id);
   analyze(ctx: AnalysisContext): void;
-  toAst(): any;
+  toAst(ctx: AstContext): ts.Expression;
 }
 //#endregion
 //#region src/ts-dsl/expr/id.d.ts
-declare const Mixed$24: abstract new () => TsDsl<ts.Identifier>;
-declare class IdTsDsl extends Mixed$24 {
+declare const Mixed$21: abstract new () => TsDsl<ts.Identifier>;
+declare class IdTsDsl extends Mixed$21 {
   readonly '~dsl' = "IdTsDsl";
   protected name: string;
   constructor(name: string);
@@ -7161,41 +7330,13 @@ declare class IdTsDsl extends Mixed$24 {
 }
 //#endregion
 //#region src/ts-dsl/expr/literal.d.ts
-declare const Mixed$23: MixinCtor<abstract new () => TsDsl<ts.LiteralExpression | ts.NullLiteral | ts.BooleanLiteral | ts.PrefixUnaryExpression>, AsMethods>;
-declare class LiteralTsDsl extends Mixed$23 {
+declare const Mixed$20: MixinCtor<abstract new () => TsDsl<ts.LiteralExpression | ts.NullLiteral | ts.BooleanLiteral | ts.PrefixUnaryExpression>, AsMethods>;
+declare class LiteralTsDsl extends Mixed$20 {
   readonly '~dsl' = "LiteralTsDsl";
   protected value: string | number | boolean | null;
   constructor(value: string | number | boolean | null);
   analyze(ctx: AnalysisContext): void;
-  toAst(): any;
-}
-//#endregion
-//#region src/ts-dsl/expr/new.d.ts
-type NewExpr = Symbol | string | MaybeTsDsl<ts.Expression>;
-declare const Mixed$22: MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.NewExpression>, TypeArgsMethods>, ExprMethods>, ArgsMethods>;
-declare class NewTsDsl extends Mixed$22 {
-  readonly '~dsl' = "NewTsDsl";
-  protected classExpr: Ref<NewExpr>;
-  constructor(classExpr: NewExpr, ...args: ReadonlyArray<NewExpr>);
-  analyze(ctx: AnalysisContext): void;
-  toAst(): ts.NewExpression;
-}
-//#endregion
-//#region src/ts-dsl/layout/hint.d.ts
-declare class HintTsDsl extends TsDsl<ts.Node> {
-  readonly '~dsl' = "HintTsDsl";
-  protected _lines: Array<string>;
-  constructor(lines?: MaybeArray$1<string>, fn?: (d: HintTsDsl) => void);
-  analyze(ctx: AnalysisContext): void;
-  add(...lines: ReadonlyArray<string>): this;
-  apply<T extends ts.Node>(node: T): T;
-  toAst(): ts.Node;
-}
-//#endregion
-//#region src/ts-dsl/mixins/hint.d.ts
-interface HintMethods extends Node {
-  $hint<T extends ts.Node>(node: T): T;
-  hint(lines?: MaybeArray$1<string>, fn?: (h: HintTsDsl) => void): this;
+  toAst(ctx: AstContext): ts.StringLiteral | ts.NumericLiteral | ts.NullLiteral | ts.TrueLiteral | ts.FalseLiteral | ts.PrefixUnaryExpression;
 }
 //#endregion
 //#region src/ts-dsl/expr/prop.d.ts
@@ -7218,8 +7359,8 @@ type Meta = {
   kind: 'spread';
   name?: undefined;
 };
-declare const Mixed$21: MixinCtor<abstract new () => TsDsl<ts.ObjectLiteralElementLike>, DocMethods>;
-declare class ObjectPropTsDsl extends Mixed$21 {
+declare const Mixed$19: MixinCtor<abstract new () => TsDsl<ts.ObjectLiteralElementLike>, DocMethods>;
+declare class ObjectPropTsDsl extends Mixed$19 {
   readonly '~dsl' = "ObjectPropTsDsl";
   protected _value?: Ref<Expr$1 | Stmt$1>;
   protected meta: Meta;
@@ -7228,7 +7369,7 @@ declare class ObjectPropTsDsl extends Mixed$21 {
   /** Returns true when all required builder calls are present. */
   get isValid(): boolean;
   value(value: Expr$1 | Stmt$1 | ((p: ObjectPropTsDsl) => void)): this;
-  toAst(): any;
+  toAst(ctx: AstContext): ts.GetAccessorDeclaration | ts.SetAccessorDeclaration | ts.PropertyAssignment | ts.ShorthandPropertyAssignment | ts.SpreadAssignment;
   $validate(): asserts this is this & {
     _value: Expr$1 | Stmt$1;
     kind: Kind;
@@ -7241,8 +7382,8 @@ type Expr = Symbol | string | MaybeTsDsl<ts.Expression>;
 type Stmt = Symbol | string | MaybeTsDsl<ts.Statement>;
 type ExprFn = Expr | ((p: ObjectPropTsDsl) => void);
 type StmtFn = Stmt | ((p: ObjectPropTsDsl) => void);
-declare const Mixed$20: MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.ObjectLiteralExpression>, LayoutMethods>, HintMethods>, ExprMethods>, AsMethods>;
-declare class ObjectTsDsl extends Mixed$20 {
+declare const Mixed$18: MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.ObjectLiteralExpression>, LayoutMethods>, HintMethods>, ExprMethods>, AsMethods>;
+declare class ObjectTsDsl extends Mixed$18 {
   readonly '~dsl' = "ObjectTsDsl";
   protected _props: Array<ObjectPropTsDsl>;
   constructor(...props: Array<ObjectPropTsDsl>);
@@ -7263,12 +7404,12 @@ declare class ObjectTsDsl extends Mixed$20 {
   setter(name: string, stmt: StmtFn): this;
   /** Adds a spread property (e.g. `{ ...options }`). */
   spread(expr: ExprFn): this;
-  toAst(): ts.ObjectLiteralExpression;
+  toAst(ctx: AstContext): ts.ObjectLiteralExpression;
 }
 //#endregion
 //#region src/ts-dsl/expr/prefix.d.ts
-declare const Mixed$19: abstract new () => TsDsl<ts.PrefixUnaryExpression>;
-declare class PrefixTsDsl extends Mixed$19 {
+declare const Mixed$17: abstract new () => TsDsl<ts.PrefixUnaryExpression>;
+declare class PrefixTsDsl extends Mixed$17 {
   readonly '~dsl' = "PrefixTsDsl";
   protected _expr?: string | MaybeTsDsl<ts.Expression>;
   protected _op?: ts.PrefixUnaryOperator;
@@ -7282,14 +7423,14 @@ declare class PrefixTsDsl extends Mixed$19 {
   not(): this;
   /** Sets the operator (e.g. `ts.SyntaxKind.ExclamationToken` for `!`). */
   op(op: ts.PrefixUnaryOperator): this;
-  toAst(): ts.PrefixUnaryExpression;
+  toAst(ctx: AstContext): ts.PrefixUnaryExpression;
 }
 //#endregion
 //#region src/ts-dsl/expr/regexp.d.ts
 type RegexFlag = 'g' | 'i' | 'm' | 's' | 'u' | 'y';
 type RegexFlags<Avail extends string = RegexFlag> = '' | { [K in Avail]: `${K}${RegexFlags<Exclude<Avail, K>>}` }[Avail];
-declare const Mixed$18: abstract new () => TsDsl<ts.RegularExpressionLiteral>;
-declare class RegExpTsDsl extends Mixed$18 {
+declare const Mixed$16: abstract new () => TsDsl<ts.RegularExpressionLiteral>;
+declare class RegExpTsDsl extends Mixed$16 {
   readonly '~dsl' = "RegExpTsDsl";
   protected pattern: string;
   protected flags?: RegexFlags;
@@ -7298,21 +7439,9 @@ declare class RegExpTsDsl extends Mixed$18 {
   toAst(): ts.RegularExpressionLiteral;
 }
 //#endregion
-//#region src/ts-dsl/expr/template.d.ts
-type TemplatePart = Symbol | string | MaybeTsDsl<ts.Expression>;
-declare const Mixed$17: abstract new () => TsDsl<ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression>;
-declare class TemplateTsDsl extends Mixed$17 {
-  readonly '~dsl' = "TemplateTsDsl";
-  protected parts: Array<Ref<TemplatePart>>;
-  constructor(value?: TemplatePart);
-  analyze(ctx: AnalysisContext): void;
-  add(value: TemplatePart): this;
-  toAst(): ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression;
-}
-//#endregion
 //#region src/ts-dsl/expr/ternary.d.ts
-declare const Mixed$16: abstract new () => TsDsl<ts.ConditionalExpression>;
-declare class TernaryTsDsl extends Mixed$16 {
+declare const Mixed$15: abstract new () => TsDsl<ts.ConditionalExpression>;
+declare class TernaryTsDsl extends Mixed$15 {
   readonly '~dsl' = "TernaryTsDsl";
   protected _condition?: string | MaybeTsDsl<ts.Expression>;
   protected _then?: string | MaybeTsDsl<ts.Expression>;
@@ -7322,49 +7451,38 @@ declare class TernaryTsDsl extends Mixed$16 {
   condition(condition: string | MaybeTsDsl<ts.Expression>): this;
   do(expr: string | MaybeTsDsl<ts.Expression>): this;
   otherwise(expr: string | MaybeTsDsl<ts.Expression>): this;
-  toAst(): ts.ConditionalExpression;
+  toAst(ctx: AstContext): ts.ConditionalExpression;
 }
 //#endregion
 //#region src/ts-dsl/layout/newline.d.ts
 declare class NewlineTsDsl extends TsDsl<ts.Identifier> {
   readonly '~dsl' = "NewlineTsDsl";
   analyze(ctx: AnalysisContext): void;
-  toAst(): ts.Identifier;
-}
-//#endregion
-//#region src/ts-dsl/layout/note.d.ts
-declare class NoteTsDsl extends TsDsl<ts.Node> {
-  readonly '~dsl' = "NoteTsDsl";
-  protected _lines: Array<string>;
-  constructor(lines?: MaybeArray$1<string>, fn?: (d: NoteTsDsl) => void);
-  analyze(ctx: AnalysisContext): void;
-  add(...lines: ReadonlyArray<string>): this;
-  apply<T extends ts.Node>(node: T): T;
-  toAst(): ts.Node;
+  toAst(ctx: AstContext): ts.Identifier;
 }
 //#endregion
 //#region src/ts-dsl/stmt/block.d.ts
-declare const Mixed$15: MixinCtor<MixinCtor<abstract new () => TsDsl<ts.Block>, LayoutMethods>, DoMethods>;
-declare class BlockTsDsl extends Mixed$15 {
+declare const Mixed$14: MixinCtor<MixinCtor<abstract new () => TsDsl<ts.Block>, LayoutMethods>, DoMethods>;
+declare class BlockTsDsl extends Mixed$14 {
   readonly '~dsl' = "BlockTsDsl";
   constructor(...items: Array<DoExpr>);
   analyze(ctx: AnalysisContext): void;
-  toAst(): ts.Block;
+  toAst(ctx: AstContext): ts.Block;
 }
 //#endregion
 //#region src/ts-dsl/stmt/stmt.d.ts
-declare const Mixed$14: abstract new () => TsDsl<ts.Statement>;
-declare class StmtTsDsl extends Mixed$14 {
+declare const Mixed$13: abstract new () => TsDsl<ts.Statement>;
+declare class StmtTsDsl extends Mixed$13 {
   readonly '~dsl' = "StmtTsDsl";
   protected _inner: ts.Expression | ts.Statement | TsDsl<any>;
   constructor(inner: ts.Expression | ts.Statement | TsDsl<any>);
   analyze(ctx: AnalysisContext): void;
-  toAst(): ts.Statement;
+  toAst(ctx: AstContext): ts.Statement;
 }
 //#endregion
 //#region src/ts-dsl/stmt/throw.d.ts
-declare const Mixed$13: abstract new () => TsDsl<ts.ThrowStatement>;
-declare class ThrowTsDsl extends Mixed$13 {
+declare const Mixed$12: abstract new () => TsDsl<ts.ThrowStatement>;
+declare class ThrowTsDsl extends Mixed$12 {
   readonly '~dsl' = "ThrowTsDsl";
   protected error: string | MaybeTsDsl<ts.Expression>;
   protected msg?: string | MaybeTsDsl<ts.Expression>;
@@ -7372,13 +7490,13 @@ declare class ThrowTsDsl extends Mixed$13 {
   constructor(error: string | MaybeTsDsl<ts.Expression>, useNew?: boolean);
   analyze(ctx: AnalysisContext): void;
   message(value: string | MaybeTsDsl<ts.Expression>): this;
-  toAst(): ts.ThrowStatement;
+  toAst(ctx: AstContext): ts.ThrowStatement;
 }
 //#endregion
 //#region src/ts-dsl/stmt/try.d.ts
-declare const Mixed$12: abstract new () => TsDsl<ts.TryStatement>;
+declare const Mixed$11: abstract new () => TsDsl<ts.TryStatement>;
 type CatchParam = Symbol | string;
-declare class TryTsDsl extends Mixed$12 {
+declare class TryTsDsl extends Mixed$11 {
   readonly '~dsl' = "TryTsDsl";
   protected _catch?: Array<DoExpr>;
   protected _catchArg?: CatchParam;
@@ -7390,25 +7508,7 @@ declare class TryTsDsl extends Mixed$12 {
   catchArg(arg: CatchParam): this;
   finally(...items: Array<DoExpr>): this;
   try(...items: Array<DoExpr>): this;
-  toAst(): ts.TryStatement;
-}
-//#endregion
-//#region src/ts-dsl/stmt/var.d.ts
-type VarName = Symbol | string;
-declare const Mixed$11: MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.VariableStatement>, ValueMethods>, PatternMethods>, HintMethods>, ExportMethods>, DocMethods>, DefaultMethods>;
-declare class VarTsDsl extends Mixed$11 {
-  readonly '~dsl' = "VarTsDsl";
-  protected kind: ts.NodeFlags;
-  protected name?: Ref<VarName>;
-  protected _type?: TypeTsDsl;
-  constructor(name?: VarName);
-  analyze(ctx: AnalysisContext): void;
-  const(): this;
-  let(): this;
-  /** Sets the variable type. */
-  type(type: string | TypeTsDsl): this;
-  var(): this;
-  toAst(): ts.VariableStatement;
+  toAst(ctx: AstContext): ts.TryStatement;
 }
 //#endregion
 //#region src/ts-dsl/token.d.ts
@@ -7444,44 +7544,41 @@ declare class TypeAliasTsDsl extends Mixed$10 {
   analyze(ctx: AnalysisContext): void;
   /** Sets the type expression on the right-hand side of `= ...`. */
   type(node: Value): this;
-  toAst(): ts.TypeAliasDeclaration;
+  toAst(ctx: AstContext): ts.TypeAliasDeclaration;
 }
 //#endregion
 //#region src/ts-dsl/type/and.d.ts
 type Type$1 = Symbol | string | ts.TypeNode | TypeTsDsl;
-declare const Mixed$9: abstract new () => TypeTsDsl<ts.IntersectionTypeNode>;
+declare const Mixed$9: abstract new () => TsDsl<ts.IntersectionTypeNode>;
 declare class TypeAndTsDsl extends Mixed$9 {
   readonly '~dsl' = "TypeAndTsDsl";
   protected _types: Array<Ref<Type$1>>;
   constructor(...nodes: Array<Type$1>);
   analyze(ctx: AnalysisContext): void;
   types(...nodes: Array<Type$1>): this;
-  toAst(): ts.IntersectionTypeNode;
+  toAst(ctx: AstContext): ts.IntersectionTypeNode;
 }
 //#endregion
 //#region src/ts-dsl/type/func.d.ts
-declare const Mixed$8: MixinCtor<MixinCtor<MixinCtor<abstract new () => TypeTsDsl<ts.FunctionTypeNode>, TypeParamsMethods>, ParamMethods>, DocMethods>;
+declare const Mixed$8: MixinCtor<MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.FunctionTypeNode>, TypeReturnsMethods>, TypeParamsMethods>, ParamMethods>, DocMethods>;
 declare class TypeFuncTsDsl extends Mixed$8 {
   readonly '~dsl' = "TypeFuncTsDsl";
-  protected _returns?: TypeTsDsl;
   analyze(ctx: AnalysisContext): void;
-  /** Sets the return type. */
-  returns(type: string | TypeTsDsl): this;
-  toAst(): ts.FunctionTypeNode;
+  toAst(ctx: AstContext): ts.FunctionTypeNode;
 }
 //#endregion
 //#region src/ts-dsl/type/literal.d.ts
-declare const Mixed$7: abstract new () => TypeTsDsl<ts.LiteralTypeNode>;
+declare const Mixed$7: abstract new () => TsDsl<ts.LiteralTypeNode>;
 declare class TypeLiteralTsDsl extends Mixed$7 {
   readonly '~dsl' = "TypeLiteralTsDsl";
   protected value: string | number | boolean | null;
   constructor(value: string | number | boolean | null);
   analyze(ctx: AnalysisContext): void;
-  toAst(): ts.LiteralTypeNode;
+  toAst(ctx: AstContext): ts.LiteralTypeNode;
 }
 //#endregion
 //#region src/ts-dsl/type/mapped.d.ts
-declare const Mixed$6: abstract new () => TypeTsDsl<ts.MappedTypeNode>;
+declare const Mixed$6: abstract new () => TsDsl<ts.MappedTypeNode>;
 declare class TypeMappedTsDsl extends Mixed$6 {
   readonly '~dsl' = "TypeMappedTsDsl";
   protected questionToken?: TokenTsDsl<ts.SyntaxKind.QuestionToken | ts.SyntaxKind.PlusToken | ts.SyntaxKind.MinusToken>;
@@ -7507,7 +7604,7 @@ declare class TypeMappedTsDsl extends Mixed$6 {
   required(): this;
   /** Sets the mapped value type: `[K in X]: ValueType` */
   type(type: string | MaybeTsDsl<ts.TypeNode>): this;
-  toAst(): ts.MappedTypeNode;
+  toAst(ctx: AstContext): ts.MappedTypeNode;
   $validate(): asserts this is this & {
     _key: string | MaybeTsDsl<ts.TypeNode>;
     _name: string;
@@ -7519,7 +7616,7 @@ declare class TypeMappedTsDsl extends Mixed$6 {
 //#region src/ts-dsl/type/idx-sig.d.ts
 type TypeIdxSigName = string;
 type TypeIdxSigType = string | MaybeTsDsl<ts.TypeNode>;
-declare const Mixed$5: MixinCtor<MixinCtor<abstract new () => TypeTsDsl<ts.IndexSignatureDeclaration>, ReadonlyMethods>, DocMethods>;
+declare const Mixed$5: MixinCtor<MixinCtor<abstract new () => TsDsl<ts.IndexSignatureDeclaration>, ReadonlyMethods>, DocMethods>;
 declare class TypeIdxSigTsDsl extends Mixed$5 {
   readonly '~dsl' = "TypeIdxSigTsDsl";
   protected _key?: TypeIdxSigType;
@@ -7533,7 +7630,7 @@ declare class TypeIdxSigTsDsl extends Mixed$5 {
   key(type: TypeIdxSigType): this;
   /** Sets the property type. */
   type(type: TypeIdxSigType): this;
-  toAst(): ts.IndexSignatureDeclaration;
+  toAst(ctx: AstContext): ts.IndexSignatureDeclaration;
   $validate(): asserts this is this & {
     _key: TypeIdxSigType;
     _name: TypeIdxSigName;
@@ -7545,7 +7642,7 @@ declare class TypeIdxSigTsDsl extends Mixed$5 {
 //#region src/ts-dsl/type/prop.d.ts
 type TypePropName = string;
 type TypePropType = Symbol | string | MaybeTsDsl<ts.TypeNode>;
-declare const Mixed$4: MixinCtor<MixinCtor<MixinCtor<abstract new () => TypeTsDsl<ts.TypeElement>, ReadonlyMethods>, OptionalMethods>, DocMethods>;
+declare const Mixed$4: MixinCtor<MixinCtor<MixinCtor<abstract new () => TsDsl<ts.TypeElement>, ReadonlyMethods>, OptionalMethods>, DocMethods>;
 declare class TypePropTsDsl extends Mixed$4 {
   readonly '~dsl' = "TypePropTsDsl";
   protected name: TypePropName;
@@ -7554,11 +7651,11 @@ declare class TypePropTsDsl extends Mixed$4 {
   analyze(ctx: AnalysisContext): void;
   /** Sets the property type. */
   type(type: TypePropType): this;
-  toAst(): ts.PropertySignature;
+  toAst(ctx: AstContext): ts.PropertySignature;
 }
 //#endregion
 //#region src/ts-dsl/type/object.d.ts
-declare const Mixed$3: abstract new () => TypeTsDsl<ts.TypeNode>;
+declare const Mixed$3: abstract new () => TsDsl<ts.TypeNode>;
 declare class TypeObjectTsDsl extends Mixed$3 {
   readonly '~dsl' = "TypeObjectTsDsl";
   protected props: Array<TypePropTsDsl | TypeIdxSigTsDsl>;
@@ -7571,23 +7668,23 @@ declare class TypeObjectTsDsl extends Mixed$3 {
   get isEmpty(): boolean;
   /** Adds a property signature (returns property builder). */
   prop(name: string, fn: (p: TypePropTsDsl) => void): this;
-  toAst(): ts.TypeLiteralNode;
+  toAst(ctx: AstContext): ts.TypeLiteralNode;
 }
 //#endregion
 //#region src/ts-dsl/type/or.d.ts
 type Type = Symbol | string | ts.TypeNode | TypeTsDsl;
-declare const Mixed$2: abstract new () => TypeTsDsl<ts.UnionTypeNode>;
+declare const Mixed$2: abstract new () => TsDsl<ts.UnionTypeNode>;
 declare class TypeOrTsDsl extends Mixed$2 {
   readonly '~dsl' = "TypeOrTsDsl";
   protected _types: Array<Ref<Type>>;
   constructor(...nodes: Array<Type>);
   analyze(ctx: AnalysisContext): void;
   types(...nodes: Array<Type>): this;
-  toAst(): ts.UnionTypeNode;
+  toAst(ctx: AstContext): ts.UnionTypeNode;
 }
 //#endregion
 //#region src/ts-dsl/type/template.d.ts
-declare const Mixed$1: abstract new () => TypeTsDsl<ts.TemplateLiteralTypeNode>;
+declare const Mixed$1: abstract new () => TsDsl<ts.TemplateLiteralTypeNode>;
 declare class TypeTemplateTsDsl extends Mixed$1 {
   readonly '~dsl' = "TypeTemplateTsDsl";
   protected parts: Array<string | MaybeTsDsl<ts.TypeNode>>;
@@ -7595,18 +7692,18 @@ declare class TypeTemplateTsDsl extends Mixed$1 {
   analyze(ctx: AnalysisContext): void;
   /** Adds a raw string segment or embedded type expression. */
   add(part: string | MaybeTsDsl<ts.TypeNode>): this;
-  toAst(): ts.TemplateLiteralTypeNode;
+  toAst(ctx: AstContext): ts.TemplateLiteralTypeNode;
 }
 //#endregion
 //#region src/ts-dsl/type/tuple.d.ts
-declare const Mixed: abstract new () => TypeTsDsl<ts.TupleTypeNode>;
+declare const Mixed: abstract new () => TsDsl<ts.TupleTypeNode>;
 declare class TypeTupleTsDsl extends Mixed {
   readonly '~dsl' = "TypeTupleTsDsl";
   protected _elements: Array<string | ts.TypeNode | TypeTsDsl>;
   constructor(...nodes: Array<string | ts.TypeNode | TypeTsDsl>);
   analyze(ctx: AnalysisContext): void;
   elements(...types: Array<string | ts.TypeNode | TypeTsDsl>): this;
-  toAst(): ts.TupleTypeNode;
+  toAst(ctx: AstContext): ts.TupleTypeNode;
 }
 //#endregion
 //#region src/ts-dsl/render/typescript.d.ts
@@ -7703,39 +7800,39 @@ declare const reserved: {
 };
 //#endregion
 //#region src/ts-dsl/index.d.ts
-declare const $: ((id: any) => ExprTsDsl) & {
+declare const $: ((id: string | _hey_api_codegen_core0.Symbol | ts.Expression | TsDsl<ts.Expression>) => ExprTsDsl) & {
   /** Creates an array literal expression (e.g. `[1, 2, 3]`). */
   array: (...args: ConstructorParameters<typeof ArrayTsDsl>) => ArrayTsDsl;
   /** Creates an `as` type assertion expression (e.g. `value as Type`). */
-  as: (expr: any, type: any) => AsTsDsl;
+  as: (expr: AsExpr, type: AsType) => AsTsDsl;
   /** Creates a property access expression (e.g. `obj.foo`). */
-  attr: (left: any, right: any) => AttrTsDsl;
+  attr: (left: AttrLeft, right: AttrRight) => AttrTsDsl;
   /** Creates an await expression (e.g. `await promise`). */
-  await: (expr: any) => AwaitTsDsl;
+  await: (expr: AwaitExpr) => AwaitTsDsl;
   /** Creates a binary expression (e.g. `a + b`). */
-  binary: (base: any, op?: (("!=" | "!==" | "&&" | "*" | "+" | "-" | "/" | "<" | "<=" | "=" | "==" | "===" | ">" | ">=" | "??" | "||") | typescript0.BinaryOperator) | undefined, expr?: any) => BinaryTsDsl;
+  binary: (base: string | _hey_api_codegen_core0.Symbol | ts.Expression | TsDsl<ts.Expression>, op?: (("!=" | "!==" | "&&" | "*" | "+" | "-" | "/" | "<" | "<=" | "=" | "==" | "===" | ">" | ">=" | "??" | "??=" | "||") | ts.BinaryOperator) | undefined, expr?: (string | _hey_api_codegen_core0.Symbol | ts.Expression | TsDsl<ts.Expression>) | undefined) => BinaryTsDsl;
   /** Creates a statement block (`{ ... }`). */
   block: (...args: ConstructorParameters<typeof BlockTsDsl>) => BlockTsDsl;
   /** Creates a function or method call expression (e.g. `fn(arg)`). */
-  call: (callee: CallCallee, ...args: any[]) => CallTsDsl;
+  call: (callee: CallCallee, ...args: (CallArg | undefined)[]) => CallTsDsl;
   /** Creates a class declaration or expression. */
-  class: (name: any) => ClassTsDsl;
+  class: (name: string | _hey_api_codegen_core0.Symbol) => ClassTsDsl;
   /** Creates a constant variable declaration (`const`). */
-  const: (name?: any) => VarTsDsl;
+  const: (name?: VarName | undefined) => VarTsDsl;
   /** Creates a decorator expression (e.g. `@decorator`). */
-  decorator: (name: any, ...args: (string | typescript0.Expression | TsDsl<typescript0.Expression>)[]) => DecoratorTsDsl;
+  decorator: (name: DecoratorName, ...args: (string | ts.Expression | TsDsl<ts.Expression>)[]) => DecoratorTsDsl;
   /** Creates a JSDoc documentation block. */
-  doc: (lines?: MaybeArray$1<string> | undefined, fn?: ((d: DocTsDsl) => void) | undefined) => DocTsDsl;
+  doc: (lines?: DocLines | undefined, fn?: DocFn | undefined) => DocTsDsl;
   /** Creates an enum declaration. */
-  enum: (name: any, fn?: ((e: EnumTsDsl) => void) | undefined) => EnumTsDsl;
+  enum: (name: EnumName, fn?: ((e: EnumTsDsl) => void) | undefined) => EnumTsDsl;
   /** Creates a general expression node. */
-  expr: (id: any) => ExprTsDsl;
+  expr: (id: string | _hey_api_codegen_core0.Symbol | ts.Expression | TsDsl<ts.Expression>) => ExprTsDsl;
   /** Creates a field declaration in a class or object. */
-  field: (name: string, fn?: ((f: FieldTsDsl) => void) | undefined) => FieldTsDsl;
+  field: (name: FieldName, fn?: ((f: FieldTsDsl) => void) | undefined) => FieldTsDsl;
   /** Converts a runtime value into a corresponding expression node. */
   fromValue: (input: unknown, options?: {
     layout?: "pretty";
-  } | undefined) => TsDsl<typescript0.Expression>;
+  } | undefined) => TsDsl<ts.Expression>;
   /** Creates a function expression or declaration. */
   func: {
     (): FuncTsDsl<"arrow">;
@@ -7747,39 +7844,41 @@ declare const $: ((id: any) => ExprTsDsl) & {
   /** Creates a getter method declaration. */
   getter: (name: GetterName, fn?: ((g: GetterTsDsl) => void) | undefined) => GetterTsDsl;
   /** Creates a single-line comment (//). */
-  hint: (lines?: MaybeArray$1<string> | undefined, fn?: ((d: HintTsDsl) => void) | undefined) => HintTsDsl;
+  hint: (lines?: HintLines | undefined, fn?: HintFn | undefined) => HintTsDsl;
   /** Creates an identifier (e.g. `foo`). */
   id: (name: string) => IdTsDsl;
   /** Creates an if statement. */
   if: (condition?: IfCondition | undefined) => IfTsDsl;
   /** Creates an initialization block or statement. */
   init: (fn?: ((i: InitTsDsl) => void) | undefined) => InitTsDsl;
+  /** Creates a lazy, context-aware node with deferred evaluation. */
+  lazy: <T extends ts.Node>(thunk: LazyThunk<T>) => LazyTsDsl<T>;
   /** Creates a let variable declaration (`let`). */
-  let: (name?: any) => VarTsDsl;
+  let: (name?: VarName | undefined) => VarTsDsl;
   /** Creates a literal value (e.g. string, number, boolean). */
   literal: (value: string | number | boolean | null) => LiteralTsDsl;
   /** Creates an enum member declaration. */
-  member: (name: string, value?: ((string | number | typescript0.Expression | TsDsl<typescript0.Expression>) | ((m: EnumMemberTsDsl) => void)) | undefined) => EnumMemberTsDsl;
+  member: (name: string, value?: ((string | number | ts.Expression | TsDsl<ts.Expression>) | ((m: EnumMemberTsDsl) => void)) | undefined) => EnumMemberTsDsl;
   /** Creates a method declaration inside a class or object. */
   method: (name: string, fn?: ((m: MethodTsDsl) => void) | undefined) => MethodTsDsl;
   /** Creates a negation expression (`-x`). */
-  neg: (expr?: string | typescript0.Expression | TsDsl<typescript0.Expression> | undefined, op?: typescript0.PrefixUnaryOperator | undefined) => PrefixTsDsl;
+  neg: (expr?: string | ts.Expression | TsDsl<ts.Expression> | undefined, op?: ts.PrefixUnaryOperator | undefined) => PrefixTsDsl;
   /** Creates a new expression (e.g. `new ClassName()`). */
-  new: (classExpr: any, ...args: any[]) => NewTsDsl;
+  new: (classExpr: NewExpr, ...args: NewExpr[]) => NewTsDsl;
   /** Creates a newline (for formatting purposes). */
   newline: () => NewlineTsDsl;
   /** Creates a logical NOT expression (`!x`). */
-  not: (expr?: string | typescript0.Expression | TsDsl<typescript0.Expression> | undefined, op?: typescript0.PrefixUnaryOperator | undefined) => PrefixTsDsl;
+  not: (expr?: string | ts.Expression | TsDsl<ts.Expression> | undefined, op?: ts.PrefixUnaryOperator | undefined) => PrefixTsDsl;
   /** Creates a block comment (/* ... *\/). */
-  note: (lines?: MaybeArray$1<string> | undefined, fn?: ((d: NoteTsDsl) => void) | undefined) => NoteTsDsl;
+  note: (lines?: NoteLines | undefined, fn?: NoteFn | undefined) => NoteTsDsl;
   /** Creates an object literal expression. */
   object: (...args: ConstructorParameters<typeof ObjectTsDsl>) => ObjectTsDsl;
   /** Creates a parameter declaration for functions or methods. */
-  param: (name: any, fn?: ((p: ParamTsDsl) => void) | undefined) => ParamTsDsl;
+  param: (name: ParamName | ((p: ParamTsDsl) => void), fn?: ((p: ParamTsDsl) => void) | undefined) => ParamTsDsl;
   /** Creates a pattern for destructuring or matching. */
   pattern: () => PatternTsDsl;
   /** Creates a prefix unary expression (e.g. `-x`, `!x`, `~x`). */
-  prefix: (expr?: string | typescript0.Expression | TsDsl<typescript0.Expression> | undefined, op?: typescript0.PrefixUnaryOperator | undefined) => PrefixTsDsl;
+  prefix: (expr?: string | ts.Expression | TsDsl<ts.Expression> | undefined, op?: ts.PrefixUnaryOperator | undefined) => PrefixTsDsl;
   /** Creates an object literal property (e.g. `{ foo: bar }`). */
   prop: (meta: {
     kind: "computed";
@@ -7800,37 +7899,37 @@ declare const $: ((id: any) => ExprTsDsl) & {
   /** Creates a regular expression literal (e.g. `/foo/gi`). */
   regexp: (pattern: string, flags?: ("" | "g" | "i" | "m" | "s" | "u" | "y" | "uy" | "yu" | "su" | "sy" | "suy" | "syu" | "ys" | "us" | "usy" | "uys" | "ysu" | "yus" | "ms" | "mu" | "my" | "muy" | "myu" | "msu" | "msy" | "msuy" | "msyu" | "mys" | "mus" | "musy" | "muys" | "mysu" | "myus" | "ym" | "um" | "umy" | "uym" | "ymu" | "yum" | "sm" | "smu" | "smy" | "smuy" | "smyu" | "sym" | "sum" | "sumy" | "suym" | "symu" | "syum" | "yms" | "ysm" | "ums" | "umsy" | "umys" | "usm" | "usmy" | "usym" | "uyms" | "uysm" | "ymsu" | "ymus" | "ysmu" | "ysum" | "yums" | "yusm" | "im" | "is" | "iu" | "iy" | "iuy" | "iyu" | "isu" | "isy" | "isuy" | "isyu" | "iys" | "ius" | "iusy" | "iuys" | "iysu" | "iyus" | "ims" | "imu" | "imy" | "imuy" | "imyu" | "imsu" | "imsy" | "imsuy" | "imsyu" | "imys" | "imus" | "imusy" | "imuys" | "imysu" | "imyus" | "iym" | "ium" | "iumy" | "iuym" | "iymu" | "iyum" | "ism" | "ismu" | "ismy" | "ismuy" | "ismyu" | "isym" | "isum" | "isumy" | "isuym" | "isymu" | "isyum" | "iyms" | "iysm" | "iums" | "iumsy" | "iumys" | "iusm" | "iusmy" | "iusym" | "iuyms" | "iuysm" | "iymsu" | "iymus" | "iysmu" | "iysum" | "iyums" | "iyusm" | "yi" | "ui" | "uiy" | "uyi" | "yiu" | "yui" | "si" | "siu" | "siy" | "siuy" | "siyu" | "syi" | "sui" | "suiy" | "suyi" | "syiu" | "syui" | "yis" | "ysi" | "uis" | "uisy" | "uiys" | "usi" | "usiy" | "usyi" | "uyis" | "uysi" | "yisu" | "yius" | "ysiu" | "ysui" | "yuis" | "yusi" | "mi" | "mis" | "miu" | "miy" | "miuy" | "miyu" | "misu" | "misy" | "misuy" | "misyu" | "miys" | "mius" | "miusy" | "miuys" | "miysu" | "miyus" | "myi" | "mui" | "muiy" | "muyi" | "myiu" | "myui" | "msi" | "msiu" | "msiy" | "msiuy" | "msiyu" | "msyi" | "msui" | "msuiy" | "msuyi" | "msyiu" | "msyui" | "myis" | "mysi" | "muis" | "muisy" | "muiys" | "musi" | "musiy" | "musyi" | "muyis" | "muysi" | "myisu" | "myius" | "mysiu" | "mysui" | "myuis" | "myusi" | "yim" | "ymi" | "uim" | "uimy" | "uiym" | "umi" | "umiy" | "umyi" | "uyim" | "uymi" | "yimu" | "yium" | "ymiu" | "ymui" | "yuim" | "yumi" | "sim" | "simu" | "simy" | "simuy" | "simyu" | "siym" | "sium" | "siumy" | "siuym" | "siymu" | "siyum" | "smi" | "smiu" | "smiy" | "smiuy" | "smiyu" | "smyi" | "smui" | "smuiy" | "smuyi" | "smyiu" | "smyui" | "syim" | "symi" | "suim" | "suimy" | "suiym" | "sumi" | "sumiy" | "sumyi" | "suyim" | "suymi" | "syimu" | "syium" | "symiu" | "symui" | "syuim" | "syumi" | "yims" | "yism" | "ymis" | "ymsi" | "ysim" | "ysmi" | "uims" | "uimsy" | "uimys" | "uism" | "uismy" | "uisym" | "uiyms" | "uiysm" | "umis" | "umisy" | "umiys" | "umsi" | "umsiy" | "umsyi" | "umyis" | "umysi" | "usim" | "usimy" | "usiym" | "usmi" | "usmiy" | "usmyi" | "usyim" | "usymi" | "uyims" | "uyism" | "uymis" | "uymsi" | "uysim" | "uysmi" | "yimsu" | "yimus" | "yismu" | "yisum" | "yiums" | "yiusm" | "ymisu" | "ymius" | "ymsiu" | "ymsui" | "ymuis" | "ymusi" | "ysimu" | "ysium" | "ysmiu" | "ysmui" | "ysuim" | "ysumi" | "yuims" | "yuism" | "yumis" | "yumsi" | "yusim" | "yusmi" | "gi" | "gm" | "gs" | "gu" | "gy" | "guy" | "gyu" | "gsu" | "gsy" | "gsuy" | "gsyu" | "gys" | "gus" | "gusy" | "guys" | "gysu" | "gyus" | "gms" | "gmu" | "gmy" | "gmuy" | "gmyu" | "gmsu" | "gmsy" | "gmsuy" | "gmsyu" | "gmys" | "gmus" | "gmusy" | "gmuys" | "gmysu" | "gmyus" | "gym" | "gum" | "gumy" | "guym" | "gymu" | "gyum" | "gsm" | "gsmu" | "gsmy" | "gsmuy" | "gsmyu" | "gsym" | "gsum" | "gsumy" | "gsuym" | "gsymu" | "gsyum" | "gyms" | "gysm" | "gums" | "gumsy" | "gumys" | "gusm" | "gusmy" | "gusym" | "guyms" | "guysm" | "gymsu" | "gymus" | "gysmu" | "gysum" | "gyums" | "gyusm" | "gim" | "gis" | "giu" | "giy" | "giuy" | "giyu" | "gisu" | "gisy" | "gisuy" | "gisyu" | "giys" | "gius" | "giusy" | "giuys" | "giysu" | "giyus" | "gims" | "gimu" | "gimy" | "gimuy" | "gimyu" | "gimsu" | "gimsy" | "gimsuy" | "gimsyu" | "gimys" | "gimus" | "gimusy" | "gimuys" | "gimysu" | "gimyus" | "giym" | "gium" | "giumy" | "giuym" | "giymu" | "giyum" | "gism" | "gismu" | "gismy" | "gismuy" | "gismyu" | "gisym" | "gisum" | "gisumy" | "gisuym" | "gisymu" | "gisyum" | "giyms" | "giysm" | "giums" | "giumsy" | "giumys" | "giusm" | "giusmy" | "giusym" | "giuyms" | "giuysm" | "giymsu" | "giymus" | "giysmu" | "giysum" | "giyums" | "giyusm" | "gyi" | "gui" | "guiy" | "guyi" | "gyiu" | "gyui" | "gsi" | "gsiu" | "gsiy" | "gsiuy" | "gsiyu" | "gsyi" | "gsui" | "gsuiy" | "gsuyi" | "gsyiu" | "gsyui" | "gyis" | "gysi" | "guis" | "guisy" | "guiys" | "gusi" | "gusiy" | "gusyi" | "guyis" | "guysi" | "gyisu" | "gyius" | "gysiu" | "gysui" | "gyuis" | "gyusi" | "gmi" | "gmis" | "gmiu" | "gmiy" | "gmiuy" | "gmiyu" | "gmisu" | "gmisy" | "gmisuy" | "gmisyu" | "gmiys" | "gmius" | "gmiusy" | "gmiuys" | "gmiysu" | "gmiyus" | "gmyi" | "gmui" | "gmuiy" | "gmuyi" | "gmyiu" | "gmyui" | "gmsi" | "gmsiu" | "gmsiy" | "gmsiuy" | "gmsiyu" | "gmsyi" | "gmsui" | "gmsuiy" | "gmsuyi" | "gmsyiu" | "gmsyui" | "gmyis" | "gmysi" | "gmuis" | "gmuisy" | "gmuiys" | "gmusi" | "gmusiy" | "gmusyi" | "gmuyis" | "gmuysi" | "gmyisu" | "gmyius" | "gmysiu" | "gmysui" | "gmyuis" | "gmyusi" | "gyim" | "gymi" | "guim" | "guimy" | "guiym" | "gumi" | "gumiy" | "gumyi" | "guyim" | "guymi" | "gyimu" | "gyium" | "gymiu" | "gymui" | "gyuim" | "gyumi" | "gsim" | "gsimu" | "gsimy" | "gsimuy" | "gsimyu" | "gsiym" | "gsium" | "gsiumy" | "gsiuym" | "gsiymu" | "gsiyum" | "gsmi" | "gsmiu" | "gsmiy" | "gsmiuy" | "gsmiyu" | "gsmyi" | "gsmui" | "gsmuiy" | "gsmuyi" | "gsmyiu" | "gsmyui" | "gsyim" | "gsymi" | "gsuim" | "gsuimy" | "gsuiym" | "gsumi" | "gsumiy" | "gsumyi" | "gsuyim" | "gsuymi" | "gsyimu" | "gsyium" | "gsymiu" | "gsymui" | "gsyuim" | "gsyumi" | "gyims" | "gyism" | "gymis" | "gymsi" | "gysim" | "gysmi" | "guims" | "guimsy" | "guimys" | "guism" | "guismy" | "guisym" | "guiyms" | "guiysm" | "gumis" | "gumisy" | "gumiys" | "gumsi" | "gumsiy" | "gumsyi" | "gumyis" | "gumysi" | "gusim" | "gusimy" | "gusiym" | "gusmi" | "gusmiy" | "gusmyi" | "gusyim" | "gusymi" | "guyims" | "guyism" | "guymis" | "guymsi" | "guysim" | "guysmi" | "gyimsu" | "gyimus" | "gyismu" | "gyisum" | "gyiums" | "gyiusm" | "gymisu" | "gymius" | "gymsiu" | "gymsui" | "gymuis" | "gymusi" | "gysimu" | "gysium" | "gysmiu" | "gysmui" | "gysuim" | "gysumi" | "gyuims" | "gyuism" | "gyumis" | "gyumsi" | "gyusim" | "gyusmi" | "yg" | "ug" | "ugy" | "uyg" | "ygu" | "yug" | "sg" | "sgu" | "sgy" | "sguy" | "sgyu" | "syg" | "sug" | "sugy" | "suyg" | "sygu" | "syug" | "ygs" | "ysg" | "ugs" | "ugsy" | "ugys" | "usg" | "usgy" | "usyg" | "uygs" | "uysg" | "ygsu" | "ygus" | "ysgu" | "ysug" | "yugs" | "yusg" | "mg" | "mgs" | "mgu" | "mgy" | "mguy" | "mgyu" | "mgsu" | "mgsy" | "mgsuy" | "mgsyu" | "mgys" | "mgus" | "mgusy" | "mguys" | "mgysu" | "mgyus" | "myg" | "mug" | "mugy" | "muyg" | "mygu" | "myug" | "msg" | "msgu" | "msgy" | "msguy" | "msgyu" | "msyg" | "msug" | "msugy" | "msuyg" | "msygu" | "msyug" | "mygs" | "mysg" | "mugs" | "mugsy" | "mugys" | "musg" | "musgy" | "musyg" | "muygs" | "muysg" | "mygsu" | "mygus" | "mysgu" | "mysug" | "myugs" | "myusg" | "ygm" | "ymg" | "ugm" | "ugmy" | "ugym" | "umg" | "umgy" | "umyg" | "uygm" | "uymg" | "ygmu" | "ygum" | "ymgu" | "ymug" | "yugm" | "yumg" | "sgm" | "sgmu" | "sgmy" | "sgmuy" | "sgmyu" | "sgym" | "sgum" | "sgumy" | "sguym" | "sgymu" | "sgyum" | "smg" | "smgu" | "smgy" | "smguy" | "smgyu" | "smyg" | "smug" | "smugy" | "smuyg" | "smygu" | "smyug" | "sygm" | "symg" | "sugm" | "sugmy" | "sugym" | "sumg" | "sumgy" | "sumyg" | "suygm" | "suymg" | "sygmu" | "sygum" | "symgu" | "symug" | "syugm" | "syumg" | "ygms" | "ygsm" | "ymgs" | "ymsg" | "ysgm" | "ysmg" | "ugms" | "ugmsy" | "ugmys" | "ugsm" | "ugsmy" | "ugsym" | "ugyms" | "ugysm" | "umgs" | "umgsy" | "umgys" | "umsg" | "umsgy" | "umsyg" | "umygs" | "umysg" | "usgm" | "usgmy" | "usgym" | "usmg" | "usmgy" | "usmyg" | "usygm" | "usymg" | "uygms" | "uygsm" | "uymgs" | "uymsg" | "uysgm" | "uysmg" | "ygmsu" | "ygmus" | "ygsmu" | "ygsum" | "ygums" | "ygusm" | "ymgsu" | "ymgus" | "ymsgu" | "ymsug" | "ymugs" | "ymusg" | "ysgmu" | "ysgum" | "ysmgu" | "ysmug" | "ysugm" | "ysumg" | "yugms" | "yugsm" | "yumgs" | "yumsg" | "yusgm" | "yusmg" | "ig" | "igm" | "igs" | "igu" | "igy" | "iguy" | "igyu" | "igsu" | "igsy" | "igsuy" | "igsyu" | "igys" | "igus" | "igusy" | "iguys" | "igysu" | "igyus" | "igms" | "igmu" | "igmy" | "igmuy" | "igmyu" | "igmsu" | "igmsy" | "igmsuy" | "igmsyu" | "igmys" | "igmus" | "igmusy" | "igmuys" | "igmysu" | "igmyus" | "igym" | "igum" | "igumy" | "iguym" | "igymu" | "igyum" | "igsm" | "igsmu" | "igsmy" | "igsmuy" | "igsmyu" | "igsym" | "igsum" | "igsumy" | "igsuym" | "igsymu" | "igsyum" | "igyms" | "igysm" | "igums" | "igumsy" | "igumys" | "igusm" | "igusmy" | "igusym" | "iguyms" | "iguysm" | "igymsu" | "igymus" | "igysmu" | "igysum" | "igyums" | "igyusm" | "iyg" | "iug" | "iugy" | "iuyg" | "iygu" | "iyug" | "isg" | "isgu" | "isgy" | "isguy" | "isgyu" | "isyg" | "isug" | "isugy" | "isuyg" | "isygu" | "isyug" | "iygs" | "iysg" | "iugs" | "iugsy" | "iugys" | "iusg" | "iusgy" | "iusyg" | "iuygs" | "iuysg" | "iygsu" | "iygus" | "iysgu" | "iysug" | "iyugs" | "iyusg" | "img" | "imgs" | "imgu" | "imgy" | "imguy" | "imgyu" | "imgsu" | "imgsy" | "imgsuy" | "imgsyu" | "imgys" | "imgus" | "imgusy" | "imguys" | "imgysu" | "imgyus" | "imyg" | "imug" | "imugy" | "imuyg" | "imygu" | "imyug" | "imsg" | "imsgu" | "imsgy" | "imsguy" | "imsgyu" | "imsyg" | "imsug" | "imsugy" | "imsuyg" | "imsygu" | "imsyug" | "imygs" | "imysg" | "imugs" | "imugsy" | "imugys" | "imusg" | "imusgy" | "imusyg" | "imuygs" | "imuysg" | "imygsu" | "imygus" | "imysgu" | "imysug" | "imyugs" | "imyusg" | "iygm" | "iymg" | "iugm" | "iugmy" | "iugym" | "iumg" | "iumgy" | "iumyg" | "iuygm" | "iuymg" | "iygmu" | "iygum" | "iymgu" | "iymug" | "iyugm" | "iyumg" | "isgm" | "isgmu" | "isgmy" | "isgmuy" | "isgmyu" | "isgym" | "isgum" | "isgumy" | "isguym" | "isgymu" | "isgyum" | "ismg" | "ismgu" | "ismgy" | "ismguy" | "ismgyu" | "ismyg" | "ismug" | "ismugy" | "ismuyg" | "ismygu" | "ismyug" | "isygm" | "isymg" | "isugm" | "isugmy" | "isugym" | "isumg" | "isumgy" | "isumyg" | "isuygm" | "isuymg" | "isygmu" | "isygum" | "isymgu" | "isymug" | "isyugm" | "isyumg" | "iygms" | "iygsm" | "iymgs" | "iymsg" | "iysgm" | "iysmg" | "iugms" | "iugmsy" | "iugmys" | "iugsm" | "iugsmy" | "iugsym" | "iugyms" | "iugysm" | "iumgs" | "iumgsy" | "iumgys" | "iumsg" | "iumsgy" | "iumsyg" | "iumygs" | "iumysg" | "iusgm" | "iusgmy" | "iusgym" | "iusmg" | "iusmgy" | "iusmyg" | "iusygm" | "iusymg" | "iuygms" | "iuygsm" | "iuymgs" | "iuymsg" | "iuysgm" | "iuysmg" | "iygmsu" | "iygmus" | "iygsmu" | "iygsum" | "iygums" | "iygusm" | "iymgsu" | "iymgus" | "iymsgu" | "iymsug" | "iymugs" | "iymusg" | "iysgmu" | "iysgum" | "iysmgu" | "iysmug" | "iysugm" | "iysumg" | "iyugms" | "iyugsm" | "iyumgs" | "iyumsg" | "iyusgm" | "iyusmg" | "ygi" | "yig" | "ugi" | "ugiy" | "ugyi" | "uig" | "uigy" | "uiyg" | "uygi" | "uyig" | "ygiu" | "ygui" | "yigu" | "yiug" | "yugi" | "yuig" | "sgi" | "sgiu" | "sgiy" | "sgiuy" | "sgiyu" | "sgyi" | "sgui" | "sguiy" | "sguyi" | "sgyiu" | "sgyui" | "sig" | "sigu" | "sigy" | "siguy" | "sigyu" | "siyg" | "siug" | "siugy" | "siuyg" | "siygu" | "siyug" | "sygi" | "syig" | "sugi" | "sugiy" | "sugyi" | "suig" | "suigy" | "suiyg" | "suygi" | "suyig" | "sygiu" | "sygui" | "syigu" | "syiug" | "syugi" | "syuig" | "ygis" | "ygsi" | "yigs" | "yisg" | "ysgi" | "ysig" | "ugis" | "ugisy" | "ugiys" | "ugsi" | "ugsiy" | "ugsyi" | "ugyis" | "ugysi" | "uigs" | "uigsy" | "uigys" | "uisg" | "uisgy" | "uisyg" | "uiygs" | "uiysg" | "usgi" | "usgiy" | "usgyi" | "usig" | "usigy" | "usiyg" | "usygi" | "usyig" | "uygis" | "uygsi" | "uyigs" | "uyisg" | "uysgi" | "uysig" | "ygisu" | "ygius" | "ygsiu" | "ygsui" | "yguis" | "ygusi" | "yigsu" | "yigus" | "yisgu" | "yisug" | "yiugs" | "yiusg" | "ysgiu" | "ysgui" | "ysigu" | "ysiug" | "ysugi" | "ysuig" | "yugis" | "yugsi" | "yuigs" | "yuisg" | "yusgi" | "yusig" | "mgi" | "mgis" | "mgiu" | "mgiy" | "mgiuy" | "mgiyu" | "mgisu" | "mgisy" | "mgisuy" | "mgisyu" | "mgiys" | "mgius" | "mgiusy" | "mgiuys" | "mgiysu" | "mgiyus" | "mgyi" | "mgui" | "mguiy" | "mguyi" | "mgyiu" | "mgyui" | "mgsi" | "mgsiu" | "mgsiy" | "mgsiuy" | "mgsiyu" | "mgsyi" | "mgsui" | "mgsuiy" | "mgsuyi" | "mgsyiu" | "mgsyui" | "mgyis" | "mgysi" | "mguis" | "mguisy" | "mguiys" | "mgusi" | "mgusiy" | "mgusyi" | "mguyis" | "mguysi" | "mgyisu" | "mgyius" | "mgysiu" | "mgysui" | "mgyuis" | "mgyusi" | "mig" | "migs" | "migu" | "migy" | "miguy" | "migyu" | "migsu" | "migsy" | "migsuy" | "migsyu" | "migys" | "migus" | "migusy" | "miguys" | "migysu" | "migyus" | "miyg" | "miug" | "miugy" | "miuyg" | "miygu" | "miyug" | "misg" | "misgu" | "misgy" | "misguy" | "misgyu" | "misyg" | "misug" | "misugy" | "misuyg" | "misygu" | "misyug" | "miygs" | "miysg" | "miugs" | "miugsy" | "miugys" | "miusg" | "miusgy" | "miusyg" | "miuygs" | "miuysg" | "miygsu" | "miygus" | "miysgu" | "miysug" | "miyugs" | "miyusg" | "mygi" | "myig" | "mugi" | "mugiy" | "mugyi" | "muig" | "muigy" | "muiyg" | "muygi" | "muyig" | "mygiu" | "mygui" | "myigu" | "myiug" | "myugi" | "myuig" | "msgi" | "msgiu" | "msgiy" | "msgiuy" | "msgiyu" | "msgyi" | "msgui" | "msguiy" | "msguyi" | "msgyiu" | "msgyui" | "msig" | "msigu" | "msigy" | "msiguy" | "msigyu" | "msiyg" | "msiug" | "msiugy" | "msiuyg" | "msiygu" | "msiyug" | "msygi" | "msyig" | "msugi" | "msugiy" | "msugyi" | "msuig" | "msuigy" | "msuiyg" | "msuygi" | "msuyig" | "msygiu" | "msygui" | "msyigu" | "msyiug" | "msyugi" | "msyuig" | "mygis" | "mygsi" | "myigs" | "myisg" | "mysgi" | "mysig" | "mugis" | "mugisy" | "mugiys" | "mugsi" | "mugsiy" | "mugsyi" | "mugyis" | "mugysi" | "muigs" | "muigsy" | "muigys" | "muisg" | "muisgy" | "muisyg" | "muiygs" | "muiysg" | "musgi" | "musgiy" | "musgyi" | "musig" | "musigy" | "musiyg" | "musygi" | "musyig" | "muygis" | "muygsi" | "muyigs" | "muyisg" | "muysgi" | "muysig" | "mygisu" | "mygius" | "mygsiu" | "mygsui" | "myguis" | "mygusi" | "myigsu" | "myigus" | "myisgu" | "myisug" | "myiugs" | "myiusg" | "mysgiu" | "mysgui" | "mysigu" | "mysiug" | "mysugi" | "mysuig" | "myugis" | "myugsi" | "myuigs" | "myuisg" | "myusgi" | "myusig" | "ygim" | "ygmi" | "yigm" | "yimg" | "ymgi" | "ymig" | "ugim" | "ugimy" | "ugiym" | "ugmi" | "ugmiy" | "ugmyi" | "ugyim" | "ugymi" | "uigm" | "uigmy" | "uigym" | "uimg" | "uimgy" | "uimyg" | "uiygm" | "uiymg" | "umgi" | "umgiy" | "umgyi" | "umig" | "umigy" | "umiyg" | "umygi" | "umyig" | "uygim" | "uygmi" | "uyigm" | "uyimg" | "uymgi" | "uymig" | "ygimu" | "ygium" | "ygmiu" | "ygmui" | "yguim" | "ygumi" | "yigmu" | "yigum" | "yimgu" | "yimug" | "yiugm" | "yiumg" | "ymgiu" | "ymgui" | "ymigu" | "ymiug" | "ymugi" | "ymuig" | "yugim" | "yugmi" | "yuigm" | "yuimg" | "yumgi" | "yumig" | "sgim" | "sgimu" | "sgimy" | "sgimuy" | "sgimyu" | "sgiym" | "sgium" | "sgiumy" | "sgiuym" | "sgiymu" | "sgiyum" | "sgmi" | "sgmiu" | "sgmiy" | "sgmiuy" | "sgmiyu" | "sgmyi" | "sgmui" | "sgmuiy" | "sgmuyi" | "sgmyiu" | "sgmyui" | "sgyim" | "sgymi" | "sguim" | "sguimy" | "sguiym" | "sgumi" | "sgumiy" | "sgumyi" | "sguyim" | "sguymi" | "sgyimu" | "sgyium" | "sgymiu" | "sgymui" | "sgyuim" | "sgyumi" | "sigm" | "sigmu" | "sigmy" | "sigmuy" | "sigmyu" | "sigym" | "sigum" | "sigumy" | "siguym" | "sigymu" | "sigyum" | "simg" | "simgu" | "simgy" | "simguy" | "simgyu" | "simyg" | "simug" | "simugy" | "simuyg" | "simygu" | "simyug" | "siygm" | "siymg" | "siugm" | "siugmy" | "siugym" | "siumg" | "siumgy" | "siumyg" | "siuygm" | "siuymg" | "siygmu" | "siygum" | "siymgu" | "siymug" | "siyugm" | "siyumg" | "smgi" | "smgiu" | "smgiy" | "smgiuy" | "smgiyu" | "smgyi" | "smgui" | "smguiy" | "smguyi" | "smgyiu" | "smgyui" | "smig" | "smigu" | "smigy" | "smiguy" | "smigyu" | "smiyg" | "smiug" | "smiugy" | "smiuyg" | "smiygu" | "smiyug" | "smygi" | "smyig" | "smugi" | "smugiy" | "smugyi" | "smuig" | "smuigy" | "smuiyg" | "smuygi" | "smuyig" | "smygiu" | "smygui" | "smyigu" | "smyiug" | "smyugi" | "smyuig" | "sygim" | "sygmi" | "syigm" | "syimg" | "symgi" | "symig" | "sugim" | "sugimy" | "sugiym" | "sugmi" | "sugmiy" | "sugmyi" | "sugyim" | "sugymi" | "suigm" | "suigmy" | "suigym" | "suimg" | "suimgy" | "suimyg" | "suiygm" | "suiymg" | "sumgi" | "sumgiy" | "sumgyi" | "sumig" | "sumigy" | "sumiyg" | "sumygi" | "sumyig" | "suygim" | "suygmi" | "suyigm" | "suyimg" | "suymgi" | "suymig" | "sygimu" | "sygium" | "sygmiu" | "sygmui" | "syguim" | "sygumi" | "syigmu" | "syigum" | "syimgu" | "syimug" | "syiugm" | "syiumg" | "symgiu" | "symgui" | "symigu" | "symiug" | "symugi" | "symuig" | "syugim" | "syugmi" | "syuigm" | "syuimg" | "syumgi" | "syumig" | "ygims" | "ygism" | "ygmis" | "ygmsi" | "ygsim" | "ygsmi" | "yigms" | "yigsm" | "yimgs" | "yimsg" | "yisgm" | "yismg" | "ymgis" | "ymgsi" | "ymigs" | "ymisg" | "ymsgi" | "ymsig" | "ysgim" | "ysgmi" | "ysigm" | "ysimg" | "ysmgi" | "ysmig" | "ugims" | "ugimsy" | "ugimys" | "ugism" | "ugismy" | "ugisym" | "ugiyms" | "ugiysm" | "ugmis" | "ugmisy" | "ugmiys" | "ugmsi" | "ugmsiy" | "ugmsyi" | "ugmyis" | "ugmysi" | "ugsim" | "ugsimy" | "ugsiym" | "ugsmi" | "ugsmiy" | "ugsmyi" | "ugsyim" | "ugsymi" | "ugyims" | "ugyism" | "ugymis" | "ugymsi" | "ugysim" | "ugysmi" | "uigms" | "uigmsy" | "uigmys" | "uigsm" | "uigsmy" | "uigsym" | "uigyms" | "uigysm" | "uimgs" | "uimgsy" | "uimgys" | "uimsg" | "uimsgy" | "uimsyg" | "uimygs" | "uimysg" | "uisgm" | "uisgmy" | "uisgym" | "uismg" | "uismgy" | "uismyg" | "uisygm" | "uisymg" | "uiygms" | "uiygsm" | "uiymgs" | "uiymsg" | "uiysgm" | "uiysmg" | "umgis" | "umgisy" | "umgiys" | "umgsi" | "umgsiy" | "umgsyi" | "umgyis" | "umgysi" | "umigs" | "umigsy" | "umigys" | "umisg" | "umisgy" | "umisyg" | "umiygs" | "umiysg" | "umsgi" | "umsgiy" | "umsgyi" | "umsig" | "umsigy" | "umsiyg" | "umsygi" | "umsyig" | "umygis" | "umygsi" | "umyigs" | "umyisg" | "umysgi" | "umysig" | "usgim" | "usgimy" | "usgiym" | "usgmi" | "usgmiy" | "usgmyi" | "usgyim" | "usgymi" | "usigm" | "usigmy" | "usigym" | "usimg" | "usimgy" | "usimyg" | "usiygm" | "usiymg" | "usmgi" | "usmgiy" | "usmgyi" | "usmig" | "usmigy" | "usmiyg" | "usmygi" | "usmyig" | "usygim" | "usygmi" | "usyigm" | "usyimg" | "usymgi" | "usymig" | "uygims" | "uygism" | "uygmis" | "uygmsi" | "uygsim" | "uygsmi" | "uyigms" | "uyigsm" | "uyimgs" | "uyimsg" | "uyisgm" | "uyismg" | "uymgis" | "uymgsi" | "uymigs" | "uymisg" | "uymsgi" | "uymsig" | "uysgim" | "uysgmi" | "uysigm" | "uysimg" | "uysmgi" | "uysmig" | "ygimsu" | "ygimus" | "ygismu" | "ygisum" | "ygiums" | "ygiusm" | "ygmisu" | "ygmius" | "ygmsiu" | "ygmsui" | "ygmuis" | "ygmusi" | "ygsimu" | "ygsium" | "ygsmiu" | "ygsmui" | "ygsuim" | "ygsumi" | "yguims" | "yguism" | "ygumis" | "ygumsi" | "ygusim" | "ygusmi" | "yigmsu" | "yigmus" | "yigsmu" | "yigsum" | "yigums" | "yigusm" | "yimgsu" | "yimgus" | "yimsgu" | "yimsug" | "yimugs" | "yimusg" | "yisgmu" | "yisgum" | "yismgu" | "yismug" | "yisugm" | "yisumg" | "yiugms" | "yiugsm" | "yiumgs" | "yiumsg" | "yiusgm" | "yiusmg" | "ymgisu" | "ymgius" | "ymgsiu" | "ymgsui" | "ymguis" | "ymgusi" | "ymigsu" | "ymigus" | "ymisgu" | "ymisug" | "ymiugs" | "ymiusg" | "ymsgiu" | "ymsgui" | "ymsigu" | "ymsiug" | "ymsugi" | "ymsuig" | "ymugis" | "ymugsi" | "ymuigs" | "ymuisg" | "ymusgi" | "ymusig" | "ysgimu" | "ysgium" | "ysgmiu" | "ysgmui" | "ysguim" | "ysgumi" | "ysigmu" | "ysigum" | "ysimgu" | "ysimug" | "ysiugm" | "ysiumg" | "ysmgiu" | "ysmgui" | "ysmigu" | "ysmiug" | "ysmugi" | "ysmuig" | "ysugim" | "ysugmi" | "ysuigm" | "ysuimg" | "ysumgi" | "ysumig" | "yugims" | "yugism" | "yugmis" | "yugmsi" | "yugsim" | "yugsmi" | "yuigms" | "yuigsm" | "yuimgs" | "yuimsg" | "yuisgm" | "yuismg" | "yumgis" | "yumgsi" | "yumigs" | "yumisg" | "yumsgi" | "yumsig" | "yusgim" | "yusgmi" | "yusigm" | "yusimg" | "yusmgi" | "yusmig") | undefined) => RegExpTsDsl;
   /** Creates a return statement. */
-  return: (expr?: any) => ReturnTsDsl;
+  return: (expr?: ReturnExpr | undefined) => ReturnTsDsl;
   /** Creates a setter method declaration. */
   setter: (name: SetterName, fn?: ((s: SetterTsDsl) => void) | undefined) => SetterTsDsl;
   /** Wraps an expression or statement-like value into a `StmtTsDsl`. */
-  stmt: (inner: typescript0.Expression | typescript0.Statement | TsDsl<any>) => StmtTsDsl;
+  stmt: (inner: ts.Expression | ts.Statement | TsDsl<any>) => StmtTsDsl;
   /** Creates a template literal expression. */
-  template: (value?: any) => TemplateTsDsl;
+  template: (value?: TemplatePart | undefined) => TemplateTsDsl;
   /** Creates a ternary conditional expression (if ? then : else). */
-  ternary: (condition?: string | typescript0.Expression | TsDsl<typescript0.Expression> | undefined) => TernaryTsDsl;
+  ternary: (condition?: string | ts.Expression | TsDsl<ts.Expression> | undefined) => TernaryTsDsl;
   /** Creates a throw statement. */
-  throw: (error: string | typescript0.Expression | TsDsl<typescript0.Expression>, useNew?: boolean | undefined) => ThrowTsDsl;
+  throw: (error: string | ts.Expression | TsDsl<ts.Expression>, useNew?: boolean | undefined) => ThrowTsDsl;
   /** Creates a syntax token (e.g. `?`, `readonly`, `+`, `-`). */
   token: () => TokenTsDsl<never>;
   /** Creates a try/catch/finally statement. */
   try: (...args: ConstructorParameters<typeof TryTsDsl>) => TryTsDsl;
   /** Creates a basic type reference or type expression (e.g. Foo or Foo<T>). */
-  type: ((name: any, fn?: ((t: TypeExprTsDsl) => void) | undefined) => TypeExprTsDsl) & {
+  type: ((name: TypeExprName, fn?: TypeExprFn | undefined) => TypeExprTsDsl) & {
     /** Creates a type alias declaration (e.g. `type Foo = Bar`). */
-    alias: (name: any, fn?: ((t: TypeAliasTsDsl) => void) | undefined) => TypeAliasTsDsl;
+    alias: (name: string | _hey_api_codegen_core0.Symbol, fn?: ((t: TypeAliasTsDsl) => void) | undefined) => TypeAliasTsDsl;
     /** Creates an intersection type (e.g. `A & B`). */
     and: (...args: ConstructorParameters<typeof TypeAndTsDsl>) => TypeAndTsDsl;
     /** Creates a qualified type reference (e.g. Foo.Bar). */
-    attr: (right: any) => TypeAttrTsDsl;
+    attr: (right: string | _hey_api_codegen_core0.Symbol | ts.Identifier) => TypeAttrTsDsl;
     /** Creates a basic type reference or type expression (e.g. Foo or Foo<T>). */
-    expr: (name: any, fn?: ((t: TypeExprTsDsl) => void) | undefined) => TypeExprTsDsl;
+    expr: (name: TypeExprName, fn?: TypeExprFn | undefined) => TypeExprTsDsl;
     /** Converts a runtime value into a corresponding type expression node. */
-    fromValue: (input: unknown) => TsDsl<typescript0.TypeNode>;
+    fromValue: (input: unknown) => TsDsl<ts.TypeNode>;
     /** Creates a function type node (e.g. `(a: string) => number`). */
     func: (...args: ConstructorParameters<typeof TypeFuncTsDsl>) => TypeFuncTsDsl;
     /** Creates an indexed-access type (e.g. `Foo<T>[K]`). */
-    idx: (base: string | typescript0.TypeNode | TsDsl<typescript0.TypeNode>, index: string | number | typescript0.TypeNode | TsDsl<typescript0.TypeNode>) => TypeIdxTsDsl;
+    idx: (base: string | ts.TypeNode | TsDsl<ts.TypeNode>, index: string | number | ts.TypeNode | TsDsl<ts.TypeNode>) => TypeIdxTsDsl;
     /** Creates a literal type node (e.g. 'foo', 42, or true). */
     literal: (value: string | number | boolean | null) => TypeLiteralTsDsl;
     /** Creates a mapped type (e.g. `{ [K in keyof T]: U }`). */
@@ -7842,18 +7941,18 @@ declare const $: ((id: any) => ExprTsDsl) & {
     /** Represents a union type (e.g. `A | B | C`). */
     or: (...args: ConstructorParameters<typeof TypeOrTsDsl>) => TypeOrTsDsl;
     /** Creates a type parameter (e.g. `<T>`). */
-    param: (name?: any, fn?: ((name: TypeParamTsDsl) => void) | undefined) => TypeParamTsDsl;
+    param: (name?: TypeParamName | undefined, fn?: ((name: TypeParamTsDsl) => void) | undefined) => TypeParamTsDsl;
     /** Creates a type query node (e.g. `typeof Foo`). */
-    query: (expr: string | MaybeTsDsl<typescript0.Expression | TypeTsDsl<typescript0.TypeNode>>) => TypeQueryTsDsl;
+    query: (expr: TypeQueryExpr) => TypeQueryTsDsl;
     /** Builds a TypeScript template literal *type* (e.g. `${Foo}-${Bar}` as a type). */
-    template: (value?: string | typescript0.TypeNode | TsDsl<typescript0.TypeNode> | undefined) => TypeTemplateTsDsl;
+    template: (value?: string | ts.TypeNode | TsDsl<ts.TypeNode> | undefined) => TypeTemplateTsDsl;
     /** Creates a tuple type (e.g. [A, B, C]). */
     tuple: (...args: ConstructorParameters<typeof TypeTupleTsDsl>) => TypeTupleTsDsl;
   };
-  /** Creates a runtime `typeof` expression (e.g. typeof x). */
-  typeofExpr: (expr: string | typescript0.Expression | TsDsl<typescript0.Expression>) => TypeOfExprTsDsl;
-  /** Creates a variable declaration (var). */
-  var: (name?: any) => VarTsDsl;
+  /** Creates a `typeof` expression (e.g. `typeof value`). */
+  typeofExpr: (expr: TypeOfExpr) => TypeOfExprTsDsl;
+  /** Creates a variable declaration (`var`). */
+  var: (name?: VarName | undefined) => VarTsDsl;
 };
 type DollarTsDsl = {
   /**
@@ -7870,7 +7969,7 @@ type DollarTsDsl = {
    *
    * Returns:
    * - A new `ExprTsDsl` instance when called directly.
-   * - The `base` factory object for constructing more specific nodes.
+   * - The `tsDsl` object for constructing more specific nodes.
    */
   $: typeof $;
 };
@@ -14136,8 +14235,6 @@ declare class PluginInstance<T extends Plugin.Types = Plugin.Types> {
     gen: IProject;
     name: string;
   });
-  addNode(node: Node | null): number;
-  updateNode(index: number, node: Node | null): void;
   /**
    * Iterates over various input elements as specified by the event types, in
    * a specific order: servers, schemas, parameters, request bodies, then
@@ -14188,6 +14285,14 @@ declare class PluginInstance<T extends Plugin.Types = Plugin.Types> {
     };
   };
   isSymbolRegistered(identifier: SymbolIdentifier): boolean;
+  /**
+   * Sets or adds a node to the project graph.
+   *
+   * @param node The node to be added or updated in the project graph.
+   * @param index The index at which to update the node. If undefined, the node will be added.
+   * @returns The index of the added node or void if updated.
+   */
+  node<T extends number | undefined = undefined>(node: Node | null, index?: T): T extends number ? void : number;
   querySymbol(filter: SymbolMeta): Symbol | undefined;
   referenceSymbol(meta: SymbolMeta): Symbol;
   /**
@@ -14766,8 +14871,8 @@ type UserOutput = {
   /**
    * If specified, this will be the file extension used when importing
    * other modules. By default, we don't add a file extension and let the
-   * runtime resolve it. If you're using moduleResolution `nodenext`, we
-   * default to `.js`.
+   * runtime resolve it. If you're using moduleResolution `nodenext` or
+   * `node16`, we default to `.js`.
    *
    * @default undefined
    */
@@ -14865,8 +14970,8 @@ type Output = {
   /**
    * If specified, this will be the file extension used when importing
    * other modules. By default, we don't add a file extension and let the
-   * runtime resolve it. If you're using moduleResolution `nodenext`, we
-   * default to `.js`.
+   * runtime resolve it. If you're using moduleResolution `nodenext` or
+   * `node16`, we default to `.js`.
    */
   importFileExtension: ImportFileExtensions | (string & {}) | null | undefined;
   /**
@@ -15553,4 +15658,4 @@ type Config = Omit<Required<UserConfig>, 'input' | 'logs' | 'output' | 'parser'
 };
 //#endregion
 export { LazyOrAsync as A, MaybeTsDsl as C, PluginHandler as D, Client as E, StringCase as O, TypeScriptRenderer as S, TypeTsDsl as T, $ as _, Plugin as a, regexp as b, OpenApiOperationObject as c, OpenApiResponseObject as d, OpenApiSchemaObject as f, ExpressionTransformer as g, TypeTransformer as h, DefinePlugin as i, MaybeArray as j, IR$1 as k, OpenApiParameterObject as l, Logger as m, UserConfig as n, OpenApi as o, Context as p, Input as r, OpenApiMetaObject as s, Config as t, OpenApiRequestBodyObject as u, DollarTsDsl as v, TsDsl as w, keywords as x, reserved as y };
-//# sourceMappingURL=config-CBa-XLy8.d.cts.map
+//# sourceMappingURL=config-CREHWzRd.d.cts.map