@kubb/plugin-ts 5.0.0-alpha.3 → 5.0.0-alpha.5

package/dist/{plugin-D5rCK1zO.cjs → plugin-meWNDVe7.cjs}

@@ -1,4 +1,4 @@
-const require_components = require("./components-DI0aTIBg.cjs");
+const require_components = require("./components-CxTvawXI.cjs");
 let node_path = require("node:path");
 node_path = require_components.__toESM(node_path);
 let _kubb_ast = require("@kubb/ast");
@@ -216,7 +216,6 @@ function printResponseSchema({ baseName, schemas, pluginManager, unknownType })
 }
 const typeGenerator$1 = (0, _kubb_plugin_oas_generators.createReactGenerator)({
 	name: "typescript",
-	version: "1",
 	Operation({ operation, generator, plugin }) {
 		const { options, options: { mapper, enumType, enumKeyCasing, syntaxType, optionalType, arrayType, unknownType, paramsCasing } } = plugin;
 		const mode = (0, _kubb_core_hooks.useMode)();
@@ -466,13 +465,17 @@ const printerTs = (0, _kubb_core.definePrinter)((options) => ({
 		any: () => require_components.keywordTypeNodes.any,
 		unknown: () => require_components.keywordTypeNodes.unknown,
 		void: () => require_components.keywordTypeNodes.void,
+		never: () => require_components.keywordTypeNodes.never,
 		boolean: () => require_components.keywordTypeNodes.boolean,
 		null: () => require_components.keywordTypeNodes.null,
 		blob: () => require_components.createTypeReferenceNode("Blob", []),
 		string: () => require_components.keywordTypeNodes.string,
 		uuid: () => require_components.keywordTypeNodes.string,
 		email: () => require_components.keywordTypeNodes.string,
-		url: () => require_components.keywordTypeNodes.string,
+		url: (node) => {
+			if (node.path) return require_components.createUrlTemplateType(node.path);
+			return require_components.keywordTypeNodes.string;
+		},
 		datetime: () => require_components.keywordTypeNodes.string,
 		number: () => require_components.keywordTypeNodes.number,
 		integer: () => require_components.keywordTypeNodes.number,
@@ -537,6 +540,7 @@ const printerTs = (0, _kubb_core.definePrinter)((options) => ({
 			const addsQuestionToken = ["questionToken", "questionTokenAndUndefined"].includes(this.options.optionalType);
 			const { print } = this;
 			const propertyNodes = node.properties.map((prop) => {
+				if (this.options.mapper && Object.hasOwn(this.options.mapper, prop.name)) return this.options.mapper[prop.name];
 				const baseType = print(prop.schema) ?? require_components.keywordTypeNodes.unknown;
 				const type = buildPropertyType(prop.schema, baseType, this.options.optionalType);
 				const propertyNode = require_components.createPropertySignature({
@@ -558,7 +562,7 @@ const printerTs = (0, _kubb_core.definePrinter)((options) => ({
 }));
 //#endregion
 //#region src/components/v2/Type.tsx
-function Type({ name, typedName, node, keysToOmit, optionalType, arrayType, syntaxType, enumType, enumKeyCasing, ...rest }) {
+function Type({ name, typedName, node, keysToOmit, optionalType, arrayType, syntaxType, enumType, enumKeyCasing, mapper, ...rest }) {
 	const typeNodes = [];
 	const description = rest.description || node?.description;
 	const enumSchemaNodes = (0, _kubb_ast.collect)(node, { schema(n) {
@@ -567,7 +571,8 @@ function Type({ name, typedName, node, keysToOmit, optionalType, arrayType, synt
 	let type = printerTs({
 		optionalType,
 		arrayType,
-		enumType
+		enumType,
+		mapper
 	}).print(node);
 	if (!type) return;
 	if (["asConst", "asPascalConst"].includes(enumType) && enumSchemaNodes.length > 0) {
@@ -658,29 +663,175 @@ function Type({ name, typedName, node, keysToOmit, optionalType, arrayType, synt
 	})] });
 }
 //#endregion
+//#region src/generators/v2/utils.ts
+/**
+* Builds an `ObjectSchemaNode` for a group of parameters (path/query/header).
+* Each property is a `ref` schema pointing to the individually-resolved parameter type.
+*/
+function buildParamsSchema({ params, operationId, resolveName }) {
+	return (0, _kubb_ast.createSchema)({
+		type: "object",
+		properties: params.map((param) => (0, _kubb_ast.createProperty)({
+			name: param.name,
+			schema: (0, _kubb_ast.createSchema)({
+				type: "ref",
+				name: resolveName({
+					name: `${operationId} ${param.name}`,
+					type: "function"
+				}),
+				optional: !param.required
+			})
+		}))
+	});
+}
+/**
+* Builds an `ObjectSchemaNode` representing the `<OperationId>Data` type:
+* - `data`         → request body ref (optional) or `never`
+* - `pathParams`   → inline object of path param refs, or `never`
+* - `queryParams`  → inline object of query param refs (optional), or `never`
+* - `headerParams` → inline object of header param refs (optional), or `never`
+* - `url`          → Express-style template literal (plugin-ts extension, handled by printer)
+*/
+function buildDataSchemaNode({ node, resolveName }) {
+	const pathParams = node.parameters.filter((p) => p.in === "path");
+	const queryParams = node.parameters.filter((p) => p.in === "query");
+	const headerParams = node.parameters.filter((p) => p.in === "header");
+	return (0, _kubb_ast.createSchema)({
+		type: "object",
+		properties: [
+			(0, _kubb_ast.createProperty)({
+				name: "data",
+				schema: node.requestBody ? (0, _kubb_ast.createSchema)({
+					type: "ref",
+					name: resolveName({
+						name: `${node.operationId} MutationRequest`,
+						type: "function"
+					}),
+					optional: true
+				}) : (0, _kubb_ast.createSchema)({
+					type: "never",
+					optional: true
+				})
+			}),
+			(0, _kubb_ast.createProperty)({
+				name: "pathParams",
+				schema: pathParams.length > 0 ? buildParamsSchema({
+					params: pathParams,
+					operationId: node.operationId,
+					resolveName
+				}) : (0, _kubb_ast.createSchema)({
+					type: "never",
+					optional: true
+				})
+			}),
+			(0, _kubb_ast.createProperty)({
+				name: "queryParams",
+				schema: queryParams.length > 0 ? (0, _kubb_ast.createSchema)({
+					...buildParamsSchema({
+						params: queryParams,
+						operationId: node.operationId,
+						resolveName
+					}),
+					optional: true
+				}) : (0, _kubb_ast.createSchema)({
+					type: "never",
+					optional: true
+				})
+			}),
+			(0, _kubb_ast.createProperty)({
+				name: "headerParams",
+				schema: headerParams.length > 0 ? (0, _kubb_ast.createSchema)({
+					...buildParamsSchema({
+						params: headerParams,
+						operationId: node.operationId,
+						resolveName
+					}),
+					optional: true
+				}) : (0, _kubb_ast.createSchema)({
+					type: "never",
+					optional: true
+				})
+			}),
+			(0, _kubb_ast.createProperty)({
+				name: "url",
+				schema: (0, _kubb_ast.createSchema)({
+					type: "url",
+					path: node.path
+				})
+			})
+		]
+	});
+}
+/**
+* Builds an `ObjectSchemaNode` representing `<OperationId>Responses` — keyed by HTTP status code.
+*
+* Example output:
+* ```ts
+* export type PlaceOrderPatchResponses = { 200: PlaceOrderPatch200; 405: PlaceOrderPatch405 }
+* ```
+*/
+function buildResponsesSchemaNode({ node, resolveName }) {
+	const responsesWithSchema = node.responses.filter((res) => res.schema);
+	if (responsesWithSchema.length === 0) return null;
+	return (0, _kubb_ast.createSchema)({
+		type: "object",
+		properties: responsesWithSchema.map((res) => (0, _kubb_ast.createProperty)({
+			name: String(res.statusCode),
+			schema: (0, _kubb_ast.createSchema)({
+				type: "ref",
+				name: resolveName({
+					name: `${node.operationId} ${res.statusCode}`,
+					type: "function"
+				})
+			})
+		}))
+	});
+}
+/**
+* Builds a `UnionSchemaNode` representing `<OperationId>Response` — all response types in union format.
+*
+* Example output:
+* ```ts
+* export type PlaceOrderPatchResponse = PlaceOrderPatch200 | PlaceOrderPatch405
+* ```
+*/
+function buildResponseUnionSchemaNode({ node, resolveName }) {
+	const responsesWithSchema = node.responses.filter((res) => res.schema);
+	if (responsesWithSchema.length === 0) return null;
+	return (0, _kubb_ast.createSchema)({
+		type: "union",
+		members: responsesWithSchema.map((res) => (0, _kubb_ast.createSchema)({
+			type: "ref",
+			name: resolveName({
+				name: `${node.operationId} ${res.statusCode}`,
+				type: "function"
+			})
+		}))
+	});
+}
+//#endregion
 //#region src/generators/v2/typeGenerator.tsx
-const typeGenerator = (0, _kubb_plugin_oas_generators.createReactGenerator)({
+const typeGenerator = (0, _kubb_core.defineGenerator)({
 	name: "typescript",
-	version: "2",
+	type: "react",
 	Operation({ node, adapter, options }) {
-		const { enumType, enumKeyCasing, optionalType, arrayType, syntaxType } = options;
-		const { plugin, mode, getFile, resolveName } = (0, _kubb_core_hooks.useKubb)();
+		const { enumType, enumKeyCasing, optionalType, arrayType, syntaxType, paramsCasing, mapper } = options;
+		const { mode, getFile, resolveName } = (0, _kubb_core_hooks.useKubb)();
 		const file = getFile({
 			name: node.operationId,
-			pluginName: plugin.name,
 			extname: ".ts",
 			mode
 		});
+		const params = (0, _kubb_ast.applyParamsCasing)(node.parameters, paramsCasing);
 		function renderSchemaType({ node: schemaNode, name, typedName, description }) {
+			if (!schemaNode) return null;
 			const imports = adapter.getImports(schemaNode, (schemaName) => ({
 				name: resolveName({
 					name: schemaName,
-					pluginName: plugin.name,
 					type: "type"
 				}),
 				path: getFile({
 					name: schemaName,
-					pluginName: plugin.name,
 					extname: ".ts",
 					mode
 				}).path
@@ -703,63 +854,90 @@ const typeGenerator = (0, _kubb_plugin_oas_generators.createReactGenerator)({
 				enumKeyCasing,
 				optionalType,
 				arrayType,
-				syntaxType
+				syntaxType,
+				mapper
 			})] });
 		}
-		const paramTypes = node.parameters.map((param) => {
-			const name = resolveName({
+		const paramTypes = params.map((param) => renderSchemaType({
+			node: param.schema,
+			name: resolveName({
 				name: `${node.operationId} ${param.name}`,
-				pluginName: plugin.name,
 				type: "function"
-			});
-			const typedName = resolveName({
+			}),
+			typedName: resolveName({
 				name: `${node.operationId} ${param.name}`,
-				pluginName: plugin.name,
 				type: "type"
-			});
-			return renderSchemaType({
-				node: param.schema,
-				name,
-				typedName
-			});
+			})
+		}));
+		const responseTypes = node.responses.filter((res) => res.schema).map((res) => renderSchemaType({
+			node: res.schema,
+			name: resolveName({
+				name: `${node.operationId} ${res.statusCode}`,
+				type: "function"
+			}),
+			typedName: resolveName({
+				name: `${node.operationId} ${res.statusCode}`,
+				type: "type"
+			}),
+			description: res.description
+		}));
+		const requestType = node.requestBody ? renderSchemaType({
+			node: node.requestBody,
+			name: resolveName({
+				name: `${node.operationId} MutationRequest`,
+				type: "function"
+			}),
+			typedName: resolveName({
+				name: `${node.operationId} MutationRequest`,
+				type: "type"
+			}),
+			description: node.requestBody.description
+		}) : null;
+		const dataType = renderSchemaType({
+			node: buildDataSchemaNode({
+				node: {
+					...node,
+					parameters: params
+				},
+				resolveName
+			}),
+			name: resolveName({
+				name: `${node.operationId} Data`,
+				type: "function"
+			}),
+			typedName: resolveName({
+				name: `${node.operationId} Data`,
+				type: "type"
+			})
 		});
-		const responseTypes = node.responses.filter((res) => res.schema).map((res) => {
-			const schemaNode = res.schema;
-			const responseName = `${node.operationId} ${res.statusCode}`;
-			return renderSchemaType({
-				node: schemaNode,
-				name: resolveName({
-					name: responseName,
-					pluginName: plugin.name,
-					type: "function"
-				}),
-				typedName: resolveName({
-					name: responseName,
-					pluginName: plugin.name,
-					type: "type"
-				}),
-				description: res.description
-			});
+		const responsesType = renderSchemaType({
+			node: buildResponsesSchemaNode({
+				node,
+				resolveName
+			}),
+			name: resolveName({
+				name: `${node.operationId} Responses`,
+				type: "function"
+			}),
+			typedName: resolveName({
+				name: `${node.operationId} Responses`,
+				type: "type"
+			})
 		});
-		const requestType = node.requestBody ? (() => {
-			const requestName = `${node.operationId} MutationRequest`;
-			const resolvedName = resolveName({
-				name: requestName,
-				pluginName: plugin.name,
+		const responseType = renderSchemaType({
+			node: buildResponseUnionSchemaNode({
+				node,
+				resolveName
+			}),
+			name: resolveName({
+				name: `${node.operationId} Response`,
 				type: "function"
-			});
-			const typedName = resolveName({
-				name: requestName,
-				pluginName: plugin.name,
+			}),
+			typedName: resolveName({
+				name: `${node.operationId} Response`,
 				type: "type"
-			});
-			return renderSchemaType({
-				node: node.requestBody,
-				name: resolvedName,
-				typedName,
-				description: node.requestBody.description
-			});
-		})() : null;
+			})
+		});
 		return /* @__PURE__ */ (0, _kubb_react_fabric_jsx_runtime.jsxs)(_kubb_react_fabric.File, {
 			baseName: file.baseName,
 			path: file.path,
@@ -767,23 +945,24 @@ const typeGenerator = (0, _kubb_plugin_oas_generators.createReactGenerator)({
 			children: [
 				paramTypes,
 				responseTypes,
-				requestType
+				requestType,
+				dataType,
+				responsesType,
+				responseType
 			]
 		});
 	},
 	Schema({ node, adapter, options }) {
-		const { enumType, enumKeyCasing, syntaxType, optionalType, arrayType } = options;
-		const { plugin, mode, resolveName, getFile } = (0, _kubb_core_hooks.useKubb)();
+		const { enumType, enumKeyCasing, syntaxType, optionalType, arrayType, mapper } = options;
+		const { mode, resolveName, getFile } = (0, _kubb_core_hooks.useKubb)();
 		if (!node.name) return;
 		const imports = adapter.getImports(node, (schemaName) => ({
 			name: resolveName({
 				name: schemaName,
-				pluginName: plugin.name,
 				type: "type"
 			}),
 			path: getFile({
 				name: schemaName,
-				pluginName: plugin.name,
 				extname: ".ts",
 				mode
 			}).path
@@ -791,20 +970,17 @@ const typeGenerator = (0, _kubb_plugin_oas_generators.createReactGenerator)({
 		const isEnumSchema = node.type === "enum";
 		let typedName = resolveName({
 			name: node.name,
-			pluginName: plugin.name,
 			type: "type"
 		});
-		if (["asConst", "asPascalConst"].includes(enumType) && isEnumSchema) typedName = typedName += "Key";
+		if (["asConst", "asPascalConst"].includes(enumType) && isEnumSchema) typedName += "Key";
 		const type = {
 			name: resolveName({
 				name: node.name,
-				pluginName: plugin.name,
 				type: "function"
 			}),
 			typedName,
 			file: getFile({
 				name: node.name,
-				pluginName: plugin.name,
 				extname: ".ts",
 				mode
 			})
@@ -830,7 +1006,8 @@ const typeGenerator = (0, _kubb_plugin_oas_generators.createReactGenerator)({
 				enumKeyCasing,
 				optionalType,
 				arrayType,
-				syntaxType
+				syntaxType,
+				mapper
 			})]
 		});
 	}
@@ -895,34 +1072,63 @@ const pluginTs = (0, _kubb_core.definePlugin)((options) => {
 				await openInStudio({ ast: true });
 				await (0, _kubb_ast.walk)(rootNode, {
 					async schema(schemaNode) {
-						await generators.map(async (generator) => {
-							if (generator.type === "react" && generator.version === "2") await (0, _kubb_plugin_oas.buildSchema)(schemaNode, {
-								adapter,
-								config,
-								fabric,
-								Component: generator.Schema,
-								plugin,
-								pluginManager,
-								mode,
-								version: generator.version
-							});
+						const writeTasks = generators.map(async (generator) => {
+							if (generator.type === "react" && generator.version === "2") {
+								const options = (0, _kubb_core.resolveOptions)(schemaNode, {
+									options: plugin.options,
+									exclude,
+									include,
+									override
+								});
+								if (options === null) return;
+								await (0, _kubb_plugin_oas.buildSchema)(schemaNode, {
+									options,
+									adapter,
+									config,
+									fabric,
+									Component: generator.Schema,
+									plugin,
+									pluginManager,
+									mode,
+									version: generator.version
+								});
+							}
 						});
+						await Promise.all(writeTasks);
 					},
 					async operation(operationNode) {
-						await generators.map(async (generator) => {
-							if (generator.type === "react" && generator.version === "2") await (0, _kubb_plugin_oas.buildOperation)(operationNode, {
-								adapter,
-								config,
-								fabric,
-								Component: generator.Operation,
-								plugin,
-								pluginManager,
-								mode,
-								version: generator.version
-							});
+						const writeTasks = generators.map(async (generator) => {
+							if (generator.type === "react" && generator.version === "2") {
+								const options = (0, _kubb_core.resolveOptions)(operationNode, {
+									options: plugin.options,
+									exclude,
+									include,
+									override
+								});
+								if (options === null) return;
+								await (0, _kubb_plugin_oas.buildOperation)(operationNode, {
+									options,
+									adapter,
+									config,
+									fabric,
+									Component: generator.Operation,
+									plugin,
+									pluginManager,
+									mode,
+									version: generator.version
+								});
+							}
 						});
+						await Promise.all(writeTasks);
 					}
 				}, { depth: "shallow" });
+				const barrelFiles = await (0, _kubb_core.getBarrelFiles)(this.fabric.files, {
+					type: output.barrelType ?? "named",
+					root,
+					output,
+					meta: { pluginName: this.plugin.name }
+				});
+				await this.upsertFile(...barrelFiles);
 				return;
 			}
 			const oas = await this.getOas();
@@ -989,4 +1195,4 @@ Object.defineProperty(exports, "typeGenerator$1", {
 	}
 });
 
-//# sourceMappingURL=plugin-D5rCK1zO.cjs.map
+//# sourceMappingURL=plugin-meWNDVe7.cjs.map