@kubb/cli 4.12.5 → 4.12.7

package/dist/{generate-DKUIRxiL.js → generate--x91ECr5.js}

@@ -1,11 +1,11 @@
-import { t as version } from "./package-BqxUFXm-.js";
+import { t as version } from "./package-V7YSB1bN.js";
 import { defineCommand, showUsage } from "citty";
 import path, { relative, resolve } from "node:path";
 import * as process$2 from "node:process";
 import process$1 from "node:process";
 import * as clack from "@clack/prompts";
 import { LogLevel, PromiseManager, defineLogger, isInputPath, safeBuild, setup } from "@kubb/core";
-import { AsyncEventEmitter, isPromise } from "@kubb/core/utils";
+import { AsyncEventEmitter, formatHrtime, formatMs, isPromise } from "@kubb/core/utils";
 import getLatestVersion from "latest-version";
 import pc from "picocolors";
 import { lt } from "semver";
@@ -18,12 +18,6 @@ import { parseArgsStringToArgv } from "string-argv";
 import { cosmiconfig } from "cosmiconfig";
 import { createJiti } from "jiti";
 
-//#region src/utils/parseHrtimeToSeconds.ts
-function parseHrtimeToSeconds(hrtime) {
-	return (hrtime[0] + hrtime[1] / 1e9).toFixed(3);
-}
-
-//#endregion
 //#region src/utils/randomColour.ts
 function randomColour(text) {
 	if (!text) return "white";
@@ -51,14 +45,14 @@ function randomCliColour(text) {
 //#endregion
 //#region src/utils/getSummary.ts
 function getSummary({ failedPlugins, filesCreated, status, hrStart, config, pluginTimings }) {
-	const elapsedSeconds = parseHrtimeToSeconds(process.hrtime(hrStart));
+	const duration = formatHrtime(hrStart);
 	const pluginsCount = config.plugins?.length || 0;
 	const successCount = pluginsCount - failedPlugins.size;
 	const meta = {
 		plugins: status === "success" ? `${pc.green(`${successCount} successful`)}, ${pluginsCount} total` : `${pc.green(`${successCount} successful`)}, ${pc.red(`${failedPlugins.size} failed`)}, ${pluginsCount} total`,
 		pluginsFailed: status === "failed" ? [...failedPlugins]?.map(({ plugin }) => randomCliColour(plugin.name))?.join(", ") : void 0,
 		filesCreated,
-		time: `${elapsedSeconds}s`,
+		time: pc.green(duration),
 		output: path.isAbsolute(config.root) ? path.resolve(config.root, config.output.path) : config.root
 	};
 	const labels = {
@@ -115,9 +109,31 @@ const clackLogger = defineLogger({
 	name: "clack",
 	install(context, options) {
 		const logLevel = options?.logLevel || LogLevel.info;
-		const activeProgress = /* @__PURE__ */ new Map();
-		const spinner = clack.spinner();
-		let isSpinning = false;
+		const state = {
+			totalPlugins: 0,
+			completedPlugins: 0,
+			failedPlugins: 0,
+			totalFiles: 0,
+			processedFiles: 0,
+			hrStart: process$1.hrtime(),
+			spinner: clack.spinner(),
+			isSpinning: false,
+			activeProgress: /* @__PURE__ */ new Map()
+		};
+		function showProgressStep() {
+			if (logLevel <= LogLevel.silent) return;
+			const parts = [];
+			const duration = formatHrtime(state.hrStart);
+			if (state.totalPlugins > 0) {
+				const pluginStr = state.failedPlugins > 0 ? `Plugins ${pc.green(state.completedPlugins.toString())}/${state.totalPlugins} ${pc.red(`(${state.failedPlugins} failed)`)}` : `Plugins ${pc.green(state.completedPlugins.toString())}/${state.totalPlugins}`;
+				parts.push(pluginStr);
+			}
+			if (state.totalFiles > 0) parts.push(`Files ${pc.green(state.processedFiles.toString())}/${state.totalFiles}`);
+			if (parts.length > 0) {
+				parts.push(pc.green(duration));
+				clack.log.step(parts.join(pc.dim(" | ")));
+			}
+		}
 		function getMessage(message) {
 			if (logLevel >= LogLevel.verbose) {
 				const timestamp = (/* @__PURE__ */ new Date()).toLocaleTimeString("en-US", {
@@ -131,12 +147,12 @@ const clackLogger = defineLogger({
 			return message;
 		}
 		function startSpinner(text) {
-			spinner.start(text);
-			isSpinning = true;
+			state.spinner.start(text);
+			state.isSpinning = true;
 		}
 		function stopSpinner(text) {
-			spinner.stop(text);
-			isSpinning = false;
+			state.spinner.stop(text);
+			state.isSpinning = false;
 		}
 		context.on("info", (message, info = "") => {
 			if (logLevel <= LogLevel.silent) return;
@@ -145,7 +161,7 @@ const clackLogger = defineLogger({
 				message,
 				pc.dim(info)
 			].join(" "));
-			if (isSpinning) spinner.message(text);
+			if (state.isSpinning) state.spinner.message(text);
 			else clack.log.info(text);
 		});
 		context.on("success", (message, info = "") => {
@@ -155,7 +171,7 @@ const clackLogger = defineLogger({
 				message,
 				logLevel >= LogLevel.info ? pc.dim(info) : void 0
 			].filter(Boolean).join(" "));
-			if (isSpinning) stopSpinner(text);
+			if (state.isSpinning) stopSpinner(text);
 			else clack.log.success(text);
 		});
 		context.on("warn", (message, info) => {
@@ -170,7 +186,7 @@ const clackLogger = defineLogger({
 		context.on("error", (error) => {
 			const caused = error.cause;
 			const text = [pc.red("✗"), error.message].join(" ");
-			if (isSpinning) stopSpinner(getMessage(text));
+			if (state.isSpinning) stopSpinner(getMessage(text));
 			else clack.log.error(getMessage(text));
 			if (logLevel >= LogLevel.debug && error.stack) {
 				const frames = error.stack.split("\n").slice(1, 4);
@@ -207,12 +223,16 @@ Run \`npm install -g @kubb/cli\` to update`, "Update available for `Kubb`", {
 			clack.intro(text);
 			startSpinner(getMessage("Configuration loading"));
 		});
-		context.on("config:end", () => {
+		context.on("config:end", (_configs) => {
 			if (logLevel <= LogLevel.silent) return;
 			const text = getMessage("Configuration completed");
 			clack.outro(text);
 		});
 		context.on("generation:start", (config) => {
+			state.totalPlugins = config.plugins?.length || 0;
+			state.completedPlugins = 0;
+			state.failedPlugins = 0;
+			state.hrStart = process$1.hrtime();
 			const text = getMessage(["Generation started", config.name ? `for ${pc.dim(config.name)}` : void 0].filter(Boolean).join(" "));
 			clack.intro(text);
 		});
@@ -229,24 +249,29 @@ Run \`npm install -g @kubb/cli\` to update`, "Update available for `Kubb`", {
 			const interval = setInterval(() => {
 				progressBar.advance();
 			}, 50);
-			activeProgress.set(plugin.name, {
+			state.activeProgress.set(plugin.name, {
 				progressBar,
 				interval
 			});
 		});
-		context.on("plugin:end", (plugin, duration) => {
+		context.on("plugin:end", (plugin, { duration, success }) => {
 			stopSpinner();
-			const active = activeProgress.get(plugin.name);
+			const active = state.activeProgress.get(plugin.name);
 			if (!active || logLevel === LogLevel.silent) return;
 			clearInterval(active.interval);
-			const durationStr = duration >= 1e3 ? `${(duration / 1e3).toFixed(2)}s` : `${duration}ms`;
-			const text = getMessage(`${pc.bold(plugin.name)} completed in ${pc.green(durationStr)}`);
+			if (success) state.completedPlugins++;
+			else state.failedPlugins++;
+			const durationStr = formatMs(duration);
+			const text = getMessage(success ? `${pc.bold(plugin.name)} completed in ${pc.green(durationStr)}` : `${pc.bold(plugin.name)} failed in ${pc.red(durationStr)}`);
 			active.progressBar.stop(text);
-			activeProgress.delete(plugin.name);
+			state.activeProgress.delete(plugin.name);
+			showProgressStep();
 		});
 		context.on("files:processing:start", (files) => {
 			if (logLevel <= LogLevel.silent) return;
 			stopSpinner();
+			state.totalFiles = files.length;
+			state.processedFiles = 0;
 			const text = `Writing ${files.length} files`;
 			const progressBar = clack.progress({
 				style: "block",
@@ -255,13 +280,14 @@ Run \`npm install -g @kubb/cli\` to update`, "Update available for `Kubb`", {
 			});
 			context.emit("info", text);
 			progressBar.start(getMessage(text));
-			activeProgress.set("files", { progressBar });
+			state.activeProgress.set("files", { progressBar });
 		});
 		context.on("file:processing:update", ({ file, config }) => {
 			if (logLevel <= LogLevel.silent) return;
 			stopSpinner();
+			state.processedFiles++;
 			const text = `Writing ${relative(config.root, file.path)}`;
-			const active = activeProgress.get("files");
+			const active = state.activeProgress.get("files");
 			if (!active) return;
 			active.progressBar.advance(void 0, text);
 		});
@@ -269,10 +295,11 @@ Run \`npm install -g @kubb/cli\` to update`, "Update available for `Kubb`", {
 			if (logLevel <= LogLevel.silent) return;
 			stopSpinner();
 			const text = getMessage("Files written successfully");
-			const active = activeProgress.get("files");
+			const active = state.activeProgress.get("files");
 			if (!active) return;
 			active.progressBar.stop(text);
-			activeProgress.delete("files");
+			state.activeProgress.delete("files");
+			showProgressStep();
 		});
 		context.on("generation:end", (config) => {
 			const text = getMessage(config.name ? `Generation completed for ${pc.dim(config.name)}` : "Generation completed");
@@ -386,11 +413,11 @@ Run \`npm install -g @kubb/cli\` to update`, "Update available for `Kubb`", {
 			});
 		});
 		context.on("lifecycle:end", () => {
-			for (const [_key, active] of activeProgress) {
+			for (const [_key, active] of state.activeProgress) {
 				if (active.interval) clearInterval(active.interval);
 				active.progressBar?.stop();
 			}
-			activeProgress.clear();
+			state.activeProgress.clear();
 		});
 	}
 });
@@ -475,7 +502,29 @@ const githubActionsLogger = defineLogger({
 	name: "github-actions",
 	install(context, options) {
 		const logLevel = options?.logLevel || LogLevel.info;
-		let currentConfigs = [];
+		const state = {
+			totalPlugins: 0,
+			completedPlugins: 0,
+			failedPlugins: 0,
+			totalFiles: 0,
+			processedFiles: 0,
+			hrStart: process.hrtime(),
+			currentConfigs: []
+		};
+		function showProgressStep() {
+			if (logLevel <= LogLevel.silent) return;
+			const parts = [];
+			const duration = formatHrtime(state.hrStart);
+			if (state.totalPlugins > 0) {
+				const pluginStr = state.failedPlugins > 0 ? `Plugins ${pc.green(state.completedPlugins.toString())}/${state.totalPlugins} ${pc.red(`(${state.failedPlugins} failed)`)}` : `Plugins ${pc.green(state.completedPlugins.toString())}/${state.totalPlugins}`;
+				parts.push(pluginStr);
+			}
+			if (state.totalFiles > 0) parts.push(`Files ${pc.green(state.processedFiles.toString())}/${state.totalFiles}`);
+			if (parts.length > 0) {
+				parts.push(pc.green(duration));
+				console.log(parts.join(pc.dim(" | ")));
+			}
+		}
 		function getMessage(message) {
 			if (logLevel >= LogLevel.verbose) {
 				const timestamp = (/* @__PURE__ */ new Date()).toLocaleTimeString("en-US", {
@@ -536,34 +585,43 @@ const githubActionsLogger = defineLogger({
 			console.log(text);
 		});
 		context.on("config:end", (configs) => {
-			currentConfigs = configs;
+			state.currentConfigs = configs;
 			if (logLevel <= LogLevel.silent) return;
 			const text = getMessage("Configuration completed");
 			console.log(text);
 			closeGroup("Configuration");
 		});
 		context.on("generation:start", (config) => {
+			state.totalPlugins = config.plugins?.length || 0;
+			state.completedPlugins = 0;
+			state.failedPlugins = 0;
+			state.hrStart = process.hrtime();
 			const text = config.name ? `Generation for ${pc.bold(config.name)}` : "Generation";
-			if (currentConfigs.length > 1) openGroup(text);
-			if (currentConfigs.length === 1) console.log(getMessage(text));
+			if (state.currentConfigs.length > 1) openGroup(text);
+			if (state.currentConfigs.length === 1) console.log(getMessage(text));
 		});
 		context.on("plugin:start", (plugin) => {
 			if (logLevel <= LogLevel.silent) return;
 			const text = getMessage(`Generating ${pc.bold(plugin.name)}`);
-			if (currentConfigs.length === 1) openGroup(`Plugin: ${plugin.name}`);
+			if (state.currentConfigs.length === 1) openGroup(`Plugin: ${plugin.name}`);
 			console.log(text);
 		});
-		context.on("plugin:end", (plugin, duration) => {
+		context.on("plugin:end", (plugin, { duration, success }) => {
 			if (logLevel <= LogLevel.silent) return;
-			const durationStr = duration >= 1e3 ? `${(duration / 1e3).toFixed(2)}s` : `${duration}ms`;
-			const text = getMessage(`${pc.bold(plugin.name)} completed in ${pc.green(durationStr)}`);
+			if (success) state.completedPlugins++;
+			else state.failedPlugins++;
+			const durationStr = formatMs(duration);
+			const text = getMessage(success ? `${pc.bold(plugin.name)} completed in ${pc.green(durationStr)}` : `${pc.bold(plugin.name)} failed in ${pc.red(durationStr)}`);
 			console.log(text);
-			if (currentConfigs.length > 1) console.log(" ");
-			if (currentConfigs.length === 1) closeGroup(`Plugin: ${plugin.name}`);
+			if (state.currentConfigs.length > 1) console.log(" ");
+			if (state.currentConfigs.length === 1) closeGroup(`Plugin: ${plugin.name}`);
+			showProgressStep();
 		});
 		context.on("files:processing:start", (files) => {
 			if (logLevel <= LogLevel.silent) return;
-			if (currentConfigs.length === 1) openGroup("File Generation");
+			state.totalFiles = files.length;
+			state.processedFiles = 0;
+			if (state.currentConfigs.length === 1) openGroup("File Generation");
 			const text = getMessage(`Writing ${files.length} files`);
 			console.log(text);
 		});
@@ -571,7 +629,15 @@ const githubActionsLogger = defineLogger({
 			if (logLevel <= LogLevel.silent) return;
 			const text = getMessage("Files written successfully");
 			console.log(text);
-			if (currentConfigs.length === 1) closeGroup("File Generation");
+			if (state.currentConfigs.length === 1) closeGroup("File Generation");
+		});
+		context.on("file:processing:update", () => {
+			if (logLevel <= LogLevel.silent) return;
+			state.processedFiles++;
+		});
+		context.on("files:processing:end", () => {
+			if (logLevel <= LogLevel.silent) return;
+			showProgressStep();
 		});
 		context.on("generation:end", (config) => {
 			const text = getMessage(config.name ? `${pc.blue("✓")} Generation completed for ${pc.dim(config.name)}` : `${pc.blue("✓")} Generation completed`);
@@ -602,45 +668,45 @@ const githubActionsLogger = defineLogger({
 		context.on("format:start", () => {
 			if (logLevel <= LogLevel.silent) return;
 			const text = getMessage("Format started");
-			if (currentConfigs.length === 1) openGroup("Formatting");
+			if (state.currentConfigs.length === 1) openGroup("Formatting");
 			console.log(text);
 		});
 		context.on("format:end", () => {
 			if (logLevel <= LogLevel.silent) return;
 			const text = getMessage("Format completed");
 			console.log(text);
-			if (currentConfigs.length === 1) closeGroup("Formatting");
+			if (state.currentConfigs.length === 1) closeGroup("Formatting");
 		});
 		context.on("lint:start", () => {
 			if (logLevel <= LogLevel.silent) return;
 			const text = getMessage("Lint started");
-			if (currentConfigs.length === 1) openGroup("Linting");
+			if (state.currentConfigs.length === 1) openGroup("Linting");
 			console.log(text);
 		});
 		context.on("lint:end", () => {
 			if (logLevel <= LogLevel.silent) return;
 			const text = getMessage("Lint completed");
 			console.log(text);
-			if (currentConfigs.length === 1) closeGroup("Linting");
+			if (state.currentConfigs.length === 1) closeGroup("Linting");
 		});
 		context.on("hook:start", (command$1) => {
 			if (logLevel <= LogLevel.silent) return;
 			const text = getMessage(`Hook ${pc.dim(command$1)} started`);
-			if (currentConfigs.length === 1) openGroup(`Hook ${command$1}`);
+			if (state.currentConfigs.length === 1) openGroup(`Hook ${command$1}`);
 			console.log(text);
 		});
 		context.on("hook:end", (command$1) => {
 			if (logLevel <= LogLevel.silent) return;
 			const text = getMessage(`Hook ${pc.dim(command$1)} completed`);
 			console.log(text);
-			if (currentConfigs.length === 1) closeGroup(`Hook ${command$1}`);
+			if (state.currentConfigs.length === 1) closeGroup(`Hook ${command$1}`);
 		});
 		context.on("generation:summary", (config, { status, failedPlugins }) => {
 			const pluginsCount = config.plugins?.length || 0;
 			const successCount = pluginsCount - failedPlugins.size;
-			if (currentConfigs.length > 1) console.log(" ");
+			if (state.currentConfigs.length > 1) console.log(" ");
 			console.log(status === "success" ? `Kubb Summary: ${pc.blue("✓")} ${`${successCount} successful`}, ${pluginsCount} total` : `Kubb Summary: ${pc.blue("✓")} ${`${successCount} successful`}, ✗ ${`${failedPlugins.size} failed`}, ${pluginsCount} total`);
-			if (currentConfigs.length > 1) closeGroup(config.name ? `Generation for ${pc.bold(config.name)}` : "Generation");
+			if (state.currentConfigs.length > 1) closeGroup(config.name ? `Generation for ${pc.bold(config.name)}` : "Generation");
 		});
 	}
 });
@@ -727,10 +793,10 @@ const plainLogger = defineLogger({
 			const text = getMessage(`Generating ${plugin.name}`);
 			console.log(text);
 		});
-		context.on("plugin:end", (plugin, duration) => {
+		context.on("plugin:end", (plugin, { duration, success }) => {
 			if (logLevel <= LogLevel.silent) return;
-			const durationStr = duration >= 1e3 ? `${(duration / 1e3).toFixed(2)}s` : `${duration}ms`;
-			const text = getMessage(`${plugin.name} completed in ${durationStr}`);
+			const durationStr = formatMs(duration);
+			const text = getMessage(success ? `${plugin.name} completed in ${durationStr}` : `${plugin.name} failed in ${durationStr}`);
 			console.log(text);
 		});
 		context.on("files:processing:start", (files) => {
@@ -931,8 +997,8 @@ async function generate({ input, config, events, logLevel }) {
 						"successfully"
 					].filter(Boolean).join(" "));
 				});
-			} catch (e) {
-				await events.emit("error", e);
+			} catch (caughtError) {
+				await events.emit("error", caughtError);
 			}
 			await events.emit("success", `Formatted with ${config.output.format}`);
 		}
@@ -951,9 +1017,9 @@ async function generate({ input, config, events, logLevel }) {
 					"successfully"
 				].filter(Boolean).join(" "));
 			});
-		} catch (e) {
+		} catch (caughtError) {
 			const error$1 = /* @__PURE__ */ new Error("Biome not found");
-			error$1.cause = e;
+			error$1.cause = caughtError;
 			await events.emit("error", error$1);
 		}
 		await events.emit("format:end");
@@ -972,9 +1038,9 @@ async function generate({ input, config, events, logLevel }) {
 					"successfully"
 				].filter(Boolean).join(" "));
 			});
-		} catch (e) {
+		} catch (caughtError) {
 			const error$1 = /* @__PURE__ */ new Error("Eslint not found");
-			error$1.cause = e;
+			error$1.cause = caughtError;
 			await events.emit("error", error$1);
 		}
 		if (config.output.lint === "biome") try {
@@ -992,9 +1058,9 @@ async function generate({ input, config, events, logLevel }) {
 					"successfully"
 				].filter(Boolean).join(" "));
 			});
-		} catch (e) {
+		} catch (caughtError) {
 			const error$1 = /* @__PURE__ */ new Error("Biome not found");
-			error$1.cause = e;
+			error$1.cause = caughtError;
 			await events.emit("error", error$1);
 		}
 		if (config.output.lint === "oxlint") try {
@@ -1008,9 +1074,9 @@ async function generate({ input, config, events, logLevel }) {
 					"successfully"
 				].filter(Boolean).join(" "));
 			});
-		} catch (e) {
+		} catch (caughtError) {
 			const error$1 = /* @__PURE__ */ new Error("Oxlint not found");
-			error$1.cause = e;
+			error$1.cause = caughtError;
 			await events.emit("error", error$1);
 		}
 		await events.emit("lint:end");
@@ -1123,8 +1189,8 @@ async function getCosmiConfig(moduleName, config) {
 	});
 	try {
 		result = config ? await explorer.load(config) : await explorer.search();
-	} catch (e) {
-		throw new Error("Config failed loading", { cause: e });
+	} catch (error) {
+		throw new Error("Config failed loading", { cause: error });
 	}
 	if (result?.isEmpty || !result || !result.config) throw new Error("Config not defined, create a kubb.config.js or pass through your config with the option --config");
 	return result;
@@ -1237,8 +1303,8 @@ const command = defineCommand({
 			});
 			await promiseManager.run("seq", promises);
 			await events.emit("lifecycle:end");
-		} catch (e) {
-			await events.emit("error", e);
+		} catch (error) {
+			await events.emit("error", error);
 		}
 	}
 });
@@ -1246,4 +1312,4 @@ var generate_default = command;
 
 //#endregion
 export { generate_default as default };
-//# sourceMappingURL=generate-DKUIRxiL.js.map
+//# sourceMappingURL=generate--x91ECr5.js.map