@kubb/cli 5.0.0-beta.14 → 5.0.0-beta.15

package/dist/{run-BNvaRFvz.js → run-BvsacB4B.js}

@@ -2,7 +2,7 @@ import "./chunk-BvFE5Tac.js";
 import { n as toCause, r as toError } from "./errors-CINO1EIv.js";
 import { a as canUseTTY, i as executeIfOnline, o as isGitHubActions, r as sendTelemetry, t as buildTelemetryEvent } from "./telemetry-BkektVz6.js";
 import { n as tokenize } from "./shell-CN6DNqeC.js";
-import { t as version } from "./package-D5eM8mZw.js";
+import { t as version } from "./package-B3fEVBWy.js";
 import { a as WATCHER_IGNORED_PATHS, i as SUMMARY_SEPARATOR, t as KUBB_NPM_PACKAGE_URL } from "./constants-B2JTeRBb.js";
 import { styleText } from "node:util";
 import { EventEmitter } from "node:events";
@@ -14,7 +14,6 @@ import path, { dirname, relative, resolve } from "node:path";
 import process$1 from "node:process";
 import * as clack from "@clack/prompts";
 import { createKubb, defineLogger, isInputPath, logLevel } from "@kubb/core";
-import { Writable } from "node:stream";
 import { cosmiconfig } from "cosmiconfig";
 import { createJiti } from "jiti";
 import { NonZeroExitError, x } from "tinyexec";
@@ -488,21 +487,6 @@ async function detectLinter() {
 //#endregion
 //#region src/loggers/clackLogger.ts
 /**
-* Node.js `Writable` stream that forwards each chunk to a clack `taskLog` message.
-* Used to pipe hook subprocess output into the clack task log UI.
-*/
-var ClackWritable = class extends Writable {
-	taskLog;
-	constructor(taskLog, opts) {
-		super(opts);
-		this.taskLog = taskLog;
-	}
-	_write(chunk, _encoding, callback) {
-		this.taskLog.message(`${styleText("dim", chunk.toString())}`);
-		callback();
-	}
-};
-/**
 * TTY logger with beautiful UI and progress indicators for local development.
 */
 const clackLogger = defineLogger({
@@ -518,7 +502,8 @@ const clackLogger = defineLogger({
 			hrStart: process$1.hrtime(),
 			spinner: clack.spinner(),
 			isSpinning: false,
-			activeProgress: /* @__PURE__ */ new Map()
+			activeProgress: /* @__PURE__ */ new Map(),
+			activeHookLogs: /* @__PURE__ */ new Map()
 		};
 		function reset() {
 			for (const [_key, active] of state.activeProgress) {
@@ -534,6 +519,7 @@ const clackLogger = defineLogger({
 			state.spinner = clack.spinner();
 			state.isSpinning = false;
 			state.activeProgress.clear();
+			state.activeHookLogs.clear();
 		}
 		function showProgressStep() {
 			if (logLevel$8 <= logLevel.silent) return;
@@ -635,8 +621,10 @@ Run \`npm install -g @kubb/cli\` to update`, "Update available for `Kubb`", {
 		context.on("kubb:generation:start", ({ config }) => {
 			reset();
 			state.totalPlugins = config.plugins?.length ?? 0;
+			if (logLevel$8 <= logLevel.silent) return;
 			const text = getMessage(["Generation started", config.name ? `for ${styleText("dim", config.name)}` : void 0].filter(Boolean).join(" "));
 			clack.intro(text);
+			startSpinner(getMessage("Setting up plugins"));
 		});
 		context.on("kubb:plugin:start", ({ plugin }) => {
 			if (logLevel$8 <= logLevel.silent) return;
@@ -704,38 +692,44 @@ Run \`npm install -g @kubb/cli\` to update`, "Update available for `Kubb`", {
 			showProgressStep();
 		});
 		context.on("kubb:generation:end", ({ config }) => {
+			stopSpinner();
 			const text = getMessage(config.name ? `Generation completed for ${styleText("dim", config.name)}` : "Generation completed");
 			clack.outro(text);
 		});
 		context.on("kubb:format:start", () => {
 			if (logLevel$8 <= logLevel.silent) return;
-			const text = getMessage("Format started");
-			clack.intro(text);
-		});
-		context.on("kubb:format:end", () => {
-			if (logLevel$8 <= logLevel.silent) return;
-			const text = getMessage("Format completed");
-			clack.outro(text);
+			clack.log.step(getMessage("Formatting"));
 		});
 		context.on("kubb:lint:start", () => {
 			if (logLevel$8 <= logLevel.silent) return;
-			const text = getMessage("Lint started");
-			clack.intro(text);
+			clack.log.step(getMessage("Linting"));
 		});
-		context.on("kubb:lint:end", () => {
+		context.on("kubb:hooks:start", () => {
 			if (logLevel$8 <= logLevel.silent) return;
-			const text = getMessage("Lint completed");
-			clack.outro(text);
+			clack.log.step(getMessage("Running hooks"));
 		});
-		context.on("kubb:hook:start", ({ command, args }) => {
-			if (logLevel$8 <= logLevel.silent) return;
-			const text = getMessage(`Hook ${styleText("dim", formatCommandWithArgs(command, args))} started`);
-			clack.intro(text);
+		context.on("kubb:hook:start", ({ id, command, args }) => {
+			if (logLevel$8 <= logLevel.silent || !id) return;
+			stopSpinner();
+			const title = getMessage(`Running ${styleText("dim", formatCommandWithArgs(command, args))}`);
+			const taskLog = clack.taskLog({ title });
+			state.activeHookLogs.set(id, {
+				taskLog,
+				hrStart: process$1.hrtime()
+			});
 		});
-		context.on("kubb:hook:end", ({ command, args }) => {
-			if (logLevel$8 <= logLevel.silent) return;
-			const text = getMessage(`Hook ${styleText("dim", formatCommandWithArgs(command, args))} successfully executed`);
-			clack.outro(text);
+		context.on("kubb:hook:end", ({ id, command, args, success, error }) => {
+			if (logLevel$8 <= logLevel.silent || !id) return;
+			const active = state.activeHookLogs.get(id);
+			if (!active) return;
+			state.activeHookLogs.delete(id);
+			const commandWithArgs = formatCommandWithArgs(command, args);
+			const duration = formatMsWithColor(getElapsedMs(active.hrStart));
+			if (success) active.taskLog.success(getMessage(`${styleText("dim", commandWithArgs)} completed in ${duration}`));
+			else {
+				const reason = error?.message ? ` (${error.message})` : "";
+				active.taskLog.error(getMessage(`${styleText("dim", commandWithArgs)} failed${reason}`), { showLog: true });
+			}
 		});
 		context.on("kubb:generation:summary", ({ config, pluginTimings, failedPlugins, filesCreated, status, hrStart }) => {
 			const summary = getSummary({
@@ -766,18 +760,19 @@ Run \`npm install -g @kubb/cli\` to update`, "Update available for `Kubb`", {
 		context.on("kubb:lifecycle:end", () => {
 			reset();
 		});
-		return (commandWithArgs) => {
+		return (_commandWithArgs, hookId) => {
 			if (logLevel$8 <= logLevel.silent) return {
 				onStdout: (s) => console.log(s),
 				onStderr: (s) => console.error(s)
 			};
-			const logger = clack.taskLog({ title: getMessage(["Executing hook", logLevel$8 >= logLevel.info ? styleText("dim", commandWithArgs) : void 0].filter(Boolean).join(" ")) });
-			const writable = new ClackWritable(logger);
+			const active = state.activeHookLogs.get(hookId);
+			if (!active) return;
+			const { taskLog } = active;
 			return {
 				stream: true,
-				onLine: (line) => writable.write(line),
-				onStdout: (s) => logger.message(s),
-				onStderr: (s) => logger.error(s)
+				onLine: (line) => taskLog.message(styleText("dim", line)),
+				onStdout: (s) => taskLog.message(s),
+				onStderr: (s) => taskLog.message(styleText("red", s))
 			};
 		};
 	}
@@ -905,17 +900,21 @@ const githubActionsLogger = defineLogger({
 			failedPlugins: 0,
 			totalFiles: 0,
 			processedFiles: 0,
-			hrStart: process.hrtime(),
-			currentConfigs: []
+			hrStart: process$1.hrtime(),
+			currentConfigs: [],
+			hookStarts: /* @__PURE__ */ new Map(),
+			openGroupDepth: 0
 		};
 		function reset() {
+			closeAllGroups();
 			state.totalPlugins = 0;
 			state.completedPlugins = 0;
 			state.failedPlugins = 0;
 			state.totalFiles = 0;
 			state.processedFiles = 0;
-			state.hrStart = process.hrtime();
+			state.hrStart = process$1.hrtime();
 			state.currentConfigs = [];
+			state.hookStarts.clear();
 		}
 		function showProgressStep() {
 			if (logLevel$7 <= logLevel.silent) return;
@@ -927,9 +926,17 @@ const githubActionsLogger = defineLogger({
 		}
 		function openGroup(name) {
 			console.log(`::group::${name}`);
+			state.openGroupDepth++;
 		}
 		function closeGroup(_name) {
 			console.log("::endgroup::");
+			if (state.openGroupDepth > 0) state.openGroupDepth--;
+		}
+		function closeAllGroups() {
+			while (state.openGroupDepth > 0) {
+				console.log("::endgroup::");
+				state.openGroupDepth--;
+			}
 		}
 		context.on("kubb:info", ({ message, info = "" }) => {
 			if (logLevel$7 <= logLevel.silent) return;
@@ -960,6 +967,7 @@ const githubActionsLogger = defineLogger({
 		});
 		context.on("kubb:error", ({ error }) => {
 			const caused = toCause(error);
+			closeAllGroups();
 			if (logLevel$7 <= logLevel.silent) return;
 			const message = error.message || String(error);
 			console.error(`::error::${message}`);
@@ -977,6 +985,9 @@ const githubActionsLogger = defineLogger({
 			console.log(styleText("yellow", `Kubb ${version} 🧩`));
 			reset();
 		});
+		context.on("kubb:version:new", ({ currentVersion, latestVersion }) => {
+			console.log(`::notice::Update available for Kubb: v${currentVersion} → v${latestVersion}. Run \`npm install -g @kubb/cli\` to update.`);
+		});
 		context.on("kubb:config:start", () => {
 			if (logLevel$7 <= logLevel.silent) return;
 			const text = getMessage("Configuration started");
@@ -1061,18 +1072,35 @@ const githubActionsLogger = defineLogger({
 			console.log(text);
 			if (state.currentConfigs.length === 1) closeGroup("Linting");
 		});
-		context.on("kubb:hook:start", ({ command, args }) => {
+		context.on("kubb:hooks:start", () => {
+			if (logLevel$7 <= logLevel.silent) return;
+			if (state.currentConfigs.length === 1) openGroup("Hooks");
+			console.log(getMessage("Hooks started"));
+		});
+		context.on("kubb:hooks:end", () => {
 			if (logLevel$7 <= logLevel.silent) return;
+			console.log(getMessage("Hooks completed"));
+			if (state.currentConfigs.length === 1) closeGroup("Hooks");
+		});
+		context.on("kubb:hook:start", ({ id, command, args }) => {
+			if (logLevel$7 <= logLevel.silent) return;
+			if (id) state.hookStarts.set(id, process$1.hrtime());
 			const commandWithArgs = formatCommandWithArgs(command, args);
 			const text = getMessage(`Hook ${styleText("dim", commandWithArgs)} started`);
 			if (state.currentConfigs.length === 1) openGroup(`Hook ${commandWithArgs}`);
 			console.log(text);
 		});
-		context.on("kubb:hook:end", ({ command, args }) => {
+		context.on("kubb:hook:end", ({ id, command, args, success, error }) => {
 			if (logLevel$7 <= logLevel.silent) return;
+			const hrStart = id ? state.hookStarts.get(id) : void 0;
+			if (id) state.hookStarts.delete(id);
+			const durationStr = hrStart ? ` in ${formatMsWithColor(getElapsedMs(hrStart))}` : "";
 			const commandWithArgs = formatCommandWithArgs(command, args);
-			const text = getMessage(`Hook ${styleText("dim", commandWithArgs)} completed`);
-			console.log(text);
+			if (success) console.log(getMessage(`${styleText("green", "✓")} Hook ${styleText("dim", commandWithArgs)} completed${durationStr}`));
+			else {
+				const reason = error?.message ? ` (${error.message})` : "";
+				console.log(`::error::Hook ${commandWithArgs} failed${durationStr}${reason}`);
+			}
 			if (state.currentConfigs.length === 1) closeGroup(`Hook ${commandWithArgs}`);
 		});
 		context.on("kubb:generation:summary", ({ config, status, hrStart, failedPlugins }) => {
@@ -1086,7 +1114,7 @@ const githubActionsLogger = defineLogger({
 		context.on("kubb:lifecycle:end", () => {
 			reset();
 		});
-		return (_commandWithArgs) => ({
+		return (_commandWithArgs, _hookId) => ({
 			onStdout: logLevel$7 > logLevel.silent ? (s) => console.log(s) : void 0,
 			onStderr: logLevel$7 > logLevel.silent ? (s) => console.error(`::error::${s}`) : void 0
 		});
@@ -1101,6 +1129,7 @@ const plainLogger = defineLogger({
 	name: "plain",
 	install(context, options) {
 		const logLevel$6 = options?.logLevel ?? logLevel.info;
+		const hookStarts = /* @__PURE__ */ new Map();
 		function getMessage(message) {
 			return formatMessage(message, logLevel$6);
 		}
@@ -1145,8 +1174,12 @@ const plainLogger = defineLogger({
 				}
 			}
 		});
-		context.on("kubb:lifecycle:start", () => {
-			console.log("Kubb CLI 🧩");
+		context.on("kubb:lifecycle:start", ({ version }) => {
+			console.log(`Kubb CLI v${version}`);
+		});
+		context.on("kubb:version:new", ({ currentVersion, latestVersion }) => {
+			if (logLevel$6 <= logLevel.silent) return;
+			console.log(getMessage(`Update available: v${currentVersion} → v${latestVersion}. Run \`npm install -g @kubb/cli\` to update.`));
 		});
 		context.on("kubb:config:start", () => {
 			if (logLevel$6 <= logLevel.silent) return;
@@ -1212,15 +1245,31 @@ const plainLogger = defineLogger({
 			const text = getMessage("Lint completed");
 			console.log(text);
 		});
-		context.on("kubb:hook:start", ({ command, args }) => {
+		context.on("kubb:hooks:start", () => {
 			if (logLevel$6 <= logLevel.silent) return;
-			const text = getMessage(`Hook ${formatCommandWithArgs(command, args)} started`);
-			console.log(text);
+			console.log(getMessage("Hooks started"));
 		});
-		context.on("kubb:hook:end", ({ command, args }) => {
+		context.on("kubb:hooks:end", () => {
 			if (logLevel$6 <= logLevel.silent) return;
-			const text = getMessage(`Hook ${formatCommandWithArgs(command, args)} completed`);
-			console.log(text);
+			console.log(getMessage("Hooks completed"));
+		});
+		context.on("kubb:hook:start", ({ id, command, args }) => {
+			if (logLevel$6 <= logLevel.silent) return;
+			if (id) hookStarts.set(id, process$1.hrtime());
+			const commandWithArgs = formatCommandWithArgs(command, args);
+			console.log(getMessage(`Hook ${commandWithArgs} started`));
+		});
+		context.on("kubb:hook:end", ({ id, command, args, success, error }) => {
+			if (logLevel$6 <= logLevel.silent) return;
+			const hrStart = id ? hookStarts.get(id) : void 0;
+			if (id) hookStarts.delete(id);
+			const durationStr = hrStart ? ` in ${formatMs(getElapsedMs(hrStart))}` : "";
+			const commandWithArgs = formatCommandWithArgs(command, args);
+			if (success) console.log(getMessage(`✓ Hook ${commandWithArgs} completed${durationStr}`));
+			else {
+				const reason = error?.message ? ` (${error.message})` : "";
+				console.log(getMessage(`✗ Hook ${commandWithArgs} failed${durationStr}${reason}`));
+			}
 		});
 		context.on("kubb:generation:summary", ({ config, pluginTimings, status, hrStart, failedPlugins, filesCreated }) => {
 			const summary = getSummary({
@@ -1235,7 +1284,7 @@ const plainLogger = defineLogger({
 			console.log(summary.join("\n"));
 			console.log(SUMMARY_SEPARATOR);
 		});
-		return (_commandWithArgs) => ({
+		return (_commandWithArgs, _hookId) => ({
 			onStdout: logLevel$6 > logLevel.silent ? (s) => console.log(s) : void 0,
 			onStderr: logLevel$6 > logLevel.silent ? (s) => console.error(s) : void 0
 		});
@@ -1422,7 +1471,7 @@ async function executeHooks({ configHooks, hooks, makeSink }) {
 			command: cmd,
 			args
 		});
-		const { stream = false, onLine, onStdout, onStderr } = makeSink?.(commandWithArgs) ?? {};
+		const { stream = false, onLine, onStdout, onStderr } = makeSink?.(commandWithArgs, hookId) ?? {};
 		await runHook({
 			id: hookId,
 			command: cmd,
@@ -1520,7 +1569,7 @@ function waitForHookEnd(hooks, hookId, onSuccess, fallbackErrorMessage) {
 		hooks.on("kubb:hook:end", handler);
 	});
 }
-async function runToolPass({ toolValue, detect, toolMap, toolLabel, successPrefix, noToolMessage, configName, outputPath, logLevel: logLevel$1, hooks, onStart, onEnd }) {
+async function runToolPass({ toolValue, detect, toolMap, toolLabel, successPrefix, noToolMessage, configName, outputPath, logLevel: logLevel$1, hooks, makeSink, onStart, onEnd }) {
 	await onStart();
 	let resolvedTool = toolValue;
 	if (resolvedTool === "auto") {
@@ -1542,20 +1591,26 @@ async function runToolPass({ toolValue, detect, toolMap, toolLabel, successPrefi
 		].filter(Boolean).join(" ");
 		try {
 			const hookArgs = toolConfig.args(outputPath);
+			const commandWithArgs = [toolConfig.command, ...hookArgs].join(" ");
 			const hookEndPromise = waitForHookEnd(hooks, hookId, () => hooks.emit("kubb:success", { message: successMessage }), toolConfig.errorMessage);
 			await hooks.emit("kubb:hook:start", {
 				id: hookId,
 				command: toolConfig.command,
 				args: hookArgs
 			});
+			const { stream = false, onLine, onStdout, onStderr } = makeSink?.(commandWithArgs, hookId) ?? {};
 			runHook({
 				id: hookId,
 				command: toolConfig.command,
 				args: hookArgs,
-				commandWithArgs: [toolConfig.command, ...hookArgs].join(" "),
+				commandWithArgs,
 				context: hooks,
-				stream: false,
-				sink: {}
+				stream,
+				sink: {
+					onLine,
+					onStdout,
+					onStderr
+				}
 			}).catch(() => {});
 			await hookEndPromise;
 		} catch (caughtError) {
@@ -1580,12 +1635,12 @@ async function generate(options) {
 		...options.config.output
 	};
 	const kubb = createKubb(config, { hooks });
-	await kubb.setup();
 	await hooks.emit("kubb:generation:start", { config });
 	await hooks.emit("kubb:info", {
 		message: config.name ? `Setup generation ${styleText("bold", config.name)}` : "Setup generation",
 		info: inputPath
 	});
+	await kubb.setup();
 	await hooks.emit("kubb:info", {
 		message: config.name ? `Build generation ${styleText("bold", config.name)}` : "Build generation",
 		info: inputPath
@@ -1655,7 +1710,8 @@ async function generate(options) {
 		configName: config.name,
 		outputPath,
 		logLevel: logLevel$2,
-		hooks
+		hooks,
+		makeSink
 	});
 	if (config.hooks) {
 		await hooks.emit("kubb:hooks:start");
@@ -1696,14 +1752,15 @@ async function run({ input, configPath, logLevel: logLevelKey, watch }) {
 	const logLevel$3 = logLevel[logLevelKey] ?? logLevel.info;
 	const hooks = new AsyncEventEmitter();
 	const makeSink = await setupLogger(hooks, { logLevel: logLevel$3 });
+	await hooks.emit("kubb:lifecycle:start", { version });
 	await checkForUpdate(hooks);
 	try {
+		await hooks.emit("kubb:config:start");
 		const { configs, configPath: resolvedConfigPath } = await getConfigs({
 			configPath,
 			input
 		});
 		const relativeConfigPath = path.relative(process$1.cwd(), resolvedConfigPath);
-		await hooks.emit("kubb:config:start");
 		await hooks.emit("kubb:info", {
 			message: "Config loaded",
 			info: relativeConfigPath
@@ -1713,10 +1770,8 @@ async function run({ input, configPath, logLevel: logLevelKey, watch }) {
 			info: relativeConfigPath
 		});
 		await hooks.emit("kubb:config:end", { configs });
-		await hooks.emit("kubb:lifecycle:start", { version });
 		let anyFailed = false;
 		for (const config of configs) if (isInputPath(config) && watch) await startWatcher([input || config.input.path], async (paths) => {
-			hooks.removeAll();
 			await generate({
 				input,
 				config,
@@ -1751,4 +1806,4 @@ async function run({ input, configPath, logLevel: logLevelKey, watch }) {
 //#endregion
 export { run };
 
-//# sourceMappingURL=run-BNvaRFvz.js.map
+//# sourceMappingURL=run-BvsacB4B.js.map