@hey-api/openapi-ts 0.94.5 → 0.95.0

package/dist/{init-DXg2DSyt.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$54 = TsDsl;
-var IdTsDsl = class extends Mixed$54 {
+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$53 = TsDsl;
-var PrefixTsDsl = class extends Mixed$53 {
+const Mixed$55 = TsDsl;
+var PrefixTsDsl = class extends Mixed$55 {
 	"~dsl" = "PrefixTsDsl";
 	_expr;
 	_op;
@@ -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$52 = AsMixin(TsDsl);
-var LiteralTsDsl = class extends Mixed$52 {
+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$51 = ArgsMixin(TsDsl);
-var DecoratorTsDsl = class extends Mixed$51 {
+const Mixed$53 = ArgsMixin(TsDsl);
+var DecoratorTsDsl = class extends Mixed$53 {
 	"~dsl" = "DecoratorTsDsl";
 	nameSanitizer = safeRuntimeName;
 	constructor(name, ...args) {
@@ -1403,8 +1406,8 @@ function StaticMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/type/param.ts
-const Mixed$50 = TsDsl;
-var TypeParamTsDsl = class extends Mixed$50 {
+const Mixed$52 = TsDsl;
+var TypeParamTsDsl = class extends Mixed$52 {
 	"~dsl" = "TypeParamTsDsl";
 	scope = "type";
 	constraint;
@@ -1615,8 +1618,8 @@ function TypeExprMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/type/attr.ts
-const Mixed$49 = TypeExprMixin(TsDsl);
-var TypeAttrTsDsl = class extends Mixed$49 {
+const Mixed$51 = TypeExprMixin(TsDsl);
+var TypeAttrTsDsl = class extends Mixed$51 {
 	"~dsl" = "TypeAttrTsDsl";
 	scope = "type";
 	_base;
@@ -1670,8 +1673,8 @@ var TypeAttrTsDsl = class extends Mixed$49 {
 
 //#endregion
 //#region src/ts-dsl/type/expr.ts
-const Mixed$48 = TypeArgsMixin(TypeExprMixin(TsDsl));
-var TypeExprTsDsl = class extends Mixed$48 {
+const Mixed$50 = TypeArgsMixin(TypeExprMixin(TsDsl));
+var TypeExprTsDsl = class extends Mixed$50 {
 	"~dsl" = "TypeExprTsDsl";
 	scope = "type";
 	_exprInput;
@@ -1715,8 +1718,8 @@ f.type.expr.set((...args) => new TypeExprTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/decl/field.ts
-const Mixed$47 = DecoratorMixin(DocMixin(OptionalMixin(PrivateMixin(ProtectedMixin(PublicMixin(ReadonlyMixin(StaticMixin(ValueMixin(TsDsl)))))))));
-var FieldTsDsl = class extends Mixed$47 {
+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$47 {
 
 //#endregion
 //#region src/ts-dsl/stmt/stmt.ts
-const Mixed$46 = TsDsl;
-var StmtTsDsl = class extends Mixed$46 {
+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$45 = TsDsl;
+const Mixed$47 = TsDsl;
 /**
 * Builds binding patterns (e.g., `{ foo, bar }`, `[a, b, ...rest]`).
 */
-var PatternTsDsl = class extends Mixed$45 {
+var PatternTsDsl = class extends Mixed$47 {
 	"~dsl" = "PatternTsDsl";
 	pattern;
 	_spread;
@@ -1898,8 +1901,8 @@ function PatternMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/decl/param.ts
-const Mixed$44 = DecoratorMixin(OptionalMixin(PatternMixin(ValueMixin(TsDsl))));
-var ParamTsDsl = class extends Mixed$44 {
+const Mixed$46 = DecoratorMixin(OptionalMixin(PatternMixin(ValueMixin(TsDsl))));
+var ParamTsDsl = class extends Mixed$46 {
 	"~dsl" = "ParamTsDsl";
 	_type;
 	constructor(name, fn) {
@@ -1920,8 +1923,8 @@ var ParamTsDsl = class extends Mixed$44 {
 		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() {
@@ -1997,8 +2000,8 @@ function LayoutMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/stmt/block.ts
-const Mixed$43 = DoMixin(LayoutMixin(TsDsl));
-var BlockTsDsl = class extends Mixed$43 {
+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$43 {
 
 //#endregion
 //#region src/ts-dsl/decl/init.ts
-const Mixed$42 = DecoratorMixin(DoMixin(DocMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(TsDsl)))))));
-var InitTsDsl = class extends Mixed$42 {
+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$41 = AbstractMixin(AsyncMixin(DecoratorMixin(DoMixin(DocMixin(OptionalMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(StaticMixin(TypeParamsMixin(TypeReturnsMixin(TsDsl)))))))))))));
-var MethodTsDsl = class extends Mixed$41 {
+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$41 {
 		return this.$docs(node);
 	}
 };
+f.method.set((...args) => new MethodTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/decl/class.ts
-const Mixed$40 = AbstractMixin(DecoratorMixin(DefaultMixin(DocMixin(ExportMixin(TypeParamsMixin(TsDsl))))));
-var ClassTsDsl = class extends Mixed$40 {
+const Mixed$42 = AbstractMixin(DecoratorMixin(DefaultMixin(DocMixin(ExportMixin(TypeParamsMixin(TsDsl))))));
+var ClassTsDsl = class extends Mixed$42 {
 	"~dsl" = "ClassTsDsl";
 	nameSanitizer = safeRuntimeName;
 	baseClass;
@@ -2158,8 +2162,8 @@ var ClassTsDsl = class extends Mixed$40 {
 
 //#endregion
 //#region src/ts-dsl/decl/member.ts
-const Mixed$39 = DocMixin(TsDsl);
-var EnumMemberTsDsl = class extends Mixed$39 {
+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$39 {
 
 //#endregion
 //#region src/ts-dsl/decl/enum.ts
-const Mixed$38 = ConstMixin(DocMixin(ExportMixin(TsDsl)));
-var EnumTsDsl = class extends Mixed$38 {
+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$38 {
 
 //#endregion
 //#region src/ts-dsl/decl/func.ts
-const Mixed$37 = AbstractMixin(AsMixin(AsyncMixin(DecoratorMixin(DoMixin(DocMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(StaticMixin(TypeParamsMixin(TypeReturnsMixin(TsDsl)))))))))))));
-var ImplFuncTsDsl = class extends Mixed$37 {
+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;
@@ -2299,8 +2303,8 @@ const FuncTsDsl = ImplFuncTsDsl;
 
 //#endregion
 //#region src/ts-dsl/decl/getter.ts
-const Mixed$36 = AbstractMixin(AsyncMixin(DecoratorMixin(DoMixin(DocMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(StaticMixin(TypeReturnsMixin(TsDsl)))))))))));
-var GetterTsDsl = class extends Mixed$36 {
+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$36 {
 
 //#endregion
 //#region src/ts-dsl/decl/setter.ts
-const Mixed$35 = AbstractMixin(AsyncMixin(DecoratorMixin(DoMixin(DocMixin(ParamMixin(PrivateMixin(ProtectedMixin(PublicMixin(StaticMixin(TsDsl))))))))));
-var SetterTsDsl = class extends Mixed$35 {
+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) {
@@ -2372,10 +2376,24 @@ function ExprMixin(Base) {
 	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$34 = AsMixin(ExprMixin(LayoutMixin(TsDsl)));
-var ArrayTsDsl = class extends Mixed$34 {
+const Mixed$36 = AsMixin(ExprMixin(LayoutMixin(SpreadMixin(TsDsl))));
+var ArrayTsDsl = class extends Mixed$36 {
 	"~dsl" = "ArrayTsDsl";
 	_elements = [];
 	constructor(...exprs) {
@@ -2384,15 +2402,12 @@ var ArrayTsDsl = class extends Mixed$34 {
 	}
 	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. */
@@ -2400,27 +2415,15 @@ var ArrayTsDsl = class extends Mixed$34 {
 		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/expr/as.ts
-const Mixed$33 = AsMixin(ExprMixin(TsDsl));
-var AsTsDsl = class extends Mixed$33 {
+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$32 = AsMixin(ExprMixin(TsDsl));
-var BinaryTsDsl = class extends Mixed$32 {
+const Mixed$34 = AsMixin(ExprMixin(TsDsl));
+var BinaryTsDsl = class extends Mixed$34 {
 	"~dsl" = "BinaryTsDsl";
 	_base;
 	_expr;
@@ -2643,8 +2646,8 @@ function OperatorMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/expr/attr.ts
-const Mixed$31 = AsMixin(ExprMixin(OperatorMixin(OptionalMixin(TsDsl))));
-var AttrTsDsl = class extends Mixed$31 {
+const Mixed$33 = AsMixin(ExprMixin(OperatorMixin(OptionalMixin(SpreadMixin(TsDsl)))));
+var AttrTsDsl = class extends Mixed$33 {
 	"~dsl" = "AttrTsDsl";
 	_computed = false;
 	_left;
@@ -2683,8 +2686,8 @@ f.attr.set((...args) => new AttrTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/expr/await.ts
-const Mixed$30 = ExprMixin(TsDsl);
-var AwaitTsDsl = class extends Mixed$30 {
+const Mixed$32 = ExprMixin(TsDsl);
+var AwaitTsDsl = class extends Mixed$32 {
 	"~dsl" = "AwaitTsDsl";
 	_awaitExpr;
 	constructor(expr) {
@@ -2703,8 +2706,8 @@ f.await.set((...args) => new AwaitTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/expr/call.ts
-const Mixed$29 = ArgsMixin(AsMixin(ExprMixin(TypeArgsMixin(TsDsl))));
-var CallTsDsl = class extends Mixed$29 {
+const Mixed$31 = ArgsMixin(AsMixin(ExprMixin(SpreadMixin(TypeArgsMixin(TsDsl)))));
+var CallTsDsl = class extends Mixed$31 {
 	"~dsl" = "CallTsDsl";
 	_callee;
 	constructor(callee, ...args) {
@@ -2724,8 +2727,8 @@ f.call.set((...args) => new CallTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/expr/expr.ts
-const Mixed$28 = AsMixin(ExprMixin(OperatorMixin(TypeExprMixin(TsDsl))));
-var ExprTsDsl = class extends Mixed$28 {
+const Mixed$30 = AsMixin(ExprMixin(OperatorMixin(SpreadMixin(TypeExprMixin(TsDsl)))));
+var ExprTsDsl = class extends Mixed$30 {
 	"~dsl" = "ExprTsDsl";
 	_exprInput;
 	constructor(id) {
@@ -2796,8 +2799,8 @@ function HintMixin(Base) {
 
 //#endregion
 //#region src/ts-dsl/expr/prop.ts
-const Mixed$27 = DocMixin(TsDsl);
-var ObjectPropTsDsl = class extends Mixed$27 {
+const Mixed$29 = DocMixin(TsDsl);
+var ObjectPropTsDsl = class extends Mixed$29 {
 	"~dsl" = "ObjectPropTsDsl";
 	_value;
 	_meta;
@@ -2805,12 +2808,6 @@ var ObjectPropTsDsl = class extends Mixed$27 {
 		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);
@@ -2818,9 +2815,14 @@ var ObjectPropTsDsl = class extends Mixed$27 {
 	get isValid() {
 		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() {
@@ -2841,6 +2843,7 @@ var ObjectPropTsDsl = class extends Mixed$27 {
 			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);
@@ -2863,14 +2866,15 @@ var ObjectPropTsDsl = class extends Mixed$27 {
 
 //#endregion
 //#region src/ts-dsl/expr/object.ts
-const Mixed$26 = AsMixin(ExprMixin(HintMixin(LayoutMixin(TsDsl))));
-var ObjectTsDsl = class extends Mixed$26 {
+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);
@@ -2907,6 +2911,15 @@ var ObjectTsDsl = class extends Mixed$26 {
 	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}`);
@@ -2944,7 +2957,7 @@ var ObjectTsDsl = class extends Mixed$26 {
 };
 
 //#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);
@@ -2967,8 +2980,8 @@ const fromValue$1 = (input, options) => {
 
 //#endregion
 //#region src/ts-dsl/expr/new.ts
-const Mixed$25 = ArgsMixin(AsMixin(ExprMixin(TypeArgsMixin(TsDsl))));
-var NewTsDsl = class extends Mixed$25 {
+const Mixed$27 = ArgsMixin(AsMixin(ExprMixin(SpreadMixin(TypeArgsMixin(TsDsl)))));
+var NewTsDsl = class extends Mixed$27 {
 	"~dsl" = "NewTsDsl";
 	_newExpr;
 	constructor(expr, ...args) {
@@ -2988,8 +3001,8 @@ f.new.set((...args) => new NewTsDsl(...args));
 
 //#endregion
 //#region src/ts-dsl/expr/postfix.ts
-const Mixed$24 = TsDsl;
-var PostfixTsDsl = class extends Mixed$24 {
+const Mixed$26 = TsDsl;
+var PostfixTsDsl = class extends Mixed$26 {
 	"~dsl" = "PostfixTsDsl";
 	_expr;
 	_op;
@@ -3045,8 +3058,8 @@ var PostfixTsDsl = class extends Mixed$24 {
 
 //#endregion
 //#region src/ts-dsl/expr/regexp.ts
-const Mixed$23 = TsDsl;
-var RegExpTsDsl = class extends Mixed$23 {
+const Mixed$25 = TsDsl;
+var RegExpTsDsl = class extends Mixed$25 {
 	"~dsl" = "RegExpTsDsl";
 	pattern;
 	flags;
@@ -3064,10 +3077,30 @@ var RegExpTsDsl = class extends Mixed$23 {
 	}
 };
 
+//#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$22 = TsDsl;
-var TemplateTsDsl = class extends Mixed$22 {
+const Mixed$23 = TsDsl;
+var TemplateTsDsl = class extends Mixed$23 {
 	"~dsl" = "TemplateTsDsl";
 	parts = [];
 	constructor(value) {
@@ -3117,8 +3150,8 @@ var TemplateTsDsl = class extends Mixed$22 {
 
 //#endregion
 //#region src/ts-dsl/expr/ternary.ts
-const Mixed$21 = TsDsl;
-var TernaryTsDsl = class extends Mixed$21 {
+const Mixed$22 = TsDsl;
+var TernaryTsDsl = class extends Mixed$22 {
 	"~dsl" = "TernaryTsDsl";
 	_condition;
 	_then;
@@ -3169,8 +3202,8 @@ var TernaryTsDsl = class extends Mixed$21 {
 
 //#endregion
 //#region src/ts-dsl/expr/typeof.ts
-const Mixed$20 = OperatorMixin(TsDsl);
-var TypeOfExprTsDsl = class extends Mixed$20 {
+const Mixed$21 = OperatorMixin(TsDsl);
+var TypeOfExprTsDsl = class extends Mixed$21 {
 	"~dsl" = "TypeOfExprTsDsl";
 	_expr;
 	constructor(expr) {
@@ -3221,8 +3254,8 @@ var NoteTsDsl = class extends TsDsl {
 
 //#endregion
 //#region src/ts-dsl/stmt/for.ts
-const Mixed$19 = DoMixin(LayoutMixin(TsDsl));
-var ImplForTsDsl = class extends Mixed$19 {
+const Mixed$20 = DoMixin(LayoutMixin(TsDsl));
+var ImplForTsDsl = class extends Mixed$20 {
 	"~dsl" = "ForTsDsl";
 	_await;
 	_condition;
@@ -3320,8 +3353,8 @@ 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;
@@ -3372,8 +3405,8 @@ var IfTsDsl = class extends Mixed$18 {
 
 //#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) {
@@ -3392,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;
@@ -3423,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;
@@ -3501,8 +3534,8 @@ var TryTsDsl = class extends Mixed$15 {
 
 //#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;
@@ -3530,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() {
@@ -3557,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";
@@ -3603,8 +3636,8 @@ var TypeAliasTsDsl = class extends Mixed$13 {
 
 //#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 = [];
@@ -3633,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;
@@ -3652,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;
@@ -3711,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;
@@ -3763,8 +3796,8 @@ var TypePropTsDsl = class extends Mixed$9 {
 
 //#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();
@@ -3806,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 = [];
@@ -3829,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);
@@ -3848,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) {
@@ -3878,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;
@@ -3926,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;
@@ -3999,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:
 *
@@ -4012,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;
@@ -4070,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 = [];
@@ -4100,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;
@@ -4122,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 = [];
@@ -4169,6 +4202,47 @@ var TypeTemplateTsDsl = class extends Mixed {
 	}
 };
 
+//#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 {
@@ -4474,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),
@@ -4496,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)
@@ -4511,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)))));
@@ -4678,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;
@@ -4695,7 +4771,7 @@ const createResponseValidator = ({ operation, plugin }) => {
 		operation,
 		plugin: validator
 	});
-};
+}
 
 //#endregion
 //#region src/plugins/@hey-api/sdk/shared/operation.ts
@@ -4723,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"));
 };
@@ -4903,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"));
@@ -5003,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;
@@ -5239,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",
@@ -6305,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."
@@ -6491,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 });
@@ -7180,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);
@@ -7350,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) {
@@ -7578,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,
@@ -8210,7 +8295,7 @@ 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 });
 	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")))));
@@ -8264,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
@@ -8458,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",
@@ -8536,7 +8621,7 @@ const createInfiniteQueryOptions = ({ operation, plugin }) => {
 		context: plugin.context,
 		operation
 	});
-	if (!plugin.getSymbol({
+	if (!plugin.querySymbol({
 		category: "utility",
 		resource: "createQueryKey",
 		tool: plugin.name
@@ -8544,7 +8629,7 @@ const createInfiniteQueryOptions = ({ operation, plugin }) => {
 		createQueryKeyType({ plugin });
 		createQueryKeyFunction({ plugin });
 	}
-	if (!plugin.getSymbol({
+	if (!plugin.querySymbol({
 		category: "utility",
 		resource: "createInfiniteParams",
 		tool: plugin.name
@@ -8644,7 +8729,7 @@ const createQueryOptions = ({ operation, plugin }) => {
 		context: plugin.context,
 		operation
 	});
-	if (!plugin.getSymbol({
+	if (!plugin.querySymbol({
 		category: "utility",
 		resource: "createQueryKey",
 		tool: plugin.name
@@ -9333,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,
@@ -9344,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,
@@ -9356,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
@@ -10208,13 +10293,25 @@ function createContractExpression(plugin, operation) {
 	const successResponse = getSuccessResponse(operation);
 	const tags = getTags(operation, plugin.config.contracts.strategyDefaultTag);
 	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) expression = expression.attr("input").call(plugin.referenceSymbol({
-		category: "schema",
-		resource: "operation",
-		resourceId: operation.id,
-		role: "data",
-		tool: plugin.config.validator.input
-	}));
+	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",
@@ -10801,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
@@ -10926,51 +10968,288 @@ 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: {
+//#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);
+}
+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"
@@ -10985,28 +11264,6 @@ function irWebhookToAst$1({ operation, path, plugin, processor, tags }) {
 	}
 }
 
-//#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);
-}
-
 //#endregion
 //#region src/plugins/shared/utils/coerce.ts
 const shouldCoerceToBigInt = (format) => format === "int64" || format === "uint64";
@@ -11826,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 = {}) {
@@ -11911,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);
@@ -12106,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,
@@ -12245,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({
@@ -12343,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,
@@ -12387,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,
@@ -12396,52 +12910,134 @@ 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({
-		category: "schema",
-		resource: "operation",
-		resourceId: operation.id,
-		role: "data",
-		tool: "zod"
-	});
-	if (!symbol) return;
+}
+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");
-	const ctx = {
+	return {
+		...ctx,
 		$,
 		chain: { current: $(z) },
-		operation,
-		plugin,
+		nodes: {
+			composite: compositeNode$1,
+			empty: emptyNode$1,
+			optional: optionalNode$1
+		},
 		symbols: {
-			schema: symbol,
+			schema: $(""),
 			z
 		}
 	};
-	const validator = plugin.config["~resolvers"]?.validator;
-	const candidates = [typeof validator === "function" ? validator : validator?.request, validatorResolver$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]);
-	}
-};
-const createResponseValidatorV3 = ({ operation, plugin }) => {
-	const symbol = plugin.getSymbol({
+}
+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,
@@ -12450,7 +13046,7 @@ const createResponseValidatorV3 = ({ operation, plugin }) => {
 	});
 	if (!symbol) return;
 	const z = plugin.external("zod.z");
-	const ctx = {
+	return runResponseResolver$1({
 		$,
 		chain: { current: $(z) },
 		operation,
@@ -12459,52 +13055,134 @@ const createResponseValidatorV3 = ({ operation, plugin }) => {
 			schema: symbol,
 			z
 		}
-	};
-	const validator = plugin.config["~resolvers"]?.validator;
-	const candidates = [typeof validator === "function" ? validator : validator?.response, validatorResolver$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]);
-	}
-};
+	});
+}
 
 //#endregion
 //#region src/plugins/zod/v4/api.ts
-const validatorResolver = (ctx) => {
+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();
-};
-const createRequestValidatorV4 = ({ operation, plugin }) => {
-	const symbol = plugin.getSymbol({
-		category: "schema",
-		resource: "operation",
-		resourceId: operation.id,
-		role: "data",
-		tool: "zod"
-	});
-	if (!symbol) 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]);
+	}
+}
+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]);
+	}
+}
+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,
@@ -12513,7 +13191,7 @@ const createResponseValidatorV4 = ({ operation, plugin }) => {
 	});
 	if (!symbol) return;
 	const z = plugin.external("zod.z");
-	const ctx = {
+	return runResponseResolver({
 		$,
 		chain: { current: $(z) },
 		operation,
@@ -12522,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);
 		}
 	}
 };
@@ -12573,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
 		});
 	}
@@ -12680,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
 /**
@@ -13386,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 = {}) {
@@ -13465,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");
@@ -13682,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,
@@ -14403,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 = {}) {
@@ -14484,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");
@@ -14697,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,
@@ -15424,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 = {}) {
@@ -15502,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");
@@ -15724,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,
@@ -15945,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: {
@@ -15960,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) => ({
@@ -16270,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-DXg2DSyt.mjs.map
+//# sourceMappingURL=init-C3GzFcQR.mjs.map