@hey-api/openapi-ts 0.94.4 → 0.95.0

package/dist/{init-B4xCXgH4.mjs → init-C3GzFcQR.mjs}

@@ -1,6 +1,6 @@
 import { createRequire } from "node:module";
 import { StructureModel, detectInteractiveSession, fromRef, isNode, isRef, isSymbol, loadConfigFile, log, nodeBrand, ref, refs } from "@hey-api/codegen-core";
-import { ConfigError, OperationPath, OperationStrategy, applyNaming, buildSymbolIn, childContext, createOperationKey, createSchemaProcessor, createSchemaWalker, deduplicateSchema, definePluginConfig, dependencyFactory, ensureDirSync, escapeComment, findTsConfigPath, getInput, getLogs, getParser, hasOperationDataRequired, hasParameterGroupObjectRequired, isEnvironment, mappers, operationPagination, operationResponsesMap, outputHeaderToPrefix, parseUrl, pathToJsonPointer, pathToName, refToName, resolveSource, satisfies, statusCodeToGroup, toCase, valueToObject } from "@hey-api/shared";
+import { ConfigError, OperationPath, OperationStrategy, applyNaming, buildSymbolIn, childContext, createOperationKey, createSchemaProcessor, createSchemaWalker, deduplicateSchema, definePluginConfig, dependencyFactory, ensureDirSync, escapeComment, findTsConfigPath, getInput, getLogs, getParser, hasOperationDataRequired, hasParameterGroupObjectRequired, isEnvironment, mappers, operationPagination, operationResponsesMap, outputHeaderToPrefix, parseUrl, pathToJsonPointer, pathToName, refToName, requestValidatorLayers, resolveSource, resolveValidatorLayer, satisfies, statusCodeToGroup, toCase, valueToObject } from "@hey-api/shared";
 import colors from "ansi-colors";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -538,8 +538,8 @@ var TypeTsDsl = class extends TsDsl {};
 
 //#endregion
 //#region src/ts-dsl/expr/id.ts
-const Mixed$52 = TsDsl;
-var IdTsDsl = class extends Mixed$52 {
+const Mixed$56 = TsDsl;
+var IdTsDsl = class extends Mixed$56 {
 	"~dsl" = "IdTsDsl";
 	constructor(name) {
 		super();
@@ -594,8 +594,8 @@ function ArgsMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/expr/prefix.ts
-const Mixed$51 = TsDsl;
-var PrefixTsDsl = class extends Mixed$51 {
+const Mixed$55 = TsDsl;
+var PrefixTsDsl = class extends Mixed$55 {
 	"~dsl" = "PrefixTsDsl";
 	_expr;
 	_op;
@@ -610,7 +610,7 @@ var PrefixTsDsl = class extends Mixed$51 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	/** Sets the operand (the expression being prefixed). */
 	expr(expr) {
@@ -627,7 +627,7 @@ var PrefixTsDsl = class extends Mixed$51 {
 		this._op = ts.SyntaxKind.ExclamationToken;
 		return this;
 	}
-	/** Sets the operator (e.g. `ts.SyntaxKind.ExclamationToken` for `!`). */
+	/** Sets the operator (e.g., `ts.SyntaxKind.ExclamationToken` for `!`). */
 	op(op) {
 		this._op = op;
 		return this;
@@ -638,7 +638,7 @@ var PrefixTsDsl = class extends Mixed$51 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Prefix unary expression missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
@@ -667,13 +667,16 @@ const f = {
 	attr: createFactory("attr"),
 	await: createFactory("await"),
 	call: createFactory("call"),
+	method: createFactory("method"),
 	new: createFactory("new"),
 	return: createFactory("return"),
+	spread: createFactory("spread"),
 	type: {
 		expr: createFactory("type.expr"),
 		idx: createFactory("type.idx"),
 		operator: createFactory("type.operator"),
-		query: createFactory("type.query")
+		query: createFactory("type.query"),
+		tupleMember: createFactory("type.tupleMember")
 	},
 	typeofExpr: createFactory("typeofExpr")
 };
@@ -694,8 +697,8 @@ function AsMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/expr/literal.ts
-const Mixed$50 = AsMixin(TsDsl);
-var LiteralTsDsl = class extends Mixed$50 {
+const Mixed$54 = AsMixin(TsDsl);
+var LiteralTsDsl = class extends Mixed$54 {
 	"~dsl" = "LiteralTsDsl";
 	value;
 	constructor(value) {
@@ -984,8 +987,8 @@ const safeTypeName = (name) => safeName(name, reserved.type);
 
 //#endregion
 //#region src/ts-dsl/decl/decorator.ts
-const Mixed$49 = ArgsMixin(TsDsl);
-var DecoratorTsDsl = class extends Mixed$49 {
+const Mixed$53 = ArgsMixin(TsDsl);
+var DecoratorTsDsl = class extends Mixed$53 {
 	"~dsl" = "DecoratorTsDsl";
 	nameSanitizer = safeRuntimeName;
 	constructor(name, ...args) {
@@ -1036,7 +1039,7 @@ function accessChainToNode(accessChain) {
 }
 function getAccessChainForNode(node) {
 	const accessChain = structuralToAccessChain([...getStructuralChainForNode(node, /* @__PURE__ */ new Set())]);
-	if (accessChain.length === 0) return [node.clone()];
+	if (!accessChain.length) return [node.clone()];
 	return accessChain.map((node) => node.clone());
 }
 function getScope(node) {
@@ -1049,7 +1052,7 @@ function getStructuralChainForNode(node, visited) {
 	if (node.structuralParents) for (const [parent] of node.structuralParents) {
 		if (getScope(parent) !== getScope(node)) continue;
 		const chain = getStructuralChainForNode(parent, visited);
-		if (chain.length > 0) return [...chain, node];
+		if (chain.length) return [...chain, node];
 	}
 	if (!node.root) return [];
 	return [node];
@@ -1263,7 +1266,7 @@ function AbstractMixin(Base) {
 	const Mixed = ModifiersMixin(Base);
 	class Abstract extends Mixed {
 		abstract(condition) {
-			const cond = arguments.length === 0 ? true : Boolean(condition);
+			const cond = !arguments.length ? true : Boolean(condition);
 			return this._m("abstract", cond);
 		}
 	}
@@ -1276,7 +1279,7 @@ function AsyncMixin(Base) {
 	const Mixed = ModifiersMixin(Base);
 	class Async extends Mixed {
 		async(condition) {
-			const cond = arguments.length === 0 ? true : Boolean(condition);
+			const cond = !arguments.length ? true : Boolean(condition);
 			return this._m("async", cond);
 		}
 	}
@@ -1289,7 +1292,7 @@ function ConstMixin(Base) {
 	const Mixed = ModifiersMixin(Base);
 	class Const extends Mixed {
 		const(condition) {
-			const cond = arguments.length === 0 ? true : Boolean(condition);
+			const cond = !arguments.length ? true : Boolean(condition);
 			return this._m("const", cond);
 		}
 	}
@@ -1308,7 +1311,7 @@ function DefaultMixin(Base) {
 		* @returns The target object for chaining.
 		*/
 		default(condition) {
-			const cond = arguments.length === 0 ? true : Boolean(condition);
+			const cond = !arguments.length ? true : Boolean(condition);
 			return this._m("default", cond);
 		}
 	}
@@ -1327,7 +1330,7 @@ function ExportMixin(Base) {
 		* @returns The target object for chaining.
 		*/
 		export(condition) {
-			const cond = arguments.length === 0 ? true : Boolean(condition);
+			const cond = !arguments.length ? true : Boolean(condition);
 			this.exported = cond;
 			if (this.symbol) this.symbol.setExported(cond);
 			return this._m("export", cond);
@@ -1342,7 +1345,7 @@ function PrivateMixin(Base) {
 	const Mixed = ModifiersMixin(Base);
 	class Private extends Mixed {
 		private(condition) {
-			const cond = arguments.length === 0 ? true : Boolean(condition);
+			const cond = !arguments.length ? true : Boolean(condition);
 			return this._m("private", cond);
 		}
 	}
@@ -1355,7 +1358,7 @@ function ProtectedMixin(Base) {
 	const Mixed = ModifiersMixin(Base);
 	class Protected extends Mixed {
 		protected(condition) {
-			const cond = arguments.length === 0 ? true : Boolean(condition);
+			const cond = !arguments.length ? true : Boolean(condition);
 			return this._m("protected", cond);
 		}
 	}
@@ -1368,7 +1371,7 @@ function PublicMixin(Base) {
 	const Mixed = ModifiersMixin(Base);
 	class Public extends Mixed {
 		public(condition) {
-			const cond = arguments.length === 0 ? true : Boolean(condition);
+			const cond = !arguments.length ? true : Boolean(condition);
 			return this._m("public", cond);
 		}
 	}
@@ -1381,7 +1384,7 @@ function ReadonlyMixin(Base) {
 	const Mixed = ModifiersMixin(Base);
 	class Readonly extends Mixed {
 		readonly(condition) {
-			const cond = arguments.length === 0 ? true : Boolean(condition);
+			const cond = !arguments.length ? true : Boolean(condition);
 			return this._m("readonly", cond);
 		}
 	}
@@ -1394,7 +1397,7 @@ function StaticMixin(Base) {
 	const Mixed = ModifiersMixin(Base);
 	class Static extends Mixed {
 		static(condition) {
-			const cond = arguments.length === 0 ? true : Boolean(condition);
+			const cond = !arguments.length ? true : Boolean(condition);
 			return this._m("static", cond);
 		}
 	}
@@ -1403,8 +1406,8 @@ function StaticMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/type/param.ts
-const Mixed$48 = TsDsl;
-var TypeParamTsDsl = class extends Mixed$48 {
+const Mixed$52 = TsDsl;
+var TypeParamTsDsl = class extends Mixed$52 {
 	"~dsl" = "TypeParamTsDsl";
 	scope = "type";
 	constraint;
@@ -1472,11 +1475,11 @@ function OptionalMixin(Base) {
 			super.analyze(ctx);
 		}
 		optional(condition) {
-			this._optional = arguments.length === 0 ? true : Boolean(condition);
+			this._optional = !arguments.length ? true : Boolean(condition);
 			return this;
 		}
 		required(condition) {
-			this._optional = arguments.length === 0 ? false : !condition;
+			this._optional = !arguments.length ? false : !condition;
 			return this;
 		}
 	}
@@ -1543,7 +1546,7 @@ var TokenTsDsl = class extends TsDsl {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Token missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
@@ -1553,7 +1556,7 @@ var TokenTsDsl = class extends TsDsl {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 };
 
@@ -1615,8 +1618,8 @@ function TypeExprMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/type/attr.ts
-const Mixed$47 = TypeExprMixin(TsDsl);
-var TypeAttrTsDsl = class extends Mixed$47 {
+const Mixed$51 = TypeExprMixin(TsDsl);
+var TypeAttrTsDsl = class extends Mixed$51 {
 	"~dsl" = "TypeAttrTsDsl";
 	scope = "type";
 	_base;
@@ -1638,7 +1641,7 @@ var TypeAttrTsDsl = class extends Mixed$47 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	base(base) {
 		if (isRef(base)) this._base = base;
@@ -1657,7 +1660,7 @@ var TypeAttrTsDsl = class extends Mixed$47 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Type attribute missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
@@ -1670,8 +1673,8 @@ var TypeAttrTsDsl = class extends Mixed$47 {
 
 //#endregion
 //#region src/ts-dsl/type/expr.ts
-const Mixed$46 = TypeArgsMixin(TypeExprMixin(TsDsl));
-var TypeExprTsDsl = class extends Mixed$46 {
+const Mixed$50 = TypeArgsMixin(TypeExprMixin(TsDsl));
+var TypeExprTsDsl = class extends Mixed$50 {
 	"~dsl" = "TypeExprTsDsl";
 	scope = "type";
 	_exprInput;
@@ -1689,9 +1692,9 @@ var TypeExprTsDsl = class extends Mixed$46 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
-	/** Accesses a nested type (e.g. `Foo.Bar`). */
+	/** Accesses a nested type (e.g., `Foo.Bar`). */
 	attr(right) {
 		this._exprInput = isNode(right) ? ref(right.base(this._exprInput)) : ref(new TypeAttrTsDsl(this._exprInput, right));
 		return this;
@@ -1702,7 +1705,7 @@ var TypeExprTsDsl = class extends Mixed$46 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Type expression missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
@@ -1715,8 +1718,8 @@ f.type.expr.set((...args) => new TypeExprTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/decl/field.ts
-const Mixed$45 = DecoratorMixin(DocMixin(OptionalMixin(PrivateMixin(ProtectedMixin(PublicMixin(ReadonlyMixin(StaticMixin(ValueMixin(TsDsl)))))))));
-var FieldTsDsl = class extends Mixed$45 {
+const Mixed$49 = DecoratorMixin(DocMixin(OptionalMixin(PrivateMixin(ProtectedMixin(PublicMixin(ReadonlyMixin(StaticMixin(ValueMixin(TsDsl)))))))));
+var FieldTsDsl = class extends Mixed$49 {
 	"~dsl" = "FieldTsDsl";
 	nameSanitizer = safeAccessorName;
 	_type;
@@ -1743,8 +1746,8 @@ var FieldTsDsl = class extends Mixed$45 {
 
 //#endregion
 //#region src/ts-dsl/stmt/stmt.ts
-const Mixed$44 = TsDsl;
-var StmtTsDsl = class extends Mixed$44 {
+const Mixed$48 = TsDsl;
+var StmtTsDsl = class extends Mixed$48 {
 	"~dsl" = "StmtTsDsl";
 	_inner;
 	constructor(inner) {
@@ -1791,11 +1794,11 @@ function DoMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/decl/pattern.ts
-const Mixed$43 = TsDsl;
+const Mixed$47 = TsDsl;
 /**
-* Builds binding patterns (e.g. `{ foo, bar }`, `[a, b, ...rest]`).
+* Builds binding patterns (e.g., `{ foo, bar }`, `[a, b, ...rest]`).
 */
-var PatternTsDsl = class extends Mixed$43 {
+var PatternTsDsl = class extends Mixed$47 {
 	"~dsl" = "PatternTsDsl";
 	pattern;
 	_spread;
@@ -1804,9 +1807,9 @@ var PatternTsDsl = class extends Mixed$43 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
-	/** Defines an array pattern (e.g. `[a, b, c]`). */
+	/** Defines an array pattern (e.g., `[a, b, c]`). */
 	array(...props) {
 		this.pattern = {
 			kind: "array",
@@ -1814,7 +1817,7 @@ var PatternTsDsl = class extends Mixed$43 {
 		};
 		return this;
 	}
-	/** Defines an object pattern (e.g. `{ a, b: alias }`). */
+	/** Defines an object pattern (e.g., `{ a, b: alias }`). */
 	object(...props) {
 		const entries = {};
 		for (const p of props) if (typeof p === "string") entries[p] = p;
@@ -1826,7 +1829,7 @@ var PatternTsDsl = class extends Mixed$43 {
 		};
 		return this;
 	}
-	/** Adds a spread element (e.g. `...rest`, `...options`, `...args`). */
+	/** Adds a spread element (e.g., `...rest`, `...options`, `...args`). */
 	spread(name) {
 		this._spread = name;
 		return this;
@@ -1849,7 +1852,7 @@ var PatternTsDsl = class extends Mixed$43 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Binding pattern missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
@@ -1882,7 +1885,7 @@ function PatternMixin(Base) {
 			(this.pattern ??= new PatternTsDsl()).object(...props);
 			return this;
 		}
-		/** Adds a spread element (e.g. `...args`, `...options`) to the pattern. */
+		/** Adds a spread element (e.g., `...args`, `...options`) to the pattern. */
 		spread(name) {
 			(this.pattern ??= new PatternTsDsl()).spread(name);
 			return this;
@@ -1898,8 +1901,8 @@ function PatternMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/decl/param.ts
-const Mixed$42 = DecoratorMixin(OptionalMixin(PatternMixin(ValueMixin(TsDsl))));
-var ParamTsDsl = class extends Mixed$42 {
+const Mixed$46 = DecoratorMixin(OptionalMixin(PatternMixin(ValueMixin(TsDsl))));
+var ParamTsDsl = class extends Mixed$46 {
 	"~dsl" = "ParamTsDsl";
 	_type;
 	constructor(name, fn) {
@@ -1917,11 +1920,11 @@ var ParamTsDsl = class extends Mixed$42 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	/** Sets the parameter type. */
-	type(type) {
-		this._type = type instanceof TypeTsDsl ? type : new TypeExprTsDsl(type);
+	type(node) {
+		this._type = node instanceof TypeTsDsl ? node : new TypeExprTsDsl(node);
 		return this;
 	}
 	toAst() {
@@ -1930,7 +1933,7 @@ var ParamTsDsl = class extends Mixed$42 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Parameter missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
@@ -1997,8 +2000,8 @@ function LayoutMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/stmt/block.ts
-const Mixed$41 = DoMixin(LayoutMixin(TsDsl));
-var BlockTsDsl = class extends Mixed$41 {
+const Mixed$45 = DoMixin(LayoutMixin(TsDsl));
+var BlockTsDsl = class extends Mixed$45 {
 	"~dsl" = "BlockTsDsl";
 	constructor(...items) {
 		super();
@@ -2015,8 +2018,8 @@ var BlockTsDsl = class extends Mixed$41 {
 
 //#endregion
 //#region src/ts-dsl/decl/init.ts
-const Mixed$40 = DecoratorMixin(DoMixin(DocMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(TsDsl)))))));
-var InitTsDsl = class extends Mixed$40 {
+const Mixed$44 = DecoratorMixin(DoMixin(DocMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(TsDsl)))))));
+var InitTsDsl = class extends Mixed$44 {
 	"~dsl" = "InitTsDsl";
 	constructor(fn) {
 		super();
@@ -2058,8 +2061,8 @@ function TypeReturnsMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/decl/method.ts
-const Mixed$39 = AbstractMixin(AsyncMixin(DecoratorMixin(DoMixin(DocMixin(OptionalMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(StaticMixin(TypeParamsMixin(TypeReturnsMixin(TsDsl)))))))))))));
-var MethodTsDsl = class extends Mixed$39 {
+const Mixed$43 = AbstractMixin(AsyncMixin(DecoratorMixin(DoMixin(DocMixin(OptionalMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(StaticMixin(TypeParamsMixin(TypeReturnsMixin(TsDsl)))))))))))));
+var MethodTsDsl = class extends Mixed$43 {
 	"~dsl" = "MethodTsDsl";
 	nameSanitizer = safeAccessorName;
 	constructor(name, fn) {
@@ -2081,11 +2084,12 @@ var MethodTsDsl = class extends Mixed$39 {
 		return this.$docs(node);
 	}
 };
+f.method.set((...args) => new MethodTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/decl/class.ts
-const Mixed$38 = AbstractMixin(DecoratorMixin(DefaultMixin(DocMixin(ExportMixin(TypeParamsMixin(TsDsl))))));
-var ClassTsDsl = class extends Mixed$38 {
+const Mixed$42 = AbstractMixin(DecoratorMixin(DefaultMixin(DocMixin(ExportMixin(TypeParamsMixin(TsDsl))))));
+var ClassTsDsl = class extends Mixed$42 {
 	"~dsl" = "ClassTsDsl";
 	nameSanitizer = safeRuntimeName;
 	baseClass;
@@ -2108,7 +2112,7 @@ var ClassTsDsl = class extends Mixed$38 {
 	}
 	/** Returns true if the class has any members. */
 	get hasBody() {
-		return this.body.length > 0;
+		return Boolean(this.body.length);
 	}
 	/** Adds one or more class members (fields, methods, etc.). */
 	do(...items) {
@@ -2158,8 +2162,8 @@ var ClassTsDsl = class extends Mixed$38 {
 
 //#endregion
 //#region src/ts-dsl/decl/member.ts
-const Mixed$37 = DocMixin(TsDsl);
-var EnumMemberTsDsl = class extends Mixed$37 {
+const Mixed$41 = DocMixin(TsDsl);
+var EnumMemberTsDsl = class extends Mixed$41 {
 	"~dsl" = "EnumMemberTsDsl";
 	_value;
 	constructor(name, value) {
@@ -2185,8 +2189,8 @@ var EnumMemberTsDsl = class extends Mixed$37 {
 
 //#endregion
 //#region src/ts-dsl/decl/enum.ts
-const Mixed$36 = ConstMixin(DocMixin(ExportMixin(TsDsl)));
-var EnumTsDsl = class extends Mixed$36 {
+const Mixed$40 = ConstMixin(DocMixin(ExportMixin(TsDsl)));
+var EnumTsDsl = class extends Mixed$40 {
 	"~dsl" = "EnumTsDsl";
 	nameSanitizer = safeRuntimeName;
 	_members = [];
@@ -2225,8 +2229,8 @@ var EnumTsDsl = class extends Mixed$36 {
 
 //#endregion
 //#region src/ts-dsl/decl/func.ts
-const Mixed$35 = AbstractMixin(AsMixin(AsyncMixin(DecoratorMixin(DoMixin(DocMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(StaticMixin(TypeParamsMixin(TypeReturnsMixin(TsDsl)))))))))))));
-var ImplFuncTsDsl = class extends Mixed$35 {
+const Mixed$39 = AbstractMixin(AsMixin(AsyncMixin(DecoratorMixin(DoMixin(DocMixin(ExportMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(StaticMixin(TypeParamsMixin(TypeReturnsMixin(TsDsl))))))))))))));
+var ImplFuncTsDsl = class extends Mixed$39 {
 	"~dsl" = "FuncTsDsl";
 	nameSanitizer = safeRuntimeName;
 	mode;
@@ -2253,7 +2257,7 @@ var ImplFuncTsDsl = class extends Mixed$35 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	/** Switches the function to an arrow function form. */
 	arrow() {
@@ -2286,7 +2290,7 @@ var ImplFuncTsDsl = class extends Mixed$35 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Function ${this.mode} missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
@@ -2299,8 +2303,8 @@ const FuncTsDsl = ImplFuncTsDsl;
 
 //#endregion
 //#region src/ts-dsl/decl/getter.ts
-const Mixed$34 = AbstractMixin(AsyncMixin(DecoratorMixin(DoMixin(DocMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(StaticMixin(TypeReturnsMixin(TsDsl)))))))))));
-var GetterTsDsl = class extends Mixed$34 {
+const Mixed$38 = AbstractMixin(AsyncMixin(DecoratorMixin(DoMixin(DocMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(StaticMixin(TypeReturnsMixin(TsDsl)))))))))));
+var GetterTsDsl = class extends Mixed$38 {
 	"~dsl" = "GetterTsDsl";
 	nameSanitizer = safeAccessorName;
 	constructor(name, fn) {
@@ -2325,8 +2329,8 @@ var GetterTsDsl = class extends Mixed$34 {
 
 //#endregion
 //#region src/ts-dsl/decl/setter.ts
-const Mixed$33 = AbstractMixin(AsyncMixin(DecoratorMixin(DoMixin(DocMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(StaticMixin(TsDsl))))))))));
-var SetterTsDsl = class extends Mixed$33 {
+const Mixed$37 = AbstractMixin(AsyncMixin(DecoratorMixin(DoMixin(DocMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(StaticMixin(TsDsl))))))))));
+var SetterTsDsl = class extends Mixed$37 {
 	"~dsl" = "SetterTsDsl";
 	nameSanitizer = safeAccessorName;
 	constructor(name, fn) {
@@ -2349,10 +2353,47 @@ var SetterTsDsl = class extends Mixed$33 {
 	}
 };
 
+//#endregion
+//#region src/ts-dsl/mixins/expr.ts
+function ExprMixin(Base) {
+	class Expr extends Base {
+		analyze(ctx) {
+			super.analyze(ctx);
+		}
+		attr(...args) {
+			return f.attr(this, ...args);
+		}
+		await() {
+			return f.await(this);
+		}
+		call(...args) {
+			return f.call(this, ...args);
+		}
+		return() {
+			return f.return(this);
+		}
+	}
+	return Expr;
+}
+
+//#endregion
+//#region src/ts-dsl/mixins/spread.ts
+function SpreadMixin(Base) {
+	class Spread extends Base {
+		analyze(ctx) {
+			super.analyze(ctx);
+		}
+		spread() {
+			return f.spread(this);
+		}
+	}
+	return Spread;
+}
+
 //#endregion
 //#region src/ts-dsl/expr/array.ts
-const Mixed$32 = AsMixin(LayoutMixin(TsDsl));
-var ArrayTsDsl = class extends Mixed$32 {
+const Mixed$36 = AsMixin(ExprMixin(LayoutMixin(SpreadMixin(TsDsl))));
+var ArrayTsDsl = class extends Mixed$36 {
 	"~dsl" = "ArrayTsDsl";
 	_elements = [];
 	constructor(...exprs) {
@@ -2361,15 +2402,12 @@ var ArrayTsDsl = class extends Mixed$32 {
 	}
 	analyze(ctx) {
 		super.analyze(ctx);
-		for (const item of this._elements) ctx.analyze(item.expr);
+		for (const item of this._elements) ctx.analyze(item);
 	}
 	/** Adds a single array element. */
 	element(expr) {
 		const node = typeof expr === "string" || typeof expr === "number" || typeof expr === "boolean" ? new LiteralTsDsl(expr) : expr;
-		this._elements.push({
-			expr: node,
-			kind: "element"
-		});
+		this._elements.push(node);
 		return this;
 	}
 	/** Adds multiple array elements. */
@@ -2377,50 +2415,15 @@ var ArrayTsDsl = class extends Mixed$32 {
 		for (const expr of exprs) this.element(expr);
 		return this;
 	}
-	/** Adds a spread element (`...expr`). */
-	spread(expr) {
-		this._elements.push({
-			expr,
-			kind: "spread"
-		});
-		return this;
-	}
 	toAst() {
-		const elements = this._elements.map((item) => {
-			const node = this.$node(item.expr);
-			return item.kind === "spread" ? ts.factory.createSpreadElement(node) : node;
-		});
-		return ts.factory.createArrayLiteralExpression(elements, this.$multiline(this._elements.length));
+		return ts.factory.createArrayLiteralExpression(this._elements.map((item) => this.$node(item)), this.$multiline(this._elements.length));
 	}
 };
 
-//#endregion
-//#region src/ts-dsl/mixins/expr.ts
-function ExprMixin(Base) {
-	class Expr extends Base {
-		analyze(ctx) {
-			super.analyze(ctx);
-		}
-		attr(...args) {
-			return f.attr(this, ...args);
-		}
-		await() {
-			return f.await(this);
-		}
-		call(...args) {
-			return f.call(this, ...args);
-		}
-		return() {
-			return f.return(this);
-		}
-	}
-	return Expr;
-}
-
 //#endregion
 //#region src/ts-dsl/expr/as.ts
-const Mixed$31 = AsMixin(ExprMixin(TsDsl));
-var AsTsDsl = class extends Mixed$31 {
+const Mixed$35 = AsMixin(ExprMixin(TsDsl));
+var AsTsDsl = class extends Mixed$35 {
 	"~dsl" = "AsTsDsl";
 	expr;
 	type;
@@ -2442,8 +2445,8 @@ f.as.set((...args) => new AsTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/expr/binary.ts
-const Mixed$30 = AsMixin(ExprMixin(TsDsl));
-var BinaryTsDsl = class extends Mixed$30 {
+const Mixed$34 = AsMixin(ExprMixin(TsDsl));
+var BinaryTsDsl = class extends Mixed$34 {
 	"~dsl" = "BinaryTsDsl";
 	_base;
 	_expr;
@@ -2461,13 +2464,13 @@ var BinaryTsDsl = class extends Mixed$30 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	/** Logical AND — `this && expr` */
 	and(expr) {
 		return this.opAndExpr("&&", expr);
 	}
-	/** Creates an assignment expression (e.g. `this = expr`). */
+	/** Creates an assignment expression (e.g., `this = expr`). */
 	assign(expr) {
 		return this.opAndExpr("=", expr);
 	}
@@ -2539,7 +2542,7 @@ var BinaryTsDsl = class extends Mixed$30 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Binary expression missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
@@ -2643,42 +2646,48 @@ function OperatorMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/expr/attr.ts
-const Mixed$29 = AsMixin(ExprMixin(OperatorMixin(OptionalMixin(TsDsl))));
-var AttrTsDsl = class extends Mixed$29 {
+const Mixed$33 = AsMixin(ExprMixin(OperatorMixin(OptionalMixin(SpreadMixin(TsDsl)))));
+var AttrTsDsl = class extends Mixed$33 {
 	"~dsl" = "AttrTsDsl";
-	left;
+	_computed = false;
+	_left;
 	constructor(left, right) {
 		super();
-		this.left = ref(left);
+		this._left = ref(left);
 		this.name.set(right);
 	}
 	analyze(ctx) {
 		super.analyze(ctx);
-		ctx.analyze(this.left);
+		ctx.analyze(this._left);
 		ctx.analyze(this.name);
 	}
+	/** Use computed property access (e.g., `obj[expr]`)? */
+	computed(condition) {
+		this._computed = condition ?? true;
+		return this;
+	}
 	toAst() {
-		const leftNode = this.$node(this.left);
+		const left = this.$node(this._left);
 		regexp.typeScriptIdentifier.lastIndex = 0;
-		const right = fromRef(this.name);
-		if (!regexp.typeScriptIdentifier.test(this.name.toString())) {
+		if (this._computed || !regexp.typeScriptIdentifier.test(this.name.toString())) {
+			const right = fromRef(this.name);
 			let value = isSymbol(right) ? right.finalName : right;
 			if (typeof value === "string") {
 				if (value.startsWith("'") && value.endsWith("'") || value.startsWith("\"") && value.endsWith("\"")) value = value.slice(1, -1);
 			}
-			if (this._optional) return ts.factory.createElementAccessChain(leftNode, this.$node(new TokenTsDsl().questionDot()), this.$node(new LiteralTsDsl(value)));
-			return ts.factory.createElementAccessExpression(leftNode, this.$node(new LiteralTsDsl(value)));
+			if (this._optional) return ts.factory.createElementAccessChain(left, this.$node(new TokenTsDsl().questionDot()), this.$node(this._computed ? this.name : new LiteralTsDsl(value)));
+			return ts.factory.createElementAccessExpression(left, this.$node(this._computed ? this.name : new LiteralTsDsl(value)));
 		}
-		if (this._optional) return ts.factory.createPropertyAccessChain(leftNode, this.$node(new TokenTsDsl().questionDot()), this.$node(this.name));
-		return ts.factory.createPropertyAccessExpression(leftNode, this.$node(this.name));
+		if (this._optional) return ts.factory.createPropertyAccessChain(left, this.$node(new TokenTsDsl().questionDot()), this.$node(this.name));
+		return ts.factory.createPropertyAccessExpression(left, this.$node(this.name));
 	}
 };
 f.attr.set((...args) => new AttrTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/expr/await.ts
-const Mixed$28 = ExprMixin(TsDsl);
-var AwaitTsDsl = class extends Mixed$28 {
+const Mixed$32 = ExprMixin(TsDsl);
+var AwaitTsDsl = class extends Mixed$32 {
 	"~dsl" = "AwaitTsDsl";
 	_awaitExpr;
 	constructor(expr) {
@@ -2697,8 +2706,8 @@ f.await.set((...args) => new AwaitTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/expr/call.ts
-const Mixed$27 = ArgsMixin(AsMixin(ExprMixin(TypeArgsMixin(TsDsl))));
-var CallTsDsl = class extends Mixed$27 {
+const Mixed$31 = ArgsMixin(AsMixin(ExprMixin(SpreadMixin(TypeArgsMixin(TsDsl)))));
+var CallTsDsl = class extends Mixed$31 {
 	"~dsl" = "CallTsDsl";
 	_callee;
 	constructor(callee, ...args) {
@@ -2718,8 +2727,8 @@ f.call.set((...args) => new CallTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/expr/expr.ts
-const Mixed$26 = AsMixin(ExprMixin(OperatorMixin(TypeExprMixin(TsDsl))));
-var ExprTsDsl = class extends Mixed$26 {
+const Mixed$30 = AsMixin(ExprMixin(OperatorMixin(SpreadMixin(TypeExprMixin(TsDsl)))));
+var ExprTsDsl = class extends Mixed$30 {
 	"~dsl" = "ExprTsDsl";
 	_exprInput;
 	constructor(id) {
@@ -2790,8 +2799,8 @@ function HintMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/expr/prop.ts
-const Mixed$25 = DocMixin(TsDsl);
-var ObjectPropTsDsl = class extends Mixed$25 {
+const Mixed$29 = DocMixin(TsDsl);
+var ObjectPropTsDsl = class extends Mixed$29 {
 	"~dsl" = "ObjectPropTsDsl";
 	_value;
 	_meta;
@@ -2799,22 +2808,21 @@ var ObjectPropTsDsl = class extends Mixed$25 {
 		super();
 		this._meta = meta;
 	}
-	get kind() {
-		return this._meta.kind;
-	}
-	get propName() {
-		return this._meta.name;
-	}
 	analyze(ctx) {
 		super.analyze(ctx);
 		ctx.analyze(this._value);
 	}
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
+	}
+	get kind() {
+		return this._meta.kind;
+	}
+	get propName() {
+		return this._meta.name;
 	}
 	value(value) {
-		if (typeof value === "function") value(this);
-		else this._value = ref(value);
+		this._value = ref(value);
 		return this;
 	}
 	toAst() {
@@ -2835,6 +2843,7 @@ var ObjectPropTsDsl = class extends Mixed$25 {
 			const result = this.$node(setter);
 			return this.$docs(result);
 		}
+		if (this._meta.kind === "method") return this.$docs(node);
 		if (ts.isIdentifier(node) && node.text === this._meta.name) {
 			const result = ts.factory.createShorthandPropertyAssignment(this._meta.name);
 			return this.$docs(result);
@@ -2845,7 +2854,7 @@ var ObjectPropTsDsl = class extends Mixed$25 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Object property${this._meta.name ? ` "${this._meta.name}"` : ""} missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
@@ -2857,14 +2866,15 @@ var ObjectPropTsDsl = class extends Mixed$25 {
 
 //#endregion
 //#region src/ts-dsl/expr/object.ts
-const Mixed$24 = AsMixin(ExprMixin(HintMixin(LayoutMixin(TsDsl))));
-var ObjectTsDsl = class extends Mixed$24 {
+const Mixed$28 = AsMixin(ExprMixin(HintMixin(LayoutMixin(TsDsl))));
+var ObjectTsDsl = class extends Mixed$28 {
 	"~dsl" = "ObjectTsDsl";
 	_props = /* @__PURE__ */ new Map();
 	_spreadCounter = 0;
 	constructor(...props) {
 		super();
-		this.props(...props);
+		if (props.length === 1 && typeof props[0] === "function") props[0](this);
+		else this.props(...props);
 	}
 	analyze(ctx) {
 		super.analyze(ctx);
@@ -2875,7 +2885,7 @@ var ObjectTsDsl = class extends Mixed$24 {
 		if (prop.kind === "spread") return `spread:${this._spreadCounter++}`;
 		return `${prop.kind}:${prop.propName}`;
 	}
-	/** Adds a computed property (e.g. `{ [expr]: value }`), or removes if null. */
+	/** Adds a computed property (e.g., `{ [expr]: value }`), or removes if null. */
 	computed(name, expr) {
 		if (expr === null) this._props.delete(`computed:${name}`);
 		else this._props.set(`computed:${name}`, new ObjectPropTsDsl({
@@ -2884,7 +2894,7 @@ var ObjectTsDsl = class extends Mixed$24 {
 		}).value(expr));
 		return this;
 	}
-	/** Adds a getter property (e.g. `{ get foo() { ... } }`), or removes if null. */
+	/** Adds a getter property (e.g., `{ get foo() { ... } }`), or removes if null. */
 	getter(name, stmt) {
 		if (stmt === null) this._props.delete(`getter:${name}`);
 		else this._props.set(`getter:${name}`, new ObjectPropTsDsl({
@@ -2901,6 +2911,15 @@ var ObjectTsDsl = class extends Mixed$24 {
 	get isEmpty() {
 		return this._props.size === 0;
 	}
+	/** Adds a method property (e.g., `{ foo() { ... } }`), or removes if null. */
+	method(name, fn) {
+		if (fn === null) this._props.delete(`method:${name}`);
+		else this._props.set(`method:${name}`, new ObjectPropTsDsl({
+			kind: "method",
+			name
+		}).value(f.method(name, fn)));
+		return this;
+	}
 	/** Adds a property assignment, or removes if null. */
 	prop(name, expr) {
 		if (expr === null) this._props.delete(`prop:${name}`);
@@ -2915,7 +2934,7 @@ var ObjectTsDsl = class extends Mixed$24 {
 		for (const prop of props) this._props.set(this._propKey(prop), prop);
 		return this;
 	}
-	/** Adds a setter property (e.g. `{ set foo(v) { ... } }`), or removes if null. */
+	/** Adds a setter property (e.g., `{ set foo(v) { ... } }`), or removes if null. */
 	setter(name, stmt) {
 		if (stmt === null) this._props.delete(`setter:${name}`);
 		else this._props.set(`setter:${name}`, new ObjectPropTsDsl({
@@ -2924,7 +2943,7 @@ var ObjectTsDsl = class extends Mixed$24 {
 		}).value(stmt));
 		return this;
 	}
-	/** Adds a spread property (e.g. `{ ...options }`). */
+	/** Adds a spread property (e.g., `{ ...options }`). */
 	spread(expr) {
 		const key = `spread:${this._spreadCounter++}`;
 		this._props.set(key, new ObjectPropTsDsl({ kind: "spread" }).value(expr));
@@ -2938,7 +2957,7 @@ var ObjectTsDsl = class extends Mixed$24 {
 };
 
 //#endregion
-//#region src/ts-dsl/expr/fromValue.ts
+//#region src/ts-dsl/expr/from-value.ts
 const fromValue$1 = (input, options) => {
 	if (isNode(input)) return input;
 	if (input === null || typeof input === "number" || typeof input === "boolean" || typeof input === "string" || typeof input === "bigint") return new LiteralTsDsl(input);
@@ -2961,8 +2980,8 @@ const fromValue$1 = (input, options) => {
 
 //#endregion
 //#region src/ts-dsl/expr/new.ts
-const Mixed$23 = ArgsMixin(AsMixin(ExprMixin(TypeArgsMixin(TsDsl))));
-var NewTsDsl = class extends Mixed$23 {
+const Mixed$27 = ArgsMixin(AsMixin(ExprMixin(SpreadMixin(TypeArgsMixin(TsDsl)))));
+var NewTsDsl = class extends Mixed$27 {
 	"~dsl" = "NewTsDsl";
 	_newExpr;
 	constructor(expr, ...args) {
@@ -2980,10 +2999,67 @@ var NewTsDsl = class extends Mixed$23 {
 };
 f.new.set((...args) => new NewTsDsl(...args));
 
+//#endregion
+//#region src/ts-dsl/expr/postfix.ts
+const Mixed$26 = TsDsl;
+var PostfixTsDsl = class extends Mixed$26 {
+	"~dsl" = "PostfixTsDsl";
+	_expr;
+	_op;
+	constructor(expr, op) {
+		super();
+		this._expr = expr;
+		this._op = op;
+	}
+	analyze(ctx) {
+		super.analyze(ctx);
+		ctx.analyze(this._expr);
+	}
+	/** Returns true when all required builder calls are present. */
+	get isValid() {
+		return !this.missingRequiredCalls().length;
+	}
+	/** Sets the operator to MinusMinusToken for decrement (`--`). */
+	dec() {
+		this._op = ts.SyntaxKind.MinusMinusToken;
+		return this;
+	}
+	/** Sets the operand (the expression being postfixed). */
+	expr(expr) {
+		this._expr = expr;
+		return this;
+	}
+	/** Sets the operator to PlusPlusToken for increment (`++`). */
+	inc() {
+		this._op = ts.SyntaxKind.PlusPlusToken;
+		return this;
+	}
+	/** Sets the operator (e.g., `ts.SyntaxKind.PlusPlusToken` for `++`). */
+	op(op) {
+		this._op = op;
+		return this;
+	}
+	toAst() {
+		this.$validate();
+		return ts.factory.createPostfixUnaryExpression(this.$node(this._expr), this._op);
+	}
+	$validate() {
+		const missing = this.missingRequiredCalls();
+		if (!missing.length) return;
+		throw new Error(`Postfix unary expression missing ${missing.join(" and ")}`);
+	}
+	missingRequiredCalls() {
+		const missing = [];
+		if (!this._expr) missing.push(".expr()");
+		if (!this._op) missing.push("operator (e.g., .inc(), .dec())");
+		return missing;
+	}
+};
+
 //#endregion
 //#region src/ts-dsl/expr/regexp.ts
-const Mixed$22 = TsDsl;
-var RegExpTsDsl = class extends Mixed$22 {
+const Mixed$25 = TsDsl;
+var RegExpTsDsl = class extends Mixed$25 {
 	"~dsl" = "RegExpTsDsl";
 	pattern;
 	flags;
@@ -3001,10 +3077,30 @@ var RegExpTsDsl = class extends Mixed$22 {
 	}
 };
 
+//#endregion
+//#region src/ts-dsl/expr/spread.ts
+const Mixed$24 = TsDsl;
+var SpreadTsDsl = class extends Mixed$24 {
+	"~dsl" = "SpreadTsDsl";
+	_expr;
+	constructor(expr) {
+		super();
+		this._expr = ref(expr);
+	}
+	analyze(ctx) {
+		super.analyze(ctx);
+		ctx.analyze(this._expr);
+	}
+	toAst() {
+		return ts.factory.createSpreadElement(this.$node(this._expr));
+	}
+};
+f.spread.set((...args) => new SpreadTsDsl(...args));
+
 //#endregion
 //#region src/ts-dsl/expr/template.ts
-const Mixed$21 = TsDsl;
-var TemplateTsDsl = class extends Mixed$21 {
+const Mixed$23 = TsDsl;
+var TemplateTsDsl = class extends Mixed$23 {
 	"~dsl" = "TemplateTsDsl";
 	parts = [];
 	constructor(value) {
@@ -3037,7 +3133,7 @@ var TemplateTsDsl = class extends Mixed$21 {
 			} else if (typeof current === "number") normalized.push(String(current));
 			else normalized.push(current);
 		}
-		if (normalized.length === 0 || typeof normalized[0] !== "string") normalized.unshift("");
+		if (!normalized.length || typeof normalized[0] !== "string") normalized.unshift("");
 		if (normalized.length === 1 && typeof normalized[0] === "string") return ts.factory.createNoSubstitutionTemplateLiteral(normalized[0]);
 		if (normalized.length === 2 && typeof normalized[0] === "string" && typeof normalized[1] !== "string") return ts.factory.createTemplateExpression(ts.factory.createTemplateHead(normalized[0]), [ts.factory.createTemplateSpan(normalized[1], ts.factory.createTemplateTail(""))]);
 		const head = ts.factory.createTemplateHead(normalized.shift());
@@ -3045,7 +3141,7 @@ var TemplateTsDsl = class extends Mixed$21 {
 		while (normalized.length) {
 			const expr = normalized.shift();
 			const next = typeof normalized[0] === "string" ? normalized.shift() : "";
-			const isLast = normalized.length === 0;
+			const isLast = !normalized.length;
 			spans.push(ts.factory.createTemplateSpan(expr, isLast ? ts.factory.createTemplateTail(next) : ts.factory.createTemplateMiddle(next)));
 		}
 		return ts.factory.createTemplateExpression(head, spans);
@@ -3054,8 +3150,8 @@ var TemplateTsDsl = class extends Mixed$21 {
 
 //#endregion
 //#region src/ts-dsl/expr/ternary.ts
-const Mixed$20 = TsDsl;
-var TernaryTsDsl = class extends Mixed$20 {
+const Mixed$22 = TsDsl;
+var TernaryTsDsl = class extends Mixed$22 {
 	"~dsl" = "TernaryTsDsl";
 	_condition;
 	_then;
@@ -3072,7 +3168,7 @@ var TernaryTsDsl = class extends Mixed$20 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	condition(condition) {
 		this._condition = condition;
@@ -3092,7 +3188,7 @@ var TernaryTsDsl = class extends Mixed$20 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Ternary expression missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
@@ -3106,8 +3202,8 @@ var TernaryTsDsl = class extends Mixed$20 {
 
 //#endregion
 //#region src/ts-dsl/expr/typeof.ts
-const Mixed$19 = OperatorMixin(TsDsl);
-var TypeOfExprTsDsl = class extends Mixed$19 {
+const Mixed$21 = OperatorMixin(TsDsl);
+var TypeOfExprTsDsl = class extends Mixed$21 {
 	"~dsl" = "TypeOfExprTsDsl";
 	_expr;
 	constructor(expr) {
@@ -3156,10 +3252,109 @@ var NoteTsDsl = class extends TsDsl {
 	}
 };
 
+//#endregion
+//#region src/ts-dsl/stmt/for.ts
+const Mixed$20 = DoMixin(LayoutMixin(TsDsl));
+var ImplForTsDsl = class extends Mixed$20 {
+	"~dsl" = "ForTsDsl";
+	_await;
+	_condition;
+	_iterableOrUpdate;
+	_mode = "for";
+	_variableOrInit;
+	constructor(variableOrInit, modeOrCondition, iterableOrUpdate) {
+		super();
+		this._iterableOrUpdate = iterableOrUpdate;
+		this._variableOrInit = variableOrInit;
+		if (typeof modeOrCondition === "string") this._mode = modeOrCondition ?? "for";
+		else this._condition = modeOrCondition;
+	}
+	analyze(ctx) {
+		ctx.analyze(this._condition);
+		ctx.analyze(this._iterableOrUpdate);
+		ctx.analyze(this._variableOrInit);
+		ctx.pushScope();
+		try {
+			super.analyze(ctx);
+		} finally {
+			ctx.popScope();
+		}
+	}
+	/** Returns true when all required builder calls are present. */
+	get isValid() {
+		return !this.missingRequiredCalls().length;
+	}
+	/** Enables async iteration (`for await...of`). Can only be called on for...of. */
+	await() {
+		this._await = true;
+		this.of();
+		return this;
+	}
+	/** Sets the condition (e.g., `i < n`). */
+	condition(condition) {
+		this._condition = condition;
+		return this;
+	}
+	/** Sets the iteration variable (e.g., `$.const('item')`). */
+	each(variable) {
+		this._variableOrInit = variable;
+		return this;
+	}
+	/** Sets the object to iterate over and switches to for...in. */
+	in(iterable) {
+		this._mode = "in";
+		if (iterable !== void 0) this.iterable(iterable);
+		return this;
+	}
+	/** Sets the initialization (e.g., `let i = 0`). */
+	init(init) {
+		this._variableOrInit = init;
+		return this;
+	}
+	/** Sets the iterable to iterate over. */
+	iterable(iterable) {
+		this._iterableOrUpdate = iterable;
+		return this;
+	}
+	/** Sets the iterable to iterate over and switches to for...of. */
+	of(iterable) {
+		this._mode = "of";
+		if (iterable !== void 0) this.iterable(iterable);
+		return this;
+	}
+	/** Sets the update expression (e.g., `i++`). */
+	update(update) {
+		this._iterableOrUpdate = update;
+		return this;
+	}
+	toAst() {
+		this.$validate();
+		const body = this.$node(new BlockTsDsl(...this._do).pretty());
+		if (this._mode === "of") return ts.factory.createForOfStatement(this._await ? ts.factory.createToken(ts.SyntaxKind.AwaitKeyword) : void 0, this.$node(this._variableOrInit).declarationList, this.$node(this._iterableOrUpdate), body);
+		if (this._mode === "in") return ts.factory.createForInStatement(this.$node(this._variableOrInit).declarationList, this.$node(this._iterableOrUpdate), body);
+		const init = this.$node(this._variableOrInit);
+		return ts.factory.createForStatement(init && ts.isVariableStatement(init) ? init.declarationList : init, this.$node(this._condition), this.$node(this._iterableOrUpdate), body);
+	}
+	$validate() {
+		const missing = this.missingRequiredCalls();
+		if (!missing.length) return;
+		throw new Error(`For${this._mode === "for" ? "" : `...${this._mode}`} statement missing ${missing.join(" and ")}`);
+	}
+	missingRequiredCalls() {
+		const missing = [];
+		if (this._mode !== "for") {
+			if (!this._variableOrInit) missing.push(".each()");
+			if (!this._iterableOrUpdate) missing.push(".iterable()");
+		}
+		return missing;
+	}
+};
+const ForTsDsl = ImplForTsDsl;
+
 //#endregion
 //#region src/ts-dsl/stmt/if.ts
-const Mixed$18 = DoMixin(TsDsl);
-var IfTsDsl = class extends Mixed$18 {
+const Mixed$19 = DoMixin(TsDsl);
+var IfTsDsl = class extends Mixed$19 {
 	"~dsl" = "IfTsDsl";
 	_condition;
 	_else;
@@ -3181,7 +3376,7 @@ var IfTsDsl = class extends Mixed$18 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	condition(condition) {
 		this._condition = condition;
@@ -3197,21 +3392,21 @@ var IfTsDsl = class extends Mixed$18 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`If statement missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
 		const missing = [];
 		if (!this._condition) missing.push(".condition()");
-		if (this._do.length === 0) missing.push(".do()");
+		if (!this._do.length) missing.push(".do()");
 		return missing;
 	}
 };
 
 //#endregion
 //#region src/ts-dsl/stmt/return.ts
-const Mixed$17 = TsDsl;
-var ReturnTsDsl = class extends Mixed$17 {
+const Mixed$18 = TsDsl;
+var ReturnTsDsl = class extends Mixed$18 {
 	"~dsl" = "ReturnTsDsl";
 	_returnExpr;
 	constructor(expr) {
@@ -3230,8 +3425,8 @@ f.return.set((...args) => new ReturnTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/stmt/throw.ts
-const Mixed$16 = TsDsl;
-var ThrowTsDsl = class extends Mixed$16 {
+const Mixed$17 = TsDsl;
+var ThrowTsDsl = class extends Mixed$17 {
 	"~dsl" = "ThrowTsDsl";
 	error;
 	msg;
@@ -3261,8 +3456,8 @@ var ThrowTsDsl = class extends Mixed$16 {
 
 //#endregion
 //#region src/ts-dsl/stmt/try.ts
-const Mixed$15 = TsDsl;
-var TryTsDsl = class extends Mixed$15 {
+const Mixed$16 = TsDsl;
+var TryTsDsl = class extends Mixed$16 {
 	"~dsl" = "TryTsDsl";
 	_catch;
 	_catchArg;
@@ -3302,7 +3497,7 @@ var TryTsDsl = class extends Mixed$15 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	catch(...items) {
 		this._catch = items;
@@ -3327,20 +3522,20 @@ var TryTsDsl = class extends Mixed$15 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Try statement missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
 		const missing = [];
-		if (!this._try || this._try.length === 0) missing.push(".try()");
+		if (!this._try || !this._try.length) missing.push(".try()");
 		return missing;
 	}
 };
 
 //#endregion
 //#region src/ts-dsl/stmt/var.ts
-const Mixed$14 = DefaultMixin(DocMixin(ExportMixin(HintMixin(PatternMixin(ValueMixin(TsDsl))))));
-var VarTsDsl = class extends Mixed$14 {
+const Mixed$15 = DefaultMixin(DocMixin(ExportMixin(HintMixin(PatternMixin(ValueMixin(TsDsl))))));
+var VarTsDsl = class extends Mixed$15 {
 	"~dsl" = "VarTsDsl";
 	nameSanitizer = safeRuntimeName;
 	kind = ts.NodeFlags.None;
@@ -3357,7 +3552,7 @@ var VarTsDsl = class extends Mixed$14 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	const() {
 		this.kind = ts.NodeFlags.Const;
@@ -3368,8 +3563,8 @@ var VarTsDsl = class extends Mixed$14 {
 		return this;
 	}
 	/** Sets the variable type. */
-	type(type) {
-		this._type = type instanceof TypeTsDsl ? type : new TypeExprTsDsl(type);
+	type(node) {
+		this._type = node instanceof TypeTsDsl ? node : new TypeExprTsDsl(node);
 		return this;
 	}
 	var() {
@@ -3383,7 +3578,7 @@ var VarTsDsl = class extends Mixed$14 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Variable declaration missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
@@ -3395,8 +3590,8 @@ var VarTsDsl = class extends Mixed$14 {
 
 //#endregion
 //#region src/ts-dsl/type/alias.ts
-const Mixed$13 = DocMixin(ExportMixin(TypeParamsMixin(TsDsl)));
-var TypeAliasTsDsl = class extends Mixed$13 {
+const Mixed$14 = DocMixin(ExportMixin(TypeParamsMixin(TsDsl)));
+var TypeAliasTsDsl = class extends Mixed$14 {
 	"~dsl" = "TypeAliasTsDsl";
 	nameSanitizer = safeTypeName;
 	scope = "type";
@@ -3414,7 +3609,7 @@ var TypeAliasTsDsl = class extends Mixed$13 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	/** Sets the type expression on the right-hand side of `= ...`. */
 	type(node) {
@@ -3428,21 +3623,21 @@ var TypeAliasTsDsl = class extends Mixed$13 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		const name = this.name.toString();
 		throw new Error(`Type alias${name ? ` "${name}"` : ""} missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
 		const missing = [];
-		if (!this.value) missing.push(".type()");
+		if (!this.value) missing.push(".​type()");
 		return missing;
 	}
 };
 
 //#endregion
 //#region src/ts-dsl/type/and.ts
-const Mixed$12 = TsDsl;
-var TypeAndTsDsl = class extends Mixed$12 {
+const Mixed$13 = TsDsl;
+var TypeAndTsDsl = class extends Mixed$13 {
 	"~dsl" = "TypeAndTsDsl";
 	scope = "type";
 	_types = [];
@@ -3471,8 +3666,8 @@ var TypeAndTsDsl = class extends Mixed$12 {
 
 //#endregion
 //#region src/ts-dsl/type/literal.ts
-const Mixed$11 = TsDsl;
-var TypeLiteralTsDsl = class extends Mixed$11 {
+const Mixed$12 = TsDsl;
+var TypeLiteralTsDsl = class extends Mixed$12 {
 	"~dsl" = "TypeLiteralTsDsl";
 	scope = "type";
 	value;
@@ -3490,8 +3685,8 @@ var TypeLiteralTsDsl = class extends Mixed$11 {
 
 //#endregion
 //#region src/ts-dsl/type/idx-sig.ts
-const Mixed$10 = DocMixin(ReadonlyMixin(TsDsl));
-var TypeIdxSigTsDsl = class extends Mixed$10 {
+const Mixed$11 = DocMixin(ReadonlyMixin(TsDsl));
+var TypeIdxSigTsDsl = class extends Mixed$11 {
 	"~dsl" = "TypeIdxSigTsDsl";
 	scope = "type";
 	_key;
@@ -3516,7 +3711,7 @@ var TypeIdxSigTsDsl = class extends Mixed$10 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	/** Sets the key type: `[name: T]` */
 	key(type) {
@@ -3535,7 +3730,7 @@ var TypeIdxSigTsDsl = class extends Mixed$10 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		const name = this.name.toString();
 		throw new Error(`Index signature${name ? ` "${name}"` : ""} missing ${missing.join(" and ")}`);
 	}
@@ -3549,8 +3744,8 @@ var TypeIdxSigTsDsl = class extends Mixed$10 {
 
 //#endregion
 //#region src/ts-dsl/type/prop.ts
-const Mixed$9 = DocMixin(OptionalMixin(ReadonlyMixin(TsDsl)));
-var TypePropTsDsl = class extends Mixed$9 {
+const Mixed$10 = DocMixin(OptionalMixin(ReadonlyMixin(TsDsl)));
+var TypePropTsDsl = class extends Mixed$10 {
 	"~dsl" = "TypePropTsDsl";
 	scope = "type";
 	_type;
@@ -3573,7 +3768,7 @@ var TypePropTsDsl = class extends Mixed$9 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	/** Sets the property type. */
 	type(type) {
@@ -3588,21 +3783,21 @@ var TypePropTsDsl = class extends Mixed$9 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		const name = this.name.toString();
 		throw new Error(`Type property${name ? ` "${name}"` : ""} missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
 		const missing = [];
-		if (!this._type) missing.push(".type()");
+		if (!this._type) missing.push(".​type()");
 		return missing;
 	}
 };
 
 //#endregion
 //#region src/ts-dsl/type/object.ts
-const Mixed$8 = TsDsl;
-var TypeObjectTsDsl = class extends Mixed$8 {
+const Mixed$9 = TsDsl;
+var TypeObjectTsDsl = class extends Mixed$9 {
 	"~dsl" = "TypeObjectTsDsl";
 	scope = "type";
 	_props = /* @__PURE__ */ new Map();
@@ -3644,8 +3839,8 @@ var TypeObjectTsDsl = class extends Mixed$8 {
 
 //#endregion
 //#region src/ts-dsl/type/tuple.ts
-const Mixed$7 = TsDsl;
-var TypeTupleTsDsl = class extends Mixed$7 {
+const Mixed$8 = TsDsl;
+var TypeTupleTsDsl = class extends Mixed$8 {
 	"~dsl" = "TypeTupleTsDsl";
 	scope = "type";
 	_elements = [];
@@ -3667,7 +3862,7 @@ var TypeTupleTsDsl = class extends Mixed$7 {
 };
 
 //#endregion
-//#region src/ts-dsl/type/fromValue.ts
+//#region src/ts-dsl/type/from-value.ts
 const fromValue = (input) => {
 	if (isNode(input)) return input;
 	if (input === null) return new TypeLiteralTsDsl(input);
@@ -3686,8 +3881,8 @@ const fromValue = (input) => {
 
 //#endregion
 //#region src/ts-dsl/type/func.ts
-const Mixed$6 = DocMixin(ParamMixin(TypeParamsMixin(TypeReturnsMixin(TsDsl))));
-var TypeFuncTsDsl = class extends Mixed$6 {
+const Mixed$7 = DocMixin(ParamMixin(TypeParamsMixin(TypeReturnsMixin(TsDsl))));
+var TypeFuncTsDsl = class extends Mixed$7 {
 	"~dsl" = "TypeFuncTsDsl";
 	scope = "type";
 	analyze(ctx) {
@@ -3695,7 +3890,7 @@ var TypeFuncTsDsl = class extends Mixed$6 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	toAst() {
 		this.$validate();
@@ -3704,7 +3899,7 @@ var TypeFuncTsDsl = class extends Mixed$6 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Function type missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
@@ -3716,8 +3911,8 @@ var TypeFuncTsDsl = class extends Mixed$6 {
 
 //#endregion
 //#region src/ts-dsl/type/idx.ts
-const Mixed$5 = TypeExprMixin(TsDsl);
-var TypeIdxTsDsl = class extends Mixed$5 {
+const Mixed$6 = TypeExprMixin(TsDsl);
+var TypeIdxTsDsl = class extends Mixed$6 {
 	"~dsl" = "TypeIdxTsDsl";
 	scope = "type";
 	_base;
@@ -3734,7 +3929,7 @@ var TypeIdxTsDsl = class extends Mixed$5 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	base(base) {
 		this._base = base;
@@ -3750,7 +3945,7 @@ var TypeIdxTsDsl = class extends Mixed$5 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Indexed access type missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
@@ -3764,8 +3959,8 @@ f.type.idx.set((...args) => new TypeIdxTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/type/mapped.ts
-const Mixed$4 = TsDsl;
-var TypeMappedTsDsl = class extends Mixed$4 {
+const Mixed$5 = TsDsl;
+var TypeMappedTsDsl = class extends Mixed$5 {
 	"~dsl" = "TypeMappedTsDsl";
 	scope = "type";
 	questionToken;
@@ -3785,7 +3980,7 @@ var TypeMappedTsDsl = class extends Mixed$4 {
 	}
 	/** Returns true when all required builder calls are present. */
 	get isValid() {
-		return this.missingRequiredCalls().length === 0;
+		return !this.missingRequiredCalls().length;
 	}
 	/** Sets the key constraint: `[K in Constraint]` */
 	key(type) {
@@ -3823,7 +4018,7 @@ var TypeMappedTsDsl = class extends Mixed$4 {
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		const name = this.name.toString();
 		throw new Error(`Mapped type${name ? ` "${name}"` : ""} missing ${missing.join(" and ")}`);
 	}
@@ -3837,7 +4032,7 @@ var TypeMappedTsDsl = class extends Mixed$4 {
 
 //#endregion
 //#region src/ts-dsl/type/operator.ts
-const Mixed$3 = TsDsl;
+const Mixed$4 = TsDsl;
 /**
 * Builds a TypeScript `TypeOperatorNode`, such as:
 *
@@ -3850,7 +4045,7 @@ const Mixed$3 = TsDsl;
 *
 * The node will throw during render if required fields are missing.
 */
-var TypeOperatorTsDsl = class extends Mixed$3 {
+var TypeOperatorTsDsl = class extends Mixed$4 {
 	"~dsl" = "TypeOperatorTsDsl";
 	scope = "type";
 	_op;
@@ -3894,7 +4089,7 @@ var TypeOperatorTsDsl = class extends Mixed$3 {
 	/** Throws if required fields are not set. */
 	$validate() {
 		const missing = this.missingRequiredCalls();
-		if (missing.length === 0) return;
+		if (!missing.length) return;
 		throw new Error(`Type operator missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
@@ -3908,8 +4103,8 @@ f.type.operator.set((...args) => new TypeOperatorTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/type/or.ts
-const Mixed$2 = TsDsl;
-var TypeOrTsDsl = class extends Mixed$2 {
+const Mixed$3 = TsDsl;
+var TypeOrTsDsl = class extends Mixed$3 {
 	"~dsl" = "TypeOrTsDsl";
 	scope = "type";
 	_types = [];
@@ -3938,8 +4133,8 @@ var TypeOrTsDsl = class extends Mixed$2 {
 
 //#endregion
 //#region src/ts-dsl/type/query.ts
-const Mixed$1 = TypeExprMixin(TsDsl);
-var TypeQueryTsDsl = class extends Mixed$1 {
+const Mixed$2 = TypeExprMixin(TsDsl);
+var TypeQueryTsDsl = class extends Mixed$2 {
 	"~dsl" = "TypeQueryTsDsl";
 	scope = "type";
 	_expr;
@@ -3960,8 +4155,8 @@ f.type.query.set((...args) => new TypeQueryTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/type/template.ts
-const Mixed = TsDsl;
-var TypeTemplateTsDsl = class extends Mixed {
+const Mixed$1 = TsDsl;
+var TypeTemplateTsDsl = class extends Mixed$1 {
 	"~dsl" = "TypeTemplateTsDsl";
 	scope = "type";
 	parts = [];
@@ -3992,7 +4187,7 @@ var TypeTemplateTsDsl = class extends Mixed {
 				normalized.push(merged);
 			} else normalized.push(current);
 		}
-		if (normalized.length === 0 || typeof normalized[0] !== "string") normalized.unshift("");
+		if (!normalized.length || typeof normalized[0] !== "string") normalized.unshift("");
 		if (normalized.length === 1 && typeof normalized[0] === "string") return ts.factory.createTemplateLiteralType(ts.factory.createTemplateHead(normalized[0]), []);
 		if (normalized.length === 2 && typeof normalized[0] === "string" && typeof normalized[1] !== "string") return ts.factory.createTemplateLiteralType(ts.factory.createTemplateHead(normalized[0]), [ts.factory.createTemplateLiteralTypeSpan(normalized[1], ts.factory.createTemplateTail(""))]);
 		const head = ts.factory.createTemplateHead(normalized.shift());
@@ -4000,13 +4195,54 @@ var TypeTemplateTsDsl = class extends Mixed {
 		while (normalized.length) {
 			const type = normalized.shift();
 			const next = typeof normalized[0] === "string" ? normalized.shift() : "";
-			const isLast = normalized.length === 0;
+			const isLast = !normalized.length;
 			spans.push(ts.factory.createTemplateLiteralTypeSpan(type, isLast ? ts.factory.createTemplateTail(next) : ts.factory.createTemplateMiddle(next)));
 		}
 		return ts.factory.createTemplateLiteralType(head, spans);
 	}
 };
 
+//#endregion
+//#region src/ts-dsl/type/tuple-member.ts
+const Mixed = OptionalMixin(TsDsl);
+var TypeTupleMemberTsDsl = class extends Mixed {
+	"~dsl" = "TypeTupleMemberTsDsl";
+	scope = "type";
+	_type;
+	constructor(name) {
+		super();
+		this.name.set(name);
+	}
+	analyze(ctx) {
+		super.analyze(ctx);
+		ctx.analyze(this.name);
+		ctx.analyze(this._type);
+	}
+	/** Returns true when all required builder calls are present. */
+	get isValid() {
+		return !this.missingRequiredCalls().length;
+	}
+	type(node) {
+		this._type = ref(node);
+		return this;
+	}
+	toAst() {
+		this.$validate();
+		return ts.factory.createNamedTupleMember(void 0, this.$node(this.name), this._optional ? ts.factory.createToken(ts.SyntaxKind.QuestionToken) : void 0, this.$type(this._type));
+	}
+	$validate() {
+		const missing = this.missingRequiredCalls();
+		if (!missing.length) return;
+		throw new Error(`Tuple member missing ${missing.join(" and ")}`);
+	}
+	missingRequiredCalls() {
+		const missing = [];
+		if (!this._type) missing.push(".​type()");
+		return missing;
+	}
+};
+f.type.tupleMember.set((name) => new TypeTupleMemberTsDsl(name));
+
 //#endregion
 //#region src/ts-dsl/utils/lazy.ts
 var LazyTsDsl = class extends TsDsl {
@@ -4165,7 +4401,7 @@ var TypeScriptRenderer = class TypeScriptRenderer {
 		const specifiers = group.imports.map((imp) => {
 			return ts.factory.createImportSpecifier(imp.isTypeOnly, imp.sourceName !== imp.localName ? $.id(imp.sourceName).toAst() : void 0, $.id(imp.localName).toAst());
 		});
-		const importClause = ts.factory.createImportClause(group.isTypeOnly, group.kind === "default" ? $.id(group.localName ?? "").toAst() : void 0, group.kind === "namespace" ? ts.factory.createNamespaceImport($.id(group.localName ?? "").toAst()) : specifiers.length > 0 ? ts.factory.createNamedImports(specifiers) : void 0);
+		const importClause = ts.factory.createImportClause(group.isTypeOnly, group.kind === "default" ? $.id(group.localName ?? "").toAst() : void 0, group.kind === "namespace" ? ts.factory.createNamespaceImport($.id(group.localName ?? "").toAst()) : specifiers.length ? ts.factory.createNamedImports(specifiers) : void 0);
 		return ts.factory.createImportDeclaration(void 0, importClause, $.literal(group.modulePath).toAst());
 	}
 	getExports(ctx) {
@@ -4275,22 +4511,24 @@ const tsDsl = {
 	call: (...args) => new CallTsDsl(...args),
 	class: (...args) => new ClassTsDsl(...args),
 	const: (...args) => new VarTsDsl(...args).const(),
+	dec: (...args) => new PostfixTsDsl(...args).dec(),
 	decorator: (...args) => new DecoratorTsDsl(...args),
 	doc: (...args) => new DocTsDsl(...args),
 	enum: (...args) => new EnumTsDsl(...args),
 	expr: (...args) => new ExprTsDsl(...args),
 	field: (...args) => new FieldTsDsl(...args),
+	for: ((...args) => new ForTsDsl(...args)),
 	fromValue: (...args) => fromValue$1(...args),
 	func: ((nameOrFn, fn) => {
 		if (nameOrFn === void 0) return new FuncTsDsl();
-		if (typeof nameOrFn !== "string") return new FuncTsDsl(nameOrFn);
-		if (fn === void 0) return new FuncTsDsl(nameOrFn);
+		if (typeof nameOrFn !== "string" || fn === void 0) return new FuncTsDsl(nameOrFn);
 		return new FuncTsDsl(nameOrFn, fn);
 	}),
 	getter: (...args) => new GetterTsDsl(...args),
 	hint: (...args) => new HintTsDsl(...args),
 	id: (...args) => new IdTsDsl(...args),
 	if: (...args) => new IfTsDsl(...args),
+	inc: (...args) => new PostfixTsDsl(...args).inc(),
 	init: (...args) => new InitTsDsl(...args),
 	lazy: (...args) => new LazyTsDsl(...args),
 	let: (...args) => new VarTsDsl(...args).let(),
@@ -4310,6 +4548,7 @@ const tsDsl = {
 	regexp: (...args) => new RegExpTsDsl(...args),
 	return: (...args) => new ReturnTsDsl(...args),
 	setter: (...args) => new SetterTsDsl(...args),
+	spread: (...args) => new SpreadTsDsl(...args),
 	stmt: (...args) => new StmtTsDsl(...args),
 	template: (...args) => new TemplateTsDsl(...args),
 	ternary: (...args) => new TernaryTsDsl(...args),
@@ -4332,7 +4571,8 @@ const tsDsl = {
 		param: (...args) => new TypeParamTsDsl(...args),
 		query: (...args) => new TypeQueryTsDsl(...args),
 		template: (...args) => new TypeTemplateTsDsl(...args),
-		tuple: (...args) => new TypeTupleTsDsl(...args)
+		tuple: (...args) => new TypeTupleTsDsl(...args),
+		tupleMember: (...args) => new TypeTupleMemberTsDsl(...args)
 	}),
 	typeofExpr: (...args) => new TypeOfExprTsDsl(...args),
 	var: (...args) => new VarTsDsl(...args)
@@ -4347,7 +4587,7 @@ const createRegistryClass = ({ plugin, sdkSymbol, symbol }) => {
 	return $.class(symbol).generic("T").field(symbolDefaultKey, (f) => f.private().readonly().assign($.literal("default"))).newline().field(symbolInstances, (f) => f.private().readonly().type($.type("Map").generics("string", "T")).assign($.new("Map"))).newline().method("get", (m) => m.returns("T").param("key", (p) => p.type("string").optional()).do($.const("instance").assign($("this").attr(symbolInstances).attr("get").call($("key").coalesce($("this").attr(symbolDefaultKey)))), $.if($.not("instance")).do($.throw("Error").message($.template("No SDK client found. Create one with \"new ").add(sdkSymbol).add("()\" to fix this error."))), $.return("instance"))).newline().method("set", (m) => m.returns("void").param("value", (p) => p.type("T")).param("key", (p) => p.type("string").optional()).do($("this").attr(symbolInstances).attr("set").call($("key").coalesce($("this").attr(symbolDefaultKey)), "value")));
 };
 const createClientClass = ({ plugin, symbol }) => {
-	const symClient = plugin.getSymbol({ category: "client" });
+	const symClient = plugin.querySymbol({ category: "client" });
 	const optionalClient = Boolean(plugin.config.client && symClient);
 	const symbolClient = plugin.external("client.Client");
 	return $.class(symbol).field("client", (f) => f.protected().type(symbolClient)).newline().init((i) => i.param("args", (p) => p.optional(optionalClient).type($.type.object().prop("client", (p) => p.optional(optionalClient).type(symbolClient)))).do($("this").attr("client").assign($("args").attr("client").optional(optionalClient).$if(optionalClient, (a) => a.coalesce(symClient)))));
@@ -4409,7 +4649,7 @@ const operationAuth = ({ operation, plugin }) => {
 //#region src/plugins/@hey-api/sdk/shared/signature.ts
 /**
 * Collects and resolves all operation parameters for flattened SDK signatures.
-* - Prefixes all conflicting names with their location (e.g. path_foo, query_foo)
+* - Prefixes all conflicting names with their location (e.g., path_foo, query_foo)
 * - Returns a flat map of resolved parameter names to their metadata
 */
 function getSignatureParameters({ operation }) {
@@ -4514,16 +4754,16 @@ function getSignatureParameters({ operation }) {
 
 //#endregion
 //#region src/plugins/@hey-api/sdk/shared/validator.ts
-const createRequestValidator = ({ operation, plugin }) => {
+function createRequestValidator({ plugin, ...args }) {
 	if (!plugin.config.validator.request) return;
 	const validator = plugin.getPluginOrThrow(plugin.config.validator.request);
 	if (!validator.api.createRequestValidator) return;
 	return validator.api.createRequestValidator({
-		operation,
+		...args,
 		plugin: validator
 	});
-};
-const createResponseValidator = ({ operation, plugin }) => {
+}
+function createResponseValidator({ operation, plugin }) {
 	if (!plugin.config.validator.response) return;
 	const validator = plugin.getPluginOrThrow(plugin.config.validator.response);
 	if (!validator.api.createResponseValidator) return;
@@ -4531,7 +4771,7 @@ const createResponseValidator = ({ operation, plugin }) => {
 		operation,
 		plugin: validator
 	});
-};
+}
 
 //#endregion
 //#region src/plugins/@hey-api/sdk/shared/operation.ts
@@ -4559,6 +4799,15 @@ const operationOptionsType = ({ isDataAllowed = true, operation, plugin, throwOn
 		});
 		return $.type(symbolOptions).generic(nuxtTypeComposable).generic(isDataAllowed ? symbolDataType ?? "unknown" : "never").generic(symbolResponseType ?? "unknown").generic(nuxtTypeDefault);
 	}
+	if (hasOperationSse({ operation })) {
+		const symbolResponseType = plugin.querySymbol({
+			category: "type",
+			resource: "operation",
+			resourceId: operation.id,
+			role: "response"
+		});
+		return $.type(symbolOptions).generic(isDataAllowed ? symbolDataType ?? "unknown" : "never").generic(throwOnError !== void 0 ? throwOnError : "boolean").generic(symbolResponseType ?? "unknown");
+	}
 	if (throwOnError) return $.type(symbolOptions).generic(isDataAllowed ? symbolDataType ?? "unknown" : "never").generic(throwOnError);
 	return $.type(symbolOptions).$if(!isDataAllowed || symbolDataType, (t) => t.generic(isDataAllowed ? symbolDataType : "never"));
 };
@@ -4739,7 +4988,7 @@ function operationStatements({ isRequiredOptions, opParameters, operation, plugi
 			reqOptions.prop("headers", headers);
 		}
 	}
-	const symbolClient = plugin.config.client ? plugin.getSymbol({ category: "client" }) : void 0;
+	const symbolClient = plugin.config.client ? plugin.querySymbol({ category: "client" }) : void 0;
 	let clientExpression;
 	const optionsClient = $("options").attr("client").required(isRequiredOptions);
 	if (isInstance(plugin)) clientExpression = optionsClient.coalesce($("this").attr("client"));
@@ -4839,7 +5088,7 @@ function enrichRootClass(args) {
 		sdkSymbol: symbol,
 		symbol: symbolRegistry
 	}));
-	const isClientRequired = !plugin.config.client || !plugin.getSymbol({ category: "client" });
+	const isClientRequired = !plugin.config.client || !plugin.querySymbol({ category: "client" });
 	const registry = plugin.symbol("__registry");
 	node.toAccessNode = (node, options) => {
 		if (options.context) return;
@@ -5075,7 +5324,7 @@ function implementHttpRequestFn(args) {
 		operation
 	});
 	const symbolHttpRequest = plugin.external("@angular/common/http.HttpRequest");
-	const symbolClient = plugin.getSymbol({ category: "client" });
+	const symbolClient = plugin.querySymbol({ category: "client" });
 	const symbolOptions = plugin.referenceSymbol({
 		category: "type",
 		resource: "client-options",
@@ -5226,33 +5475,11 @@ function toHttpResourceNode(model, plugin) {
 const handler$13 = ({ plugin }) => {
 	plugin.symbol("HttpRequest", {
 		external: "@angular/common/http",
-		kind: "type",
-		meta: {
-			category: "external",
-			resource: "@angular/common/http.HttpRequest"
-		}
-	});
-	plugin.symbol("inject", {
-		external: "@angular/core",
-		meta: {
-			category: "external",
-			resource: "@angular/core.inject"
-		}
-	});
-	plugin.symbol("Injectable", {
-		external: "@angular/core",
-		meta: {
-			category: "external",
-			resource: "@angular/core.Injectable"
-		}
-	});
-	plugin.symbol("httpResource", {
-		external: "@angular/common/http",
-		meta: {
-			category: "external",
-			resource: "@angular/common/http.httpResource"
-		}
+		kind: "type"
 	});
+	plugin.symbol("inject", { external: "@angular/core" });
+	plugin.symbol("Injectable", { external: "@angular/core" });
+	plugin.symbol("httpResource", { external: "@angular/common/http" });
 	const httpRequestStructure = new StructureModel();
 	const httpResourceStructure = new StructureModel();
 	if (plugin.config.httpRequests.enabled) {
@@ -6150,7 +6377,6 @@ const createTypeOptions = ({ plugin }) => {
 		external: clientModule,
 		kind: "type",
 		meta: {
-			category: "external",
 			resource: "client.Client",
 			tool: client.name
 		}
@@ -6164,7 +6390,7 @@ const createTypeOptions = ({ plugin }) => {
 		resource: "client-options",
 		tool: "sdk"
 	} });
-	const typeOptions = $.type.alias(symbolOptions).export().$if(isNuxtClient, (t) => t.generic("TComposable", (g) => g.extends(plugin.external("client.Composable")).default($.type.literal("$fetch"))).generic("TData", (g) => g.extends(symbolTDataShape).default(symbolTDataShape)).generic(nuxtTypeResponse, (g) => g.default("unknown")).generic(nuxtTypeDefault, (g) => g.default("undefined")), (t) => t.generic("TData", (g) => g.extends(symbolTDataShape).default(symbolTDataShape)).generic("ThrowOnError", (g) => g.extends("boolean").default("boolean"))).type($.type.and($.type(symbolClientOptions).$if(isNuxtClient, (t) => t.generic("TComposable").generic("TData").generic(nuxtTypeResponse).generic(nuxtTypeDefault), (t) => t.generic("TData").generic("ThrowOnError")), $.type.object().prop("client", (p) => p.doc([
+	const typeOptions = $.type.alias(symbolOptions).export().$if(isNuxtClient, (t) => t.generic("TComposable", (g) => g.extends(plugin.external("client.Composable")).default($.type.literal("$fetch"))).generic("TData", (g) => g.extends(symbolTDataShape).default(symbolTDataShape)).generic(nuxtTypeResponse, (g) => g.default("unknown")).generic(nuxtTypeDefault, (g) => g.default("undefined")), (t) => t.generic("TData", (g) => g.extends(symbolTDataShape).default(symbolTDataShape)).generic("ThrowOnError", (g) => g.extends("boolean").default("boolean")).generic("TResponse", (g) => g.default("unknown"))).type($.type.and($.type(symbolClientOptions).$if(isNuxtClient, (t) => t.generic("TComposable").generic("TData").generic(nuxtTypeResponse).generic(nuxtTypeDefault), (t) => t.generic("TData").generic("ThrowOnError").generic("TResponse")), $.type.object().prop("client", (p) => p.doc([
 		"You can provide a client instance returned by `createClient()` instead of",
 		"individual options. This might be also useful if you want to implement a",
 		"custom client."
@@ -6182,7 +6408,6 @@ const handlerV1$3 = ({ plugin }) => {
 	plugin.symbol("formDataBodySerializer", {
 		external: clientModule,
 		meta: {
-			category: "external",
 			resource: "client.formDataBodySerializer",
 			tool: client.name
 		}
@@ -6190,7 +6415,6 @@ const handlerV1$3 = ({ plugin }) => {
 	plugin.symbol("urlSearchParamsBodySerializer", {
 		external: clientModule,
 		meta: {
-			category: "external",
 			resource: "client.urlSearchParamsBodySerializer",
 			tool: client.name
 		}
@@ -6198,7 +6422,6 @@ const handlerV1$3 = ({ plugin }) => {
 	plugin.symbol("buildClientParams", {
 		external: clientModule,
 		meta: {
-			category: "external",
 			resource: "client.buildClientParams",
 			tool: client.name
 		}
@@ -6207,18 +6430,11 @@ const handlerV1$3 = ({ plugin }) => {
 		external: clientModule,
 		kind: "type",
 		meta: {
-			category: "external",
 			resource: "client.Composable",
 			tool: client.name
 		}
 	});
-	if (isAngularClient) plugin.symbol("Injectable", {
-		external: "@angular/core",
-		meta: {
-			category: "external",
-			resource: "@angular/core.Injectable"
-		}
-	});
+	if (isAngularClient) plugin.symbol("Injectable", { external: "@angular/core" });
 	createTypeOptions({ plugin });
 	const structure = new StructureModel();
 	const shell = createShell$1(plugin);
@@ -6322,16 +6538,16 @@ const defineConfig$16 = definePluginConfig(defaultConfig$16);
 //#region src/plugins/@hey-api/transformers/expressions.ts
 const bigIntExpressions = ({ dataExpression, schema }) => {
 	if (schema.type !== "integer" || schema.format !== "int64") return;
-	const bigIntCallExpression = dataExpression !== void 0 ? $("BigInt").call($.expr(dataExpression).attr("toString").call()) : void 0;
+	const bigIntCallExpression = dataExpression !== void 0 ? $("BigInt").call($(dataExpression).attr("toString").call()) : void 0;
 	if (bigIntCallExpression) {
 		if (typeof dataExpression === "string") return [bigIntCallExpression];
-		if (dataExpression) return [$.expr(dataExpression).assign(bigIntCallExpression)];
+		if (dataExpression) return [$(dataExpression).assign(bigIntCallExpression)];
 	}
 };
 const dateExpressions = ({ dataExpression, schema }) => {
 	if (schema.type !== "string" || !(schema.format === "date" || schema.format === "date-time")) return;
 	if (typeof dataExpression === "string") return [$.new("Date").arg(dataExpression)];
-	if (dataExpression) return [$.expr(dataExpression).assign($.new("Date").arg(dataExpression))];
+	if (dataExpression) return [$(dataExpression).assign($.new("Date").arg(dataExpression))];
 };
 
 //#endregion
@@ -6360,7 +6576,7 @@ function processSchemaType({ dataExpression, plugin, schema }) {
 			resource: "definition",
 			resourceId: schema.$ref
 		};
-		const symbol = plugin.getSymbol(query) ?? plugin.symbol(applyNaming(refToName(schema.$ref), {
+		const symbol = plugin.querySymbol(query) ?? plugin.symbol(applyNaming(refToName(schema.$ref), {
 			case: "camelCase",
 			name: "{{name}}SchemaResponseTransformer"
 		}), { meta: query });
@@ -6419,6 +6635,17 @@ function processSchemaType({ dataExpression, plugin, schema }) {
 			if (required.includes(name) && noNullableTypesInSchema) nodes = nodes.concat(propertyNodes);
 			else nodes.push($.if(propertyAccessExpression).do(...propertyNodes));
 		}
+		if (schema.additionalProperties && dataExpression) {
+			const entryValueNodes = processSchemaType({
+				dataExpression: $(dataExpression).attr("key").computed(),
+				plugin,
+				schema: schema.additionalProperties
+			});
+			if (entryValueNodes.length) {
+				const properties = Object.keys(schema.properties ?? {});
+				nodes.push($.for($.const("key")).of($("Object").attr("keys").call(dataExpression)).$if(properties.length, (f) => f.do($.if($.not($.array(...properties).attr("includes").call("key"))).do(...entryValueNodes)), (f) => f.do(...entryValueNodes)));
+			}
+		}
 		return nodes;
 	}
 	if (schema.items) {
@@ -6815,9 +7042,9 @@ function itemsNode$4(ctx) {
 function baseNode$61(ctx) {
 	const { schema } = ctx;
 	const items = schema.items ?? [];
-	if (items.length === 0) return $.type("never");
+	if (!items.length) return $.type("never");
 	const literalTypes = items.filter((item) => item.const !== void 0).map((item) => $.type.fromValue(item.const));
-	return literalTypes.length > 0 ? $.type.or(...literalTypes) : $.type("string");
+	return literalTypes.length ? $.type.or(...literalTypes) : $.type("string");
 }
 function enumResolver$4(ctx) {
 	return ctx.nodes.base(ctx);
@@ -6966,16 +7193,16 @@ function baseNode$56(ctx) {
 		const ir = schema.patternProperties[pattern];
 		indexSchemas.unshift(ir);
 	}
-	const hasPatterns = !!schema.patternProperties && Object.keys(schema.patternProperties).length > 0;
+	const hasPatterns = schema.patternProperties && Object.keys(schema.patternProperties).length;
 	const addPropsRaw = schema.additionalProperties;
 	const addPropsObj = addPropsRaw !== false && addPropsRaw ? addPropsRaw : void 0;
-	if (hasPatterns || !!addPropsObj && (addPropsObj.type !== "never" || !indexSchemas.length)) {
+	if (hasPatterns || addPropsObj && (addPropsObj.type !== "never" || !indexSchemas.length)) {
 		const addProps = addPropsObj;
 		if (addProps && addProps.type !== "never") if (addProps.type === "unknown") indexSchemas = [addProps, ...schema.patternProperties ? Object.values(schema.patternProperties) : []];
 		else indexSchemas.unshift(addProps);
 		else if (!hasPatterns && !indexSchemas.length && addProps && addProps.type === "never") indexSchemas = [addProps];
 		if (hasOptionalProperties && addProps?.type !== "unknown") indexSchemas.push({ type: "undefined" });
-		if (indexSchemas.length > 0) {
+		if (indexSchemas.length) {
 			const indexType = walk(indexSchemas.length === 1 ? indexSchemas[0] : deduplicateSchema({ schema: {
 				items: indexSchemas,
 				logicalOperator: "or"
@@ -7038,14 +7265,14 @@ function formatNode$4(ctx) {
 			resourceId: typeidBase,
 			tool: "typescript"
 		};
-		if (!plugin.getSymbol(typeidQuery)) {
+		if (!plugin.querySymbol(typeidQuery)) {
 			const containerQuery = {
 				category: "type",
 				resource: "type-id",
 				tool: "typescript",
 				variant: "container"
 			};
-			if (!plugin.getSymbol(containerQuery)) {
+			if (!plugin.querySymbol(containerQuery)) {
 				const symbolTypeId = plugin.symbol("TypeID", { meta: containerQuery });
 				const nodeTypeId = $.type.alias(symbolTypeId).export().generic("T", (g) => g.extends("string")).type($.type.template().add($.type("T")).add("_").add($.type("string")));
 				plugin.node(nodeTypeId);
@@ -7208,7 +7435,7 @@ function voidToAst$3({ plugin, schema }) {
 
 //#endregion
 //#region src/plugins/@hey-api/typescript/v1/walker.ts
-function createVisitor$4(config) {
+function createVisitor$4(config = {}) {
 	const { schemaExtractor } = config;
 	return {
 		applyModifiers(result) {
@@ -7350,7 +7577,7 @@ function createVisitor$4(config) {
 				resource: "definition",
 				resourceId: $ref
 			});
-			if (schema.omit && schema.omit.length > 0) {
+			if (schema.omit && schema.omit.length) {
 				const omittedKeys = schema.omit.length === 1 ? $.type.literal(schema.omit[0]) : $.type.or(...schema.omit.map((key) => $.type.literal(key)));
 				return {
 					meta: defaultMeta$2(schema),
@@ -7436,7 +7663,7 @@ function createProcessor$4(plugin) {
 	const extractorHooks = [plugin.config["~hooks"]?.schemas?.shouldExtract, plugin.context.config.parser.hooks.schemas?.shouldExtract];
 	function extractor(ctx) {
 		if (processor.hasEmitted(ctx.path)) return ctx.schema;
-		for (const hook of extractorHooks) if (hook?.(ctx)) {
+		for (const hook of extractorHooks) if (typeof hook === "boolean" ? hook : hook?.(ctx) ?? false) {
 			process({
 				namingAnchor: processor.context.anchor,
 				tags: processor.context.tags,
@@ -7564,7 +7791,7 @@ const operationToType = ({ operation, path, plugin, tags }) => {
 	if (data.properties.path.required) dataRequired.push("path");
 	if (data.properties.query.required) dataRequired.push("query");
 	dataRequired.push("url");
-	if (dataRequired.length > 0) data.required = dataRequired;
+	if (dataRequired.length) data.required = dataRequired;
 	const dataResult = processor.process({
 		export: false,
 		meta: {
@@ -7850,7 +8077,7 @@ const handlerV1$2 = ({ plugin }) => {
 		plugin,
 		servers
 	});
-	if (webhooks.length > 0) {
+	if (webhooks.length) {
 		const symbol = plugin.registerSymbol(buildSymbolIn({
 			meta: {
 				category: "type",
@@ -8068,22 +8295,16 @@ const createQueryKeyFunction$1 = ({ plugin }) => {
 		resource: "client-options",
 		tool: "sdk"
 	});
-	const symbolClient = plugin.getSymbol({ category: "client" });
+	const symbolClient = plugin.querySymbol({ category: "client" });
 	const clientModule = clientFolderAbsolutePath(getTypedConfig(plugin));
-	const symbolSerializeQueryValue = plugin.symbol("serializeQueryKeyValue", {
-		external: clientModule,
-		meta: {
-			category: "external",
-			resource: `${clientModule}.serializeQueryKeyValue`
-		}
-	});
+	const symbolSerializeQueryValue = plugin.symbol("serializeQueryKeyValue", { external: clientModule });
 	const fn = $.const(symbolCreateQueryKey).assign($.func().param("id", (p) => p.type("string")).param("options", (p) => p.optional().type(TOptionsType$1)).param("tags", (p) => p.optional().type("ReadonlyArray<string>")).returns($.type.tuple(returnType)).generic(TOptionsType$1, (g) => g.extends(symbolOptions)).do($.const("params").type(returnType).assign($.object().prop("_id", "id").prop(baseUrlKey, $("options").attr(baseUrlKey).optional().or($("options").attr("client").optional().$if(symbolClient, (a, v) => a.coalesce(v)).attr("getConfig").call().attr(baseUrlKey))).as(returnType)), $.if("tags").do($("params").attr("tags").assign($("tags").as("unknown").as(symbolJsonValue))), $.if($("options").attr("body").optional().neq($.id("undefined"))).do($.const("normalizedBody").assign($(symbolSerializeQueryValue).call($("options").attr("body"))), $.if($("normalizedBody").neq($.id("undefined"))).do($("params").attr("body").assign("normalizedBody"))), $.if($("options").attr("path").optional()).do($("params").attr("path").assign($("options").attr("path"))), $.if($("options").attr("query").optional().neq($.id("undefined"))).do($.const("normalizedQuery").assign($(symbolSerializeQueryValue).call($("options").attr("query"))), $.if($("normalizedQuery").neq($.id("undefined"))).do($("params").attr("query").assign("normalizedQuery"))), $.return($.array($("params")))));
 	plugin.node(fn);
 };
 const createQueryKeyLiteral$1 = ({ id, operation, plugin }) => {
 	const config = plugin.config.queryKeys;
 	let tagsExpression;
-	if (config.tags && operation.tags && operation.tags.length > 0) tagsExpression = $.array(...operation.tags.map((tag) => $.literal(tag)));
+	if (config.tags && operation.tags && operation.tags.length) tagsExpression = $.array(...operation.tags.map((tag) => $.literal(tag)));
 	return $(plugin.referenceSymbol({
 		category: "utility",
 		resource: "createQueryKey",
@@ -8128,7 +8349,7 @@ const createQueryOptions$1 = ({ operation, plugin }) => {
 		context: plugin.context,
 		operation
 	});
-	if (!plugin.getSymbol({
+	if (!plugin.querySymbol({
 		category: "utility",
 		resource: "createQueryKey",
 		tool: plugin.name
@@ -8153,7 +8374,7 @@ const createQueryOptions$1 = ({ operation, plugin }) => {
 			tool: plugin.name
 		});
 		let tagsExpr;
-		if (plugin.config.queryKeys.tags && operation.tags && operation.tags.length > 0) tagsExpr = $.array(...operation.tags.map((t) => $.literal(t)));
+		if (plugin.config.queryKeys.tags && operation.tags && operation.tags.length) tagsExpr = $.array(...operation.tags.map((t) => $.literal(t)));
 		keyExpression = $(symbolCreateQueryKey).call($.literal(operation.id), optionsParamName$2, tagsExpr);
 	}
 	const typeData = getPublicTypeData({
@@ -8191,44 +8412,22 @@ const createQueryOptions$1 = ({ operation, plugin }) => {
 //#endregion
 //#region src/plugins/@pinia/colada/v0/plugin.ts
 const handlerV0 = ({ plugin }) => {
-	plugin.symbol("defineQueryOptions", {
-		external: plugin.name,
-		meta: {
-			category: "external",
-			resource: `${plugin.name}.defineQueryOptions`
-		}
-	});
+	plugin.symbol("defineQueryOptions", { external: plugin.name });
 	plugin.symbol("UseMutationOptions", {
 		external: plugin.name,
-		kind: "type",
-		meta: {
-			category: "external",
-			resource: `${plugin.name}.UseMutationOptions`
-		}
+		kind: "type"
 	});
 	plugin.symbol("UseQueryOptions", {
 		external: plugin.name,
-		kind: "type",
-		meta: {
-			category: "external",
-			resource: `${plugin.name}.UseQueryOptions`
-		}
+		kind: "type"
 	});
 	plugin.symbol("_JSONValue", {
 		external: plugin.name,
-		kind: "type",
-		meta: {
-			category: "external",
-			resource: `${plugin.name}._JSONValue`
-		}
+		kind: "type"
 	});
 	plugin.symbol("AxiosError", {
 		external: "axios",
-		kind: "type",
-		meta: {
-			category: "external",
-			resource: "axios.AxiosError"
-		}
+		kind: "type"
 	});
 	plugin.forEach("operation", ({ operation }) => {
 		if (plugin.hooks.operation.isQuery(operation)) {
@@ -8344,7 +8543,7 @@ const createQueryKeyFunction = ({ plugin }) => {
 		tool: plugin.name
 	});
 	const baseUrlKey = getClientBaseUrlKey(getTypedConfig(plugin));
-	const symbolClient = plugin.getSymbol({ category: "client" });
+	const symbolClient = plugin.querySymbol({ category: "client" });
 	const symbolOptions = plugin.referenceSymbol({
 		category: "type",
 		resource: "client-options",
@@ -8357,7 +8556,7 @@ const createQueryKeyFunction = ({ plugin }) => {
 const createQueryKeyLiteral = ({ id, isInfinite, operation, plugin }) => {
 	const config = isInfinite ? plugin.config.infiniteQueryKeys : plugin.config.queryKeys;
 	let tagsArray;
-	if (config.tags && operation.tags && operation.tags.length > 0) tagsArray = $.array().elements(...operation.tags);
+	if (config.tags && operation.tags && operation.tags.length) tagsArray = $.array().elements(...operation.tags);
 	return $(plugin.referenceSymbol({
 		category: "utility",
 		resource: "createQueryKey",
@@ -8422,7 +8621,7 @@ const createInfiniteQueryOptions = ({ operation, plugin }) => {
 		context: plugin.context,
 		operation
 	});
-	if (!plugin.getSymbol({
+	if (!plugin.querySymbol({
 		category: "utility",
 		resource: "createQueryKey",
 		tool: plugin.name
@@ -8430,7 +8629,7 @@ const createInfiniteQueryOptions = ({ operation, plugin }) => {
 		createQueryKeyType({ plugin });
 		createQueryKeyFunction({ plugin });
 	}
-	if (!plugin.getSymbol({
+	if (!plugin.querySymbol({
 		category: "utility",
 		resource: "createInfiniteParams",
 		tool: plugin.name
@@ -8530,7 +8729,7 @@ const createQueryOptions = ({ operation, plugin }) => {
 		context: plugin.context,
 		operation
 	});
-	if (!plugin.getSymbol({
+	if (!plugin.querySymbol({
 		category: "utility",
 		resource: "createQueryKey",
 		tool: plugin.name
@@ -8641,64 +8840,25 @@ const createUseQuery = ({ operation, plugin }) => {
 const handlerV5 = ({ plugin }) => {
 	plugin.symbol("DefaultError", {
 		external: plugin.name,
-		kind: "type",
-		meta: {
-			category: "external",
-			resource: `${plugin.name}.DefaultError`
-		}
+		kind: "type"
 	});
 	plugin.symbol("InfiniteData", {
 		external: plugin.name,
-		kind: "type",
-		meta: {
-			category: "external",
-			resource: `${plugin.name}.InfiniteData`
-		}
+		kind: "type"
 	});
 	const mutationsType = plugin.name === "@tanstack/angular-query-experimental" || plugin.name === "@tanstack/svelte-query" || plugin.name === "@tanstack/solid-query" ? "MutationOptions" : "UseMutationOptions";
 	plugin.symbol(mutationsType, {
 		external: plugin.name,
 		kind: "type",
-		meta: {
-			category: "external",
-			resource: `${plugin.name}.MutationOptions`
-		}
-	});
-	plugin.symbol("infiniteQueryOptions", {
-		external: plugin.name,
-		meta: {
-			category: "external",
-			resource: `${plugin.name}.infiniteQueryOptions`
-		}
-	});
-	plugin.symbol("queryOptions", {
-		external: plugin.name,
-		meta: {
-			category: "external",
-			resource: `${plugin.name}.queryOptions`
-		}
-	});
-	plugin.symbol("useMutation", {
-		external: plugin.name,
-		meta: {
-			category: "external",
-			resource: `${plugin.name}.useMutation`
-		}
-	});
-	plugin.symbol("useQuery", {
-		external: plugin.name,
-		meta: {
-			category: "external",
-			resource: `${plugin.name}.useQuery`
-		}
+		meta: { resource: `${plugin.name}.MutationOptions` }
 	});
+	plugin.symbol("infiniteQueryOptions", { external: plugin.name });
+	plugin.symbol("queryOptions", { external: plugin.name });
+	plugin.symbol("useMutation", { external: plugin.name });
+	plugin.symbol("useQuery", { external: plugin.name });
 	plugin.symbol("AxiosError", {
 		external: "axios",
-		kind: "type",
-		meta: {
-			category: "external",
-			resource: "axios.AxiosError"
-		}
+		kind: "type"
 	});
 	plugin.forEach("operation", ({ operation }) => {
 		if (plugin.hooks.operation.isQuery(operation)) {
@@ -9258,8 +9418,8 @@ const defineConfig$7 = definePluginConfig(defaultConfig$7);
 
 //#endregion
 //#region src/plugins/arktype/v2/api.ts
-const createRequestValidatorV2 = ({ operation, plugin }) => {
-	const symbol = plugin.getSymbol({
+function createRequestValidatorV2({ operation, plugin }) {
+	const symbol = plugin.querySymbol({
 		category: "schema",
 		resource: "operation",
 		resourceId: operation.id,
@@ -9269,9 +9429,9 @@ const createRequestValidatorV2 = ({ operation, plugin }) => {
 	if (!symbol) return;
 	const dataParameterName = "data";
 	return $.func().async().param(dataParameterName).do($(symbol).attr("parseAsync").call(dataParameterName).await().return());
-};
-const createResponseValidatorV2 = ({ operation, plugin }) => {
-	const symbol = plugin.getSymbol({
+}
+function createResponseValidatorV2({ operation, plugin }) {
+	const symbol = plugin.querySymbol({
 		category: "schema",
 		resource: "operation",
 		resourceId: operation.id,
@@ -9281,7 +9441,7 @@ const createResponseValidatorV2 = ({ operation, plugin }) => {
 	if (!symbol) return;
 	const dataParameterName = "data";
 	return $.func().async().param(dataParameterName).do($(symbol).attr("parseAsync").call(dataParameterName).await().return());
-};
+}
 
 //#endregion
 //#region src/plugins/arktype/api.ts
@@ -9628,13 +9788,7 @@ function handleComponent({ plugin, schema, state }) {
 	});
 }
 const handlerV2$1 = ({ plugin }) => {
-	plugin.symbol("type", {
-		external: "arktype",
-		meta: {
-			category: "external",
-			resource: "arktype.type"
-		}
-	});
+	plugin.symbol("type", { external: "arktype" });
 	plugin.forEach("operation", "parameter", "requestBody", "schema", "webhook", (event) => {
 		const state = refs({
 			hasLazyExpression: false,
@@ -10088,9 +10242,9 @@ function normalizeConfig(input, context) {
 //#endregion
 //#region src/plugins/orpc/shared/operation.ts
 function hasInput(operation) {
-	const hasPathParams = Boolean(operation.parameters?.path && Object.keys(operation.parameters.path).length > 0);
-	const hasQueryParams = Boolean(operation.parameters?.query && Object.keys(operation.parameters.query).length > 0);
-	const hasHeaderParams = Boolean(operation.parameters?.header && Object.keys(operation.parameters.header).length > 0);
+	const hasPathParams = Boolean(operation.parameters?.path && Object.keys(operation.parameters.path).length);
+	const hasQueryParams = Boolean(operation.parameters?.query && Object.keys(operation.parameters.query).length);
+	const hasHeaderParams = Boolean(operation.parameters?.header && Object.keys(operation.parameters.header).length);
 	const hasBody = Boolean(operation.body);
 	return hasPathParams || hasQueryParams || hasHeaderParams || hasBody;
 }
@@ -10108,7 +10262,7 @@ function getSuccessResponse(operation) {
 	};
 }
 function getTags(operation, defaultTag) {
-	return operation.tags && operation.tags.length > 0 ? [...operation.tags] : [defaultTag];
+	return operation.tags && operation.tags.length ? [...operation.tags] : [defaultTag];
 }
 
 //#endregion
@@ -10135,17 +10289,29 @@ function createContractSymbol(plugin, item) {
 		tool: plugin.name
 	} });
 }
-function createContractExpression(plugin, operation, baseSymbol) {
+function createContractExpression(plugin, operation) {
 	const successResponse = getSuccessResponse(operation);
 	const tags = getTags(operation, plugin.config.contracts.strategyDefaultTag);
-	let expression = $(baseSymbol).attr("route").call($.object().$if(operation.deprecated, (o, v) => o.prop("deprecated", $.literal(v))).$if(operation.description, (o, v) => o.prop("description", $.literal(v))).prop("method", $.literal(operation.method.toUpperCase())).$if(operation.operationId, (o, v) => o.prop("operationId", $.literal(v))).prop("path", $.literal(operation.path)).$if(successResponse.hasOutput && successResponse.statusCode !== 200 && successResponse.statusCode, (o, v) => o.prop("successStatus", $.literal(v))).$if(operation.summary, (o, v) => o.prop("summary", $.literal(v))).$if(tags.length > 0 && tags, (o, v) => o.prop("tags", $.fromValue(v))));
-	if (hasInput(operation) && plugin.config.validator.input) expression = expression.attr("input").call(plugin.referenceSymbol({
-		category: "schema",
-		resource: "operation",
-		resourceId: operation.id,
-		role: "data",
-		tool: plugin.config.validator.input
-	}));
+	let expression = $(plugin.external("@orpc/contract.oc")).attr("route").call($.object().$if(operation.deprecated, (o, v) => o.prop("deprecated", $.literal(v))).$if(operation.description, (o, v) => o.prop("description", $.literal(v))).prop("inputStructure", $.literal("detailed")).prop("method", $.literal(operation.method.toUpperCase())).$if(operation.operationId, (o, v) => o.prop("operationId", $.literal(v))).prop("path", $.literal(operation.path)).$if(successResponse.hasOutput && successResponse.statusCode !== 200 && successResponse.statusCode, (o, v) => o.prop("successStatus", $.literal(v))).$if(operation.summary, (o, v) => o.prop("summary", $.literal(v))).$if(Boolean(tags.length) && tags, (o, v) => o.prop("tags", $.fromValue(v))));
+	if (hasInput(operation) && plugin.config.validator.input) {
+		const validator = plugin.getPluginOrThrow(plugin.config.validator.input);
+		if ("createRequestSchema" in validator.api) {
+			const requestSchema = validator.api.createRequestSchema({
+				layers: {
+					body: { whenEmpty: "omit" },
+					headers: { whenEmpty: "omit" },
+					path: {
+						as: "params",
+						whenEmpty: "omit"
+					},
+					query: { whenEmpty: "omit" }
+				},
+				operation,
+				plugin: validator
+			});
+			if (requestSchema) expression = expression.attr("input").call(requestSchema);
+		}
+	}
 	if (successResponse.hasOutput && plugin.config.validator.output) expression = expression.attr("output").call(plugin.referenceSymbol({
 		category: "schema",
 		resource: "operation",
@@ -10191,14 +10357,14 @@ function createShell(plugin) {
 		};
 	} };
 }
-function toNode$1(model, plugin, baseSymbol) {
+function toNode$1(model, plugin) {
 	if (model.virtual) {
 		const nodes = [];
 		const symbols = /* @__PURE__ */ new Map();
 		for (const item of model.itemsFrom(source)) {
 			const { operation } = item.data;
 			const contractSymbol = createContractSymbol(plugin, item);
-			const expression = createContractExpression(plugin, operation, baseSymbol);
+			const expression = createContractExpression(plugin, operation);
 			const node = $.const(contractSymbol).export().$if(createOperationComment(operation), (n, v) => n.doc(v)).assign(expression);
 			nodes.push(node);
 			symbols.set(operation.id, contractSymbol);
@@ -10214,7 +10380,7 @@ function toNode$1(model, plugin, baseSymbol) {
 	for (const item of model.itemsFrom(source)) {
 		const { operation } = item.data;
 		const contractSymbol = createContractSymbol(plugin, item);
-		const expression = createContractExpression(plugin, operation, baseSymbol);
+		const expression = createContractExpression(plugin, operation);
 		const node = $.const(contractSymbol).export().$if(createOperationComment(operation), (n, v) => n.doc(v)).assign(expression);
 		nodes.push(node);
 		symbols.set(operation.id, contractSymbol);
@@ -10258,10 +10424,7 @@ function resolveStrategy(plugin) {
 //#endregion
 //#region src/plugins/orpc/v1/plugin.ts
 const handlerV1$1 = ({ plugin }) => {
-	const oc = plugin.symbol("oc", { external: "@orpc/contract" });
-	const baseSymbol = plugin.symbol("base");
-	const baseNode = $.const(baseSymbol).export().assign($(oc).attr("$route").call($.object().prop("inputStructure", $.literal("detailed"))));
-	plugin.node(baseNode);
+	plugin.symbol("oc", { external: "@orpc/contract" });
 	const structure = new StructureModel();
 	const shell = createShell(plugin);
 	const strategy = resolveStrategy(plugin);
@@ -10281,7 +10444,7 @@ const handlerV1$1 = ({ plugin }) => {
 	}, { order: "declarations" });
 	const allNodes = [];
 	for (const node of structure.walk()) {
-		const { nodes } = toNode$1(node, plugin, baseSymbol);
+		const { nodes } = toNode$1(node, plugin);
 		allNodes.push(...nodes);
 	}
 	for (const node of allNodes) plugin.node(node);
@@ -10333,7 +10496,7 @@ const defineConfig$3 = definePluginConfig(defaultConfig$3);
 //#region src/plugins/swr/v2/useSwr.ts
 const createUseSwr = ({ operation, plugin }) => {
 	if (hasOperationSse({ operation })) return;
-	const symbolUseSwr = plugin.external("swr");
+	const symbolUseSwr = plugin.external("swr.useSWR");
 	const symbolUseQueryFn = plugin.symbol(applyNaming(operation.id, plugin.config.useSwr));
 	const awaitSdkFn = $.lazy((ctx) => ctx.access(plugin.referenceSymbol({
 		category: "sdk",
@@ -10353,11 +10516,7 @@ const handlerV2 = ({ plugin }) => {
 	plugin.symbol("useSWR", {
 		external: "swr",
 		importKind: "default",
-		kind: "function",
-		meta: {
-			category: "external",
-			resource: "swr"
-		}
+		kind: "function"
 	});
 	plugin.forEach("operation", ({ operation }) => {
 		if (plugin.hooks.operation.isQuery(operation)) {
@@ -10718,7 +10877,7 @@ function push(target, result) {
 }
 function toNode(pipes, plugin) {
 	if (!(pipes instanceof Array)) return pipes;
-	if (pipes.length === 0) return $(plugin.external("valibot.v")).attr(identifiers$1.schemas.unknown).call();
+	if (!pipes.length) return $(plugin.external("valibot.v")).attr(identifiers$1.schemas.unknown).call();
 	if (pipes.length === 1) return pipes[0];
 	return $(plugin.external("valibot.v")).attr(identifiers$1.methods.pipe).call(...pipes);
 }
@@ -10739,82 +10898,27 @@ function pipesToNode(pipes, plugin) {
 }
 
 //#endregion
-//#region src/plugins/valibot/v1/api.ts
-const validatorResolver$3 = (ctx) => {
-	const { schema, v } = ctx.symbols;
-	return $(v).attr(identifiers$1.async.parseAsync).call(schema, "data").await().return();
-};
-const createRequestValidatorV1 = ({ operation, plugin }) => {
-	const symbol = plugin.getSymbol({
-		category: "schema",
-		resource: "operation",
-		resourceId: operation.id,
-		role: "data",
-		tool: "valibot"
-	});
-	if (!symbol) return;
-	const ctx = {
-		$,
-		operation,
-		pipes: {
-			...pipes,
-			current: []
-		},
-		plugin,
-		symbols: {
-			schema: symbol,
-			v: plugin.external("valibot.v")
-		}
-	};
-	const validator = plugin.config["~resolvers"]?.validator;
-	const candidates = [typeof validator === "function" ? validator : validator?.request, validatorResolver$3];
-	for (const candidate of candidates) {
-		const statements = candidate?.(ctx);
-		if (statements === null) return;
-		if (statements !== void 0) return $.func().async().param("data").do(...statements instanceof Array ? statements : [statements]);
-	}
-};
-const createResponseValidatorV1 = ({ operation, plugin }) => {
-	const symbol = plugin.getSymbol({
-		category: "schema",
-		resource: "operation",
-		resourceId: operation.id,
-		role: "responses",
-		tool: "valibot"
-	});
-	if (!symbol) return;
-	const ctx = {
-		$,
-		operation,
-		pipes: {
-			...pipes,
-			current: []
+//#region src/plugins/valibot/shared/export.ts
+function exportAst$1({ final, meta, naming, namingAnchor, path, plugin, schema, tags }) {
+	const v = plugin.external("valibot.v");
+	const name = pathToName(path, { anchor: namingAnchor });
+	const symbol = plugin.registerSymbol(buildSymbolIn({
+		meta: {
+			category: "schema",
+			path,
+			tags,
+			tool: "valibot",
+			...meta
 		},
+		name,
+		naming,
 		plugin,
-		symbols: {
-			schema: symbol,
-			v: plugin.external("valibot.v")
-		}
-	};
-	const validator = plugin.config["~resolvers"]?.validator;
-	const candidates = [typeof validator === "function" ? validator : validator?.response, validatorResolver$3];
-	for (const candidate of candidates) {
-		const statements = candidate?.(ctx);
-		if (statements === null) return;
-		if (statements !== void 0) return $.func().async().param("data").do(...statements instanceof Array ? statements : [statements]);
-	}
-};
-
-//#endregion
-//#region src/plugins/valibot/api.ts
-var Api$1 = class {
-	createRequestValidator(args) {
-		return createRequestValidatorV1(args);
-	}
-	createResponseValidator(args) {
-		return createResponseValidatorV1(args);
-	}
-};
+		schema
+	}));
+	const statement = $.const(symbol).export().$if(plugin.config.comments && createSchemaComment(schema), (c, v) => c.doc(v)).$if(final.typeName, (c) => c.type($.type(v).attr(final.typeName))).assign(pipesToNode(final.pipes, plugin));
+	plugin.node(statement);
+	return symbol;
+}
 
 //#endregion
 //#region src/plugins/valibot/shared/operation-schema.ts
@@ -10864,85 +10968,300 @@ function buildOperationSchema$1(operation) {
 }
 
 //#endregion
-//#region src/plugins/valibot/shared/operation.ts
-function irOperationToAst$1({ operation, path, plugin, processor, tags }) {
-	if (plugin.config.requests.enabled) {
-		const { schema } = buildOperationSchema$1(operation);
-		processor.process({
-			meta: {
-				resource: "operation",
-				resourceId: operation.id,
-				role: "data"
-			},
-			naming: plugin.config.requests,
-			namingAnchor: operation.id,
-			path,
-			plugin,
-			schema,
-			tags
-		});
-	}
-	if (plugin.config.responses.enabled) {
-		if (operation.responses) {
-			const { response } = operationResponsesMap(operation);
-			if (response) processor.process({
-				meta: {
-					resource: "operation",
-					resourceId: operation.id,
-					role: "responses"
-				},
-				naming: plugin.config.responses,
-				namingAnchor: operation.id,
-				path: [...path, "responses"],
-				plugin,
-				schema: response,
-				tags
-			});
+//#region src/plugins/valibot/shared/validator.ts
+function getDefaultRequestValidatorLayers$1(operation) {
+	const { schema } = buildOperationSchema$1(operation);
+	return {
+		body: {
+			as: "body",
+			optional: !schema.required?.includes("body"),
+			whenEmpty: "strict"
+		},
+		headers: {
+			as: "headers",
+			optional: !schema.required?.includes("headers"),
+			whenEmpty: "omit"
+		},
+		path: {
+			as: "path",
+			optional: !schema.required?.includes("path"),
+			whenEmpty: "strict"
+		},
+		query: {
+			as: "query",
+			optional: !schema.required?.includes("query"),
+			whenEmpty: "strict"
 		}
-	}
+	};
 }
 
 //#endregion
-//#region src/plugins/valibot/shared/webhook.ts
-function irWebhookToAst$1({ operation, path, plugin, processor, tags }) {
-	if (plugin.config.webhooks.enabled) {
-		const { schema } = buildOperationSchema$1(operation);
-		processor.process({
-			meta: {
-				resource: "webhook",
-				resourceId: operation.id,
-				role: "data"
-			},
-			naming: plugin.config.webhooks,
-			namingAnchor: operation.id,
-			path,
-			plugin,
-			schema,
-			tags
+//#region src/plugins/valibot/v1/api.ts
+function emptyNode$3(ctx) {
+	const { v } = ctx.symbols;
+	if (ctx.layer.whenEmpty === "omit") throw new Error(`Cannot create empty schema for layer "${ctx.layer.as}" with whenEmpty: 'omit'`);
+	if (ctx.layer.whenEmpty === "strict") return $(v).attr(identifiers$1.schemas.never).call();
+	return $(v).attr(identifiers$1.schemas.object).call($.object());
+}
+function optionalNode$3(ctx) {
+	if (!ctx.layer.optional) return ctx.schema;
+	const v = ctx.symbols.v;
+	return $(v).attr(identifiers$1.schemas.optional).call(ctx.schema);
+}
+function compositeNode$3(ctx) {
+	const { v } = ctx.symbols;
+	const obj = $.object();
+	const defaultValues = getDefaultRequestValidatorLayers$1(ctx.operation);
+	for (const key of requestValidatorLayers) {
+		const layer = resolveValidatorLayer(ctx.layers, key, defaultValues);
+		const layerSchema = ctx.plugin.querySymbol({
+			category: "schema",
+			resource: "operation",
+			resourceId: ctx.operation.id,
+			role: `request-${key}`,
+			tool: "valibot"
+		});
+		if (layerSchema) {
+			obj.prop(layer.as, ctx.nodes.optional({
+				...ctx,
+				layer,
+				schema: $(layerSchema)
+			}));
+			continue;
+		}
+		if (layer.whenEmpty === "omit") continue;
+		const empty = ctx.nodes.empty({
+			...ctx,
+			layer
 		});
+		obj.prop(layer.as, ctx.nodes.optional({
+			...ctx,
+			layer,
+			schema: empty
+		}));
 	}
+	if (obj.isEmpty) return;
+	return $(v).attr(identifiers$1.schemas.object).call(obj);
 }
-
-//#endregion
-//#region src/plugins/valibot/shared/export.ts
-function exportAst$1({ final, meta, naming, namingAnchor, path, plugin, schema, tags }) {
-	const v = plugin.external("valibot.v");
-	const name = pathToName(path, { anchor: namingAnchor });
-	const symbol = plugin.registerSymbol(buildSymbolIn({
-		meta: {
-			category: "schema",
-			path,
-			tags,
-			tool: "valibot",
-			...meta
-		},
-		name,
-		naming,
-		plugin,
-		schema
-	}));
-	const statement = $.const(symbol).export().$if(plugin.config.comments && createSchemaComment(schema), (c, v) => c.doc(v)).$if(final.typeName, (c) => c.type($.type(v).attr(final.typeName))).assign(pipesToNode(final.pipes, plugin));
-	plugin.node(statement);
+function requestValidatorResolver$3(ctx) {
+	const { schema, v } = ctx.symbols;
+	return $(v).attr(identifiers$1.async.parseAsync).call(schema, "data").await().return();
+}
+function responseValidatorResolver$3(ctx) {
+	const { schema, v } = ctx.symbols;
+	return $(v).attr(identifiers$1.async.parseAsync).call(schema, "data").await().return();
+}
+function runRequestResolver$3(ctx) {
+	const validator = ctx.plugin.config["~resolvers"]?.validator;
+	const candidates = [typeof validator === "function" ? validator : validator?.request, requestValidatorResolver$3];
+	for (const candidate of candidates) {
+		const statements = candidate?.(ctx);
+		if (statements === null) return;
+		if (statements !== void 0) return $.func().async().param("data").do(...statements instanceof Array ? statements : [statements]);
+	}
+}
+function runResponseResolver$3(ctx) {
+	const validator = ctx.plugin.config["~resolvers"]?.validator;
+	const candidates = [typeof validator === "function" ? validator : validator?.response, responseValidatorResolver$3];
+	for (const candidate of candidates) {
+		const statements = candidate?.(ctx);
+		if (statements === null) return;
+		if (statements !== void 0) return $.func().async().param("data").do(...statements instanceof Array ? statements : [statements]);
+	}
+}
+function createRequestSchemaContext$3(ctx) {
+	const { plugin } = ctx;
+	const v = plugin.external("valibot.v");
+	return {
+		...ctx,
+		$,
+		nodes: {
+			composite: compositeNode$3,
+			empty: emptyNode$3,
+			optional: optionalNode$3
+		},
+		pipes: {
+			...pipes,
+			current: []
+		},
+		symbols: {
+			schema: $(""),
+			v
+		}
+	};
+}
+function createRequestSchemaV1(ctx) {
+	const { operation, plugin } = ctx;
+	const baseCtx = createRequestSchemaContext$3(ctx);
+	const schema = baseCtx.nodes.composite(baseCtx);
+	if (!schema) return;
+	if (!plugin.config.requests.shouldExtract({ operation })) return schema;
+	return exportAst$1({
+		final: { pipes: [schema] },
+		meta: {
+			resource: "operation",
+			resourceId: operation.id,
+			role: "data"
+		},
+		naming: plugin.config.requests,
+		namingAnchor: operation.id,
+		path: [],
+		plugin,
+		schema: {}
+	});
+}
+function createRequestValidatorV1(ctx) {
+	const symbolOrSchema = createRequestSchemaV1(ctx);
+	if (!symbolOrSchema) return;
+	const baseCtx = createRequestSchemaContext$3(ctx);
+	return runRequestResolver$3({
+		...baseCtx,
+		symbols: {
+			...baseCtx.symbols,
+			schema: symbolOrSchema
+		}
+	});
+}
+function createResponseValidatorV1({ operation, plugin }) {
+	const symbol = plugin.querySymbol({
+		category: "schema",
+		resource: "operation",
+		resourceId: operation.id,
+		role: "responses",
+		tool: "valibot"
+	});
+	if (!symbol) return;
+	const v = plugin.external("valibot.v");
+	return runResponseResolver$3({
+		$,
+		operation,
+		pipes: {
+			...pipes,
+			current: []
+		},
+		plugin,
+		symbols: {
+			schema: symbol,
+			v
+		}
+	});
+}
+
+//#endregion
+//#region src/plugins/valibot/api.ts
+var Api$1 = class {
+	createRequestSchema(ctx) {
+		const { plugin } = ctx;
+		if (!plugin.config.requests.enabled) return;
+		return createRequestSchemaV1(ctx);
+	}
+	createRequestValidator(args) {
+		const { plugin } = args;
+		if (!plugin.config.requests.enabled) return;
+		return createRequestValidatorV1(args);
+	}
+	createResponseValidator(args) {
+		return createResponseValidatorV1(args);
+	}
+};
+
+//#endregion
+//#region src/plugins/valibot/shared/operation.ts
+function irOperationToAst$1({ operation, path, plugin, processor, tags }) {
+	if (plugin.config.requests.enabled) {
+		const { schema } = buildOperationSchema$1(operation);
+		if (schema.properties?.body && schema.properties.body.type !== "never") processor.process({
+			meta: {
+				resource: "operation",
+				resourceId: operation.id,
+				role: "request-body"
+			},
+			naming: plugin.config.requests.body,
+			namingAnchor: operation.id,
+			path: [...path, "body"],
+			plugin,
+			schema: schema.properties.body,
+			tags
+		});
+		if (schema.properties?.headers && schema.properties.headers.type === "object") processor.process({
+			meta: {
+				resource: "operation",
+				resourceId: operation.id,
+				role: "request-headers"
+			},
+			naming: plugin.config.requests.headers,
+			namingAnchor: operation.id,
+			path: [...path, "headers"],
+			plugin,
+			schema: schema.properties.headers,
+			tags
+		});
+		if (schema.properties?.path && schema.properties.path.type === "object") processor.process({
+			meta: {
+				resource: "operation",
+				resourceId: operation.id,
+				role: "request-path"
+			},
+			naming: plugin.config.requests.path,
+			namingAnchor: operation.id,
+			path: [...path, "path"],
+			plugin,
+			schema: schema.properties.path,
+			tags
+		});
+		if (schema.properties?.query && schema.properties.query.type === "object") processor.process({
+			meta: {
+				resource: "operation",
+				resourceId: operation.id,
+				role: "request-query"
+			},
+			naming: plugin.config.requests.query,
+			namingAnchor: operation.id,
+			path: [...path, "query"],
+			plugin,
+			schema: schema.properties.query,
+			tags
+		});
+	}
+	if (plugin.config.responses.enabled) {
+		if (operation.responses) {
+			const { response } = operationResponsesMap(operation);
+			if (response) processor.process({
+				meta: {
+					resource: "operation",
+					resourceId: operation.id,
+					role: "responses"
+				},
+				naming: plugin.config.responses,
+				namingAnchor: operation.id,
+				path: [...path, "responses"],
+				plugin,
+				schema: response,
+				tags
+			});
+		}
+	}
+}
+
+//#endregion
+//#region src/plugins/valibot/shared/webhook.ts
+function irWebhookToAst$1({ operation, path, plugin, processor, tags }) {
+	if (plugin.config.webhooks.enabled) {
+		const { schema } = buildOperationSchema$1(operation);
+		processor.process({
+			meta: {
+				resource: "webhook",
+				resourceId: operation.id,
+				role: "data"
+			},
+			naming: plugin.config.webhooks,
+			namingAnchor: operation.id,
+			path,
+			plugin,
+			schema,
+			tags
+		});
+	}
 }
 
 //#endregion
@@ -11234,7 +11553,7 @@ function enumToPipes({ plugin, schema }) {
 function baseNode$45(ctx) {
 	const { applyModifiers, childResults, plugin, symbols } = ctx;
 	const { v } = symbols;
-	if (childResults.length === 0) return $(v).attr(identifiers$1.schemas.any).call();
+	if (!childResults.length) return $(v).attr(identifiers$1.schemas.any).call();
 	if (childResults.length === 1) return applyModifiers(childResults[0]).pipes;
 	const itemNodes = childResults.map((item) => pipesToNode(item.pipes, plugin));
 	return $(v).attr(identifiers$1.schemas.intersect).call($.array(...itemNodes));
@@ -11695,7 +12014,7 @@ function baseNode$37(ctx) {
 		const schema = schemas[index];
 		if (schema.type !== "null" && schema.const !== null) nonNullItems.push(item);
 	});
-	if (nonNullItems.length === 0) return $(v).attr(identifiers$1.schemas.null).call();
+	if (!nonNullItems.length) return $(v).attr(identifiers$1.schemas.null).call();
 	if (nonNullItems.length === 1) return nonNullItems[0].pipes;
 	const itemNodes = nonNullItems.map((i) => pipesToNode(i.pipes, plugin));
 	return $(v).attr(identifiers$1.schemas.union).call($.array(...itemNodes));
@@ -11764,7 +12083,7 @@ function voidToPipes({ plugin, schema }) {
 function getDefaultValue(meta) {
 	return meta.format ? maybeBigInt(meta.default, meta.format) : $.fromValue(meta.default);
 }
-function createVisitor$3(config) {
+function createVisitor$3(config = {}) {
 	const { schemaExtractor } = config;
 	return {
 		applyModifiers(result, ctx, options = {}) {
@@ -11849,6 +12168,10 @@ function createVisitor$3(config) {
 				});
 				if (extracted !== schema) return walk(extracted, ctx);
 			}
+			if (schema.symbolRef) return {
+				meta: defaultMeta$1(schema),
+				pipes: [$(schema.symbolRef)]
+			};
 		},
 		intersection(items, schemas, parentSchema, ctx) {
 			const applyModifiers = (result, opts) => this.applyModifiers(result, ctx, opts);
@@ -12044,7 +12367,7 @@ function createProcessor$3(plugin) {
 	const extractorHooks = [plugin.config["~hooks"]?.schemas?.shouldExtract, plugin.context.config.parser.hooks.schemas?.shouldExtract];
 	function extractor(ctx) {
 		if (processor.hasEmitted(ctx.path)) return ctx.schema;
-		for (const hook of extractorHooks) if (hook?.(ctx)) {
+		for (const hook of extractorHooks) if (typeof hook === "boolean" ? hook : hook?.(ctx) ?? false) {
 			process({
 				namingAnchor: processor.context.anchor,
 				tags: processor.context.tags,
@@ -12089,11 +12412,7 @@ function createProcessor$3(plugin) {
 const handlerV1 = ({ plugin }) => {
 	plugin.symbol("v", {
 		external: "valibot",
-		importKind: "namespace",
-		meta: {
-			category: "external",
-			resource: "valibot.v"
-		}
+		importKind: "namespace"
 	});
 	const processor = createProcessor$3(plugin);
 	plugin.forEach("operation", "parameter", "requestBody", "schema", "webhook", (event) => {
@@ -12187,11 +12506,58 @@ const defaultConfig$1 = {
 		});
 		plugin.config.requests = context.valueToObject({
 			defaultValue: {
+				body: {
+					case: plugin.config.case ?? "camelCase",
+					enabled: true,
+					name: "v{{name}}Body"
+				},
 				case: plugin.config.case ?? "camelCase",
 				enabled: true,
-				name: "v{{name}}Data"
+				headers: {
+					case: plugin.config.case ?? "camelCase",
+					enabled: true,
+					name: "v{{name}}Headers"
+				},
+				name: "v{{name}}Data",
+				path: {
+					case: plugin.config.case ?? "camelCase",
+					enabled: true,
+					name: "v{{name}}Path"
+				},
+				query: {
+					case: plugin.config.case ?? "camelCase",
+					enabled: true,
+					name: "v{{name}}Query"
+				},
+				shouldExtract: () => false
+			},
+			mappers: {
+				...mappers,
+				object: (fields, defaultValue) => ({
+					...fields,
+					body: context.valueToObject({
+						defaultValue: defaultValue.body,
+						mappers,
+						value: fields.body
+					}),
+					headers: context.valueToObject({
+						defaultValue: defaultValue.headers,
+						mappers,
+						value: fields.headers
+					}),
+					path: context.valueToObject({
+						defaultValue: defaultValue.path,
+						mappers,
+						value: fields.path
+					}),
+					query: context.valueToObject({
+						defaultValue: defaultValue.query,
+						mappers,
+						value: fields.query
+					}),
+					shouldExtract: fields.shouldExtract !== void 0 ? typeof fields.shouldExtract === "function" ? fields.shouldExtract : () => Boolean(fields.shouldExtract) : defaultValue.shouldExtract
+				})
 			},
-			mappers,
 			value: plugin.config.requests
 		});
 		plugin.config.responses = context.valueToObject({
@@ -12285,42 +12651,248 @@ const identifiers = {
 	void: "void"
 };
 
+//#endregion
+//#region src/plugins/zod/shared/export.ts
+function exportAst({ final, meta, naming, namingAnchor, path, plugin, schema, tags }) {
+	const z = plugin.external("zod.z");
+	const name = pathToName(path, { anchor: namingAnchor });
+	const symbol = plugin.registerSymbol(buildSymbolIn({
+		meta: {
+			category: "schema",
+			path,
+			tags,
+			tool: "zod",
+			...meta
+		},
+		name,
+		naming,
+		plugin,
+		schema
+	}));
+	const typeInferSymbol = naming.types.infer.enabled ? plugin.registerSymbol(buildSymbolIn({
+		meta: {
+			category: "type",
+			path,
+			tags,
+			tool: "zod",
+			variant: "infer",
+			...meta
+		},
+		name,
+		naming: naming.types.infer,
+		plugin,
+		schema
+	})) : void 0;
+	const statement = $.const(symbol).export().$if(plugin.config.comments && createSchemaComment(schema), (c, v) => c.doc(v)).$if(final.typeName, (c) => c.type($.type(z).attr(final.typeName))).assign(final.expression);
+	plugin.node(statement);
+	if (typeInferSymbol) {
+		const inferType = $.type.alias(typeInferSymbol).export().type($.type(z).attr(identifiers.infer).generic($(symbol).typeofType()));
+		plugin.node(inferType);
+	}
+	return symbol;
+}
+
+//#endregion
+//#region src/plugins/zod/shared/operation-schema.ts
+function buildOperationSchema(operation) {
+	const requiredProperties = /* @__PURE__ */ new Set();
+	const schema = {
+		properties: {
+			body: { type: "never" },
+			path: { type: "never" },
+			query: { type: "never" }
+		},
+		type: "object"
+	};
+	if (operation.parameters) for (const location of [
+		"header",
+		"path",
+		"query"
+	]) {
+		const params = operation.parameters[location];
+		if (!params) continue;
+		const properties = {};
+		const required = [];
+		const propKey = location === "header" ? "headers" : location;
+		for (const key in params) {
+			const parameter = params[key];
+			properties[parameter.name] = parameter.schema;
+			if (parameter.required) {
+				required.push(parameter.name);
+				requiredProperties.add(propKey);
+			}
+		}
+		if (Object.keys(properties).length) schema.properties[propKey] = {
+			properties,
+			required,
+			type: "object"
+		};
+	}
+	if (operation.body) {
+		schema.properties.body = operation.body.schema;
+		if (operation.body.required) requiredProperties.add("body");
+	}
+	schema.required = [...requiredProperties];
+	return {
+		required: schema.required,
+		schema
+	};
+}
+
+//#endregion
+//#region src/plugins/zod/shared/validator.ts
+function getDefaultRequestValidatorLayers(operation) {
+	const { schema } = buildOperationSchema(operation);
+	return {
+		body: {
+			as: "body",
+			optional: !schema.required?.includes("body"),
+			whenEmpty: "strict"
+		},
+		headers: {
+			as: "headers",
+			optional: !schema.required?.includes("headers"),
+			whenEmpty: "omit"
+		},
+		path: {
+			as: "path",
+			optional: !schema.required?.includes("path"),
+			whenEmpty: "strict"
+		},
+		query: {
+			as: "query",
+			optional: !schema.required?.includes("query"),
+			whenEmpty: "strict"
+		}
+	};
+}
+
 //#endregion
 //#region src/plugins/zod/mini/api.ts
-const validatorResolver$2 = (ctx) => {
+function emptyNode$2(ctx) {
+	const { z } = ctx.symbols;
+	if (ctx.layer.whenEmpty === "omit") throw new Error(`Cannot create empty schema for layer "${ctx.layer.as}" with whenEmpty: 'omit'`);
+	if (ctx.layer.whenEmpty === "strict") return $(z).attr(identifiers.never).call();
+	return $(z).attr(identifiers.object).call($.object());
+}
+function optionalNode$2(ctx) {
+	if (!ctx.layer.optional) return ctx.schema;
+	const { z } = ctx.symbols;
+	return $(z).attr(identifiers.optional).call(ctx.schema);
+}
+function compositeNode$2(ctx) {
+	const { z } = ctx.symbols;
+	const obj = $.object();
+	const defaultValues = getDefaultRequestValidatorLayers(ctx.operation);
+	for (const key of requestValidatorLayers) {
+		const layer = resolveValidatorLayer(ctx.layers, key, defaultValues);
+		const layerSchema = ctx.plugin.querySymbol({
+			category: "schema",
+			resource: "operation",
+			resourceId: ctx.operation.id,
+			role: `request-${key}`,
+			tool: "zod"
+		});
+		if (layerSchema) {
+			obj.prop(layer.as, ctx.nodes.optional({
+				...ctx,
+				layer,
+				schema: $(layerSchema)
+			}));
+			continue;
+		}
+		if (layer.whenEmpty === "omit") continue;
+		const empty = ctx.nodes.empty({
+			...ctx,
+			layer
+		});
+		obj.prop(layer.as, ctx.nodes.optional({
+			...ctx,
+			layer,
+			schema: empty
+		}));
+	}
+	if (obj.isEmpty) return;
+	return $(z).attr(identifiers.object).call(obj);
+}
+function requestValidatorResolver$2(ctx) {
 	const { schema } = ctx.symbols;
 	return $(schema).attr(identifiers.parseAsync).call("data").await().return();
-};
-const createRequestValidatorMini = ({ operation, plugin }) => {
-	const symbol = plugin.getSymbol({
-		category: "schema",
-		resource: "operation",
-		resourceId: operation.id,
-		role: "data",
-		tool: "zod"
-	});
-	if (!symbol) return;
+}
+function responseValidatorResolver$2(ctx) {
+	const { schema } = ctx.symbols;
+	return $(schema).attr(identifiers.parseAsync).call("data").await().return();
+}
+function runRequestResolver$2(ctx) {
+	const validator = ctx.plugin.config["~resolvers"]?.validator;
+	const candidates = [typeof validator === "function" ? validator : validator?.request, requestValidatorResolver$2];
+	for (const candidate of candidates) {
+		const statements = candidate?.(ctx);
+		if (statements === null) return;
+		if (statements !== void 0) return $.func().async().param("data").do(...statements instanceof Array ? statements : [statements]);
+	}
+}
+function runResponseResolver$2(ctx) {
+	const validator = ctx.plugin.config["~resolvers"]?.validator;
+	const candidates = [typeof validator === "function" ? validator : validator?.response, responseValidatorResolver$2];
+	for (const candidate of candidates) {
+		const statements = candidate?.(ctx);
+		if (statements === null) return;
+		if (statements !== void 0) return $.func().async().param("data").do(...statements instanceof Array ? statements : [statements]);
+	}
+}
+function createRequestSchemaContext$2(ctx) {
+	const { plugin } = ctx;
 	const z = plugin.external("zod.z");
-	const ctx = {
+	return {
+		...ctx,
 		$,
 		chain: { current: $(z) },
-		operation,
-		plugin,
+		nodes: {
+			composite: compositeNode$2,
+			empty: emptyNode$2,
+			optional: optionalNode$2
+		},
 		symbols: {
-			schema: symbol,
+			schema: $(""),
 			z
 		}
 	};
-	const validator = plugin.config["~resolvers"]?.validator;
-	const candidates = [typeof validator === "function" ? validator : validator?.request, validatorResolver$2];
-	for (const candidate of candidates) {
-		const statements = candidate?.(ctx);
-		if (statements === null) return;
-		if (statements !== void 0) return $.func().async().param("data").do(...statements instanceof Array ? statements : [statements]);
-	}
-};
-const createResponseValidatorMini = ({ operation, plugin }) => {
-	const symbol = plugin.getSymbol({
+}
+function createRequestSchemaMini(ctx) {
+	const { operation, plugin } = ctx;
+	const baseCtx = createRequestSchemaContext$2(ctx);
+	const schema = baseCtx.nodes.composite(baseCtx);
+	if (!schema) return;
+	if (!plugin.config.requests.shouldExtract({ operation })) return schema;
+	return exportAst({
+		final: { expression: schema },
+		meta: {
+			resource: "operation",
+			resourceId: operation.id,
+			role: "data"
+		},
+		naming: plugin.config.requests,
+		namingAnchor: operation.id,
+		path: [],
+		plugin,
+		schema: {}
+	});
+}
+function createRequestValidatorMini(ctx) {
+	const symbolOrSchema = createRequestSchemaMini(ctx);
+	if (!symbolOrSchema) return;
+	const baseCtx = createRequestSchemaContext$2(ctx);
+	return runRequestResolver$2({
+		...baseCtx,
+		symbols: {
+			...baseCtx.symbols,
+			schema: symbolOrSchema
+		}
+	});
+}
+function createResponseValidatorMini({ operation, plugin }) {
+	const symbol = plugin.querySymbol({
 		category: "schema",
 		resource: "operation",
 		resourceId: operation.id,
@@ -12329,7 +12901,7 @@ const createResponseValidatorMini = ({ operation, plugin }) => {
 	});
 	if (!symbol) return;
 	const z = plugin.external("zod.z");
-	const ctx = {
+	return runResponseResolver$2({
 		$,
 		chain: { current: $(z) },
 		operation,
@@ -12338,33 +12910,143 @@ const createResponseValidatorMini = ({ operation, plugin }) => {
 			schema: symbol,
 			z
 		}
-	};
-	const validator = plugin.config["~resolvers"]?.validator;
-	const candidates = [typeof validator === "function" ? validator : validator?.response, validatorResolver$2];
-	for (const candidate of candidates) {
-		const statements = candidate?.(ctx);
-		if (statements === null) return;
-		if (statements !== void 0) return $.func().async().param("data").do(...statements instanceof Array ? statements : [statements]);
-	}
-};
+	});
+}
 
 //#endregion
 //#region src/plugins/zod/v3/api.ts
-const validatorResolver$1 = (ctx) => {
+function emptyNode$1(ctx) {
+	const { z } = ctx.symbols;
+	if (ctx.layer.whenEmpty === "omit") throw new Error(`Cannot create empty schema for layer "${ctx.layer.as}" with whenEmpty: 'omit'`);
+	if (ctx.layer.whenEmpty === "strict") return $(z).attr(identifiers.never).call();
+	return $(z).attr(identifiers.object).call($.object());
+}
+function optionalNode$1(ctx) {
+	if (!ctx.layer.optional) return ctx.schema;
+	return $(ctx.schema).attr(identifiers.optional).call();
+}
+function compositeNode$1(ctx) {
+	const { z } = ctx.symbols;
+	const obj = $.object();
+	const defaultValues = getDefaultRequestValidatorLayers(ctx.operation);
+	for (const key of requestValidatorLayers) {
+		const layer = resolveValidatorLayer(ctx.layers, key, defaultValues);
+		const layerSchema = ctx.plugin.querySymbol({
+			category: "schema",
+			resource: "operation",
+			resourceId: ctx.operation.id,
+			role: `request-${key}`,
+			tool: "zod"
+		});
+		if (layerSchema) {
+			obj.prop(layer.as, ctx.nodes.optional({
+				...ctx,
+				layer,
+				schema: $(layerSchema)
+			}));
+			continue;
+		}
+		if (layer.whenEmpty === "omit") continue;
+		const empty = ctx.nodes.empty({
+			...ctx,
+			layer
+		});
+		obj.prop(layer.as, ctx.nodes.optional({
+			...ctx,
+			layer,
+			schema: empty
+		}));
+	}
+	if (obj.isEmpty) return;
+	return $(z).attr(identifiers.object).call(obj);
+}
+function requestValidatorResolver$1(ctx) {
 	const { schema } = ctx.symbols;
 	return $(schema).attr(identifiers.parseAsync).call("data").await().return();
-};
-const createRequestValidatorV3 = ({ operation, plugin }) => {
-	const symbol = plugin.getSymbol({
+}
+function responseValidatorResolver$1(ctx) {
+	const { schema } = ctx.symbols;
+	return $(schema).attr(identifiers.parseAsync).call("data").await().return();
+}
+function runRequestResolver$1(ctx) {
+	const validator = ctx.plugin.config["~resolvers"]?.validator;
+	const candidates = [typeof validator === "function" ? validator : validator?.request, requestValidatorResolver$1];
+	for (const candidate of candidates) {
+		const statements = candidate?.(ctx);
+		if (statements === null) return;
+		if (statements !== void 0) return $.func().async().param("data").do(...statements instanceof Array ? statements : [statements]);
+	}
+}
+function runResponseResolver$1(ctx) {
+	const validator = ctx.plugin.config["~resolvers"]?.validator;
+	const candidates = [typeof validator === "function" ? validator : validator?.response, responseValidatorResolver$1];
+	for (const candidate of candidates) {
+		const statements = candidate?.(ctx);
+		if (statements === null) return;
+		if (statements !== void 0) return $.func().async().param("data").do(...statements instanceof Array ? statements : [statements]);
+	}
+}
+function createRequestSchemaContext$1(ctx) {
+	const { plugin } = ctx;
+	const z = plugin.external("zod.z");
+	return {
+		...ctx,
+		$,
+		chain: { current: $(z) },
+		nodes: {
+			composite: compositeNode$1,
+			empty: emptyNode$1,
+			optional: optionalNode$1
+		},
+		symbols: {
+			schema: $(""),
+			z
+		}
+	};
+}
+function createRequestSchemaV3(ctx) {
+	const { operation, plugin } = ctx;
+	const baseCtx = createRequestSchemaContext$1(ctx);
+	const schema = baseCtx.nodes.composite(baseCtx);
+	if (!schema) return;
+	if (!plugin.config.requests.shouldExtract({ operation })) return schema;
+	return exportAst({
+		final: { expression: schema },
+		meta: {
+			resource: "operation",
+			resourceId: operation.id,
+			role: "data"
+		},
+		naming: plugin.config.requests,
+		namingAnchor: operation.id,
+		path: [],
+		plugin,
+		schema: {}
+	});
+}
+function createRequestValidatorV3(ctx) {
+	const symbolOrSchema = createRequestSchemaV3(ctx);
+	if (!symbolOrSchema) return;
+	const baseCtx = createRequestSchemaContext$1(ctx);
+	return runRequestResolver$1({
+		...baseCtx,
+		symbols: {
+			...baseCtx.symbols,
+			schema: symbolOrSchema
+		}
+	});
+}
+function createResponseValidatorV3({ operation, plugin }) {
+	const symbol = plugin.querySymbol({
 		category: "schema",
 		resource: "operation",
 		resourceId: operation.id,
-		role: "data",
+		role: "responses",
 		tool: "zod"
 	});
 	if (!symbol) return;
 	const z = plugin.external("zod.z");
-	const ctx = {
+	return runResponseResolver$1({
 		$,
 		chain: { current: $(z) },
 		operation,
@@ -12373,80 +13055,134 @@ const createRequestValidatorV3 = ({ operation, plugin }) => {
 			schema: symbol,
 			z
 		}
-	};
-	const validator = plugin.config["~resolvers"]?.validator;
-	const candidates = [typeof validator === "function" ? validator : validator?.request, validatorResolver$1];
+	});
+}
+
+//#endregion
+//#region src/plugins/zod/v4/api.ts
+function emptyNode(ctx) {
+	const { z } = ctx.symbols;
+	if (ctx.layer.whenEmpty === "omit") throw new Error(`Cannot create empty schema for layer "${ctx.layer.as}" with whenEmpty: 'omit'`);
+	if (ctx.layer.whenEmpty === "strict") return $(z).attr(identifiers.never).call();
+	return $(z).attr(identifiers.object).call($.object());
+}
+function optionalNode(ctx) {
+	if (!ctx.layer.optional) return ctx.schema;
+	return $(ctx.schema).attr(identifiers.optional).call();
+}
+function compositeNode(ctx) {
+	const { z } = ctx.symbols;
+	const obj = $.object();
+	const defaultValues = getDefaultRequestValidatorLayers(ctx.operation);
+	for (const key of requestValidatorLayers) {
+		const layer = resolveValidatorLayer(ctx.layers, key, defaultValues);
+		const layerSchema = ctx.plugin.querySymbol({
+			category: "schema",
+			resource: "operation",
+			resourceId: ctx.operation.id,
+			role: `request-${key}`,
+			tool: "zod"
+		});
+		if (layerSchema) {
+			obj.prop(layer.as, ctx.nodes.optional({
+				...ctx,
+				layer,
+				schema: $(layerSchema)
+			}));
+			continue;
+		}
+		if (layer.whenEmpty === "omit") continue;
+		const empty = ctx.nodes.empty({
+			...ctx,
+			layer
+		});
+		obj.prop(layer.as, ctx.nodes.optional({
+			...ctx,
+			layer,
+			schema: empty
+		}));
+	}
+	if (obj.isEmpty) return;
+	return $(z).attr(identifiers.object).call(obj);
+}
+function requestValidatorResolver(ctx) {
+	const { schema } = ctx.symbols;
+	return $(schema).attr(identifiers.parseAsync).call("data").await().return();
+}
+function responseValidatorResolver(ctx) {
+	const { schema } = ctx.symbols;
+	return $(schema).attr(identifiers.parseAsync).call("data").await().return();
+}
+function runRequestResolver(ctx) {
+	const validator = ctx.plugin.config["~resolvers"]?.validator;
+	const candidates = [typeof validator === "function" ? validator : validator?.request, requestValidatorResolver];
 	for (const candidate of candidates) {
 		const statements = candidate?.(ctx);
 		if (statements === null) return;
 		if (statements !== void 0) return $.func().async().param("data").do(...statements instanceof Array ? statements : [statements]);
 	}
-};
-const createResponseValidatorV3 = ({ operation, plugin }) => {
-	const symbol = plugin.getSymbol({
-		category: "schema",
-		resource: "operation",
-		resourceId: operation.id,
-		role: "responses",
-		tool: "zod"
-	});
-	if (!symbol) return;
-	const z = plugin.external("zod.z");
-	const ctx = {
-		$,
-		chain: { current: $(z) },
-		operation,
-		plugin,
-		symbols: {
-			schema: symbol,
-			z
-		}
-	};
-	const validator = plugin.config["~resolvers"]?.validator;
-	const candidates = [typeof validator === "function" ? validator : validator?.response, validatorResolver$1];
+}
+function runResponseResolver(ctx) {
+	const validator = ctx.plugin.config["~resolvers"]?.validator;
+	const candidates = [typeof validator === "function" ? validator : validator?.response, responseValidatorResolver];
 	for (const candidate of candidates) {
 		const statements = candidate?.(ctx);
 		if (statements === null) return;
 		if (statements !== void 0) return $.func().async().param("data").do(...statements instanceof Array ? statements : [statements]);
 	}
-};
-
-//#endregion
-//#region src/plugins/zod/v4/api.ts
-const validatorResolver = (ctx) => {
-	const { schema } = ctx.symbols;
-	return $(schema).attr(identifiers.parseAsync).call("data").await().return();
-};
-const createRequestValidatorV4 = ({ operation, plugin }) => {
-	const symbol = plugin.getSymbol({
-		category: "schema",
-		resource: "operation",
-		resourceId: operation.id,
-		role: "data",
-		tool: "zod"
-	});
-	if (!symbol) return;
+}
+function createRequestSchemaContext(ctx) {
+	const { plugin } = ctx;
 	const z = plugin.external("zod.z");
-	const ctx = {
+	return {
+		...ctx,
 		$,
 		chain: { current: $(z) },
-		operation,
-		plugin,
+		nodes: {
+			composite: compositeNode,
+			empty: emptyNode,
+			optional: optionalNode
+		},
 		symbols: {
-			schema: symbol,
+			schema: $(""),
 			z
 		}
 	};
-	const validator = plugin.config["~resolvers"]?.validator;
-	const candidates = [typeof validator === "function" ? validator : validator?.request, validatorResolver];
-	for (const candidate of candidates) {
-		const statements = candidate?.(ctx);
-		if (statements === null) return;
-		if (statements !== void 0) return $.func().async().param("data").do(...statements instanceof Array ? statements : [statements]);
-	}
-};
-const createResponseValidatorV4 = ({ operation, plugin }) => {
-	const symbol = plugin.getSymbol({
+}
+function createRequestSchemaV4(ctx) {
+	const { operation, plugin } = ctx;
+	const baseCtx = createRequestSchemaContext(ctx);
+	const schema = baseCtx.nodes.composite(baseCtx);
+	if (!schema) return;
+	if (!plugin.config.requests.shouldExtract({ operation })) return schema;
+	return exportAst({
+		final: { expression: schema },
+		meta: {
+			resource: "operation",
+			resourceId: operation.id,
+			role: "data"
+		},
+		naming: plugin.config.requests,
+		namingAnchor: operation.id,
+		path: [],
+		plugin,
+		schema: {}
+	});
+}
+function createRequestValidatorV4(ctx) {
+	const symbolOrSchema = createRequestSchemaV4(ctx);
+	if (!symbolOrSchema) return;
+	const baseCtx = createRequestSchemaContext(ctx);
+	return runRequestResolver({
+		...baseCtx,
+		symbols: {
+			...baseCtx.symbols,
+			schema: symbolOrSchema
+		}
+	});
+}
+function createResponseValidatorV4({ operation, plugin }) {
+	const symbol = plugin.querySymbol({
 		category: "schema",
 		resource: "operation",
 		resourceId: operation.id,
@@ -12455,7 +13191,7 @@ const createResponseValidatorV4 = ({ operation, plugin }) => {
 	});
 	if (!symbol) return;
 	const z = plugin.external("zod.z");
-	const ctx = {
+	return runResponseResolver({
 		$,
 		chain: { current: $(z) },
 		operation,
@@ -12464,33 +13200,36 @@ const createResponseValidatorV4 = ({ operation, plugin }) => {
 			schema: symbol,
 			z
 		}
-	};
-	const validator = plugin.config["~resolvers"]?.validator;
-	const candidates = [typeof validator === "function" ? validator : validator?.response, validatorResolver];
-	for (const candidate of candidates) {
-		const statements = candidate?.(ctx);
-		if (statements === null) return;
-		if (statements !== void 0) return $.func().async().param("data").do(...statements instanceof Array ? statements : [statements]);
-	}
-};
+	});
+}
 
 //#endregion
 //#region src/plugins/zod/api.ts
 var Api = class {
-	createRequestValidator(args) {
-		const { plugin } = args;
+	createRequestSchema(ctx) {
+		const { plugin } = ctx;
+		if (!plugin.config.requests.enabled) return;
 		switch (plugin.config.compatibilityVersion) {
-			case 3: return createRequestValidatorV3(args);
-			case "mini": return createRequestValidatorMini(args);
-			default: return createRequestValidatorV4(args);
+			case 3: return createRequestSchemaV3(ctx);
+			case "mini": return createRequestSchemaMini(ctx);
+			default: return createRequestSchemaV4(ctx);
 		}
 	}
-	createResponseValidator(args) {
-		const { plugin } = args;
+	createRequestValidator(ctx) {
+		const { plugin } = ctx;
+		if (!plugin.config.requests.enabled) return;
+		switch (plugin.config.compatibilityVersion) {
+			case 3: return createRequestValidatorV3(ctx);
+			case "mini": return createRequestValidatorMini(ctx);
+			default: return createRequestValidatorV4(ctx);
+		}
+	}
+	createResponseValidator(ctx) {
+		const { plugin } = ctx;
 		switch (plugin.config.compatibilityVersion) {
-			case 3: return createResponseValidatorV3(args);
-			case "mini": return createResponseValidatorMini(args);
-			default: return createResponseValidatorV4(args);
+			case 3: return createResponseValidatorV3(ctx);
+			case "mini": return createResponseValidatorMini(ctx);
+			default: return createResponseValidatorV4(ctx);
 		}
 	}
 };
@@ -12515,69 +13254,61 @@ function getZodModule({ plugin }) {
 	}
 }
 
-//#endregion
-//#region src/plugins/zod/shared/operation-schema.ts
-function buildOperationSchema(operation) {
-	const requiredProperties = /* @__PURE__ */ new Set();
-	const schema = {
-		properties: {
-			body: { type: "never" },
-			path: { type: "never" },
-			query: { type: "never" }
-		},
-		type: "object"
-	};
-	if (operation.parameters) for (const location of [
-		"header",
-		"path",
-		"query"
-	]) {
-		const params = operation.parameters[location];
-		if (!params) continue;
-		const properties = {};
-		const required = [];
-		const propKey = location === "header" ? "headers" : location;
-		for (const key in params) {
-			const parameter = params[key];
-			properties[parameter.name] = parameter.schema;
-			if (parameter.required) {
-				required.push(parameter.name);
-				requiredProperties.add(propKey);
-			}
-		}
-		if (Object.keys(properties).length) schema.properties[propKey] = {
-			properties,
-			required,
-			type: "object"
-		};
-	}
-	if (operation.body) {
-		schema.properties.body = operation.body.schema;
-		if (operation.body.required) requiredProperties.add("body");
-	}
-	schema.required = [...requiredProperties];
-	return {
-		required: schema.required,
-		schema
-	};
-}
-
 //#endregion
 //#region src/plugins/zod/shared/operation.ts
 function irOperationToAst({ operation, path, plugin, processor, tags }) {
 	if (plugin.config.requests.enabled) {
 		const { schema } = buildOperationSchema(operation);
-		processor.process({
+		if (schema.properties?.body && schema.properties.body.type !== "never") processor.process({
 			meta: {
 				resource: "operation",
 				resourceId: operation.id,
-				role: "data"
+				role: "request-body"
 			},
-			naming: plugin.config.requests,
+			naming: plugin.config.requests.body,
 			namingAnchor: operation.id,
-			path,
+			path: [...path, "body"],
 			plugin,
-			schema,
+			schema: schema.properties.body,
+			tags
+		});
+		if (schema.properties?.headers && schema.properties.headers.type === "object") processor.process({
+			meta: {
+				resource: "operation",
+				resourceId: operation.id,
+				role: "request-headers"
+			},
+			naming: plugin.config.requests.headers,
+			namingAnchor: operation.id,
+			path: [...path, "headers"],
+			plugin,
+			schema: schema.properties.headers,
+			tags
+		});
+		if (schema.properties?.path && schema.properties.path.type === "object") processor.process({
+			meta: {
+				resource: "operation",
+				resourceId: operation.id,
+				role: "request-path"
+			},
+			naming: plugin.config.requests.path,
+			namingAnchor: operation.id,
+			path: [...path, "path"],
+			plugin,
+			schema: schema.properties.path,
+			tags
+		});
+		if (schema.properties?.query && schema.properties.query.type === "object") processor.process({
+			meta: {
+				resource: "operation",
+				resourceId: operation.id,
+				role: "request-query"
+			},
+			naming: plugin.config.requests.query,
+			namingAnchor: operation.id,
+			path: [...path, "query"],
+			plugin,
+			schema: schema.properties.query,
 			tags
 		});
 	}
@@ -12622,46 +13353,6 @@ function irWebhookToAst({ operation, path, plugin, processor, tags }) {
 	}
 }
 
-//#endregion
-//#region src/plugins/zod/shared/export.ts
-function exportAst({ final, meta, naming, namingAnchor, path, plugin, schema, tags }) {
-	const z = plugin.external("zod.z");
-	const name = pathToName(path, { anchor: namingAnchor });
-	const symbol = plugin.registerSymbol(buildSymbolIn({
-		meta: {
-			category: "schema",
-			path,
-			tags,
-			tool: "zod",
-			...meta
-		},
-		name,
-		naming,
-		plugin,
-		schema
-	}));
-	const typeInferSymbol = naming.types.infer.enabled ? plugin.registerSymbol(buildSymbolIn({
-		meta: {
-			category: "type",
-			path,
-			tags,
-			tool: "zod",
-			variant: "infer",
-			...meta
-		},
-		name,
-		naming: naming.types.infer,
-		plugin,
-		schema
-	})) : void 0;
-	const statement = $.const(symbol).export().$if(plugin.config.comments && createSchemaComment(schema), (c, v) => c.doc(v)).$if(final.typeName, (c) => c.type($.type(z).attr(final.typeName))).assign(final.expression);
-	plugin.node(statement);
-	if (typeInferSymbol) {
-		const inferType = $.type.alias(typeInferSymbol).export().type($.type(z).attr(identifiers.infer).generic($(symbol).typeofType()));
-		plugin.node(inferType);
-	}
-}
-
 //#endregion
 //#region src/plugins/zod/shared/meta.ts
 /**
@@ -12900,7 +13591,7 @@ function baseNode$32(ctx) {
 	const { symbols } = ctx;
 	const { z } = symbols;
 	const { allStrings, enumMembers, literalMembers } = ctx.nodes.items(ctx);
-	if (allStrings && enumMembers.length > 0) return $(z).attr(identifiers.enum).call($.array(...enumMembers));
+	if (allStrings && enumMembers.length) return $(z).attr(identifiers.enum).call($.array(...enumMembers));
 	if (literalMembers.length === 1) return literalMembers[0];
 	return $(z).attr(identifiers.union).call($.array(...literalMembers));
 }
@@ -13030,7 +13721,7 @@ function numberResolver$2(ctx) {
 	if (minNode) checks.push(minNode);
 	const maxNode = ctx.nodes.max(ctx);
 	if (maxNode) checks.push(maxNode);
-	if (checks.length > 0) ctx.chain.current = ctx.chain.current.attr(identifiers.check).call(...checks);
+	if (checks.length) ctx.chain.current = ctx.chain.current.attr(identifiers.check).call(...checks);
 	return ctx.chain.current;
 }
 function numberToNode$2({ plugin, schema }) {
@@ -13061,7 +13752,7 @@ function numberToNode$2({ plugin, schema }) {
 //#region src/plugins/zod/mini/toAst/object.ts
 function additionalPropertiesNode$2(ctx) {
 	const { _childResults, applyModifiers, schema, walk, walkerCtx } = ctx;
-	if (!schema.additionalProperties || schema.properties && Object.keys(schema.properties).length > 0) return;
+	if (!schema.additionalProperties || schema.properties && Object.keys(schema.properties).length) return;
 	const additionalResult = walk(schema.additionalProperties, childContext(walkerCtx, "additionalProperties"));
 	_childResults.push(additionalResult);
 	return applyModifiers(additionalResult, {}).expression;
@@ -13193,7 +13884,7 @@ function stringResolver$2(ctx) {
 	}
 	const patternNode = ctx.nodes.pattern(ctx);
 	if (patternNode) checks.push(patternNode);
-	if (checks.length > 0) ctx.chain.current = ctx.chain.current.attr(identifiers.check).call(...checks);
+	if (checks.length) ctx.chain.current = ctx.chain.current.attr(identifiers.check).call(...checks);
 	return ctx.chain.current;
 }
 function stringToNode$2({ plugin, schema }) {
@@ -13224,7 +13915,7 @@ function baseNode$26(ctx) {
 	const { applyModifiers, childResults, symbols } = ctx;
 	const { z } = symbols;
 	const tupleFn = $(z).attr(identifiers.tuple);
-	if (childResults.length === 0) return tupleFn.call($.array());
+	if (!childResults.length) return tupleFn.call($.array());
 	const tupleElements = childResults.map((result) => applyModifiers(result, { optional: false }).expression);
 	return tupleFn.call($.array(...tupleElements));
 }
@@ -13328,7 +14019,7 @@ function voidToAst$2({ plugin, schema }) {
 
 //#endregion
 //#region src/plugins/zod/mini/walker.ts
-function createVisitor$2(config) {
+function createVisitor$2(config = {}) {
 	const { schemaExtractor } = config;
 	return {
 		applyModifiers(result, ctx, options = {}) {
@@ -13407,6 +14098,10 @@ function createVisitor$2(config) {
 				});
 				if (extracted !== schema) return walk(extracted, ctx);
 			}
+			if (schema.symbolRef) return {
+				expression: $(schema.symbolRef),
+				meta: defaultMeta(schema)
+			};
 		},
 		intersection(items, schemas, parentSchema, ctx) {
 			const z = ctx.plugin.external("zod.z");
@@ -13576,7 +14271,7 @@ function createVisitor$2(config) {
 				if (schema.type !== "null" && schema.const !== null) nonNullItems.push(item);
 			});
 			let expression;
-			if (nonNullItems.length === 0) expression = $(z).attr(identifiers.null).call();
+			if (!nonNullItems.length) expression = $(z).attr(identifiers.null).call();
 			else if (nonNullItems.length === 1) expression = nonNullItems[0].expression;
 			else expression = $(z).attr(identifiers.union).call($.array().pretty().elements(...nonNullItems.map((item) => item.expression)));
 			return {
@@ -13624,10 +14319,10 @@ function createVisitor$2(config) {
 //#region src/plugins/zod/mini/processor.ts
 function createProcessor$2(plugin) {
 	const processor = createSchemaProcessor();
-	const hooks = [plugin.config["~hooks"]?.schemas, plugin.context.config.parser.hooks.schemas];
+	const extractorHooks = [plugin.config["~hooks"]?.schemas?.shouldExtract, plugin.context.config.parser.hooks.schemas?.shouldExtract];
 	function extractor(ctx) {
 		if (processor.hasEmitted(ctx.path)) return ctx.schema;
-		for (const hook of hooks) if (hook?.shouldExtract?.(ctx)) {
+		for (const hook of extractorHooks) if (typeof hook === "boolean" ? hook : hook?.(ctx) ?? false) {
 			process({
 				namingAnchor: processor.context.anchor,
 				tags: processor.context.tags,
@@ -13673,10 +14368,7 @@ const handlerMini = ({ plugin }) => {
 	plugin.symbol("z", {
 		external: getZodModule({ plugin }),
 		importKind: "namespace",
-		meta: {
-			category: "external",
-			resource: "zod.z"
-		}
+		meta: { resource: "zod.z" }
 	});
 	const processor = createProcessor$2(plugin);
 	plugin.forEach("operation", "parameter", "requestBody", "schema", "webhook", (event) => {
@@ -13937,7 +14629,7 @@ function baseNode$20(ctx) {
 	const { symbols } = ctx;
 	const { z } = symbols;
 	const { allStrings, enumMembers, literalMembers } = ctx.nodes.items(ctx);
-	if (allStrings && enumMembers.length > 0) return $(z).attr(identifiers.enum).call($.array(...enumMembers));
+	if (allStrings && enumMembers.length) return $(z).attr(identifiers.enum).call($.array(...enumMembers));
 	else if (literalMembers.length === 1) return literalMembers[0];
 	else return $(z).attr(identifiers.union).call($.array(...literalMembers));
 }
@@ -14089,7 +14781,7 @@ function numberToNode$1({ plugin, schema }) {
 //#region src/plugins/zod/v3/toAst/object.ts
 function additionalPropertiesNode$1(ctx) {
 	const { applyModifiers, schema, walk, walkerCtx } = ctx;
-	if (!schema.additionalProperties || schema.properties && Object.keys(schema.properties).length > 0) return;
+	if (!schema.additionalProperties || schema.properties && Object.keys(schema.properties).length) return;
 	const additionalResult = walk(schema.additionalProperties, childContext(walkerCtx, "additionalProperties"));
 	ctx._childResults.push(additionalResult);
 	return applyModifiers(additionalResult, {}).expression;
@@ -14244,7 +14936,7 @@ function baseNode$14(ctx) {
 	const { applyModifiers, childResults, symbols } = ctx;
 	const { z } = symbols;
 	const tupleFn = $(z).attr(identifiers.tuple);
-	if (childResults.length === 0) return tupleFn.call($.array());
+	if (!childResults.length) return tupleFn.call($.array());
 	const tupleElements = childResults.map((result) => applyModifiers(result, { optional: false }).expression);
 	return tupleFn.call($.array(...tupleElements));
 }
@@ -14348,7 +15040,7 @@ function voidToAst$1({ plugin, schema }) {
 
 //#endregion
 //#region src/plugins/zod/v3/walker.ts
-function createVisitor$1(config) {
+function createVisitor$1(config = {}) {
 	const { schemaExtractor } = config;
 	return {
 		applyModifiers(result, ctx, options = {}) {
@@ -14429,6 +15121,10 @@ function createVisitor$1(config) {
 				});
 				if (extracted !== schema) return walk(extracted, ctx);
 			}
+			if (schema.symbolRef) return {
+				expression: $(schema.symbolRef),
+				meta: defaultMeta(schema)
+			};
 		},
 		intersection(items, schemas, parentSchema, ctx) {
 			const z = ctx.plugin.external("zod.z");
@@ -14594,7 +15290,7 @@ function createVisitor$1(config) {
 				if (schema.type !== "null" && schema.const !== null) nonNullItems.push(item);
 			});
 			let expression;
-			if (nonNullItems.length === 0) expression = $(z).attr(identifiers.null).call();
+			if (!nonNullItems.length) expression = $(z).attr(identifiers.null).call();
 			else if (nonNullItems.length === 1) expression = nonNullItems[0].expression;
 			else expression = $(z).attr(identifiers.union).call($.array().pretty().elements(...nonNullItems.map((item) => item.expression)));
 			return {
@@ -14642,10 +15338,10 @@ function createVisitor$1(config) {
 //#region src/plugins/zod/v3/processor.ts
 function createProcessor$1(plugin) {
 	const processor = createSchemaProcessor();
-	const hooks = [plugin.config["~hooks"]?.schemas, plugin.context.config.parser.hooks.schemas];
+	const extractorHooks = [plugin.config["~hooks"]?.schemas?.shouldExtract, plugin.context.config.parser.hooks.schemas?.shouldExtract];
 	function extractor(ctx) {
 		if (processor.hasEmitted(ctx.path)) return ctx.schema;
-		for (const hook of hooks) if (hook?.shouldExtract?.(ctx)) {
+		for (const hook of extractorHooks) if (typeof hook === "boolean" ? hook : hook?.(ctx) ?? false) {
 			process({
 				namingAnchor: processor.context.anchor,
 				tags: processor.context.tags,
@@ -14690,10 +15386,7 @@ function createProcessor$1(plugin) {
 const handlerV3 = ({ plugin }) => {
 	plugin.symbol("z", {
 		external: getZodModule({ plugin }),
-		meta: {
-			category: "external",
-			resource: "zod.z"
-		}
+		meta: { resource: "zod.z" }
 	});
 	const processor = createProcessor$1(plugin);
 	plugin.forEach("operation", "parameter", "requestBody", "schema", "webhook", (event) => {
@@ -14954,7 +15647,7 @@ function baseNode$8(ctx) {
 	const { symbols } = ctx;
 	const { z } = symbols;
 	const { allStrings, enumMembers, literalMembers } = ctx.nodes.items(ctx);
-	if (allStrings && enumMembers.length > 0) return $(z).attr(identifiers.enum).call($.array(...enumMembers));
+	if (allStrings && enumMembers.length) return $(z).attr(identifiers.enum).call($.array(...enumMembers));
 	if (literalMembers.length === 1) return literalMembers[0];
 	return $(z).attr(identifiers.union).call($.array(...literalMembers));
 }
@@ -15111,7 +15804,7 @@ function numberToNode({ plugin, schema }) {
 //#region src/plugins/zod/v4/toAst/object.ts
 function additionalPropertiesNode(ctx) {
 	const { _childResults, applyModifiers, schema, walk, walkerCtx } = ctx;
-	if (!schema.additionalProperties || schema.properties && Object.keys(schema.properties).length > 0) return;
+	if (!schema.additionalProperties || schema.properties && Object.keys(schema.properties).length) return;
 	const additionalResult = walk(schema.additionalProperties, childContext(walkerCtx, "additionalProperties"));
 	_childResults.push(additionalResult);
 	return applyModifiers(additionalResult, {}).expression;
@@ -15268,7 +15961,7 @@ function baseNode$2(ctx) {
 	const { applyModifiers, childResults, symbols } = ctx;
 	const { z } = symbols;
 	const tupleFn = $(z).attr(identifiers.tuple);
-	if (childResults.length === 0) return tupleFn.call($.array());
+	if (!childResults.length) return tupleFn.call($.array());
 	const tupleElements = childResults.map((result) => applyModifiers(result, { optional: false }).expression);
 	return tupleFn.call($.array(...tupleElements));
 }
@@ -15372,7 +16065,7 @@ function voidToAst({ plugin, schema }) {
 
 //#endregion
 //#region src/plugins/zod/v4/walker.ts
-function createVisitor(config) {
+function createVisitor(config = {}) {
 	const { schemaExtractor } = config;
 	return {
 		applyModifiers(result, ctx, options = {}) {
@@ -15450,6 +16143,10 @@ function createVisitor(config) {
 				});
 				if (extracted !== schema) return walk(extracted, ctx);
 			}
+			if (schema.symbolRef) return {
+				expression: $(schema.symbolRef),
+				meta: defaultMeta(schema)
+			};
 		},
 		intersection(items, schemas, parentSchema, ctx) {
 			const z = ctx.plugin.external("zod.z");
@@ -15624,7 +16321,7 @@ function createVisitor(config) {
 				if (schema.type !== "null" && schema.const !== null) nonNullItems.push(item);
 			});
 			let expression;
-			if (nonNullItems.length === 0) expression = $(z).attr(identifiers.null).call();
+			if (!nonNullItems.length) expression = $(z).attr(identifiers.null).call();
 			else if (nonNullItems.length === 1) expression = nonNullItems[0].expression;
 			else expression = $(z).attr(identifiers.union).call($.array().pretty().elements(...nonNullItems.map((item) => item.expression)));
 			return {
@@ -15672,10 +16369,10 @@ function createVisitor(config) {
 //#region src/plugins/zod/v4/processor.ts
 function createProcessor(plugin) {
 	const processor = createSchemaProcessor();
-	const hooks = [plugin.config["~hooks"]?.schemas, plugin.context.config.parser.hooks.schemas];
+	const extractorHooks = [plugin.config["~hooks"]?.schemas?.shouldExtract, plugin.context.config.parser.hooks.schemas?.shouldExtract];
 	function extractor(ctx) {
 		if (processor.hasEmitted(ctx.path)) return ctx.schema;
-		for (const hook of hooks) if (hook?.shouldExtract?.(ctx)) {
+		for (const hook of extractorHooks) if (typeof hook === "boolean" ? hook : hook?.(ctx) ?? false) {
 			process({
 				namingAnchor: processor.context.anchor,
 				tags: processor.context.tags,
@@ -15721,10 +16418,7 @@ const handlerV4 = ({ plugin }) => {
 	plugin.symbol("z", {
 		external: getZodModule({ plugin }),
 		importKind: "namespace",
-		meta: {
-			category: "external",
-			resource: "zod.z"
-		}
+		meta: { resource: "zod.z" }
 	});
 	const processor = createProcessor(plugin);
 	plugin.forEach("operation", "parameter", "requestBody", "schema", "webhook", (event) => {
@@ -15896,9 +16590,58 @@ const defaultConfig = {
 		});
 		plugin.config.requests = context.valueToObject({
 			defaultValue: {
+				body: {
+					case: plugin.config.case ?? "camelCase",
+					enabled: true,
+					name: "z{{name}}Body",
+					types: {
+						...plugin.config.types,
+						infer: {
+							...plugin.config.types.infer,
+							name: "{{name}}BodyZodType"
+						}
+					}
+				},
 				case: plugin.config.case ?? "camelCase",
 				enabled: true,
+				headers: {
+					case: plugin.config.case ?? "camelCase",
+					enabled: true,
+					name: "z{{name}}Headers",
+					types: {
+						...plugin.config.types,
+						infer: {
+							...plugin.config.types.infer,
+							name: "{{name}}HeadersZodType"
+						}
+					}
+				},
 				name: "z{{name}}Data",
+				path: {
+					case: plugin.config.case ?? "camelCase",
+					enabled: true,
+					name: "z{{name}}Path",
+					types: {
+						...plugin.config.types,
+						infer: {
+							...plugin.config.types.infer,
+							name: "{{name}}PathZodType"
+						}
+					}
+				},
+				query: {
+					case: plugin.config.case ?? "camelCase",
+					enabled: true,
+					name: "z{{name}}Query",
+					types: {
+						...plugin.config.types,
+						infer: {
+							...plugin.config.types.infer,
+							name: "{{name}}QueryZodType"
+						}
+					}
+				},
+				shouldExtract: () => false,
 				types: {
 					...plugin.config.types,
 					infer: {
@@ -15911,6 +16654,107 @@ const defaultConfig = {
 				...mappers,
 				object: (fields, defaultValue) => ({
 					...fields,
+					body: context.valueToObject({
+						defaultValue: defaultValue.body,
+						mappers: {
+							...mappers,
+							object: (fields, defaultValue) => ({
+								...fields,
+								types: context.valueToObject({
+									defaultValue: defaultValue.types,
+									mappers: { object: (fields, defaultValue) => ({
+										...fields,
+										infer: context.valueToObject({
+											defaultValue: {
+												...defaultValue.infer,
+												enabled: fields.infer !== void 0 ? Boolean(fields.infer) : defaultValue.infer.enabled
+											},
+											mappers,
+											value: fields.infer
+										})
+									}) },
+									value: fields.types
+								})
+							})
+						},
+						value: fields.body
+					}),
+					headers: context.valueToObject({
+						defaultValue: defaultValue.headers,
+						mappers: {
+							...mappers,
+							object: (fields, defaultValue) => ({
+								...fields,
+								types: context.valueToObject({
+									defaultValue: defaultValue.types,
+									mappers: { object: (fields, defaultValue) => ({
+										...fields,
+										infer: context.valueToObject({
+											defaultValue: {
+												...defaultValue.infer,
+												enabled: fields.infer !== void 0 ? Boolean(fields.infer) : defaultValue.infer.enabled
+											},
+											mappers,
+											value: fields.infer
+										})
+									}) },
+									value: fields.types
+								})
+							})
+						},
+						value: fields.headers
+					}),
+					path: context.valueToObject({
+						defaultValue: defaultValue.path,
+						mappers: {
+							...mappers,
+							object: (fields, defaultValue) => ({
+								...fields,
+								types: context.valueToObject({
+									defaultValue: defaultValue.types,
+									mappers: { object: (fields, defaultValue) => ({
+										...fields,
+										infer: context.valueToObject({
+											defaultValue: {
+												...defaultValue.infer,
+												enabled: fields.infer !== void 0 ? Boolean(fields.infer) : defaultValue.infer.enabled
+											},
+											mappers,
+											value: fields.infer
+										})
+									}) },
+									value: fields.types
+								})
+							})
+						},
+						value: fields.path
+					}),
+					query: context.valueToObject({
+						defaultValue: defaultValue.query,
+						mappers: {
+							...mappers,
+							object: (fields, defaultValue) => ({
+								...fields,
+								types: context.valueToObject({
+									defaultValue: defaultValue.types,
+									mappers: { object: (fields, defaultValue) => ({
+										...fields,
+										infer: context.valueToObject({
+											defaultValue: {
+												...defaultValue.infer,
+												enabled: fields.infer !== void 0 ? Boolean(fields.infer) : defaultValue.infer.enabled
+											},
+											mappers,
+											value: fields.infer
+										})
+									}) },
+									value: fields.types
+								})
+							})
+						},
+						value: fields.query
+					}),
+					shouldExtract: fields.shouldExtract !== void 0 ? typeof fields.shouldExtract === "function" ? fields.shouldExtract : () => Boolean(fields.shouldExtract) : defaultValue.shouldExtract,
 					types: context.valueToObject({
 						defaultValue: defaultValue.types,
 						mappers: { object: (fields, defaultValue) => ({
@@ -16221,4 +17065,4 @@ async function resolveJobs({ logger, userConfigs }) {
 
 //#endregion
 export { postProcessors as _, clientDefaultConfig as a, TypeScriptRenderer as c, reserved as d, keywords as f, getTypedConfig as g, getClientPlugin as h, generateClientBundle as i, TsDslContext as l, TsDsl as m, defaultPlugins as n, clientDefaultMeta as o, regexp as p, clientPluginHandler as r, $ as s, resolveJobs as t, ctx as u };
-//# sourceMappingURL=init-B4xCXgH4.mjs.map
+//# sourceMappingURL=init-C3GzFcQR.mjs.map