@kubb/plugin-swr 5.0.0-beta.86 → 5.0.0-beta.94

package/dist/index.cjs

@@ -161,6 +161,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
@@ -339,8 +355,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,
@@ -350,20 +369,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);
@@ -903,40 +917,8 @@ function MutationKey({ name, typeName, node, transformer }) {
 	})] });
 }
 //#endregion
-//#region src/components/QueryOptions.tsx
-const declarationPrinter$1 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-function getQueryOptionsParams(node, options) {
-	return buildQueryOptionsParams(node, options);
-}
-function QueryOptions({ name, clientName, node, tsResolver }) {
-	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter$1.print(paramsNode) ?? "";
-	const fetcherBody = `const { data } = await ${buildClientCall(node, {
-		clientName,
-		signal: false
-	})}
-          return data`;
-	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
-		name,
-		isExportable: true,
-		isIndexable: true,
-		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
-			name,
-			export: true,
-			params: paramsSignature,
-			children: `
-      return {
-        fetcher: async () => {
-          ${fetcherBody}
-        },
-      }
-`
-		})
-	});
-}
-//#endregion
 //#region src/components/Query.tsx
-const declarationPrinter = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
+const declarationPrinter$1 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 const callPrinter = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
 function buildQueryParamsNode(node, options) {
 	const { resolver } = options;
@@ -964,10 +946,10 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 	];
 	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
 	const queryKeyParamsCall = callPrinter.print(queryKeyParamsNode) ?? "";
-	const queryOptionsParamsNode = getQueryOptionsParams(node, { resolver: tsResolver });
+	const queryOptionsParamsNode = buildQueryOptionsParams(node, { resolver: tsResolver });
 	const queryOptionsParamsCall = callPrinter.print(queryOptionsParamsNode) ?? "";
 	const paramsNode = buildQueryParamsNode(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter.print(paramsNode) ?? "";
+	const paramsSignature = declarationPrinter$1.print(paramsNode) ?? "";
 	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
@@ -999,6 +981,35 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 	});
 }
 //#endregion
+//#region src/components/QueryOptions.tsx
+const declarationPrinter = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
+function QueryOptions({ name, clientName, node, tsResolver }) {
+	const paramsNode = buildQueryOptionsParams(node, { resolver: tsResolver });
+	const paramsSignature = declarationPrinter.print(paramsNode) ?? "";
+	const fetcherBody = `const { data } = await ${buildClientCall(node, {
+		clientName,
+		signal: false
+	})}
+          return data`;
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
+		name,
+		isExportable: true,
+		isIndexable: true,
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
+			name,
+			export: true,
+			params: paramsSignature,
+			children: `
+      return {
+        fetcher: async () => {
+          ${fetcherBody}
+        },
+      }
+`
+		})
+	});
+}
+//#endregion
 //#region src/generators/mutationGenerator.tsx
 /**
 * Built-in generator for `useSWRMutation` hooks. Emits one `useFooMutation` hook
@@ -1136,14 +1147,11 @@ const queryGenerator = (0, kubb_kit.defineGenerator)({
 	operation(node, ctx) {
 		if (!kubb_kit.ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, client, group } = ctx.options;
+		const { output, query, client, group } = ctx.options;
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
-		const isQuery = query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase());
-		const queryMethods = new Set(query ? query.methods : []);
-		const isMutation = mutation !== false && !isQuery && (mutation ? mutation.methods : []).some((method) => !queryMethods.has(method) && node.method.toLowerCase() === method.toLowerCase());
-		if (!isQuery || isMutation) return null;
+		if (!(query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase()))) return null;
 		const importPath = query ? query.importPath : "swr";
 		const contractOp = resolveClientOperation({
 			clientPlugin: { pluginName: client.pluginName },
@@ -1331,7 +1339,7 @@ const pluginSwrName = "plugin-swr";
 * import { pluginSwr } from '@kubb/plugin-swr'
 *
 * export default defineConfig({
-*   input: { path: './petStore.yaml' },
+*   input: './petStore.yaml',
 *   output: { path: './src/gen' },
 *   plugins: [
 *     pluginTs(),
@@ -1345,7 +1353,7 @@ const pluginSwr = (0, kubb_kit.definePlugin)((options) => {
 		path: "hooks",
 		barrel: { type: "named" }
 	}, group, exclude = [], include, override = [], mutation = {}, query = {}, mutationKey = mutationKeyTransformer, queryKey = queryKeyTransformer, client, resolver: userResolver, macros: userMacros } = options;
-	const selectedGenerators = [queryGenerator, mutationGenerator].filter((generator) => Boolean(generator));
+	const selectedGenerators = [queryGenerator, mutationGenerator];
 	const groupConfig = createGroupConfig(group) ?? void 0;
 	return {
 		name: pluginSwrName,