@kubb/plugin-swr 5.0.0-beta.77 → 5.0.0-beta.80

package/dist/index.d.ts

@@ -10,7 +10,7 @@ import { Exclude, Group, Include, Output, OutputOptions, Override, PluginFactory
  *   body and query parameters before the call; `response` validates the success response body and,
  *   on the non-throw path, the error body.
  */
-type ParserOptions = false | 'zod' | {
+type ValidatorOptions = false | 'zod' | {
   request?: 'zod';
   response?: 'zod';
 };
@@ -82,7 +82,7 @@ type Options$1 = OutputOptions & {
    *
    * @default false
    */
-  parser?: ParserOptions;
+  validator?: ValidatorOptions;
   /**
    * Generates a class-based SDK instead of the standalone functions. Each tag client is an instance
    * class whose constructor takes a client config and builds its own client, so every environment is
@@ -148,7 +148,7 @@ type ResolvedOptions$1 = {
   override: Array<Override<ResolvedOptions$1>>;
   group: Group | null;
   baseURL: Options$1['baseURL'];
-  parser: NonNullable<Options$1['parser']>;
+  validator: NonNullable<Options$1['validator']>;
   sdk: {
     mode: Mode;
     name: string | undefined;
@@ -321,7 +321,7 @@ type Options = OutputOptions & {
   /**
    * Parser to use for validating response data.
    */
-  parser?: Options$1['parser'];
+  validator?: Options$1['validator'];
   /**
    * Override naming conventions for function names and types.
    */
@@ -349,7 +349,7 @@ type ResolvedOptions = {
    * The resolved contract client the generators import and call.
    */
   client: ResolvedClient;
-  parser: NonNullable<Options['parser']>;
+  validator: NonNullable<Options['validator']>;
   queryKey: QueryKey | undefined;
   query: NonNullable<Required<Query>> | false;
   mutationKey: MutationKey | undefined;

package/dist/index.js

@@ -62,7 +62,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",
@@ -291,6 +291,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
 /**
@@ -329,11 +346,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`,
@@ -395,20 +428,33 @@ 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) {
 	const code = Number(statusCode);
 	return Number.isNaN(code) ? null : code;
 }
+function isSuccessStatusCode(statusCode) {
+	const code = getStatusCodeNumber(statusCode);
+	return code !== null && code >= 200 && code < 300;
+}
 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));
 }
@@ -479,14 +525,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
@@ -1016,7 +1062,7 @@ const mutationGenerator = defineGenerator({
 	operation(node, ctx) {
 		if (!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 } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -1062,7 +1108,7 @@ const mutationGenerator = defineGenerator({
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
-		const pluginZod = isParserEnabled(parser) ? driver.getPlugin(pluginZodName) : void 0;
+		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(pluginZodName) : void 0;
 		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : void 0;
 		const fileZod = zodResolver ? zodResolver.resolveFile({
 			name: node.operationId,
@@ -1074,7 +1120,7 @@ const mutationGenerator = defineGenerator({
 			output: pluginZod?.options?.output ?? output,
 			group: pluginZod?.options?.group
 		}) : void 0;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, parser);
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
@@ -1157,7 +1203,7 @@ const queryGenerator = defineGenerator({
 	operation(node, ctx) {
 		if (!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 } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -1205,7 +1251,7 @@ const queryGenerator = defineGenerator({
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
-		const pluginZod = isParserEnabled(parser) ? driver.getPlugin(pluginZodName) : void 0;
+		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(pluginZodName) : void 0;
 		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : void 0;
 		const fileZod = zodResolver ? zodResolver.resolveFile({
 			name: node.operationId,
@@ -1217,7 +1263,7 @@ const queryGenerator = defineGenerator({
 			output: pluginZod?.options?.output ?? output,
 			group: pluginZod?.options?.group
 		}) : void 0;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, parser);
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
@@ -1358,13 +1404,13 @@ const pluginSwr = definePlugin((options) => {
 	const { output = {
 		path: "hooks",
 		barrel: { type: "named" }
-	}, group, exclude = [], include, override = [], parser = false, mutation = {}, query = {}, mutationKey = mutationKeyTransformer, queryKey = queryKeyTransformer, client, resolver: userResolver, macros: userMacros } = options;
+	}, group, exclude = [], include, override = [], validator = false, mutation = {}, query = {}, mutationKey = mutationKeyTransformer, queryKey = queryKeyTransformer, client, resolver: userResolver, macros: userMacros } = options;
 	const selectedGenerators = [queryGenerator, mutationGenerator].filter((generator) => Boolean(generator));
 	const groupConfig = createGroupConfig(group) ?? void 0;
 	return {
 		name: pluginSwrName,
 		options,
-		dependencies: [pluginTsName, isParserEnabled(parser) ? pluginZodName : void 0].filter((dependency) => Boolean(dependency)),
+		dependencies: [pluginTsName, isValidatorEnabled(validator) ? pluginZodName : void 0].filter((dependency) => Boolean(dependency)),
 		hooks: { "kubb:plugin:setup"(ctx) {
 			const resolver = userResolver ? {
 				...resolverSwr,
@@ -1399,7 +1445,7 @@ const pluginSwr = definePlugin((options) => {
 					],
 					...mutation
 				},
-				parser,
+				validator,
 				group: groupConfig,
 				exclude,
 				include,