@kubb/plugin-fetch 5.5.2 → 5.5.4

package/README.md

@@ -10,7 +10,7 @@
 [![Node][node-src]][node-href]
 
 <h4>
-<a href="https://kubb.dev/plugins/fetch" target="_blank">Documentation</a>
+<a href="https://kubb.dev/plugins/plugin-fetch" target="_blank">Documentation</a>
 <span> · </span>
 <a href="https://github.com/kubb-labs/kubb/issues/" target="_blank">Report Bug</a>
 <span> · </span>
@@ -38,7 +38,7 @@ npm install @kubb/plugin-fetch
 
 ## Documentation
 
-See the [full documentation](https://kubb.dev/plugins/fetch) for configuration options and examples.
+See the [full documentation](https://kubb.dev/plugins/plugin-fetch) for configuration options and examples.
 
 ## Supporting Kubb
 

package/dist/index.cjs

@@ -478,7 +478,8 @@ function buildRequestResultGenerics({ node, types }) {
 }
 /**
 * Builds the full return type an operation's function signature uses: `Unwrappable<RequestResult>`
-* for the default `returnType: 'full'`, already a promise so no further wrapping is needed, or a
+* for the default `returnType: 'full'`, already a promise so no further wrapping is needed, a plain
+* `Promise<RequestResult>` for the internal `'plain'` shape, or a
 * `Promise` of the runtime's `UnwrappedResult` when `returnType: 'data'` narrows a resolved call
 * down to the bare success body.
 *
@@ -490,7 +491,9 @@ function buildResultType({ node, types, returnType }) {
 		node,
 		types
 	});
-	return returnType === "data" ? `Promise<UnwrappedResult<${generics}>>` : `Unwrappable<RequestResult<${generics}>>`;
+	if (returnType === "data") return `Promise<UnwrappedResult<${generics}>>`;
+	if (returnType === "plain") return `Promise<RequestResult<${generics}>>`;
+	return `Unwrappable<RequestResult<${generics}>>`;
 }
 //#endregion
 //#region ../../internals/client/src/builders/returnStatement.ts
@@ -502,6 +505,7 @@ function buildResultType({ node, types, returnType }) {
 * body. With `returnType: 'data'` it instead routes the call through the runtime's `unwrapResult`,
 * which narrows the resolved value down to the bare success body the same way `RequestResult`
 * already does, using the plugin default when the call leaves `throwOnError` unset.
+* With `returnType: 'plain'` it returns the runtime call as is, cast to `RequestResult`, with no helper.
 *
 * Cast first, wrap second, for the `'full'` path. That order keeps `withUnwrap`'s generic inferred
 * as `RequestResult` instead of the runtime's own internal result type. Casting an `Unwrappable<A>`
@@ -512,6 +516,8 @@ function buildResultType({ node, types, returnType }) {
 * `return withUnwrap(request({ method: 'POST', url: '/pet', ...config }) as Promise<RequestResult<AddPetResponses, ThrowOnError>>)`
 * @example
 * `return unwrapResult(request({ method: 'POST', url: '/pet', ...config }), config.throwOnError ?? false) as Promise<UnwrappedResult<AddPetResponses, ThrowOnError>>`
+* @example
+* `return request({ method: 'POST', url: '/pet', ...config }) as Promise<RequestResult<AddPetResponses, ThrowOnError>>`
 */
 function buildReturnStatement({ node, types, callConfig, returnType, throwOnErrorDefault }) {
 	if (returnType === "data") return `return unwrapResult(request(${callConfig}), config.throwOnError ?? ${throwOnErrorDefault}) as ${buildResultType({
@@ -519,6 +525,10 @@ function buildReturnStatement({ node, types, callConfig, returnType, throwOnErro
 		types,
 		returnType
 	})}`;
+	if (returnType === "plain") return `return request(${callConfig}) as Promise<RequestResult<${buildRequestResultGenerics({
+		node,
+		types
+	})}>>`;
 	return `return withUnwrap(request(${callConfig}) as Promise<RequestResult<${buildRequestResultGenerics({
 		node,
 		types
@@ -996,7 +1006,7 @@ function resolveOperationTypes(driver) {
 * generator `name` differs between plugins. Every other resolution, import, and rendering step is
 * identical.
 */
-function createClientGenerator(name) {
+function createClientGenerator(name, resolveClientPath) {
 	return (0, kubb_kit.defineGenerator)({
 		name,
 		renderer: kubb_jsx.jsxRenderer,
@@ -1046,8 +1056,30 @@ function createClientGenerator(name) {
 				method: node.method,
 				path: node.path
 			});
-			const clientPath = node_path.default.resolve(root, ".kubb/client.ts");
+			const customClientPath = resolveClientPath?.(ctx.options, root);
+			const clientPath = customClientPath ?? node_path.default.resolve(root, ".kubb/client.ts");
+			const clientRoot = customClientPath === void 0 ? meta.file.path : void 0;
 			const eventStream = isEventStream(node);
+			const clientValueImports = (() => {
+				if (eventStream) return ["client", "toEventStream"];
+				if (returnType === "plain") return ["client"];
+				if (returnType === "data") return ["client", "unwrapResult"];
+				return ["client", "withUnwrap"];
+			})();
+			const clientTypeImports = (() => {
+				if (eventStream) return [
+					"Options",
+					"EventStreamResult",
+					"SuccessOf"
+				];
+				if (returnType === "plain") return ["Options", "RequestResult"];
+				if (returnType === "data") return ["Options", "UnwrappedResult"];
+				return [
+					"Options",
+					"Unwrappable",
+					"RequestResult"
+				];
+			})();
 			return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx.File, {
 				baseName: meta.file.baseName,
 				path: meta.file.path,
@@ -1070,21 +1102,13 @@ function createClientGenerator(name) {
 				}),
 				children: [
 					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
-						name: eventStream ? ["client", "toEventStream"] : ["client", returnType === "data" ? "unwrapResult" : "withUnwrap"],
-						root: meta.file.path,
+						name: clientValueImports,
+						root: clientRoot,
 						path: clientPath
 					}),
 					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
-						name: eventStream ? [
-							"Options",
-							"EventStreamResult",
-							"SuccessOf"
-						] : returnType === "data" ? ["Options", "UnwrappedResult"] : [
-							"Options",
-							"Unwrappable",
-							"RequestResult"
-						],
-						root: meta.file.path,
+						name: clientTypeImports,
+						root: clientRoot,
 						path: clientPath,
 						isTypeOnly: true
 					}),