@kubb/plugin-vue-query 5.0.0-beta.77 → 5.0.0-beta.80

package/dist/index.cjs

@@ -89,7 +89,7 @@ function toFilePath(name, caseLast = camelCase) {
 * JavaScript and Java reserved words.
 * @link https://github.com/jonschlinkert/reserved/blob/master/index.js
 */
-const reservedWords = new Set([
+const reservedWords = /* @__PURE__ */ new Set([
 	"abstract",
 	"arguments",
 	"boolean",
@@ -318,6 +318,23 @@ function caseParams(params, casing) {
 	caseParamsCache.set(params, result);
 	return result;
 }
+/**
+* Drops parameters that collapse to the same property identity once camelCased, keeping the first.
+*
+* Some specs declare the same parameter twice under different casings (for example AWS S3 lists both
+* `max-uploads` and `MaxUploads`). Both resolve to one output property, so emitting both would yield
+* an object type with a duplicate member, which TypeScript rejects. De-duplicate by the camelCased
+* identity so the resulting group is collision-free regardless of the names each caller carries.
+*/
+function dedupeByCasedName(params) {
+	const seen = /* @__PURE__ */ new Set();
+	return params.filter((param) => {
+		const key = camelCase(param.name);
+		if (seen.has(key)) return false;
+		seen.add(key);
+		return true;
+	});
+}
 //#endregion
 //#region ../../internals/shared/src/operation.ts
 /**
@@ -356,11 +373,27 @@ function getContentTypeInfo(node) {
 		hasFormData: contentTypes.some((ct) => ct === "multipart/form-data")
 	};
 }
+/**
+* The request-body counterpart for the primary success response: the content types it documents and
+* whether several are present, so the client can let a caller pick which one to accept.
+*/
+function getResponseContentTypeInfo(node) {
+	const contentTypes = getPrimarySuccessResponse(node)?.content?.map((e) => e.contentType) ?? [];
+	const isMultipleContentTypes = contentTypes.length > 1;
+	return {
+		contentTypes,
+		isMultipleContentTypes,
+		contentTypeUnion: isMultipleContentTypes ? contentTypes.map((ct) => JSON.stringify(ct)).join(" | ") : "",
+		defaultContentType: contentTypes[0] ?? "application/json",
+		hasFormData: contentTypes.some((ct) => ct === "multipart/form-data")
+	};
+}
 function buildRequestConfigType(node) {
-	const { isMultipleContentTypes, contentTypeUnion } = getContentTypeInfo(node);
+	const request = getContentTypeInfo(node);
+	const response = getResponseContentTypeInfo(node);
 	const configType = `Partial<Omit<RequestConfig, 'path' | 'query' | 'body' | 'headers' | 'url'>>`;
-	const contentTypeProp = isMultipleContentTypes ? `contentType?: ${contentTypeUnion}` : null;
-	return contentTypeProp ? `${configType} & { ${contentTypeProp} }` : configType;
+	const members = [request.isMultipleContentTypes ? `request?: ${request.contentTypeUnion}` : null, response.isMultipleContentTypes ? `response?: ${response.contentTypeUnion}` : null].filter(Boolean);
+	return members.length ? `${configType} & { contentType?: { ${members.join("; ")} } }` : configType;
 }
 /**
 * Builds the `client?:` option type shared by the generated query hooks (`useQuery`,
@@ -422,10 +455,10 @@ function buildOperationComments(node, options = {}) {
 function getOperationParameters(node, options = {}) {
 	const params = caseParams(node.parameters, options.paramsCasing === "original" ? void 0 : "camelcase");
 	return {
-		path: params.filter((param) => param.in === "path"),
-		query: params.filter((param) => param.in === "query"),
-		header: params.filter((param) => param.in === "header"),
-		cookie: params.filter((param) => param.in === "cookie")
+		path: dedupeByCasedName(params.filter((param) => param.in === "path")),
+		query: dedupeByCasedName(params.filter((param) => param.in === "query")),
+		header: dedupeByCasedName(params.filter((param) => param.in === "header")),
+		cookie: dedupeByCasedName(params.filter((param) => param.in === "cookie"))
 	};
 }
 function getStatusCodeNumber(statusCode) {
@@ -440,6 +473,15 @@ function isErrorStatusCode(statusCode) {
 	const code = getStatusCodeNumber(statusCode);
 	return code !== null && code >= 400;
 }
+function getSuccessResponses(responses) {
+	return responses.filter((response) => isSuccessStatusCode(response.statusCode));
+}
+function getOperationSuccessResponses(node) {
+	return getSuccessResponses(node.responses);
+}
+function getPrimarySuccessResponse(node) {
+	return getOperationSuccessResponses(node)[0] ?? null;
+}
 function resolveErrorNames(node, resolver) {
 	return node.responses.filter((response) => isErrorStatusCode(response.statusCode)).map((response) => resolver.resolveResponseStatusName(node, response.statusCode));
 }
@@ -513,14 +555,14 @@ function createGroupConfig(group) {
 	};
 }
 //#endregion
-//#region ../../internals/client/src/builders/parser.ts
+//#region ../../internals/client/src/builders/validatorOptions.ts
 /**
-* Returns `true` when any direction of the parser uses zod (used for dependency checks).
+* Returns `true` when any direction of the validator uses zod (used for dependency checks).
 */
-function isParserEnabled(parser) {
-	if (!parser) return false;
-	if (parser === "zod") return true;
-	return Boolean(parser.request || parser.response);
+function isValidatorEnabled(validator) {
+	if (!validator) return false;
+	if (validator === "zod") return true;
+	return Boolean(validator.request || validator.response);
 }
 //#endregion
 //#region ../../internals/client/src/resolveClient.ts
@@ -655,6 +697,19 @@ const requestGroupOrder$1 = [
 	"headers"
 ];
 /**
+* Widens a request-group member type so a generated TanStack hook accepts either the value or a
+* deferred value. Both plugins apply this through the `memberTypeWrapper` of `buildGroupedRequestParam`;
+* they only differ in how the deferred form is later resolved.
+*
+* `maybeRefOrGetter` is used by vue-query, which keeps the ref/getter live and unwraps it lazily with
+* `toValue` because vue-query keys are reactive. `maybeValueOrGetter` is used by react-query, which
+* resolves the getter once at the hook boundary and forwards a plain value because React Query hashes
+* keys structurally and cannot hold a function.
+*/
+function maybeRefOrGetter(type) {
+	return `MaybeRefOrGetter<${type}>`;
+}
+/**
 * Builds the grouped `{ path, query, body, headers }` parameter that mirrors the client
 * function signature. Only the groups the operation carries are emitted, typed from the
 * operation's `RequestConfig`. `keys` narrows the emitted groups, used by the query key which
@@ -776,12 +831,6 @@ const queryKeyTransformer = ({ node }) => {
 };
 //#endregion
 //#region src/utils.ts
-/**
-* Wraps a type string in `MaybeRefOrGetter<…>` so a vue-query signature accepts refs or getters.
-*/
-function maybeRefOrGetter(type) {
-	return `MaybeRefOrGetter<${type}>`;
-}
 const requestGroupOrder = [
 	"path",
 	"query",
@@ -1225,7 +1274,7 @@ const infiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 	operation(node, ctx) {
 		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, infinite, parser, client, group } = ctx.options;
+		const { output, query, mutation, infinite, validator, client, group, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
@@ -1275,14 +1324,14 @@ const infiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 				includeParams: false
 			})
 		].filter((name) => Boolean(name));
-		const pluginZod = isParserEnabled(parser) ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : null;
+		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : null;
 		const zodResolver = pluginZod ? driver.getResolver(_kubb_plugin_zod.pluginZodName) : null;
 		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: pluginZod?.options?.output ?? output,
 			group: pluginZod?.options?.group ?? void 0
 		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, parser);
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
 			baseName: meta.file.baseName,
@@ -1364,30 +1413,32 @@ const infiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 					initialPageParam: infiniteOptions.initialPageParam,
 					queryParam: infiniteOptions.queryParam
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-					name: ["useInfiniteQuery"],
-					path: importPath
-				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-					name: [
-						"QueryKey",
-						"QueryClient",
-						"UseInfiniteQueryOptions",
-						"UseInfiniteQueryReturnType"
-					],
-					path: importPath,
-					isTypeOnly: true
-				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(InfiniteQuery, {
-					name: queryName,
-					queryOptionsName,
-					queryKeyName,
-					queryKeyTypeName,
-					node,
-					tsResolver,
-					initialPageParam: infiniteOptions.initialPageParam,
-					queryParam: infiniteOptions.queryParam
-				})
+				hooks && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+						name: ["useInfiniteQuery"],
+						path: importPath
+					}),
+					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+						name: [
+							"QueryKey",
+							"QueryClient",
+							"UseInfiniteQueryOptions",
+							"UseInfiniteQueryReturnType"
+						],
+						path: importPath,
+						isTypeOnly: true
+					}),
+					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(InfiniteQuery, {
+						name: queryName,
+						queryOptionsName,
+						queryKeyName,
+						queryKeyTypeName,
+						node,
+						tsResolver,
+						initialPageParam: infiniteOptions.initialPageParam,
+						queryParam: infiniteOptions.queryParam
+					})
+				] })
 			]
 		});
 	}
@@ -1405,7 +1456,7 @@ const mutationGenerator = (0, _kubb_core.defineGenerator)({
 	operation(node, ctx) {
 		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, parser, client, group } = ctx.options;
+		const { output, query, mutation, validator, client, group, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
@@ -1440,14 +1491,14 @@ const mutationGenerator = (0, _kubb_core.defineGenerator)({
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
-		const pluginZod = isParserEnabled(parser) ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : null;
+		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : null;
 		const zodResolver = pluginZod ? driver.getResolver(_kubb_plugin_zod.pluginZodName) : null;
 		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: pluginZod?.options?.output ?? output,
 			group: pluginZod?.options?.group ?? void 0
 		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, parser);
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		const groups = getRequestGroups(node);
 		const hasRequestGroups = groups.path || groups.query || groups.body || groups.headers;
@@ -1508,7 +1559,7 @@ const mutationGenerator = (0, _kubb_core.defineGenerator)({
 					node,
 					transformer: ctx.options.mutationKey
 				}),
-				mutation && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
+				mutation && hooks && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
 					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
 						name: ["useMutation"],
 						path: importPath
@@ -1544,7 +1595,7 @@ const queryGenerator = (0, _kubb_core.defineGenerator)({
 	operation(node, ctx) {
 		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, parser, client, group } = ctx.options;
+		const { output, query, mutation, validator, client, group, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
@@ -1582,14 +1633,14 @@ const queryGenerator = (0, _kubb_core.defineGenerator)({
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
-		const pluginZod = isParserEnabled(parser) ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : null;
+		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : null;
 		const zodResolver = pluginZod ? driver.getResolver(_kubb_plugin_zod.pluginZodName) : null;
 		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: pluginZod?.options?.output ?? output,
 			group: pluginZod?.options?.group ?? void 0
 		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, parser);
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
 			baseName: meta.file.baseName,
@@ -1661,7 +1712,7 @@ const queryGenerator = (0, _kubb_core.defineGenerator)({
 					node,
 					tsResolver
 				}),
-				query && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
+				query && hooks && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
 					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
 						name: ["useQuery"],
 						path: importPath
@@ -1797,7 +1848,7 @@ const pluginVueQuery = (0, _kubb_core.definePlugin)((options) => {
 	const { output = {
 		path: "hooks",
 		barrel: { type: "named" }
-	}, group, exclude = [], include, override = [], parser = false, infinite = false, mutation = {}, query = {}, mutationKey = mutationKeyTransformer, queryKey = queryKeyTransformer, client, resolver: userResolver, macros: userMacros } = options;
+	}, group, exclude = [], include, override = [], validator = false, infinite = false, mutation = {}, query = {}, mutationKey = mutationKeyTransformer, queryKey = queryKeyTransformer, hooks = false, client, resolver: userResolver, macros: userMacros } = options;
 	const selectedGenerators = [
 		queryGenerator,
 		infiniteQueryGenerator,
@@ -1807,7 +1858,7 @@ const pluginVueQuery = (0, _kubb_core.definePlugin)((options) => {
 	return {
 		name: pluginVueQueryName,
 		options,
-		dependencies: [_kubb_plugin_ts.pluginTsName, isParserEnabled(parser) ? _kubb_plugin_zod.pluginZodName : void 0].filter((dependency) => Boolean(dependency)),
+		dependencies: [_kubb_plugin_ts.pluginTsName, isValidatorEnabled(validator) ? _kubb_plugin_zod.pluginZodName : void 0].filter((dependency) => Boolean(dependency)),
 		hooks: { "kubb:plugin:setup"(ctx) {
 			const resolver = userResolver ? {
 				...resolverVueQuery,
@@ -1850,7 +1901,8 @@ const pluginVueQuery = (0, _kubb_core.definePlugin)((options) => {
 					previousParam: null,
 					...infinite
 				} : false,
-				parser,
+				hooks,
+				validator,
 				group: groupConfig,
 				exclude,
 				include,