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

package/src/loggers/githubActionsLogger.ts

@@ -1,5 +1,6 @@
+import process from 'node:process'
 import { styleText } from 'node:util'
-import { formatHrtime, formatMs, formatMsWithColor, toCause } from '@internals/utils'
+import { formatHrtime, formatMs, formatMsWithColor, getElapsedMs, toCause } from '@internals/utils'
 import { type Config, defineLogger, logLevel as logLevelMap } from '@kubb/core'
 import { buildProgressLine, formatCommandWithArgs, formatMessage } from './utils.ts'
 
@@ -18,9 +19,12 @@ export const githubActionsLogger = defineLogger({
       processedFiles: 0,
       hrStart: process.hrtime(),
       currentConfigs: [] as Array<Config>,
+      hookStarts: new Map<string, [number, number]>(),
+      openGroupDepth: 0,
     }
 
     function reset() {
+      closeAllGroups()
       state.totalPlugins = 0
       state.completedPlugins = 0
       state.failedPlugins = 0
@@ -28,6 +32,7 @@ export const githubActionsLogger = defineLogger({
       state.processedFiles = 0
       state.hrStart = process.hrtime()
       state.currentConfigs = []
+      state.hookStarts.clear()
     }
 
     function showProgressStep() {
@@ -47,10 +52,19 @@ export const githubActionsLogger = defineLogger({
 
     function openGroup(name: string) {
       console.log(`::group::${name}`)
+      state.openGroupDepth++
     }
 
     function closeGroup(_name: string) {
       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 = '' }) => {
@@ -86,6 +100,10 @@ export const githubActionsLogger = defineLogger({
     context.on('kubb:error', ({ error }) => {
       const caused = toCause(error)
 
+      // Always release any unclosed groups so a thrown :start without a matching :end
+      // (e.g., when getConfigs or kubb.setup throws) doesn't leak an open section.
+      closeAllGroups()
+
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -115,6 +133,10 @@ export const githubActionsLogger = defineLogger({
       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 <= logLevelMap.silent) {
         return
@@ -306,11 +328,39 @@ export const githubActionsLogger = defineLogger({
       }
     })
 
-    context.on('kubb:hook:start', ({ command, args }) => {
+    context.on('kubb:hooks:start', () => {
+      if (logLevel <= logLevelMap.silent) {
+        return
+      }
+
+      if (state.currentConfigs.length === 1) {
+        openGroup('Hooks')
+      }
+
+      console.log(getMessage('Hooks started'))
+    })
+
+    context.on('kubb:hooks:end', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
 
+      console.log(getMessage('Hooks completed'))
+
+      if (state.currentConfigs.length === 1) {
+        closeGroup('Hooks')
+      }
+    })
+
+    context.on('kubb:hook:start', ({ id, command, args }) => {
+      if (logLevel <= logLevelMap.silent) {
+        return
+      }
+
+      if (id) {
+        state.hookStarts.set(id, process.hrtime())
+      }
+
       const commandWithArgs = formatCommandWithArgs(command, args)
       const text = getMessage(`Hook ${styleText('dim', commandWithArgs)} started`)
 
@@ -320,15 +370,23 @@ export const githubActionsLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('kubb:hook:end', ({ command, args }) => {
+    context.on('kubb:hook:end', ({ id, command, args, success, error }) => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
 
+      const hrStart = id ? state.hookStarts.get(id) : undefined
+      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}`)
@@ -359,7 +417,7 @@ export const githubActionsLogger = defineLogger({
       reset()
     })
 
-    return (_commandWithArgs: string) => ({
+    return (_commandWithArgs: string, _hookId: string) => ({
       onStdout: logLevel > logLevelMap.silent ? (s: string) => console.log(s) : undefined,
       onStderr: logLevel > logLevelMap.silent ? (s: string) => console.error(`::error::${s}`) : undefined,
     })

package/src/loggers/plainLogger.ts

@@ -1,5 +1,6 @@
 import { relative } from 'node:path'
-import { formatMs, toCause } from '@internals/utils'
+import process from 'node:process'
+import { formatMs, getElapsedMs, toCause } from '@internals/utils'
 import { defineLogger, logLevel as logLevelMap } from '@kubb/core'
 import { SUMMARY_SEPARATOR } from '../constants.ts'
 import { getSummary } from './utils.ts'
@@ -12,6 +13,7 @@ export const plainLogger = defineLogger({
   name: 'plain',
   install(context, options) {
     const logLevel = options?.logLevel ?? logLevelMap.info
+    const hookStarts = new Map<string, [number, number]>()
 
     function getMessage(message: string): string {
       return formatMessage(message, logLevel)
@@ -72,8 +74,16 @@ export 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 <= logLevelMap.silent) {
+        return
+      }
+
+      console.log(getMessage(`Update available: v${currentVersion} → v${latestVersion}. Run \`npm install -g @kubb/cli\` to update.`))
     })
 
     context.on('kubb:config:start', () => {
@@ -198,26 +208,52 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('kubb:hook:start', ({ command, args }) => {
+    context.on('kubb:hooks:start', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
 
-      const commandWithArgs = formatCommandWithArgs(command, args)
-      const text = getMessage(`Hook ${commandWithArgs} started`)
+      console.log(getMessage('Hooks started'))
+    })
 
-      console.log(text)
+    context.on('kubb:hooks:end', () => {
+      if (logLevel <= logLevelMap.silent) {
+        return
+      }
+
+      console.log(getMessage('Hooks completed'))
     })
 
-    context.on('kubb:hook:end', ({ command, args }) => {
+    context.on('kubb:hook:start', ({ id, command, args }) => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
 
+      if (id) {
+        hookStarts.set(id, process.hrtime())
+      }
+
       const commandWithArgs = formatCommandWithArgs(command, args)
-      const text = getMessage(`Hook ${commandWithArgs} completed`)
+      console.log(getMessage(`Hook ${commandWithArgs} started`))
+    })
 
-      console.log(text)
+    context.on('kubb:hook:end', ({ id, command, args, success, error }) => {
+      if (logLevel <= logLevelMap.silent) {
+        return
+      }
+
+      const hrStart = id ? hookStarts.get(id) : undefined
+      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 }) => {
@@ -235,7 +271,7 @@ export const plainLogger = defineLogger({
       console.log(SUMMARY_SEPARATOR)
     })
 
-    return (_commandWithArgs: string) => ({
+    return (_commandWithArgs: string, _hookId: string) => ({
       onStdout: logLevel > logLevelMap.silent ? (s: string) => console.log(s) : undefined,
       onStderr: logLevel > logLevelMap.silent ? (s: string) => console.error(s) : undefined,
     })

package/src/loggers/utils.ts

@@ -43,8 +43,11 @@ export type HookSinkOptions = HookOutputSink & {
 /**
  * Factory called once per hook command to build the output sink and streaming flag.
  * The function should set up any logger UI (e.g., spinner) and return callbacks that forward subprocess output to it.
+ *
+ * `hookId` is the same id passed to `kubb:hook:start` / `kubb:hook:end`, letting the logger
+ * correlate streamed output with the active UI element (e.g., a clack `taskLog`) it created in the start handler.
  */
-export type HookSinkFactory = (commandWithArgs: string) => HookSinkOptions | undefined
+export type HookSinkFactory = (commandWithArgs: string, hookId: string) => HookSinkOptions | undefined
 
 /**
  * Logger variant that may return a {@link HookSinkFactory} from `install`.

package/src/runners/generate/run.ts

@@ -10,7 +10,7 @@ import { version } from '../../../package.json'
 import { KUBB_NPM_PACKAGE_URL } from '../../constants.ts'
 import { setupLogger, type HookSinkFactory } from '../../loggers/utils.ts'
 import { buildTelemetryEvent, sendTelemetry } from '../../telemetry.ts'
-import { executeHooks, getConfigs, startWatcher } from './utils.ts'
+import { executeHooks, getConfigs, runHook, startWatcher } from './utils.ts'
 
 type GenerateProps = {
   input?: string
@@ -33,6 +33,7 @@ type RunToolPassOptions = {
   outputPath: string
   logLevel: number
   hooks: AsyncEventEmitter<KubbHooks>
+  makeSink?: HookSinkFactory
   onStart: () => Promise<void>
   onEnd: () => Promise<void>
 }
@@ -67,6 +68,7 @@ async function runToolPass({
   outputPath,
   logLevel,
   hooks,
+  makeSink,
   onStart,
   onEnd,
 }: RunToolPassOptions) {
@@ -98,9 +100,23 @@ async function runToolPass({
       .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: toolConfig.args(outputPath) })
+      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,
+        context: hooks,
+        stream,
+        sink: { onLine, onStdout, onStderr },
+      }).catch(() => {})
 
       await hookEndPromise
     } catch (caughtError) {
@@ -130,10 +146,12 @@ async function generate(options: GenerateProps): Promise<boolean> {
   } satisfies Config
 
   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 })
 
   const { files, failedPlugins, pluginTimings, error, driver } = await kubb.safeBuild()
@@ -195,7 +213,7 @@ async function generate(options: GenerateProps): Promise<boolean> {
   ].filter(Boolean) as Omit<RunToolPassOptions, 'configName' | 'outputPath' | 'logLevel' | 'hooks'>[]
 
   for (const pass of toolPasses) {
-    await runToolPass({ ...pass, configName: config.name, outputPath, logLevel, hooks })
+    await runToolPass({ ...pass, configName: config.name, outputPath, logLevel, hooks, makeSink })
   }
 
   if (config.hooks) {
@@ -241,17 +259,19 @@ export async function run({ input, configPath, logLevel: logLevelKey, watch }: G
 
   const makeSink = await setupLogger(hooks, { logLevel })
 
+  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.cwd(), resolvedConfigPath)
 
-    await hooks.emit('kubb:config:start')
     await hooks.emit('kubb:info', { message: 'Config loaded', info: relativeConfigPath })
     await hooks.emit('kubb:success', { message: 'Config loaded successfully', info: relativeConfigPath })
     await hooks.emit('kubb:config:end', { configs })
-    await hooks.emit('kubb:lifecycle:start', { version })
 
     let anyFailed = false
     for (const config of configs) {
@@ -259,7 +279,10 @@ export async function run({ input, configPath, logLevel: logLevelKey, watch }: G
         await startWatcher(
           [input || config.input.path],
           async (paths) => {
-            hooks.removeAll()
+            // Don't removeAll() — that would also drop logger and lifecycle listeners.
+            // Plugin and middleware listeners are already disposed by safeBuild's
+            // setupResult.dispose() in its finally block, so re-running generate()
+            // on the same hooks emitter is safe.
             await generate({ input, config, logLevel, hooks, makeSink })
             clack.log.step(styleText('yellow', `Watching for changes in ${paths.join(' and ')}`))
           },

package/src/runners/generate/utils.ts

@@ -107,7 +107,7 @@ export async function getConfigs({ configPath, input }: GetConfigsOptions): Prom
 type ExecuteHooksOptions = {
   configHooks: NonNullable<Config['hooks']>
   hooks: AsyncEventEmitter<KubbHooks>
-  makeSink?: (commandWithArgs: string) => HookSinkOptions | undefined
+  makeSink?: (commandWithArgs: string, hookId: string) => HookSinkOptions | undefined
 }
 
 /**
@@ -125,7 +125,7 @@ export async function executeHooks({ configHooks, hooks, makeSink }: ExecuteHook
 
     await hooks.emit('kubb:hook:start', { id: hookId, 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, args, commandWithArgs, context: hooks, stream, sink: { onLine, onStdout, onStderr } })
   }
 }
@@ -140,7 +140,7 @@ type RunHookOptions = {
   sink?: HookSinkOptions
 }
 
-async function runHook({ id, command, args, commandWithArgs, context, stream = false, sink }: RunHookOptions): Promise<void> {
+export async function runHook({ id, command, args, commandWithArgs, context, stream = false, sink }: RunHookOptions): Promise<void> {
   const emitEnd = (success: boolean, error: Error | null) => context.emit('kubb:hook:end', { command, args, id, success, error })
 
   try {

package/dist/package-Cljxf8a3.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"package-Cljxf8a3.cjs","names":[],"sources":["../package.json"],"sourcesContent":[""],"mappings":""}

package/dist/package-DTbBkfHc.js

@@ -1,6 +0,0 @@
-//#region package.json
-var version = "5.0.0-beta.13";
-//#endregion
-export { version as t };
-
-//# sourceMappingURL=package-DTbBkfHc.js.map

package/dist/package-DTbBkfHc.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"package-DTbBkfHc.js","names":[],"sources":["../package.json"],"sourcesContent":[""],"mappings":""}