@kubb/plugin-msw 5.0.0-beta.81 → 5.0.0-beta.85

package/dist/index.cjs

@@ -3,11 +3,11 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 //#endregion
-let _kubb_core = require("@kubb/core");
+let kubb_kit = require("kubb/kit");
 let _kubb_plugin_faker = require("@kubb/plugin-faker");
 let _kubb_plugin_ts = require("@kubb/plugin-ts");
-let _kubb_renderer_jsx = require("@kubb/renderer-jsx");
-let _kubb_renderer_jsx_jsx_runtime = require("@kubb/renderer-jsx/jsx-runtime");
+let kubb_jsx = require("kubb/jsx");
+let kubb_jsx_jsx_runtime = require("kubb/jsx/jsx-runtime");
 //#region ../../internals/utils/src/casing.ts
 /**
 * Shared implementation for camelCase and PascalCase conversion.
@@ -35,31 +35,6 @@ function camelCase(text, { prefix = "", suffix = "" } = {}) {
 	return toCamelOrPascal(`${prefix} ${text} ${suffix}`, false);
 }
 //#endregion
-//#region ../../internals/utils/src/fs.ts
-/**
-* Builds a nested file path from a dotted name. Splits on dots that precede a letter
-* (so version numbers embedded in operationIds like `v2025.0` stay intact), camelCases
-* every earlier segment, applies `caseLast` to the final segment, and joins with `/`.
-*
-* Empty segments are dropped before joining. They arise when the name starts with a dot
-* followed by a letter (e.g. `..Schema` splits into `['..', 'Schema']` and `'..'` cases to
-* an empty string). Without this a leading `/` would form, which `path.resolve` reads as an
-* absolute path, letting generated files escape the configured output directory.
-*
-* @example Nested path from a dotted name
-* `toFilePath('pet.petId') // 'pet/petId'`
-*
-* @example PascalCase the final segment
-* `toFilePath('pet.Pet', pascalCase) // 'pet/Pet'`
-*
-* @example Suffix applied to the final segment only
-* `toFilePath('tag.tag', (part) => camelCase(part, { suffix: 'schema' })) // 'tag/tagSchema'`
-*/
-function toFilePath(name, caseLast = camelCase) {
-	const parts = name.split(/\.(?=[a-zA-Z])/);
-	return parts.map((part, i) => i === parts.length - 1 ? caseLast(part) : camelCase(part)).filter(Boolean).join("/");
-}
-//#endregion
 //#region ../../internals/utils/src/reserved.ts
 /**
 * JavaScript and Java reserved words.
@@ -296,12 +271,12 @@ function resolveResponseTypes(node, resolver) {
 	const types = [];
 	for (const response of node.responses) {
 		if (response.statusCode === "default") {
-			types.push(["default", resolver.resolveResponseName(node)]);
+			types.push(["default", resolver.response.response(node)]);
 			continue;
 		}
 		const code = getStatusCodeNumber(response.statusCode);
 		if (code === null) continue;
-		types.push([code, isSuccessStatusCode(code) ? resolver.resolveResponseName(node) : resolver.resolveResponseStatusName(node, response.statusCode)]);
+		types.push([code, isSuccessStatusCode(code) ? resolver.response.response(node) : resolver.response.status(node, response.statusCode)]);
 	}
 	return types;
 }
@@ -340,48 +315,46 @@ function createGroupConfig(group) {
 //#region src/generators/handlersGenerator.ts
 /**
 * Aggregate generator enabled by `pluginMsw({ handlers: true })`. Emits a
-* `handlers.ts` file that re-exports every generated handler grouped by HTTP
-* method, ready to spread into `setupServer(...handlers)` or
+* `handlers.ts` file that re-exports every generated handler in operation
+* order, ready to spread into `setupServer(...handlers)` or
 * `setupWorker(...handlers)`.
 */
-const handlersGenerator = (0, _kubb_core.defineGenerator)({
+const handlersGenerator = (0, kubb_kit.defineGenerator)({
 	name: "plugin-msw",
 	operations(nodes, ctx) {
 		const { resolver, config, root } = ctx;
 		const { output, group } = ctx.options;
-		const handlersName = resolver.resolveHandlersName();
-		const file = resolver.resolveFile({
-			name: resolver.resolvePathName(handlersName, "file"),
-			extname: ".ts"
-		}, {
+		const handlersName = resolver.handler.listName();
+		const file = resolver.file({
+			name: handlersName,
+			extname: ".ts",
 			root,
 			output,
 			group: group ?? void 0
 		});
 		const imports = nodes.map((node) => {
-			const operationName = resolver.resolveHandlerName(node);
-			const operationFile = resolver.resolveFile({
-				name: resolver.resolveName(node.operationId),
+			const operationName = resolver.handler.name(node);
+			const operationFile = resolver.file({
+				name: resolver.name(node.operationId),
 				extname: ".ts",
 				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+				path: node.path,
 				root,
 				output,
 				group: group ?? void 0
 			});
-			return _kubb_core.ast.factory.createImport({
+			return kubb_kit.ast.factory.createImport({
 				name: [operationName],
 				root: file.path,
 				path: operationFile.path
 			});
 		});
-		const handlers = nodes.map((node) => `${resolver.resolveHandlerName(node)}()`);
-		return [_kubb_core.ast.factory.createFile({
+		const handlers = nodes.map((node) => `${resolver.handler.name(node)}()`);
+		return [kubb_kit.ast.factory.createFile({
 			baseName: file.baseName,
 			path: file.path,
 			meta: file.meta,
-			banner: resolver.resolveBanner(ctx.meta, {
+			banner: resolver.default.banner(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -389,7 +362,7 @@ const handlersGenerator = (0, _kubb_core.defineGenerator)({
 					baseName: file.baseName
 				}
 			}),
-			footer: resolver.resolveFooter(ctx.meta, {
+			footer: resolver.default.footer(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -398,11 +371,11 @@ const handlersGenerator = (0, _kubb_core.defineGenerator)({
 				}
 			}),
 			imports,
-			sources: [_kubb_core.ast.factory.createSource({
+			sources: [kubb_kit.ast.factory.createSource({
 				name: handlersName,
 				isIndexable: true,
 				isExportable: true,
-				nodes: [_kubb_core.ast.factory.createText(`export const ${handlersName} = ${JSON.stringify(handlers).replaceAll("\"", "")} as const`)]
+				nodes: [kubb_kit.ast.factory.createText(`export const ${handlersName} = ${JSON.stringify(handlers).replaceAll("\"", "")} as const`)]
 			})]
 		})];
 	}
@@ -439,13 +412,13 @@ function getResponseContentType(response) {
 * Converts an HTTP method to its lowercase MSW equivalent (e.g., 'POST' → 'post').
 */
 function getMswMethod(node) {
-	return _kubb_core.ast.isHttpOperationNode(node) ? node.method.toLowerCase() : "";
+	return kubb_kit.ast.isHttpOperationNode(node) ? node.method.toLowerCase() : "";
 }
 /**
 * Converts an OpenAPI-style path to an Express/MSW-style path by replacing `{param}` with `:param`.
 */
 function getMswUrl(node) {
-	return _kubb_core.ast.isHttpOperationNode(node) ? node.path.replaceAll("{", ":").replaceAll("}", "") : "";
+	return kubb_kit.ast.isHttpOperationNode(node) ? node.path.replaceAll("{", ":").replaceAll("}", "") : "";
 }
 /**
 * Resolves faker metadata for an MSW operation, including response name and file path.
@@ -454,13 +427,12 @@ function resolveFakerMeta(node, options) {
 	const { root, fakerResolver, fakerOutput, fakerGroup } = options;
 	const tag = node.tags[0] ?? "default";
 	return {
-		name: fakerResolver.resolveResponseName(node),
-		file: fakerResolver.resolveFile({
+		name: fakerResolver.response.response(node),
+		file: fakerResolver.file({
 			name: node.operationId,
 			extname: ".ts",
 			tag,
-			path: node.path
-		}, {
+			path: node.path,
 			root,
 			output: fakerOutput,
 			group: fakerGroup ?? void 0
@@ -485,11 +457,11 @@ function Mock({ baseURL = "", name, typeName, requestTypeName, node }) {
 		optional: true
 	})] }));
 	const httpCall = requestTypeName ? `http.${method}<Record<string, string>, ${requestTypeName}>` : `http.${method}`;
-	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isIndexable: true,
 		isExportable: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function, {
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
 			name,
 			export: true,
 			params: params ?? "",
@@ -523,11 +495,11 @@ function MockWithFaker({ baseURL = "", name, fakerName, typeName, requestTypeNam
 		optional: true
 	})] }));
 	const httpCall = requestTypeName ? `http.${method}<Record<string, string>, ${requestTypeName}>` : `http.${method}`;
-	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isIndexable: true,
 		isExportable: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function, {
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
 			name,
 			export: true,
 			params: params ?? "",
@@ -557,11 +529,11 @@ function Response({ name, typeName, response }) {
 		optional: !hasResponseSchema(response)
 	})] }));
 	const responseName = `${name}Response${statusCode}`;
-	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name: responseName,
 		isIndexable: true,
 		isExportable: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function, {
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
 			name: responseName,
 			export: true,
 			params: params ?? "",
@@ -583,22 +555,21 @@ function Response({ name, typeName, response }) {
 * from `@kubb/plugin-faker`; with `parser: 'data'` it returns a typed empty
 * payload for tests to fill in.
 */
-const mswGenerator = (0, _kubb_core.defineGenerator)({
+const mswGenerator = (0, kubb_kit.defineGenerator)({
 	name: "msw",
-	renderer: _kubb_renderer_jsx.jsxRenderer,
+	renderer: kubb_jsx.jsxRenderer,
 	operation(node, ctx) {
-		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
+		if (!kubb_kit.ast.isHttpOperationNode(node)) return null;
 		const { driver, resolver, config, root } = ctx;
 		const { output, parser, baseURL, group } = ctx.options;
-		const fileName = resolver.resolveName(node.operationId);
+		const fileName = resolver.name(node.operationId);
 		const mock = {
-			name: resolver.resolveHandlerName(node),
-			file: resolver.resolveFile({
+			name: resolver.handler.name(node),
+			file: resolver.file({
 				name: fileName,
 				extname: ".ts",
 				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+				path: node.path,
 				root,
 				output,
 				group: group ?? void 0
@@ -615,26 +586,25 @@ const mswGenerator = (0, _kubb_core.defineGenerator)({
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
 		const type = {
-			file: tsResolver.resolveFile({
+			file: tsResolver.file({
 				name: node.operationId,
 				extname: ".ts",
 				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+				path: node.path,
 				root,
 				output: pluginTs.options?.output ?? output,
 				group: pluginTs.options?.group ?? void 0
 			}),
-			responseName: tsResolver.resolveResponseName(node)
+			responseName: tsResolver.response.response(node)
 		};
 		const types = resolveResponseTypes(node, tsResolver);
 		const hasSuccessSchema = getOperationSuccessResponses(node).some((response) => !!response.content?.[0]?.schema);
-		const requestName = node.requestBody?.content?.[0]?.schema ? tsResolver.resolveDataName(node) : null;
-		return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
+		const requestName = node.requestBody?.content?.[0]?.schema ? tsResolver.response.body(node) : null;
+		return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx.File, {
 			baseName: mock.file.baseName,
 			path: mock.file.path,
 			meta: mock.file.meta,
-			banner: resolver.resolveBanner(ctx.meta, {
+			banner: resolver.default.banner(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -642,7 +612,7 @@ const mswGenerator = (0, _kubb_core.defineGenerator)({
 					baseName: mock.file.baseName
 				}
 			}),
-			footer: resolver.resolveFooter(ctx.meta, {
+			footer: resolver.default.footer(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -651,16 +621,16 @@ const mswGenerator = (0, _kubb_core.defineGenerator)({
 				}
 			}),
 			children: [
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["http"],
 					path: "msw"
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["HttpResponseResolver"],
 					isTypeOnly: true,
 					path: "msw"
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: Array.from(/* @__PURE__ */ new Set([
 						type.responseName,
 						...types.map((t) => t[1]),
@@ -670,7 +640,7 @@ const mswGenerator = (0, _kubb_core.defineGenerator)({
 					root: mock.file.path,
 					isTypeOnly: true
 				}),
-				parser === "faker" && faker && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				parser === "faker" && faker && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: [faker.name],
 					root: mock.file.path,
 					path: faker.file.path
@@ -678,20 +648,20 @@ const mswGenerator = (0, _kubb_core.defineGenerator)({
 				types.filter(([code]) => code !== "default").map(([code, typeName]) => {
 					const response = node.responses.find((item) => item.statusCode === String(code));
 					if (!response) return null;
-					return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(Response, {
+					return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(Response, {
 						typeName,
 						response,
 						name: mock.name
 					}, typeName);
 				}),
-				parser === "faker" && faker && hasSuccessSchema ? /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(MockWithFaker, {
+				parser === "faker" && faker && hasSuccessSchema ? /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(MockWithFaker, {
 					name: mock.name,
 					typeName: type.responseName,
 					requestTypeName: requestName,
 					fakerName: faker.name,
 					node,
 					baseURL
-				}) : /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(Mock, {
+				}) : /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(Mock, {
 					name: mock.name,
 					typeName: type.responseName,
 					requestTypeName: requestName,
@@ -709,32 +679,30 @@ const mswGenerator = (0, _kubb_core.defineGenerator)({
 * paths for every generated MSW handler. Function names get a `Handler`
 * suffix; the aggregate export is always `handlers`.
 *
+* The top-level `name` applies the `handler` suffix, and `file` falls back to the built-in
+* `toFilePath` casing. Operation-specific naming is grouped under the `handler` namespace.
+*
 * @example Resolve a handler name
 * ```ts
 * import { resolverMsw } from '@kubb/plugin-msw'
 *
-* resolverMsw.resolveName('addPet') // 'addPetHandler'
+* resolverMsw.name('addPet') // 'addPetHandler'
 * ```
 */
-const resolverMsw = (0, _kubb_core.defineResolver)(() => ({
-	name: "default",
+const resolverMsw = (0, kubb_kit.createResolver)({
 	pluginName: "plugin-msw",
-	default(name, type) {
-		return type === "file" ? toFilePath(name) : camelCase(name);
-	},
-	resolveName(name) {
+	name(name) {
 		return camelCase(name, { suffix: "handler" });
 	},
-	resolvePathName(name, type) {
-		return this.default(name, type);
-	},
-	resolveHandlerName(node) {
-		return this.resolveName(node.operationId);
-	},
-	resolveHandlersName() {
-		return "handlers";
+	handler: {
+		name(node) {
+			return this.name(node.operationId);
+		},
+		listName() {
+			return "handlers";
+		}
 	}
-}));
+});
 //#endregion
 //#region src/plugin.ts
 /**
@@ -751,7 +719,7 @@ const pluginMswName = "plugin-msw";
 *
 * @example
 * ```ts
-* import { defineConfig } from 'kubb'
+* import { defineConfig } from 'kubb/config'
 * import { pluginTs } from '@kubb/plugin-ts'
 * import { pluginMsw } from '@kubb/plugin-msw'
 *
@@ -768,7 +736,7 @@ const pluginMswName = "plugin-msw";
 * })
 * ```
 */
-const pluginMsw = (0, _kubb_core.definePlugin)((options) => {
+const pluginMsw = (0, kubb_kit.definePlugin)((options) => {
 	const { output = {
 		path: "handlers",
 		barrel: { type: "named" }
@@ -779,10 +747,7 @@ const pluginMsw = (0, _kubb_core.definePlugin)((options) => {
 		options,
 		dependencies: [_kubb_plugin_ts.pluginTsName, parser === "faker" ? _kubb_plugin_faker.pluginFakerName : null].filter((dependency) => Boolean(dependency)),
 		hooks: { "kubb:plugin:setup"(ctx) {
-			const resolver = userResolver ? {
-				...resolverMsw,
-				...userResolver
-			} : resolverMsw;
+			const resolver = userResolver ? kubb_kit.Resolver.merge(resolverMsw, userResolver) : resolverMsw;
 			ctx.setOptions({
 				output,
 				parser,