@kubb/core 5.12.7 → 5.13.0

package/dist/{createAdapter-DFXvZLZC.d.ts → createAdapter-BNUEQcw9.d.ts}

@@ -846,9 +846,13 @@ declare class FileManager {
   add(...files: Array<FileNode>): Array<FileNode>;
   upsert(...files: Array<FileNode>): Array<FileNode>;
   /** Stores a generator result: a file array is upserted as is, an element renders through `renderer` first, falsy is a no-op. */
-  dispatch<TElement = unknown>({ result, renderer }: {
+  dispatch<TElement = unknown>({ result, renderer, pointer }: {
     result: TElement | Array<FileNode> | undefined | null;
     renderer?: RendererFactory<TElement> | null;
+    /**
+     * Pointer of the node the result was generated from, set on each source that carries none.
+     */
+    pointer?: string;
   }): Promise<void>;
   /**
    * Releases all stored files. Called by the core after `kubb:build:end`.
@@ -3183,6 +3187,11 @@ type Adapter<TOptions extends AdapterFactoryOptions = AdapterFactoryOptions> = {
   validate: (input: string, options?: {
     throwOnError?: boolean;
   }) => Promise<void>;
+  /**
+   * Waits for work `parse` left running alongside generation, such as spec validation in a worker thread.
+   * Kubb awaits it before `kubb:build:end`, inside the build's diagnostics scope. Must not reject.
+   */
+  settle?: () => Promise<void>;
   /**
    * Zero-based UTF-16 offsets of a diagnostic in `source` for a code frame, `end` exclusive; `undefined` when it cannot be found.
    */
@@ -3223,4 +3232,4 @@ type AdapterFactory<T extends AdapterFactoryOptions = AdapterFactoryOptions> = E
 declare function createAdapter<T extends AdapterFactoryOptions = AdapterFactoryOptions>(definition: AdapterDefinition<T>): AdapterFactory<T>;
 //#endregion
 export { NodeCache as $, ReporterContext as $t, PluginFactory as A, KubbInfoContext as At, ResolveImportsOptions as B, RunHookOptions as Bt, NormalizedPlugin as C, KubbGenerationEndContext as Ct, Override as D, KubbHookLineContext as Dt, OutputOptions as E, KubbHookEndContext as Et, definePlugin as F, KubbWarnContext as Ft, ResolverFile as G, createOutputManifest as Gt, ResolvePathOptions as H, KubbDriver as Ht, BannerMeta as I, PossibleConfig as It, ResolverPatch as J, createRenderer as Jt, ResolverFileParams as K, Renderer as Kt, ResolveBannerContext as L, PostGenerateCommand as Lt, PluginType as M, KubbMessageContext as Mt, ResolvePluginOptions as N, KubbPluginsEndContext as Nt, Plugin as O, KubbHookStartContext as Ot, assertPluginOption as P, KubbSuccessContext as Pt, defineGenerator as Q, Reporter as Qt, ResolveBannerFile as R, UserConfig as Rt, KubbPluginStartContext as S, KubbFilesProcessingUpdateContext as St, OutputMode as T, KubbGenerationSummaryContext as Tt, Resolver as U, Hookable as Ut, ResolveOptionsContext as V, runHook as Vt, ResolverDefault as W, OutputManifest as Wt, Generator as X, createStorage as Xt, ResolverPathParams as Y, Storage as Yt, GeneratorContext as Z, GenerationResult as Zt, Filter as _, KubbDiagnosticContext as _t, AdapterSource as a, DiagnosticFormatOptions as an, Diagnostics as at, KubbPluginEndContext as b, KubbFilesProcessingEndContext as bt, ExtensionDependency as c, ParserDefinition as cn, ProblemDiagnostic as ct, ExtensionKind as d, CLIOptions as dt, ReporterName as en, Diagnostic as et, ExtensionMeta as f, Config as ft, Exclude$1 as g, KubbBuildStartContext as gt, resolveMeta as h, KubbBuildEndContext as ht, AdapterFactoryOptions as i, logLevel as in, DiagnosticSeverity as it, PluginName as j, KubbLifecycleStartContext as jt, PluginDefinition as k, KubbHooks as kt, ExtensionDependencyRecord as l, ParserFactory as ln, UpdateDiagnostic as lt, defineExtension as m, Input as mt, AdapterDefinition as n, UserReporter as nn, DiagnosticKind as nt, createAdapter as o, SerializedDiagnostic as on, PerformanceDiagnostic as ot, checkCompatibility as p, FilesContext as pt, ResolverFilePathParams as q, RendererFactory as qt, AdapterFactory as r, createReporter as rn, DiagnosticLocation as rt, ExtensionDependencies as s, Parser as sn, ProblemCode as st, Adapter as t, ReporterPluginFiles as tn, DiagnosticDoc as tt, ExtensionFactory as u, defineParser as un, BuildOutput as ut, Group as v, KubbErrorContext as vt, Output as w, KubbGenerationStartContext as wt, KubbPluginSetupContext as x, KubbFilesProcessingStartContext as xt, Include as y, KubbFileProcessingUpdate as yt, ResolveFileOptions as z, HookResult as zt };
-//# sourceMappingURL=createAdapter-DFXvZLZC.d.ts.map
+//# sourceMappingURL=createAdapter-BNUEQcw9.d.ts.map

package/dist/index.cjs

@@ -39,13 +39,10 @@ node_net = __toESM(node_net, 1);
 let node_os = require("node:os");
 let node_crypto = require("node:crypto");
 let node_readline = require("node:readline");
-let unstorage = require("unstorage");
-let unstorage_drivers_fs = require("unstorage/drivers/fs");
-unstorage_drivers_fs = __toESM(unstorage_drivers_fs, 1);
 let node_url = require("node:url");
 let node_module = require("node:module");
 //#region package.json
-var version = "5.12.7";
+var version = "5.13.0";
 //#endregion
 //#region ../../internals/utils/src/casing.ts
 /**
@@ -138,20 +135,6 @@ function isCIEnvironment() {
 	return !!(ci && ci !== "false" && ci !== "0" || node_process.default.env.GITHUB_ACTIONS || node_process.default.env.GITLAB_CI || node_process.default.env.BITBUCKET_BUILD_NUMBER || node_process.default.env.JENKINS_URL || node_process.default.env.CIRCLECI || node_process.default.env.TRAVIS || node_process.default.env.TEAMCITY_VERSION || node_process.default.env.BUILDKITE || node_process.default.env.TF_BUILD);
 }
 //#endregion
-//#region ../../internals/utils/src/jsonPointer.ts
-/**
-* Escapes a single JSON pointer reference token per RFC 6901 (`~` → `~0`, `/` → `~1`), so a
-* name holding those characters maps to a distinct pointer.
-*
-* @example
-* ```ts
-* escapePointerToken('/pets/{id}') // '~1pets~1{id}'
-* ```
-*/
-function escapePointerToken(token) {
-	return token.replaceAll("~", "~0").replaceAll("/", "~1");
-}
-//#endregion
 //#region ../../internals/utils/src/openInBrowser.ts
 const ignore = () => {};
 /**
@@ -203,6 +186,21 @@ function detect() {
 //#endregion
 //#region ../../internals/utils/src/fs.ts
 /**
+* Resolves to `true` when the file or directory at `path` exists.
+* Uses `Bun.file().exists()` when running under Bun, `fs.access` otherwise.
+*
+* @example
+* ```ts
+* if (await exists('./kubb.config.ts')) {
+*   const content = await read('./kubb.config.ts')
+* }
+* ```
+*/
+async function exists(path) {
+	if (runtime.isBun) return Bun.file(path).exists();
+	return (0, node_fs_promises.access)(path).then(() => true, () => false);
+}
+/**
 * Reads the file at `path` as a UTF-8 string.
 * Uses `Bun.file().text()` when running under Bun, `fs.readFile` otherwise.
 *
@@ -1842,13 +1840,13 @@ var Resolver = class Resolver {
 		const resolveName = name ?? ((schemaName) => this.name(schemaName));
 		return (0, _kubb_ast.collectImportedRefNames)(node).map((schemaName) => _kubb_ast.ast.factory.createImport({
 			name: [resolveName(schemaName)],
-			path: this.file({
+			path: this.#resolveFilePath({
 				name: schemaName,
 				extname,
 				root,
 				output,
 				group
-			}).path
+			})
 		}));
 	}
 	/**
@@ -2007,19 +2005,13 @@ var Resolver = class Resolver {
 		});
 		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(options) {
-		const { name, extname, tag, path: groupPath, root, output, group } = options;
+	/** The absolute path `#resolveFile` places a file at. */
+	#resolveFilePath({ name, extname, tag, path: groupPath, root, output, group }) {
 		const baseName = this.#baseName({
 			name,
 			extname
 		});
-		const filePath = this.#filePath ? this.#resolveOverridePath(this.#filePath({
+		return this.#filePath ? this.#resolveOverridePath(this.#filePath({
 			baseName,
 			output
 		}), root) : this.#resolvePath({
@@ -2030,6 +2022,15 @@ var Resolver = class Resolver {
 			output,
 			group
 		});
+	}
+	/**
+	* 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(options) {
+		const filePath = this.#resolveFilePath(options);
 		return _kubb_ast.ast.factory.createFile({
 			path: filePath,
 			baseName: node_path.default.basename(filePath),
@@ -2301,6 +2302,17 @@ function createProgress(files, config, hooks) {
 		if (updates.length) await hooks.callHook("kubb:files:processing:update", { files: updates });
 	};
 }
+/** Links each source without a pointer to the node its file was generated from. */
+function withPointer(files, pointer) {
+	if (!pointer) return files;
+	return files.map((file) => ({
+		...file,
+		sources: file.sources.map((source) => source.pointer ? source : {
+			...source,
+			pointer
+		})
+	}));
+}
 /**
 * In-memory file store for generated files, and the writer that turns them into source
 * strings on `storage`. Files sharing a `path` are merged (sources/imports/exports
@@ -2319,6 +2331,7 @@ var FileManager = class {
 	#cache = /* @__PURE__ */ new Map();
 	#pending = /* @__PURE__ */ new Set();
 	#sorted = null;
+	#merges = /* @__PURE__ */ new WeakSet();
 	add(...files) {
 		return this.#store(files, false);
 	}
@@ -2326,18 +2339,18 @@ var FileManager = class {
 		return this.#store(files, true);
 	}
 	/** Stores a generator result: a file array is upserted as is, an element renders through `renderer` first, falsy is a no-op. */
-	async dispatch({ result, renderer }) {
+	async dispatch({ result, renderer, pointer }) {
 		try {
 			var _usingCtx$2 = _usingCtx();
 			if (!result) return;
 			if (Array.isArray(result)) {
-				this.#defer(result);
+				this.#defer(withPointer(result, pointer));
 				return;
 			}
 			if (!renderer) return;
 			const instance = _usingCtx$2.u(renderer());
 			await instance.render(result);
-			this.#defer(instance.files);
+			this.#defer(withPointer(instance.files, pointer));
 		} catch (_) {
 			_usingCtx$2.e = _;
 		} finally {
@@ -2347,9 +2360,24 @@ var FileManager = class {
 	/** Upserts without normalizing: the raw merge waits in `#pending` until the file is read. */
 	#defer(files) {
 		for (const file of files) {
-			const existing = this.#cache.get(file.path);
-			this.#cache.set(file.path, existing ? mergeFile(existing, file) : file);
 			this.#pending.add(file.path);
+			const existing = this.#cache.get(file.path);
+			if (!existing) {
+				this.#cache.set(file.path, file);
+				continue;
+			}
+			if (!this.#merges.has(existing)) {
+				const merged = mergeFile(existing, file);
+				this.#merges.add(merged);
+				this.#cache.set(file.path, merged);
+				continue;
+			}
+			existing.banner = file.banner;
+			existing.footer = file.footer;
+			existing.copy = file.copy ?? existing.copy;
+			existing.sources.push(...file.sources);
+			existing.imports.push(...file.imports);
+			existing.exports.push(...file.exports);
 		}
 		if (files.length > 0) this.#sorted = null;
 	}
@@ -2528,24 +2556,23 @@ function assertPluginEntry(entry, index) {
 	});
 }
 /**
-* Where a generator crashed: a label naming the node and, when the node has one, a JSON pointer
-* to it. Built from the node fields so core stays adapter-agnostic.
+* Where a generator crashed: a label naming the node and, when the adapter set one, the node's
+* pointer into the input.
 */
 function getCrashSite(node) {
-	if (node.kind === "Schema") return node.name ? {
-		label: `schema "${node.name}"`,
-		location: {
+	if (node.kind === "Schema") return {
+		label: node.name ? `schema "${node.name}"` : "an inline schema",
+		location: node.pointer ? {
 			kind: "schema",
-			pointer: `#/components/schemas/${escapePointerToken(node.name)}`
-		}
-	} : { label: "an inline schema" };
-	if (!node.method || !node.path) return { label: `operation "${node.operationId}"` };
+			pointer: node.pointer
+		} : void 0
+	};
 	return {
-		label: `operation "${node.operationId}" (${node.method.toUpperCase()} ${node.path})`,
-		location: {
+		label: node.method && node.path ? `operation "${node.operationId}" (${node.method.toUpperCase()} ${node.path})` : `operation "${node.operationId}"`,
+		location: node.pointer ? {
 			kind: "operation",
-			pointer: `#/paths/${escapePointerToken(node.path)}/${node.method.toLowerCase()}`
-		}
+			pointer: node.pointer
+		} : void 0
 	};
 }
 var KubbDriver = class {
@@ -2833,6 +2860,7 @@ var KubbDriver = class {
 					hooks,
 					config
 				});
+				await this.adapter?.settle?.();
 				await hooks.callHook("kubb:build:end", {
 					files: this.fileManager.files,
 					config,
@@ -2840,6 +2868,7 @@ var KubbDriver = class {
 				});
 				return { diagnostics: Diagnostics.dedupe(diagnostics) };
 			} catch (caughtError) {
+				await this.adapter?.settle?.();
 				diagnostics.push(Diagnostics.from(caughtError));
 				return { diagnostics: Diagnostics.dedupe(diagnostics) };
 			}
@@ -3068,7 +3097,8 @@ var KubbDriver = class {
 			if (!(generator.match ? await generator.match(node, ctx) : true)) continue;
 			await this.fileManager.dispatch({
 				result: await generate(generator),
-				renderer: generator.renderer
+				renderer: generator.renderer,
+				pointer: node.pointer
 			});
 		}
 	}
@@ -4143,8 +4173,9 @@ function resolveKubbDir(base = "") {
 	}
 }
 /**
-* unstorage on the fs driver, rooted at {@link resolveKubbDir}. The fs driver cannot set a file
-* mode, so the 0700 folder keeps files such as a stored token private.
+* Key-value files rooted at {@link resolveKubbDir}. Each key is a file path inside that folder.
+* Strings are stored as is and other values as JSON. `getItem` parses JSON and falls back to the
+* raw string. The 0700 folder keeps files such as a stored token private.
 *
 * @example
 * ```ts
@@ -4153,7 +4184,30 @@ function resolveKubbDir(base = "") {
 * ```
 */
 function kubbStorage({ base } = {}) {
-	return (0, unstorage.createStorage)({ driver: (0, unstorage_drivers_fs.default)({ base: resolveKubbDir(base) }) });
+	const dir = resolveKubbDir(base);
+	const pathOf = (key) => {
+		const path = (0, node_path.resolve)(dir, key.replaceAll(":", "/"));
+		if (path === dir || !isPathInside(path, dir)) throw new Error(`Invalid key: ${JSON.stringify(key)}. It should not leave the storage folder`);
+		return path;
+	};
+	return {
+		async getItem(key) {
+			const path = pathOf(key);
+			if (!await exists(path)) return null;
+			const raw = await read(path);
+			try {
+				return JSON.parse(raw);
+			} catch {
+				return raw;
+			}
+		},
+		async setItem(key, value) {
+			await writeRaw(pathOf(key), typeof value === "string" ? value : JSON.stringify(value));
+		},
+		async removeItem(key) {
+			await (0, node_fs_promises.rm)(pathOf(key), { force: true });
+		}
+	};
 }
 //#endregion
 //#region src/reporters/fileReporter.ts