@kubb/plugin-swr 5.0.0-beta.104 → 5.0.0-beta.109

package/dist/index.cjs

@@ -23,7 +23,7 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));
@@ -85,7 +85,7 @@ function operationFileEntry(node, name, extname = ".ts") {
 */
 function resolveDependencyOperationFile(options) {
 	const { cache, node, resolver, root, output, group } = options;
-	return cache.getOrSet(`${resolver.pluginName}:operationFile`, () => resolver.file({
+	return cache.ensureItem(`${resolver.pluginName}:operationFile`, () => resolver.file({
 		...operationFileEntry(node, node.operationId),
 		root,
 		output,
@@ -429,7 +429,7 @@ function resolveContractClient(options) {
 function resolveClientOperation(options) {
 	const { clientPlugin, driver, node, root, output, cache } = options;
 	if (!clientPlugin) return null;
-	return cache.getOrSet(`${clientPlugin.pluginName}:clientOperation`, () => {
+	return cache.ensureItem(`${clientPlugin.pluginName}:clientOperation`, () => {
 		const resolver = driver.getResolver(clientPlugin.pluginName);
 		const plugin = driver.getPlugin(clientPlugin.pluginName);
 		const file = resolver.file({
@@ -511,14 +511,16 @@ function buildGroupedRequestParam(node, options) {
 */
 function buildQueryOptionsParams(node, options) {
 	const { resolver, memberTypeWrapper } = options;
-	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [buildGroupedRequestParam(node, {
+	const groupedParam = buildGroupedRequestParam(node, {
 		resolver,
 		memberTypeWrapper
-	}), (0, _kubb_plugin_ts.createFunctionParameter)({
+	});
+	const configParam = (0, _kubb_plugin_ts.createFunctionParameter)({
 		name: "config",
 		type: `Partial<Omit<RequestConfig, 'path' | 'query' | 'body' | 'headers' | 'url'>>`,
 		default: "{}"
-	})].filter((param) => param !== null) });
+	});
+	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [groupedParam, configParam].filter((param) => param !== null) });
 }
 /**
 * Builds the call to a client `<op>` function inside a query/mutation hook body. The function takes
@@ -735,10 +737,12 @@ function buildMutationParamsNode(node, options) {
 	const { mutationKeyTypeName, mutationArgTypeName, resolver } = options;
 	const responseName = resolver.response.response(node);
 	const errorNames = resolveErrorNames(node, resolver);
+	const TData = responseName;
+	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
 	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [(0, _kubb_plugin_ts.createFunctionParameter)({
 		name: "options",
 		type: `{
-  mutation?: SWRMutationConfiguration<${responseName}, ${`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`}, ${mutationKeyTypeName} | null, ${mutationArgTypeName}> & { throwOnError?: boolean },
+  mutation?: SWRMutationConfiguration<${TData}, ${TError}, ${mutationKeyTypeName} | null, ${mutationArgTypeName}> & { throwOnError?: boolean },
   client?: ${buildRequestConfigType(node)},
   shouldFetch?: boolean,
 }`,
@@ -833,17 +837,20 @@ function buildQueryParamsNode(node, options) {
 	const { resolver } = options;
 	const responseName = resolver.response.response(node);
 	const errorNames = resolveErrorNames(node, resolver);
+	const TData = responseName;
+	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
 	const optionsParam = (0, _kubb_plugin_ts.createFunctionParameter)({
 		name: "options",
 		type: `{
-  query?: SWRConfiguration<${[responseName, `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`].join(", ")}>,
+  query?: SWRConfiguration<${[TData, TError].join(", ")}>,
   client?: ${buildClientOptionType()},
   shouldFetch?: boolean,
   immutable?: boolean
 }`,
 		default: "{}"
 	});
-	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [buildGroupedRequestParam(node, { resolver }), optionsParam].filter((param) => param !== null) });
+	const groupedParam = buildGroupedRequestParam(node, { resolver });
+	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [groupedParam, optionsParam].filter((param) => param !== null) });
 }
 function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver }) {
 	const responseName = tsResolver.response.response(node);