@kubb/core 5.0.0-beta.86 → 5.0.0-beta.88

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { t as __name } from "./rolldown-runtime-C0LytTxp.js";
-import { $ as Include, A as KubbHookStartContext, At as UserReporter, B as Kubb, C as KubbFilesProcessingEndContext, Ct as createRenderer, D as KubbGenerationStartContext, Dt as Reporter, E as KubbGenerationEndContext, Et as GenerationResult, F as KubbSuccessContext, Ft as AdapterSource, G as KubbDriver, H as Generator, I as KubbWarnContext, It as createAdapter, J as Parser, K as FileManagerHooks, L as PossibleConfig, M as KubbInfoContext, Mt as logLevel, N as KubbLifecycleStartContext, Nt as Adapter, O as KubbHookEndContext, Ot as ReporterContext, P as KubbPluginsEndContext, Pt as AdapterFactoryOptions, Q as Group, R as UserConfig, S as KubbFileProcessingUpdate, St as RendererFactory, T as KubbFilesProcessingUpdateContext, Tt as createStorage, U as GeneratorContext, V as createKubb, W as defineGenerator, X as Exclude, Y as defineParser, Z as Filter, _ as InputPath, _t as ResolverDefault, a as DiagnosticLocation, at as OutputMode, b as KubbDiagnosticContext, bt as ResolverPathParams, c as PerformanceDiagnostic, ct as Plugin, d as SerializedDiagnostic, dt as BannerMeta, et as KubbPluginEndContext, f as UpdateDiagnostic, ft as ResolveBannerContext, g as InputData, gt as ResolverContext, h as Config, ht as Resolver, i as DiagnosticKind, it as Output, j as KubbHooks, jt as createReporter, k as KubbHookLineContext, kt as ReporterName, l as ProblemCode, lt as PluginFactoryOptions, m as CLIOptions, mt as ResolveOptionsContext, n as DiagnosticByCode, nt as KubbPluginStartContext, o as DiagnosticSeverity, ot as OutputOptions, p as BuildOutput, pt as ResolveBannerFile, q as Hookable, r as DiagnosticDoc, rt as NormalizedPlugin, s as Diagnostics, st as Override, t as Diagnostic, tt as KubbPluginSetupContext, u as ProblemDiagnostic, ut as definePlugin, v as KubbBuildEndContext, vt as ResolverFileParams, w as KubbFilesProcessingStartContext, wt as Storage, x as KubbErrorContext, xt as Renderer, y as KubbBuildStartContext, yt as ResolverPatch, z as CreateKubbOptions } from "./Diagnostics-aWJg-H2d.js";
+import { $ as Include, A as KubbHookStartContext, At as Reporter, B as Kubb, C as KubbFilesProcessingEndContext, Ct as ResolverPathParams, D as KubbGenerationStartContext, Dt as Storage, E as KubbGenerationEndContext, Et as createRenderer, F as KubbSuccessContext, Ft as logLevel, G as KubbDriver, H as Generator, I as KubbWarnContext, It as Adapter, J as Parser, K as FileManagerHooks, L as PossibleConfig, Lt as AdapterFactoryOptions, M as KubbInfoContext, Mt as ReporterName, N as KubbLifecycleStartContext, Nt as UserReporter, O as KubbHookEndContext, Ot as createStorage, P as KubbPluginsEndContext, Pt as createReporter, Q as Group, R as UserConfig, Rt as AdapterSource, S as KubbFileProcessingUpdate, St as ResolverPatch, T as KubbFilesProcessingUpdateContext, Tt as RendererFactory, U as GeneratorContext, V as createKubb, W as defineGenerator, X as Exclude, Y as defineParser, Z as Filter, _ as InputPath, _t as Resolver, a as DiagnosticLocation, at as OutputMode, b as KubbDiagnosticContext, bt as ResolverFileParams, c as PerformanceDiagnostic, ct as Plugin, d as SerializedDiagnostic, dt as BannerMeta, et as KubbPluginEndContext, f as UpdateDiagnostic, ft as ResolveBannerContext, g as InputData, gt as ResolvePathOptions, h as Config, ht as ResolveOptionsContext, i as DiagnosticKind, it as Output, j as KubbHooks, jt as ReporterContext, k as KubbHookLineContext, kt as GenerationResult, l as ProblemCode, lt as PluginFactoryOptions, m as CLIOptions, mt as ResolveFileOptions, n as DiagnosticByCode, nt as KubbPluginStartContext, o as DiagnosticSeverity, ot as OutputOptions, p as BuildOutput, pt as ResolveBannerFile, q as Hookable, r as DiagnosticDoc, rt as NormalizedPlugin, s as Diagnostics, st as Override, t as Diagnostic, tt as KubbPluginSetupContext, u as ProblemDiagnostic, ut as definePlugin, v as KubbBuildEndContext, vt as ResolverDefault, w as KubbFilesProcessingStartContext, wt as Renderer, x as KubbErrorContext, xt as ResolverFilePathParams, y as KubbBuildStartContext, yt as ResolverFile, z as CreateKubbOptions, zt as createAdapter } from "./Diagnostics-C2HF9H7A.js";
 
 //#region src/reporters/cliReporter.d.ts
 /**
@@ -40,7 +40,7 @@ declare const jsonReporter: Reporter;
 type ResolverOptions<T extends PluginFactoryOptions> = Omit<T['resolver'], keyof Resolver> & {
   pluginName: T['name'];
   name?: T['resolver']['name'];
-  file?: T['resolver']['file'];
+  file?: ResolverFile;
 } & ThisType<T['resolver']>;
 /**
  * Defines a plugin resolver, the object that decides what every generated symbol and file
@@ -49,15 +49,39 @@ type ResolverOptions<T extends PluginFactoryOptions> = Omit<T['resolver'], keyof
  * (`query`, `schema`, …). Every method reaches sibling helpers and the built-in machinery
  * through `this.name`, `this.file`, and `this.default`.
  *
- * @example Custom identifier and file casing
+ * @example Custom identifier casing
  * ```ts
  * export const resolverTs = createResolver<PluginTs>({
  *   pluginName: 'plugin-ts',
  *   name(name) {
  *     return ensureValidVarName(pascalCase(name))
  *   },
- *   file(params, context) {
- *     return this.default.file({ ...params, resolveName: (name) => toFilePath(name, pascalCase) }, context)
+ * })
+ * ```
+ *
+ * @example Rename generated files with `file.baseName`
+ * ```ts
+ * export const resolverFaker = createResolver<PluginFaker>({
+ *   pluginName: 'plugin-faker',
+ *   name(name) {
+ *     return camelCase(name, { prefix: 'create' })
+ *   },
+ *   file: {
+ *     baseName({ name, extname }) {
+ *       return `${camelCase(name, { prefix: 'create' })}${extname}`
+ *     },
+ *   },
+ * })
+ * ```
+ *
+ * @example Own the full path with `file.path`
+ * ```ts
+ * export const resolverFaker = createResolver<PluginFaker>({
+ *   pluginName: 'plugin-faker',
+ *   file: {
+ *     path({ baseName, output }) {
+ *       return `${output.path}/mocks/${baseName}`
+ *     },
  *   },
  * })
  * ```
@@ -116,5 +140,5 @@ declare const fsStorage: (options?: Record<string, never> | undefined) => Storag
  */
 declare const memoryStorage: (options?: Record<string, never> | undefined) => Storage;
 //#endregion
-export { type Adapter, type AdapterFactoryOptions, type AdapterSource, type BannerMeta, BuildOutput, CLIOptions, Config, type CreateKubbOptions, type Diagnostic, type DiagnosticByCode, type DiagnosticDoc, type DiagnosticKind, type DiagnosticLocation, type DiagnosticSeverity, Diagnostics, type Exclude, type FileManagerHooks, type Filter, type GenerationResult, type Generator, type GeneratorContext, type Group, Hookable, type Include, InputData, InputPath, type Kubb, KubbBuildEndContext, KubbBuildStartContext, KubbDiagnosticContext, KubbDriver, KubbErrorContext, KubbFileProcessingUpdate, KubbFilesProcessingEndContext, KubbFilesProcessingStartContext, KubbFilesProcessingUpdateContext, KubbGenerationEndContext, KubbGenerationStartContext, KubbHookEndContext, KubbHookLineContext, KubbHookStartContext, KubbHooks, KubbInfoContext, KubbLifecycleStartContext, type KubbPluginEndContext, type KubbPluginSetupContext, type KubbPluginStartContext, KubbPluginsEndContext, KubbSuccessContext, KubbWarnContext, type NormalizedPlugin, type Output, type OutputMode, type OutputOptions, type Override, type Parser, type PerformanceDiagnostic, type Plugin, type PluginFactoryOptions, PossibleConfig, type ProblemCode, type ProblemDiagnostic, type Renderer, type RendererFactory, type Reporter, type ReporterContext, type ReporterName, type ResolveBannerContext, type ResolveBannerFile, type ResolveOptionsContext, Resolver, type ResolverContext, type ResolverDefault, type ResolverFileParams, type ResolverPatch, type ResolverPathParams, type SerializedDiagnostic, type Storage, type UpdateDiagnostic, UserConfig, type UserReporter, cliReporter, createAdapter, createKubb, createRenderer, createReporter, createResolver, createStorage, defineGenerator, defineParser, definePlugin, fileReporter, fsStorage, jsonReporter, logLevel, memoryStorage };
+export { type Adapter, type AdapterFactoryOptions, type AdapterSource, type BannerMeta, BuildOutput, CLIOptions, Config, type CreateKubbOptions, type Diagnostic, type DiagnosticByCode, type DiagnosticDoc, type DiagnosticKind, type DiagnosticLocation, type DiagnosticSeverity, Diagnostics, type Exclude, type FileManagerHooks, type Filter, type GenerationResult, type Generator, type GeneratorContext, type Group, Hookable, type Include, InputData, InputPath, type Kubb, KubbBuildEndContext, KubbBuildStartContext, KubbDiagnosticContext, KubbDriver, KubbErrorContext, KubbFileProcessingUpdate, KubbFilesProcessingEndContext, KubbFilesProcessingStartContext, KubbFilesProcessingUpdateContext, KubbGenerationEndContext, KubbGenerationStartContext, KubbHookEndContext, KubbHookLineContext, KubbHookStartContext, KubbHooks, KubbInfoContext, KubbLifecycleStartContext, type KubbPluginEndContext, type KubbPluginSetupContext, type KubbPluginStartContext, KubbPluginsEndContext, KubbSuccessContext, KubbWarnContext, type NormalizedPlugin, type Output, type OutputMode, type OutputOptions, type Override, type Parser, type PerformanceDiagnostic, type Plugin, type PluginFactoryOptions, PossibleConfig, type ProblemCode, type ProblemDiagnostic, type Renderer, type RendererFactory, type Reporter, type ReporterContext, type ReporterName, type ResolveBannerContext, type ResolveBannerFile, type ResolveFileOptions, type ResolveOptionsContext, type ResolvePathOptions, Resolver, type ResolverDefault, type ResolverFile, type ResolverFileParams, type ResolverFilePathParams, type ResolverPatch, type ResolverPathParams, type SerializedDiagnostic, type Storage, type UpdateDiagnostic, UserConfig, type UserReporter, cliReporter, createAdapter, createKubb, createRenderer, createReporter, createResolver, createStorage, defineGenerator, defineParser, definePlugin, fileReporter, fsStorage, jsonReporter, logLevel, memoryStorage };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -170,7 +170,7 @@ function memoize(store, factory) {
 }
 //#endregion
 //#region package.json
-var version = "5.0.0-beta.86";
+var version = "5.0.0-beta.88";
 //#endregion
 //#region src/constants.ts
 /**
@@ -745,6 +745,12 @@ function isNamespace(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 /**
+* Built-in `file.baseName`: casts the identifier with `toFilePath` and appends the extension.
+*/
+function toBaseName({ name, extname }) {
+	return `${toFilePath(name)}${extname}`;
+}
+/**
 * Base constraint for all plugin resolver objects.
 *
 * The built-in machinery lives under `default`. Generators call the top-level `name` and
@@ -773,9 +779,13 @@ var Resolver = class Resolver {
 	static #optionsCache = /* @__PURE__ */ new WeakMap();
 	pluginName;
 	#options;
+	#baseName;
+	#filePath;
 	constructor(options) {
 		this.pluginName = options.pluginName;
 		this.#options = options;
+		this.#baseName = options.file?.baseName ? options.file.baseName.bind(this) : toBaseName;
+		this.#filePath = options.file?.path ? options.file.path.bind(this) : void 0;
 		this.#apply(options);
 	}
 	/**
@@ -795,19 +805,26 @@ var Resolver = class Resolver {
 	name(name) {
 		return this.default.name(name);
 	}
-	file(params, context) {
-		return this.default.file(params, context);
+	file(options) {
+		return this.#resolveFile(options);
 	}
 	/**
-	* Merges `override` over `base` and returns a new resolver with helpers re-bound.
-	* Each key is replaced wholesale. Used when applying `setResolver` partial overrides.
+	* Merges `override` over `base` and returns a new resolver with helpers re-bound. Top-level
+	* keys replace, and a namespace (or `file`) merges per method, so overriding `query.name`
+	* keeps the base `query.keyName`. Used when applying `setResolver` partial overrides.
 	*/
 	static merge(base, override) {
 		const patch = override instanceof Resolver ? override.#options : override;
-		return new Resolver({
-			...base.#options,
-			...patch
-		});
+		const merged = { ...base.#options };
+		for (const [key, value] of Object.entries(patch)) {
+			if (value === void 0) continue;
+			const current = merged[key];
+			merged[key] = isNamespace(value) && isNamespace(current) ? {
+				...current,
+				...value
+			} : value;
+		}
+		return new Resolver(merged);
 	}
 	/**
 	* Binds each entry of `options` onto the resolver, so `this.name`, `this.default`, and
@@ -818,7 +835,7 @@ var Resolver = class Resolver {
 		const root = this;
 		const bind = (value) => typeof value === "function" ? value.bind(root) : value;
 		for (const [key, value] of Object.entries(options)) {
-			if (key === "pluginName" || key === "default" || value === void 0) continue;
+			if (key === "pluginName" || key === "default" || key === "file" || value === void 0) continue;
 			root[key] = isNamespace(value) ? Object.fromEntries(Object.entries(value).map(([method, member]) => [method, bind(member)])) : bind(value);
 		}
 	}
@@ -903,7 +920,7 @@ var Resolver = class Resolver {
 	* to `output.path/{baseName}`, or into a subdirectory when `group` and a `tag`/`path` value
 	* are provided.
 	*/
-	#resolvePath({ baseName, tag, path: groupPath }, { root, output, group }) {
+	#resolvePath({ baseName, tag, path: groupPath, root, output, group }) {
 		if (output.mode === "file") return path.resolve(root, output.path);
 		const outputDir = path.resolve(root, output.path);
 		const result = group && (groupPath || tag) ? path.resolve(outputDir, Resolver.#resolveGroupDir(group, group.type === "path" ? groupPath : tag), baseName) : path.resolve(outputDir, baseName);
@@ -918,17 +935,45 @@ var Resolver = class Resolver {
 		return result;
 	}
 	/**
-	* Builds a `FileNode` by combining file-name casing (`params.resolveName`) with path
-	* resolution. The resolved file starts with empty `sources`, `imports`, and `exports`,
-	* which consumers populate separately.
+	* Resolves a resolver-supplied full path (`file.path`) against `root`, bypassing `output.path`
+	* and `group`. The path may not escape `root`, which keeps a `file.path` that interpolates
+	* spec-derived values from writing outside the project.
+	*/
+	#resolveOverridePath(filePath, root) {
+		const resolved = path.resolve(root, filePath);
+		const rootWithSep = root.endsWith(path.sep) ? root : `${root}${path.sep}`;
+		if (resolved !== root && !resolved.startsWith(rootWithSep)) throw new Diagnostics.Error({
+			code: Diagnostics.code.pathTraversal,
+			severity: "error",
+			message: `Resolved path "${resolved}" is outside the project root "${root}".`,
+			help: "A resolver `file.path` must return a path inside the project root.",
+			location: { kind: "config" }
+		});
+		return resolved;
+	}
+	/**
+	* Builds a `FileNode`. When `#filePath` (the resolver's `file.path`) is set it owns the whole
+	* path; otherwise the base name (from `#baseName`, the resolver's `file.baseName` or the
+	* built-in `toBaseName`) is placed by the `output.path`/`group` layout. The resolved file starts
+	* with empty `sources`, `imports`, and `exports`, which consumers populate separately.
 	*/
-	#resolveFile({ name, extname, tag, path: groupPath, resolveName = toFilePath }, context) {
-		const resolvedName = context.output.mode === "file" ? "" : resolveName(name);
-		const filePath = this.#resolvePath({
-			baseName: `${resolvedName}${extname}`,
+	#resolveFile(options) {
+		const { name, extname, tag, path: groupPath, root, output, group } = options;
+		const baseName = this.#baseName({
+			name,
+			extname
+		});
+		const filePath = this.#filePath ? this.#resolveOverridePath(this.#filePath({
+			baseName,
+			output
+		}), root) : this.#resolvePath({
+			baseName,
 			tag,
-			path: groupPath
-		}, context);
+			path: groupPath,
+			root,
+			output,
+			group
+		});
 		return ast.factory.createFile({
 			path: filePath,
 			baseName: path.basename(filePath),
@@ -1005,15 +1050,39 @@ var Resolver = class Resolver {
 * (`query`, `schema`, …). Every method reaches sibling helpers and the built-in machinery
 * through `this.name`, `this.file`, and `this.default`.
 *
-* @example Custom identifier and file casing
+* @example Custom identifier casing
 * ```ts
 * export const resolverTs = createResolver<PluginTs>({
 *   pluginName: 'plugin-ts',
 *   name(name) {
 *     return ensureValidVarName(pascalCase(name))
 *   },
-*   file(params, context) {
-*     return this.default.file({ ...params, resolveName: (name) => toFilePath(name, pascalCase) }, context)
+* })
+* ```
+*
+* @example Rename generated files with `file.baseName`
+* ```ts
+* export const resolverFaker = createResolver<PluginFaker>({
+*   pluginName: 'plugin-faker',
+*   name(name) {
+*     return camelCase(name, { prefix: 'create' })
+*   },
+*   file: {
+*     baseName({ name, extname }) {
+*       return `${camelCase(name, { prefix: 'create' })}${extname}`
+*     },
+*   },
+* })
+* ```
+*
+* @example Own the full path with `file.path`
+* ```ts
+* export const resolverFaker = createResolver<PluginFaker>({
+*   pluginName: 'plugin-faker',
+*   file: {
+*     path({ baseName, output }) {
+*       return `${output.path}/mocks/${baseName}`
+*     },
 *   },
 * })
 * ```
@@ -1324,7 +1393,7 @@ var KubbDriver = class {
 	* the failure as a {@link Diagnostic} instead of propagating. Each plugin also
 	* contributes a `timing` diagnostic for the run summary.
 	*/
-	async run({ storage }) {
+	async run() {
 		const { hooks, config, fileManager } = this;
 		const diagnostics = [];
 		const parsersMap = /* @__PURE__ */ new Map();
@@ -1406,7 +1475,7 @@ var KubbDriver = class {
 				diagnostics.push(...await this.#runGenerators(generatorPlugins));
 				await hooks.callHook("kubb:plugins:end", Object.assign({ config }, this.#filesPayload()));
 				await fileManager.write(fileManager.files, {
-					storage,
+					storage: config.storage,
 					parsers: parsersMap,
 					extension: config.output.extension
 				});
@@ -1974,7 +2043,7 @@ var Kubb = class {
 			const self = _usingCtx$1.u(this);
 			const driver = self.driver;
 			const storage = self.storage;
-			const { diagnostics } = await driver.run({ storage });
+			const { diagnostics } = await driver.run();
 			return {
 				diagnostics,
 				files: driver.fileManager.files,