@kubb/plugin-cypress 5.1.1 → 5.1.3

package/dist/index.d.cts

@@ -1,7 +1,6 @@
 import { Exclude, Group, Include, Output, OutputOptions, Override, PluginType, Resolver, ResolverPatch, ast } from "kubb/kit";
 import { ResolverTs } from "@kubb/plugin-ts";
 import { KubbReactNode } from "kubb/jsx";
-//#region src/components/Request.d.ts
 type Props = {
   /**
    * Name of the function
@@ -18,8 +17,6 @@ type Props = {
   baseURL: string | null | undefined;
 };
 export declare function Request({ baseURL, name, resolver, node }: Props): KubbReactNode;
-//#endregion
-//#region src/types.d.ts
 /**
  * Resolver for Cypress that provides naming methods for test functions.
  */
@@ -73,16 +70,12 @@ declare global {
     }
   }
 }
-//#endregion
-//#region src/generators/cypressGenerator.d.ts
 /**
  * Built-in generator for `@kubb/plugin-cypress`. Emits one typed
  * `cy.request()` wrapper per OpenAPI operation, ready to call inside Cypress
  * test specs and custom commands.
  */
 export declare const cypressGenerator: import("kubb/kit").Generator<PluginCypress, unknown>;
-//#endregion
-//#region src/plugin.d.ts
 /**
  * Canonical plugin name for `@kubb/plugin-cypress`. Used for driver lookups and
  * cross-plugin dependency references.
@@ -112,8 +105,6 @@ export declare const pluginCypressName = "plugin-cypress";
  * ```
  */
 export declare const pluginCypress: import("kubb/kit").PluginFactory<PluginCypress>;
-//#endregion
-//#region src/resolvers/resolverCypress.d.ts
 /**
  * Default resolver used by `@kubb/plugin-cypress`. Decides the names and file
  * paths for every generated `cy.request()` wrapper. Functions and files use
@@ -127,6 +118,5 @@ export declare const pluginCypress: import("kubb/kit").PluginFactory<PluginCypre
  * ```
  */
 export declare const resolverCypress: import("kubb/kit").Resolver;
-//#endregion
 export { type PluginCypress, type ResolverCypress, pluginCypress as default };
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import { Exclude, Group, Include, Output, OutputOptions, Override, PluginType, Resolver, ResolverPatch, ast } from "kubb/kit";
 import { ResolverTs } from "@kubb/plugin-ts";
 import { KubbReactNode } from "kubb/jsx";
-//#region src/components/Request.d.ts
 type Props = {
   /**
    * Name of the function
@@ -18,8 +17,6 @@ type Props = {
   baseURL: string | null | undefined;
 };
 export declare function Request({ baseURL, name, resolver, node }: Props): KubbReactNode;
-//#endregion
-//#region src/types.d.ts
 /**
  * Resolver for Cypress that provides naming methods for test functions.
  */
@@ -73,16 +70,12 @@ declare global {
     }
   }
 }
-//#endregion
-//#region src/generators/cypressGenerator.d.ts
 /**
  * Built-in generator for `@kubb/plugin-cypress`. Emits one typed
  * `cy.request()` wrapper per OpenAPI operation, ready to call inside Cypress
  * test specs and custom commands.
  */
 export declare const cypressGenerator: import("kubb/kit").Generator<PluginCypress, unknown>;
-//#endregion
-//#region src/plugin.d.ts
 /**
  * Canonical plugin name for `@kubb/plugin-cypress`. Used for driver lookups and
  * cross-plugin dependency references.
@@ -112,8 +105,6 @@ export declare const pluginCypressName = "plugin-cypress";
  * ```
  */
 export declare const pluginCypress: import("kubb/kit").PluginFactory<PluginCypress>;
-//#endregion
-//#region src/resolvers/resolverCypress.d.ts
 /**
  * Default resolver used by `@kubb/plugin-cypress`. Decides the names and file
  * paths for every generated `cy.request()` wrapper. Functions and files use
@@ -127,6 +118,5 @@ export declare const pluginCypress: import("kubb/kit").PluginFactory<PluginCypre
  * ```
  */
 export declare const resolverCypress: import("kubb/kit").Resolver;
-//#endregion
 export { type PluginCypress, type ResolverCypress, pluginCypress as default };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,9 +1,8 @@
-import { Resolver, Url, addGenerator, ast, createResolver, defineExtension, defineGenerator, setMacros, setResolver } from "kubb/kit";
+import { Resolver, Url, addGenerator, ast, camelCase, createResolver, defineExtension, defineGenerator, setMacros, setResolver } from "kubb/kit";
 import { File, Function, jsxRenderer } from "kubb/jsx";
 import { jsx, jsxs } from "kubb/jsx/jsx-runtime";
 import { pluginTsName } from "@kubb/plugin-ts";
-//#endregion
-//#region ../../internals/shared/src/operation.ts
+// ../../internals/shared/src/operation.ts
 /**
 * Builds the `ResolverFileParams` every operation generator passes to
 * `resolver.file`: a file named `name`, tagged by the operation's first
@@ -120,8 +119,9 @@ function buildRequestParamsSignature(node, resolver, options = {}) {
 		"body",
 		"headers"
 	].filter((key) => groups[key]);
+	const optionsType = hasRequestContentTypeChoice(node) ? `Pick<${resolver.response.options(node)}, ${names.map((name) => `'${name}'`).join(" | ")}>` : resolver.response.options(node);
 	return {
-		signature: [names.length > 0 ? `{ ${names.join(", ")} }: ${resolver.response.options(node)}${isOptional ? " = {}" : ""}` : null, isConfigurable ? `config: ${buildRequestConfigType(node)} = {}` : null].filter(Boolean).join(", "),
+		signature: [names.length > 0 ? `{ ${names.join(", ")} }: ${optionsType}${isOptional ? " = {}" : ""}` : null, isConfigurable ? `config: ${buildRequestConfigType(node)} = {}` : null].filter(Boolean).join(", "),
 		groups
 	};
 }
@@ -152,6 +152,16 @@ function getOperationParameters(node) {
 	operationParameterGroupsByNode.set(node, groups);
 	return groups;
 }
+/**
+* Builds the combined `{ body, path, query, headers }` options object schema for an operation,
+* referencing the already-resolved body and grouped param names. Shared by `@kubb/plugin-ts`'s
+* `Options` type and `@kubb/plugin-zod`'s inferred options schema, so both printers emit the same
+* shape from the same inputs. `primitive: 'object'` is a no-op for the TS printer and tells the Zod
+* printer to emit `z.object(…)` rather than a record.
+*/
+function hasRequestContentTypeChoice(node) {
+	return (node.requestBody?.content ?? []).filter((entry) => entry.schema).length > 1;
+}
 function getStatusCodeNumber(statusCode) {
 	const code = Number(statusCode);
 	return Number.isNaN(code) ? null : code;
@@ -179,78 +189,198 @@ function resolveErrorNames(node, resolver) {
 function resolveStatusCodeNames(node, resolver) {
 	return node.responses.map((response) => resolver.response.status(node, response.statusCode));
 }
-const typeNamesByResolver = /* @__PURE__ */ new WeakMap();
+/**
+* Lists the type names an operation's types file declares, computed once per resolver and `options` so every
+* dependent reads the same list.
+*/
 function resolveOperationTypeNames(node, resolver, options = {}) {
-	const cacheKey = `${node.operationId}\0${options.order ?? ""}\0${options.responseStatusNames ?? ""}\0${options.includeParams === false ? "noparams" : ""}\0${(options.exclude ?? []).join(",")}`;
-	let byResolver = typeNamesByResolver.get(resolver);
-	if (byResolver) {
-		const cached = byResolver.get(cacheKey);
-		if (cached) return cached;
-	} else {
-		byResolver = /* @__PURE__ */ new Map();
-		typeNamesByResolver.set(resolver, byResolver);
-	}
-	const { path, query, header } = getOperationParameters(node);
-	const responseStatusNames = options.responseStatusNames === "error" ? resolveErrorNames(node, resolver) : options.responseStatusNames === false ? [] : resolveStatusCodeNames(node, resolver);
-	const exclude = new Set(options.exclude ?? []);
-	const paramNames = options.includeParams === false ? [] : [
-		...path.map((param) => resolver.param.path(node, param)),
-		...query.map((param) => resolver.param.query(node, param)),
-		...header.map((param) => resolver.param.headers(node, param))
-	];
-	const bodyAndResponseNames = [node.requestBody?.content?.[0]?.schema ? resolver.response.body(node) : null, resolver.response.response(node)];
-	const result = (options.order === "body-response-first" ? [
-		...bodyAndResponseNames,
-		...paramNames,
-		...responseStatusNames
-	] : [
-		...paramNames,
-		...bodyAndResponseNames,
-		...responseStatusNames
-	]).filter((name) => Boolean(name) && !exclude.has(name));
-	byResolver.set(cacheKey, result);
-	return result;
+	const key = `${node.operationId}\0${options.order ?? ""}\0${options.responseStatusNames ?? ""}\0${options.includeParams === false ? "noparams" : ""}\0${(options.exclude ?? []).join(",")}`;
+	return resolver.memo(`operationTypeNames:${key}`, () => {
+		const { path, query, header } = getOperationParameters(node);
+		const responseStatusNames = options.responseStatusNames === "error" ? resolveErrorNames(node, resolver) : options.responseStatusNames === false ? [] : resolveStatusCodeNames(node, resolver);
+		const exclude = new Set(options.exclude ?? []);
+		const paramNames = options.includeParams === false ? [] : [
+			...path.map((param) => resolver.param.path(node, param)),
+			...query.map((param) => resolver.param.query(node, param)),
+			...header.map((param) => resolver.param.headers(node, param))
+		];
+		const bodyAndResponseNames = [node.requestBody?.content?.[0]?.schema ? resolver.response.body(node) : null, resolver.response.response(node)];
+		return (options.order === "body-response-first" ? [
+			...bodyAndResponseNames,
+			...paramNames,
+			...responseStatusNames
+		] : [
+			...paramNames,
+			...bodyAndResponseNames,
+			...responseStatusNames
+		]).filter((name) => Boolean(name) && !exclude.has(name));
+	});
 }
-//#endregion
-//#region ../../internals/utils/src/casing.ts
+// ../../internals/utils/src/reserved.ts
 /**
-* Shared implementation for camelCase and PascalCase conversion.
-* Splits on common word boundaries (spaces, hyphens, underscores, dots, slashes, colons)
-* and capitalizes each word according to `pascal`.
+* JavaScript and Java reserved words.
+* @link https://github.com/jonschlinkert/reserved/blob/master/index.js
+*/
+const reservedWords = /* @__PURE__ */ new Set([
+	"abstract",
+	"arguments",
+	"await",
+	"boolean",
+	"break",
+	"byte",
+	"case",
+	"catch",
+	"char",
+	"class",
+	"const",
+	"continue",
+	"debugger",
+	"default",
+	"delete",
+	"do",
+	"double",
+	"else",
+	"enum",
+	"eval",
+	"export",
+	"extends",
+	"false",
+	"final",
+	"finally",
+	"float",
+	"for",
+	"function",
+	"goto",
+	"if",
+	"implements",
+	"import",
+	"in",
+	"instanceof",
+	"int",
+	"interface",
+	"let",
+	"long",
+	"native",
+	"new",
+	"null",
+	"package",
+	"private",
+	"protected",
+	"public",
+	"return",
+	"short",
+	"static",
+	"super",
+	"switch",
+	"synchronized",
+	"this",
+	"throw",
+	"throws",
+	"transient",
+	"true",
+	"try",
+	"typeof",
+	"var",
+	"void",
+	"volatile",
+	"while",
+	"with",
+	"yield",
+	"Array",
+	"Date",
+	"hasOwnProperty",
+	"Infinity",
+	"isFinite",
+	"isNaN",
+	"isPrototypeOf",
+	"length",
+	"Math",
+	"name",
+	"NaN",
+	"Number",
+	"Object",
+	"prototype",
+	"String",
+	"toString",
+	"undefined",
+	"valueOf"
+]);
+/**
+* Returns `true` when `name` is a syntactically valid JavaScript variable name.
 *
-* When `pascal` is `true` the first word is also capitalized (PascalCase), otherwise only subsequent words are.
+* @example
+* ```ts
+* isValidVarName('status')  // true
+* isValidVarName('class')   // false (reserved word)
+* isValidVarName('42foo')   // false (starts with digit)
+* ```
 */
-function convert(text, pascal) {
-	return text.trim().replace(/([a-z\d])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").replace(/(\d)([a-z])/g, "$1 $2").split(/[\s\-_./\\:]+/).filter(Boolean).map((word, i) => {
-		if (word.length > 1 && word === word.toUpperCase()) return word;
-		return (i === 0 && !pascal ? word.charAt(0).toLowerCase() : word.charAt(0).toUpperCase()) + word.slice(1);
-	}).join("").replace(/[^a-zA-Z0-9]/g, "");
+function isValidVarName(name) {
+	if (!name || reservedWords.has(name)) return false;
+	return isIdentifier(name);
 }
-const cache = /* @__PURE__ */ new Map();
-const cacheLimit = 1e4;
-function toCamelOrPascal(text, pascal) {
-	const key = `${pascal ? "P" : "c"}${text}`;
-	const cached = cache.get(key);
-	if (cached !== void 0) return cached;
-	const result = convert(text, pascal);
-	if (cache.size >= cacheLimit) cache.clear();
-	cache.set(key, result);
-	return result;
+/**
+* Returns `name` when it's a syntactically valid JavaScript variable name,
+* otherwise prefixes it with `_` so the result is a valid identifier.
+*
+* Useful for sanitizing OpenAPI schema names or operation IDs that start with
+* a digit (e.g. `409`, `504AccountCancel`) before using them as exported
+* variable, type, or function names.
+*
+* @example
+* ```ts
+* ensureValidVarName('409')             // '_409'
+* ensureValidVarName('504AccountCancel') // '_504AccountCancel'
+* ensureValidVarName('Pet')              // 'Pet'
+* ensureValidVarName('class')            // '_class'
+* ```
+*/
+function ensureValidVarName(name) {
+	if (!name || isValidVarName(name)) return name;
+	return `_${name}`;
 }
 /**
-* Converts `text` to camelCase.
+* 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 Word boundaries
-* `camelCase('hello-world') // 'helloWorld'`
+* @example
+* ```ts
+* isIdentifier('name')   // true
+* isIdentifier('x-total')// false
+* ```
+*/
+function isIdentifier(name) {
+	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
+}
+// ../../internals/shared/src/resolver.ts
+/**
+* The shared top-level `name` of the operation plugins, computed once per operation name and build.
+*/
+function resolveOperationName(name) {
+	return this.memo(`operation:${name}`, () => ensureValidVarName(camelCase(name)));
+}
+/**
+* Builds the allocation key for a declaration an operation owns. `scope` names which declaration
+* it is, so two of them never share an allocation even when a custom resolver gives both the same
+* name. Leave `scope` empty for the operation's own declaration.
 *
-* @example With a prefix
-* `camelCase('tag', { prefix: 'create' }) // 'createTag'`
+* @example
+* ```ts
+* resolver.resolveName({ key: operationKey(node, 'response', 'status', 404), name })
+* ```
 */
-function camelCase(text, { prefix = "", suffix = "" } = {}) {
-	return toCamelOrPascal(`${prefix} ${text} ${suffix}`, false);
+function operationKey(node, ...scope) {
+	return [
+		"operation",
+		node.method,
+		node.path,
+		...scope.map(String)
+	];
 }
-//#endregion
-//#region ../../internals/shared/src/group.ts
+// ../../internals/shared/src/group.ts
 /**
 * Builds the `group` config a Kubb plugin passes to `ctx.setOptions`, applying the
 * shared default naming so every plugin groups output consistently:
@@ -280,8 +410,7 @@ function createGroupConfig(group) {
 		name: group.name ? group.name : defaultName
 	};
 }
-//#endregion
-//#region src/components/Request.tsx
+// src/components/Request.tsx
 function Request({ baseURL = "", name, resolver, node }) {
 	const { signature, groups } = buildRequestParamsSignature(node, resolver, { isConfigurable: false });
 	const paramsSignature = [signature, "options: Partial<Cypress.RequestOptions> = {}"].filter(Boolean).join(", ");
@@ -311,8 +440,7 @@ function Request({ baseURL = "", name, resolver, node }) {
 		})
 	});
 }
-//#endregion
-//#region src/generators/cypressGenerator.tsx
+// src/generators/cypressGenerator.tsx
 /**
 * Built-in generator for `@kubb/plugin-cypress`. Emits one typed
 * `cy.request()` wrapper per OpenAPI operation, ready to call inside Cypress
@@ -328,8 +456,12 @@ const cypressGenerator = defineGenerator({
 		const pluginTs = ctx.requirePlugin(pluginTsName);
 		const tsResolver = driver.getResolver(pluginTsName);
 		const importedTypeNames = [tsResolver.response.options(node), ...resolveOperationTypeNames(node, tsResolver, { includeParams: false })];
+		const name = resolver.name(node.operationId);
 		const meta = {
-			name: resolver.name(node.operationId),
+			name: resolver.resolveName({
+				key: operationKey(node),
+				name
+			}),
 			file: resolver.file({
 				name: node.operationId,
 				extname: ".ts",
@@ -382,17 +514,14 @@ const cypressGenerator = defineGenerator({
 		});
 	}
 });
-//#endregion
-//#region kubb-extension.json
+// kubb-extension.json
 var compatibility = {
-	"kubb": ">=5.8.3",
+	"kubb": ">=5.14.6",
 	"node": ">=22.22"
 };
-//#endregion
-//#region package.json
-var version = "5.1.1";
-//#endregion
-//#region src/resolvers/resolverCypress.ts
+// package.json
+var version = "5.1.3";
+// src/resolvers/resolverCypress.ts
 /**
 * Default resolver used by `@kubb/plugin-cypress`. Decides the names and file
 * paths for every generated `cy.request()` wrapper. Functions and files use
@@ -405,9 +534,11 @@ var version = "5.1.1";
 * resolverCypress.name('list pets') // 'listPets'
 * ```
 */
-const resolverCypress = createResolver({ pluginName: "plugin-cypress" });
-//#endregion
-//#region src/plugin.ts
+const resolverCypress = createResolver({
+	pluginName: "plugin-cypress",
+	name: resolveOperationName
+});
+// src/plugin.ts
 /**
 * Canonical plugin name for `@kubb/plugin-cypress`. Used for driver lookups and
 * cross-plugin dependency references.
@@ -463,7 +594,6 @@ const pluginCypress = defineExtension({
 		};
 	}
 });
-//#endregion
 export { Request, cypressGenerator, pluginCypress as default, pluginCypress, pluginCypressName, resolverCypress };
 
 //# sourceMappingURL=index.js.map