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

package/dist/{run-DK-3QOOS.cjs → run-DJBakoaj.cjs}

@@ -2,7 +2,7 @@ const require_chunk = require("./chunk-ByKO4r7w.cjs");
 const require_errors = require("./errors-CLCjoSg0.cjs");
 const require_telemetry = require("./telemetry-B2iWkY5e.cjs");
 const require_shell = require("./shell-475fQKaX.cjs");
-const require_package = require("./package-C7ZmbQd7.cjs");
+const require_package = require("./package-CGujHNGG.cjs");
 const require_constants = require("./constants-BINTA5VZ.cjs");
 let node_util = require("node:util");
 let node_events = require("node:events");
@@ -17,7 +17,6 @@ node_process = require_chunk.__toESM(node_process, 1);
 let _clack_prompts = require("@clack/prompts");
 _clack_prompts = require_chunk.__toESM(_clack_prompts, 1);
 let _kubb_core = require("@kubb/core");
-let node_stream = require("node:stream");
 let cosmiconfig = require("cosmiconfig");
 let jiti = require("jiti");
 let tinyexec = require("tinyexec");
@@ -491,21 +490,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 node_stream.Writable {
-	taskLog;
-	constructor(taskLog, opts) {
-		super(opts);
-		this.taskLog = taskLog;
-	}
-	_write(chunk, _encoding, callback) {
-		this.taskLog.message(`${(0, node_util.styleText)("dim", chunk.toString())}`);
-		callback();
-	}
-};
-/**
 * TTY logger with beautiful UI and progress indicators for local development.
 */
 const clackLogger = (0, _kubb_core.defineLogger)({
@@ -521,7 +505,8 @@ const clackLogger = (0, _kubb_core.defineLogger)({
 			hrStart: node_process.default.hrtime(),
 			spinner: _clack_prompts.spinner(),
 			isSpinning: false,
-			activeProgress: /* @__PURE__ */ new Map()
+			activeProgress: /* @__PURE__ */ new Map(),
+			activeHookLogs: /* @__PURE__ */ new Map()
 		};
 		function reset() {
 			for (const [_key, active] of state.activeProgress) {
@@ -537,6 +522,7 @@ const clackLogger = (0, _kubb_core.defineLogger)({
 			state.spinner = _clack_prompts.spinner();
 			state.isSpinning = false;
 			state.activeProgress.clear();
+			state.activeHookLogs.clear();
 		}
 		function showProgressStep() {
 			if (logLevel <= _kubb_core.logLevel.silent) return;
@@ -551,6 +537,7 @@ const clackLogger = (0, _kubb_core.defineLogger)({
 			state.isSpinning = true;
 		}
 		function stopSpinner(text) {
+			if (!state.isSpinning) return;
 			state.spinner.stop(text);
 			state.isSpinning = false;
 		}
@@ -638,6 +625,7 @@ 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 <= _kubb_core.logLevel.silent) return;
 			const text = getMessage(["Generation started", config.name ? `for ${(0, node_util.styleText)("dim", config.name)}` : void 0].filter(Boolean).join(" "));
 			_clack_prompts.intro(text);
 		});
@@ -707,38 +695,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 ${(0, node_util.styleText)("dim", config.name)}` : "Generation completed");
 			_clack_prompts.outro(text);
 		});
 		context.on("kubb:format:start", () => {
 			if (logLevel <= _kubb_core.logLevel.silent) return;
-			const text = getMessage("Format started");
-			_clack_prompts.intro(text);
-		});
-		context.on("kubb:format:end", () => {
-			if (logLevel <= _kubb_core.logLevel.silent) return;
-			const text = getMessage("Format completed");
-			_clack_prompts.outro(text);
+			_clack_prompts.log.step(getMessage("Formatting"));
 		});
 		context.on("kubb:lint:start", () => {
 			if (logLevel <= _kubb_core.logLevel.silent) return;
-			const text = getMessage("Lint started");
-			_clack_prompts.intro(text);
+			_clack_prompts.log.step(getMessage("Linting"));
 		});
-		context.on("kubb:lint:end", () => {
+		context.on("kubb:hooks:start", () => {
 			if (logLevel <= _kubb_core.logLevel.silent) return;
-			const text = getMessage("Lint completed");
-			_clack_prompts.outro(text);
+			_clack_prompts.log.step(getMessage("Running hooks"));
 		});
-		context.on("kubb:hook:start", ({ command, args }) => {
-			if (logLevel <= _kubb_core.logLevel.silent) return;
-			const text = getMessage(`Hook ${(0, node_util.styleText)("dim", formatCommandWithArgs(command, args))} started`);
-			_clack_prompts.intro(text);
+		context.on("kubb:hook:start", ({ id, command, args }) => {
+			if (logLevel <= _kubb_core.logLevel.silent || !id) return;
+			stopSpinner();
+			const title = getMessage(`Running ${(0, node_util.styleText)("dim", formatCommandWithArgs(command, args))}`);
+			const taskLog = _clack_prompts.taskLog({ title });
+			state.activeHookLogs.set(id, {
+				taskLog,
+				hrStart: node_process.default.hrtime()
+			});
 		});
-		context.on("kubb:hook:end", ({ command, args }) => {
-			if (logLevel <= _kubb_core.logLevel.silent) return;
-			const text = getMessage(`Hook ${(0, node_util.styleText)("dim", formatCommandWithArgs(command, args))} successfully executed`);
-			_clack_prompts.outro(text);
+		context.on("kubb:hook:end", ({ id, command, args, success, error }) => {
+			if (logLevel <= _kubb_core.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(`${(0, node_util.styleText)("dim", commandWithArgs)} completed in ${duration}`));
+			else {
+				const reason = error?.message ? ` (${error.message})` : "";
+				active.taskLog.error(getMessage(`${(0, node_util.styleText)("dim", commandWithArgs)} failed${reason}`), { showLog: true });
+			}
 		});
 		context.on("kubb:generation:summary", ({ config, pluginTimings, failedPlugins, filesCreated, status, hrStart }) => {
 			const summary = getSummary({
@@ -769,18 +763,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 <= _kubb_core.logLevel.silent) return {
 				onStdout: (s) => console.log(s),
 				onStderr: (s) => console.error(s)
 			};
-			const logger = _clack_prompts.taskLog({ title: getMessage(["Executing hook", logLevel >= _kubb_core.logLevel.info ? (0, node_util.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((0, node_util.styleText)("dim", line)),
+				onStdout: (s) => taskLog.message(s),
+				onStderr: (s) => taskLog.message((0, node_util.styleText)("red", s))
 			};
 		};
 	}
@@ -908,17 +903,21 @@ const githubActionsLogger = (0, _kubb_core.defineLogger)({
 			failedPlugins: 0,
 			totalFiles: 0,
 			processedFiles: 0,
-			hrStart: process.hrtime(),
-			currentConfigs: []
+			hrStart: node_process.default.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 = node_process.default.hrtime();
 			state.currentConfigs = [];
+			state.hookStarts.clear();
 		}
 		function showProgressStep() {
 			if (logLevel <= _kubb_core.logLevel.silent) return;
@@ -930,9 +929,17 @@ const githubActionsLogger = (0, _kubb_core.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 <= _kubb_core.logLevel.silent) return;
@@ -963,6 +970,7 @@ const githubActionsLogger = (0, _kubb_core.defineLogger)({
 		});
 		context.on("kubb:error", ({ error }) => {
 			const caused = require_errors.toCause(error);
+			closeAllGroups();
 			if (logLevel <= _kubb_core.logLevel.silent) return;
 			const message = error.message || String(error);
 			console.error(`::error::${message}`);
@@ -980,6 +988,9 @@ const githubActionsLogger = (0, _kubb_core.defineLogger)({
 			console.log((0, node_util.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 <= _kubb_core.logLevel.silent) return;
 			const text = getMessage("Configuration started");
@@ -1064,18 +1075,35 @@ const githubActionsLogger = (0, _kubb_core.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 <= _kubb_core.logLevel.silent) return;
+			if (state.currentConfigs.length === 1) openGroup("Hooks");
+			console.log(getMessage("Hooks started"));
+		});
+		context.on("kubb:hooks:end", () => {
 			if (logLevel <= _kubb_core.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 <= _kubb_core.logLevel.silent) return;
+			if (id) state.hookStarts.set(id, node_process.default.hrtime());
 			const commandWithArgs = formatCommandWithArgs(command, args);
 			const text = getMessage(`Hook ${(0, node_util.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 <= _kubb_core.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 ${(0, node_util.styleText)("dim", commandWithArgs)} completed`);
-			console.log(text);
+			if (success) console.log(getMessage(`${(0, node_util.styleText)("green", "✓")} Hook ${(0, node_util.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 }) => {
@@ -1089,7 +1117,7 @@ const githubActionsLogger = (0, _kubb_core.defineLogger)({
 		context.on("kubb:lifecycle:end", () => {
 			reset();
 		});
-		return (_commandWithArgs) => ({
+		return (_commandWithArgs, _hookId) => ({
 			onStdout: logLevel > _kubb_core.logLevel.silent ? (s) => console.log(s) : void 0,
 			onStderr: logLevel > _kubb_core.logLevel.silent ? (s) => console.error(`::error::${s}`) : void 0
 		});
@@ -1104,6 +1132,7 @@ const plainLogger = (0, _kubb_core.defineLogger)({
 	name: "plain",
 	install(context, options) {
 		const logLevel = options?.logLevel ?? _kubb_core.logLevel.info;
+		const hookStarts = /* @__PURE__ */ new Map();
 		function getMessage(message) {
 			return formatMessage(message, logLevel);
 		}
@@ -1148,8 +1177,12 @@ const plainLogger = (0, _kubb_core.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 <= _kubb_core.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 <= _kubb_core.logLevel.silent) return;
@@ -1215,15 +1248,31 @@ const plainLogger = (0, _kubb_core.defineLogger)({
 			const text = getMessage("Lint completed");
 			console.log(text);
 		});
-		context.on("kubb:hook:start", ({ command, args }) => {
+		context.on("kubb:hooks:start", () => {
 			if (logLevel <= _kubb_core.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 <= _kubb_core.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 <= _kubb_core.logLevel.silent) return;
+			if (id) hookStarts.set(id, node_process.default.hrtime());
+			const commandWithArgs = formatCommandWithArgs(command, args);
+			console.log(getMessage(`Hook ${commandWithArgs} started`));
+		});
+		context.on("kubb:hook:end", ({ id, command, args, success, error }) => {
+			if (logLevel <= _kubb_core.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({
@@ -1238,7 +1287,7 @@ const plainLogger = (0, _kubb_core.defineLogger)({
 			console.log(summary.join("\n"));
 			console.log(require_constants.SUMMARY_SEPARATOR);
 		});
-		return (_commandWithArgs) => ({
+		return (_commandWithArgs, _hookId) => ({
 			onStdout: logLevel > _kubb_core.logLevel.silent ? (s) => console.log(s) : void 0,
 			onStderr: logLevel > _kubb_core.logLevel.silent ? (s) => console.error(s) : void 0
 		});
@@ -1425,7 +1474,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,
@@ -1523,7 +1572,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, hooks, onStart, onEnd }) {
+async function runToolPass({ toolValue, detect, toolMap, toolLabel, successPrefix, noToolMessage, configName, outputPath, logLevel, hooks, makeSink, onStart, onEnd }) {
 	await onStart();
 	let resolvedTool = toolValue;
 	if (resolvedTool === "auto") {
@@ -1545,20 +1594,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) {
@@ -1583,12 +1638,12 @@ async function generate(options) {
 		...options.config.output
 	};
 	const kubb = (0, _kubb_core.createKubb)(config, { hooks });
-	await kubb.setup();
 	await hooks.emit("kubb:generation:start", { config });
 	await hooks.emit("kubb:info", {
 		message: config.name ? `Setup generation ${(0, node_util.styleText)("bold", config.name)}` : "Setup generation",
 		info: inputPath
 	});
+	await kubb.setup();
 	await hooks.emit("kubb:info", {
 		message: config.name ? `Build generation ${(0, node_util.styleText)("bold", config.name)}` : "Build generation",
 		info: inputPath
@@ -1658,7 +1713,8 @@ async function generate(options) {
 		configName: config.name,
 		outputPath,
 		logLevel,
-		hooks
+		hooks,
+		makeSink
 	});
 	if (config.hooks) {
 		await hooks.emit("kubb:hooks:start");
@@ -1699,14 +1755,15 @@ async function run({ input, configPath, logLevel: logLevelKey, watch }) {
 	const logLevel = _kubb_core.logLevel[logLevelKey] ?? _kubb_core.logLevel.info;
 	const hooks = new AsyncEventEmitter();
 	const makeSink = await setupLogger(hooks, { logLevel });
+	await hooks.emit("kubb:lifecycle:start", { version: require_package.version });
 	await checkForUpdate(hooks);
 	try {
+		await hooks.emit("kubb:config:start");
 		const { configs, configPath: resolvedConfigPath } = await getConfigs({
 			configPath,
 			input
 		});
 		const relativeConfigPath = node_path.default.relative(node_process.default.cwd(), resolvedConfigPath);
-		await hooks.emit("kubb:config:start");
 		await hooks.emit("kubb:info", {
 			message: "Config loaded",
 			info: relativeConfigPath
@@ -1716,10 +1773,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: require_package.version });
 		let anyFailed = false;
 		for (const config of configs) if ((0, _kubb_core.isInputPath)(config) && watch) await startWatcher([input || config.input.path], async (paths) => {
-			hooks.removeAll();
 			await generate({
 				input,
 				config,
@@ -1754,4 +1809,4 @@ async function run({ input, configPath, logLevel: logLevelKey, watch }) {
 //#endregion
 exports.run = run;
 
-//# sourceMappingURL=run-DK-3QOOS.cjs.map
+//# sourceMappingURL=run-DJBakoaj.cjs.map