@kubb/plugin-vue-query 5.0.0-beta.86 → 5.0.0-beta.94

package/dist/index.d.ts

@@ -307,7 +307,7 @@ declare const pluginVueQueryName = "plugin-vue-query";
  * import { pluginVueQuery } from '@kubb/plugin-vue-query'
  *
  * export default defineConfig({
- *   input: { path: './petStore.yaml' },
+ *   input: './petStore.yaml',
  *   output: { path: './src/gen' },
  *   plugins: [
  *     pluginTs(),

package/dist/index.js

@@ -131,6 +131,22 @@ const reservedWords = /* @__PURE__ */ new Set([
 */
 function isValidVarName(name) {
 	if (!name || reservedWords.has(name)) return false;
+	return isIdentifier(name);
+}
+/**
+* Returns `true` when `name` is syntactically a valid identifier, ignoring reserved words.
+*
+* Reserved words and globals (`class`, `name`, `Date`, …) are valid as bare object-literal keys
+* even though they are not valid variable names, so use this (not {@link isValidVarName}) when
+* deciding whether an object key needs quoting.
+*
+* @example
+* ```ts
+* isIdentifier('name')   // true
+* isIdentifier('x-total')// false
+* ```
+*/
+function isIdentifier(name) {
 	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
 }
 //#endregion
@@ -326,8 +342,11 @@ function getOperationLink(node, link) {
 	if (link === "urlPath") return node.path ? `{@link ${Url.toPath(node.path)}}` : null;
 	return node.path ? `{@link ${node.path.replaceAll("{", ":").replaceAll("}", "")}}` : null;
 }
-function getContentTypeInfo(node) {
-	const contentTypes = node.requestBody?.content?.map((e) => e.contentType) ?? [];
+/**
+* Derives the shared `ContentTypeInfo` shape from a list of content types, tracking whether several
+* are present and the union, default, and form-data flags the client uses to pick one.
+*/
+function buildContentTypeInfo(contentTypes) {
 	const isMultipleContentTypes = contentTypes.length > 1;
 	return {
 		contentTypes,
@@ -337,20 +356,15 @@ function getContentTypeInfo(node) {
 		hasFormData: contentTypes.some((ct) => ct === "multipart/form-data")
 	};
 }
+function getContentTypeInfo(node) {
+	return buildContentTypeInfo(node.requestBody?.content?.map((e) => e.contentType) ?? []);
+}
 /**
 * 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")
-	};
+	return buildContentTypeInfo(getPrimarySuccessResponse(node)?.content?.map((e) => e.contentType) ?? []);
 }
 function buildRequestConfigType(node) {
 	const request = getContentTypeInfo(node);
@@ -1065,8 +1079,6 @@ function Mutation({ name, clientName, node, tsResolver, mutationKeyName }) {
 		resolveMutationRequestType(node, tsResolver),
 		"TContext"
 	].join(", ");
-	const mutationKeyParamsNode = createFunctionParameters({ params: [] });
-	const mutationKeyParamsCall = callPrinter$1.print(mutationKeyParamsNode) ?? "";
 	const paramsNode = buildMutationParamsNode(node, { resolver: tsResolver });
 	const paramsSignature = declarationPrinter$1.print(paramsNode) ?? "";
 	return /* @__PURE__ */ jsx(File.Source, {
@@ -1082,10 +1094,10 @@ function Mutation({ name, clientName, node, tsResolver, mutationKeyName }) {
 			children: `
         const { mutation = {}, client: config = {} } = options ?? {}
         const { client: queryClient, ...mutationOptions } = mutation;
-        const mutationKey = mutationOptions?.mutationKey ?? ${mutationKeyName}(${mutationKeyParamsCall})
+        const mutationKey = mutationOptions?.mutationKey ?? ${mutationKeyName}()
 
         return useMutation<${generics}>({
-          mutationFn: async(${hasMutationParams ? argBindingStr : ""}) => {
+          mutationFn: async(${argBindingStr}) => {
             ${mutationFnBody}
           },
           mutationKey,
@@ -1194,9 +1206,7 @@ const infiniteQueryGenerator = defineGenerator({
 		if (!isQuery || isMutation || !infiniteOptions) return null;
 		const normalizeKey = (key) => key.replace(/\?$/, "");
 		const queryParamKeys = getOperationParameters(node, { paramsCasing: "original" }).query.map((p) => p.name);
-		const hasQueryParam = infiniteOptions.queryParam ? queryParamKeys.some((k) => normalizeKey(k) === infiniteOptions.queryParam) : false;
-		const hasCursorParam = !infiniteOptions.cursorParam || true;
-		if (!hasQueryParam || !hasCursorParam) return null;
+		if (!(infiniteOptions.queryParam ? queryParamKeys.some((k) => normalizeKey(k) === infiniteOptions.queryParam) : false)) return null;
 		const importPath = query ? query.importPath : "@tanstack/vue-query";
 		const contractOp = resolveClientOperation({
 			clientPlugin: { pluginName: client.pluginName },
@@ -1707,7 +1717,7 @@ const pluginVueQueryName = "plugin-vue-query";
 * import { pluginVueQuery } from '@kubb/plugin-vue-query'
 *
 * export default defineConfig({
-*   input: { path: './petStore.yaml' },
+*   input: './petStore.yaml',
 *   output: { path: './src/gen' },
 *   plugins: [
 *     pluginTs(),
@@ -1727,7 +1737,7 @@ const pluginVueQuery = definePlugin((options) => {
 		queryGenerator,
 		infiniteQueryGenerator,
 		mutationGenerator
-	].filter((generator) => Boolean(generator));
+	];
 	const groupConfig = createGroupConfig(group);
 	return {
 		name: pluginVueQueryName,