@kubb/core 5.0.0-alpha.25 → 5.0.0-alpha.27

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { t as __name } from "./chunk--u3MIqq1.js";
-import { $ as formatters, A as PrinterFactoryOptions, B as UserConfig, C as PluginLifecycle, D as Preset, E as PluginWithLifeCycle, F as ResolvePathParams, G as UserResolver, H as UserLogger, I as Resolver, J as Generator, K as KubbEvents, L as ResolverContext, M as ResolveNameParams, N as ResolveOptionsContext, O as Presets, P as ResolvePathOptions, Q as createStorage, R as ResolverFileParams, S as PluginFactoryOptions, T as PluginParameter, U as UserPlugin, V as UserGroup, W as UserPluginWithLifeCycle, X as defineGenerator, Y as ReactGeneratorV2, Z as Storage, _ as LoggerOptions, a as AdapterSource, b as Plugin, c as Config, d as Group, et as linters, f as Include, g as LoggerContext, h as Logger, i as AdapterFactoryOptions, j as ResolveBannerContext, k as Printer, l as DevtoolsOptions, m as InputPath, n as getMode, nt as PossiblePromise, o as BarrelType, p as InputData, q as CoreGeneratorV2, r as Adapter, rt as AsyncEventEmitter, s as CompatibilityPreset, t as PluginDriver, tt as logLevel, u as Exclude, v as Output, w as PluginLifecycleHooks, x as PluginContext, y as Override, z as ResolverPathParams } from "./PluginDriver-BGRDpPpK.js";
-import { definePrinter } from "@kubb/ast";
+import { $ as createStorage, A as PrinterFactoryOptions, B as ResolverPathParams, C as PluginLifecycle, D as Preset, E as PluginWithLifeCycle, F as ResolvePathOptions, G as UserPluginWithLifeCycle, H as UserGroup, I as ResolvePathParams, J as CoreGeneratorV2, K as UserResolver, L as Resolver, M as ResolveBannerContext, N as ResolveNameParams, O as Presets, P as ResolveOptionsContext, Q as Storage, R as ResolverContext, S as PluginFactoryOptions, T as PluginParameter, U as UserLogger, V as UserConfig, W as UserPlugin, X as ReactGeneratorV2, Y as Generator, Z as defineGenerator, _ as LoggerOptions, a as AdapterSource, b as Plugin, c as Config, d as Group, et as formatters, f as Include, g as LoggerContext, h as Logger, i as AdapterFactoryOptions, it as AsyncEventEmitter, j as PrinterPartial, k as Printer, l as DevtoolsOptions, m as InputPath, n as getMode, nt as logLevel, o as BarrelType, p as InputData, q as KubbEvents, r as Adapter, rt as PossiblePromise, s as CompatibilityPreset, t as PluginDriver, tt as linters, u as Exclude, v as Output, w as PluginLifecycleHooks, x as PluginContext, y as Override, z as ResolverFileParams } from "./PluginDriver-B12z6KO-.js";
+import { composeTransformers, definePrinter } from "@kubb/ast";
 import { Node, OperationNode, RootNode, SchemaNode, Visitor } from "@kubb/ast/types";
 import { Fabric, FabricFile } from "@kubb/fabric-core/types";
 import { Fabric as Fabric$1 } from "@kubb/react-fabric/types";
@@ -809,25 +809,32 @@ declare function getConfigs(config: ConfigInput | UserConfig, args: CLIOptions):
 type GetPresetParams<TResolver extends Resolver> = {
   preset: CompatibilityPreset;
   presets: Presets<TResolver>;
-  resolvers?: Array<TResolver>;
+  /**
+   * Optional single resolver whose methods override the preset resolver.
+   * When a method returns `null` or `undefined` the preset resolver's method is used instead.
+   */
+  resolver?: Partial<TResolver> & ThisType<TResolver>;
   /**
    * User-supplied generators to append after the preset's generators.
    */
   generators?: Array<Generator<any>>;
-  transformers?: Array<Visitor>;
+  /**
+   * Optional single transformer visitor whose methods override the preset transformer.
+   * When a method returns `null` or `undefined` the preset transformer's method is used instead.
+   */
+  transformer?: Visitor;
 };
 type GetPresetResult<TResolver extends Resolver> = {
   resolver: TResolver;
-  transformers: Array<Visitor>;
+  transformer: Visitor | undefined;
   generators: Array<Generator<any>>;
   preset: Preset<TResolver> | undefined;
 };
 /**
- * Resolves a named preset into merged resolvers, transformers, and generators.
+ * Resolves a named preset into a resolver, transformer, and generators.
  *
- * - Merges the preset's resolvers on top of the first (default)
- * - Merges any additional user-supplied resolvers on top of that to produce the final `resolver`.
- * - Concatenates preset transformers before user-supplied transformers.
+ * - Selects the preset resolver; wraps it with user overrides using null/undefined fallback.
+ * - Composes the preset's transformers into a single visitor; wraps it with the user transformer using null/undefined fallback.
  * - Combines preset generators with user-supplied generators; falls back to the `default` preset's generators when neither provides any.
  */
 declare function getPreset<TResolver extends Resolver = Resolver>(params: GetPresetParams<TResolver>): GetPresetResult<TResolver>;
@@ -850,20 +857,6 @@ type Linter = keyof typeof linters;
  */
 declare function detectLinter(): Promise<Linter | null>;
 //#endregion
-//#region src/utils/mergeResolvers.d.ts
-/**
- * Merges an ordered list of resolvers into a single resolver by shallow-merging each entry left to right.
- *
- * Later entries win when keys conflict, so the last resolver in the list takes highest precedence.
- *
- * @example
- * ```ts
- * const resolver = mergeResolvers(resolverTs, resolverTsLegacy)
- * // resolverTsLegacy methods override resolverTs where they overlap
- * ```
- */
-declare function mergeResolvers<T extends Resolver>(...resolvers: Array<T>): T;
-//#endregion
 //#region src/utils/packageJSON.d.ts
 type DependencyName = string;
 type DependencyVersion = string;
@@ -884,5 +877,5 @@ type DependencyVersion = string;
  */
 declare function satisfiesDependency(dependency: DependencyName | RegExp, version: DependencyVersion, cwd?: string): boolean;
 //#endregion
-export { Adapter, AdapterFactoryOptions, AdapterSource, AsyncEventEmitter, BarrelType, type CLIOptions, CompatibilityPreset, Config, type ConfigInput, CoreGeneratorV2, DevtoolsOptions, Exclude, type FileMetaBase, FunctionParams, type FunctionParamsAST, Generator, Group, Include, InputData, InputPath, KubbEvents, Logger, LoggerContext, LoggerOptions, Output, Override, Plugin, PluginContext, PluginDriver, PluginFactoryOptions, PluginLifecycle, PluginLifecycleHooks, PluginParameter, PluginWithLifeCycle, Preset, Presets, Printer, PrinterFactoryOptions, ReactGeneratorV2, ResolveBannerContext, ResolveNameParams, ResolveOptionsContext, ResolvePathOptions, ResolvePathParams, Resolver, ResolverContext, ResolverFileParams, ResolverPathParams, Storage, URLPath, UserConfig, UserGroup, UserLogger, UserPlugin, UserPluginWithLifeCycle, UserResolver, build, build as default, buildDefaultBanner, createAdapter, createPlugin, createStorage, defaultResolveBanner, defaultResolveFile, defaultResolveFooter, defaultResolveOptions, defaultResolvePath, defineConfig, defineGenerator, defineLogger, definePresets, definePrinter, defineResolver, detectFormatter, detectLinter, formatters, fsStorage, getBarrelFiles, getConfigs, getMode, getPreset, isInputPath, linters, logLevel, memoryStorage, mergeResolvers, renderOperation, renderOperations, renderSchema, runGeneratorOperation, runGeneratorOperations, runGeneratorSchema, safeBuild, satisfiesDependency, setup };
+export { Adapter, AdapterFactoryOptions, AdapterSource, AsyncEventEmitter, BarrelType, type CLIOptions, CompatibilityPreset, Config, type ConfigInput, CoreGeneratorV2, DevtoolsOptions, Exclude, type FileMetaBase, FunctionParams, type FunctionParamsAST, Generator, Group, Include, InputData, InputPath, KubbEvents, Logger, LoggerContext, LoggerOptions, Output, Override, Plugin, PluginContext, PluginDriver, PluginFactoryOptions, PluginLifecycle, PluginLifecycleHooks, PluginParameter, PluginWithLifeCycle, Preset, Presets, Printer, PrinterFactoryOptions, PrinterPartial, ReactGeneratorV2, ResolveBannerContext, ResolveNameParams, ResolveOptionsContext, ResolvePathOptions, ResolvePathParams, Resolver, ResolverContext, ResolverFileParams, ResolverPathParams, Storage, URLPath, UserConfig, UserGroup, UserLogger, UserPlugin, UserPluginWithLifeCycle, UserResolver, build, build as default, buildDefaultBanner, composeTransformers, createAdapter, createPlugin, createStorage, defaultResolveBanner, defaultResolveFile, defaultResolveFooter, defaultResolveOptions, defaultResolvePath, defineConfig, defineGenerator, defineLogger, definePresets, definePrinter, defineResolver, detectFormatter, detectLinter, formatters, fsStorage, getBarrelFiles, getConfigs, getMode, getPreset, isInputPath, linters, logLevel, memoryStorage, renderOperation, renderOperations, renderSchema, runGeneratorOperation, runGeneratorOperations, runGeneratorSchema, safeBuild, satisfiesDependency, setup };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -3,7 +3,7 @@ import { EventEmitter } from "node:events";
 import { readFileSync } from "node:fs";
 import { access, mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import path, { basename, dirname, extname, join, posix, relative, resolve } from "node:path";
-import { definePrinter, isOperationNode, isSchemaNode } from "@kubb/ast";
+import { composeTransformers, composeTransformers as composeTransformers$1, definePrinter, isOperationNode, isSchemaNode } from "@kubb/ast";
 import { Fabric, createFabric, createReactFabric } from "@kubb/react-fabric";
 import { typescriptParser } from "@kubb/react-fabric/parsers";
 import { fsPlugin } from "@kubb/react-fabric/plugins";
@@ -996,6 +996,9 @@ var PluginDriver = class {
 			get resolver() {
 				return plugin.resolver;
 			},
+			get transformer() {
+				return plugin.transformer;
+			},
 			openInStudio(options) {
 				if (!driver.config.devtools || driver.#studioIsOpen) return;
 				if (typeof driver.config.devtools !== "object") throw new Error("Devtools must be an object");
@@ -1410,7 +1413,7 @@ const fsStorage = createStorage(() => ({
 }));
 //#endregion
 //#region package.json
-var version$1 = "5.0.0-alpha.25";
+var version$1 = "5.0.0-alpha.27";
 //#endregion
 //#region src/utils/diagnostics.ts
 /**
@@ -2763,46 +2766,43 @@ async function getConfigs(config, args) {
 	}));
 }
 //#endregion
-//#region src/utils/mergeResolvers.ts
+//#region src/utils/getPreset.ts
 /**
-* Merges an ordered list of resolvers into a single resolver by shallow-merging each entry left to right.
-*
-* Later entries win when keys conflict, so the last resolver in the list takes highest precedence.
-*
-* @example
-* ```ts
-* const resolver = mergeResolvers(resolverTs, resolverTsLegacy)
-* // resolverTsLegacy methods override resolverTs where they overlap
-* ```
+* Returns a copy of `defaults` where each function in `userOverrides` is wrapped
+* so a `null`/`undefined` return falls back to the original. Non-function values
+* are assigned directly. All calls use the merged object as `this`.
 */
-function mergeResolvers(...resolvers) {
-	return resolvers.reduce((acc, curr) => ({
-		...acc,
-		...curr
-	}), resolvers[0]);
+function withFallback(defaults, userOverrides) {
+	const merged = { ...defaults };
+	for (const key of Object.keys(userOverrides)) {
+		const userVal = userOverrides[key];
+		const defaultVal = defaults[key];
+		if (typeof userVal === "function" && typeof defaultVal === "function") merged[key] = (...args) => userVal.apply(merged, args) ?? defaultVal.apply(merged, args);
+		else if (userVal !== void 0) merged[key] = userVal;
+	}
+	return merged;
 }
-//#endregion
-//#region src/utils/getPreset.ts
 /**
-* Resolves a named preset into merged resolvers, transformers, and generators.
+* Resolves a named preset into a resolver, transformer, and generators.
 *
-* - Merges the preset's resolvers on top of the first (default)
-* - Merges any additional user-supplied resolvers on top of that to produce the final `resolver`.
-* - Concatenates preset transformers before user-supplied transformers.
+* - Selects the preset resolver; wraps it with user overrides using null/undefined fallback.
+* - Composes the preset's transformers into a single visitor; wraps it with the user transformer using null/undefined fallback.
 * - Combines preset generators with user-supplied generators; falls back to the `default` preset's generators when neither provides any.
 */
 function getPreset(params) {
-	const { preset: presetName, presets, resolvers = [], transformers: userTransformers = [], generators: userGenerators = [] } = params;
-	const [defaultResolver, ...userResolvers] = resolvers;
+	const { preset: presetName, presets, resolver: userResolver, transformer: userTransformer, generators: userGenerators = [] } = params;
 	const preset = presets[presetName];
-	const resolver = mergeResolvers(mergeResolvers(defaultResolver, ...preset?.resolvers ?? []), ...userResolvers ?? []);
-	const transformers = [...preset?.transformers ?? [], ...userTransformers ?? []];
+	const presetResolver = preset?.resolver ?? presets["default"].resolver;
+	const resolver = userResolver ? withFallback(presetResolver, userResolver) : presetResolver;
+	const presetTransformers = preset?.transformers ?? [];
+	const presetTransformer = presetTransformers.length > 0 ? composeTransformers$1(...presetTransformers) : void 0;
+	const transformer = presetTransformer && userTransformer ? withFallback(presetTransformer, userTransformer) : userTransformer ?? presetTransformer;
 	const presetGenerators = preset?.generators ?? [];
-	const defaultPresetGenerators = presets["default"]?.generators ?? [];
+	const defaultGenerators = presets["default"]?.generators ?? [];
 	return {
 		resolver,
-		transformers,
-		generators: presetGenerators.length > 0 || userGenerators.length ? [...presetGenerators, ...userGenerators] : defaultPresetGenerators,
+		transformer,
+		generators: presetGenerators.length > 0 || userGenerators.length > 0 ? [...presetGenerators, ...userGenerators] : defaultGenerators,
 		preset
 	};
 }
@@ -2889,6 +2889,6 @@ function satisfiesDependency(dependency, version, cwd) {
 	return satisfies(semVer, version);
 }
 //#endregion
-export { AsyncEventEmitter, FunctionParams, PluginDriver, URLPath, build, build as default, buildDefaultBanner, createAdapter, createPlugin, createStorage, defaultResolveBanner, defaultResolveFile, defaultResolveFooter, defaultResolveOptions, defaultResolvePath, defineConfig, defineGenerator, defineLogger, definePresets, definePrinter, defineResolver, detectFormatter, detectLinter, formatters, fsStorage, getBarrelFiles, getConfigs, getMode, getPreset, isInputPath, linters, logLevel, memoryStorage, mergeResolvers, renderOperation, renderOperations, renderSchema, runGeneratorOperation, runGeneratorOperations, runGeneratorSchema, safeBuild, satisfiesDependency, setup };
+export { AsyncEventEmitter, FunctionParams, PluginDriver, URLPath, build, build as default, buildDefaultBanner, composeTransformers, createAdapter, createPlugin, createStorage, defaultResolveBanner, defaultResolveFile, defaultResolveFooter, defaultResolveOptions, defaultResolvePath, defineConfig, defineGenerator, defineLogger, definePresets, definePrinter, defineResolver, detectFormatter, detectLinter, formatters, fsStorage, getBarrelFiles, getConfigs, getMode, getPreset, isInputPath, linters, logLevel, memoryStorage, renderOperation, renderOperations, renderSchema, runGeneratorOperation, runGeneratorOperations, runGeneratorSchema, safeBuild, satisfiesDependency, setup };
 
 //# sourceMappingURL=index.js.map