@kubb/cli 4.12.5 → 4.12.7

package/src/loggers/clackLogger.ts

@@ -1,10 +1,11 @@
 import { relative } from 'node:path'
+import process from 'node:process'
 import * as clack from '@clack/prompts'
 import { defineLogger, LogLevel } from '@kubb/core'
+import { formatHrtime, formatMs } from '@kubb/core/utils'
 import { execa } from 'execa'
 import { default as gradientString } from 'gradient-string'
 import pc from 'picocolors'
-
 import { getSummary } from '../utils/getSummary.ts'
 import { ClackWritable } from '../utils/Writables.ts'
 
@@ -16,9 +17,43 @@ export const clackLogger = defineLogger({
   name: 'clack',
   install(context, options) {
     const logLevel = options?.logLevel || LogLevel.info
-    const activeProgress = new Map<string, { interval?: NodeJS.Timeout; progressBar: clack.ProgressResult }>()
-    const spinner = clack.spinner()
-    let isSpinning = false
+    const state = {
+      totalPlugins: 0,
+      completedPlugins: 0,
+      failedPlugins: 0,
+      totalFiles: 0,
+      processedFiles: 0,
+      hrStart: process.hrtime(),
+      spinner: clack.spinner(),
+      isSpinning: false,
+      activeProgress: new Map<string, { interval?: NodeJS.Timeout; progressBar: clack.ProgressResult }>(),
+    }
+
+    function showProgressStep() {
+      if (logLevel <= LogLevel.silent) {
+        return
+      }
+
+      const parts: string[] = []
+      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: string): string {
       if (logLevel >= LogLevel.verbose) {
@@ -36,13 +71,13 @@ export const clackLogger = defineLogger({
     }
 
     function startSpinner(text?: string) {
-      spinner.start(text)
-      isSpinning = true
+      state.spinner.start(text)
+      state.isSpinning = true
     }
 
     function stopSpinner(text?: string) {
-      spinner.stop(text)
-      isSpinning = false
+      state.spinner.stop(text)
+      state.isSpinning = false
     }
 
     context.on('info', (message, info = '') => {
@@ -52,8 +87,8 @@ export const clackLogger = defineLogger({
 
       const text = getMessage([pc.blue('ℹ'), message, pc.dim(info)].join(' '))
 
-      if (isSpinning) {
-        spinner.message(text)
+      if (state.isSpinning) {
+        state.spinner.message(text)
       } else {
         clack.log.info(text)
       }
@@ -66,7 +101,7 @@ export const clackLogger = defineLogger({
 
       const text = getMessage([pc.blue('✓'), message, logLevel >= LogLevel.info ? pc.dim(info) : undefined].filter(Boolean).join(' '))
 
-      if (isSpinning) {
+      if (state.isSpinning) {
         stopSpinner(text)
       } else {
         clack.log.success(text)
@@ -88,7 +123,7 @@ export const clackLogger = defineLogger({
 
       const text = [pc.red('✗'), error.message].join(' ')
 
-      if (isSpinning) {
+      if (state.isSpinning) {
         stopSpinner(getMessage(text))
       } else {
         clack.log.error(getMessage(text))
@@ -147,7 +182,7 @@ Run \`npm install -g @kubb/cli\` to update`,
       startSpinner(getMessage('Configuration loading'))
     })
 
-    context.on('config:end', () => {
+    context.on('config:end', (_configs) => {
       if (logLevel <= LogLevel.silent) {
         return
       }
@@ -158,6 +193,12 @@ Run \`npm install -g @kubb/cli\` to update`,
     })
 
     context.on('generation:start', (config) => {
+      // Initialize progress tracking
+      state.totalPlugins = config.plugins?.length || 0
+      state.completedPlugins = 0
+      state.failedPlugins = 0
+      state.hrStart = process.hrtime()
+
       const text = getMessage(['Generation started', config.name ? `for ${pc.dim(config.name)}` : undefined].filter(Boolean).join(' '))
 
       clack.intro(text)
@@ -182,13 +223,13 @@ Run \`npm install -g @kubb/cli\` to update`,
         progressBar.advance()
       }, 50)
 
-      activeProgress.set(plugin.name, { progressBar, interval })
+      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
@@ -196,11 +237,22 @@ Run \`npm install -g @kubb/cli\` to update`,
 
       clearInterval(active.interval)
 
-      const durationStr = duration >= 1000 ? `${(duration / 1000).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)
+
+      // Show progress step after each plugin
+      showProgressStep()
     })
 
     context.on('files:processing:start', (files) => {
@@ -210,6 +262,9 @@ Run \`npm install -g @kubb/cli\` to update`,
 
       stopSpinner()
 
+      state.totalFiles = files.length
+      state.processedFiles = 0
+
       const text = `Writing ${files.length} files`
       const progressBar = clack.progress({
         style: 'block',
@@ -219,7 +274,7 @@ Run \`npm install -g @kubb/cli\` to update`,
 
       context.emit('info', text)
       progressBar.start(getMessage(text))
-      activeProgress.set('files', { progressBar })
+      state.activeProgress.set('files', { progressBar })
     })
 
     context.on('file:processing:update', ({ file, config }) => {
@@ -229,8 +284,10 @@ Run \`npm install -g @kubb/cli\` to update`,
 
       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
@@ -246,14 +303,17 @@ Run \`npm install -g @kubb/cli\` to update`,
       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')
+
+      // Show final progress step after files are written
+      showProgressStep()
     })
 
     context.on('generation:end', (config) => {
@@ -421,13 +481,13 @@ Run \`npm install -g @kubb/cli\` to update`,
     })
 
     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()
     })
   },
 })

package/src/loggers/githubActionsLogger.ts

@@ -1,4 +1,5 @@
 import { type Config, defineLogger, LogLevel } from '@kubb/core'
+import { formatHrtime, formatMs } from '@kubb/core/utils'
 import { execa } from 'execa'
 import pc from 'picocolors'
 
@@ -10,7 +11,41 @@ export const githubActionsLogger = defineLogger({
   name: 'github-actions',
   install(context, options) {
     const logLevel = options?.logLevel || LogLevel.info
-    let currentConfigs: Array<Config> = []
+    const state = {
+      totalPlugins: 0,
+      completedPlugins: 0,
+      failedPlugins: 0,
+      totalFiles: 0,
+      processedFiles: 0,
+      hrStart: process.hrtime(),
+      currentConfigs: [] as Array<Config>,
+    }
+
+    function showProgressStep() {
+      if (logLevel <= LogLevel.silent) {
+        return
+      }
+
+      const parts: string[] = []
+      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: string): string {
       if (logLevel >= LogLevel.verbose) {
@@ -90,7 +125,7 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('config:end', (configs) => {
-      currentConfigs = configs
+      state.currentConfigs = configs
 
       if (logLevel <= LogLevel.silent) {
         return
@@ -104,13 +139,19 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('generation:start', (config) => {
+      // Initialize progress tracking
+      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) {
+      if (state.currentConfigs.length > 1) {
         openGroup(text)
       }
 
-      if (currentConfigs.length === 1) {
+      if (state.currentConfigs.length === 1) {
         console.log(getMessage(text))
       }
     })
@@ -121,35 +162,51 @@ export const githubActionsLogger = defineLogger({
       }
       const text = getMessage(`Generating ${pc.bold(plugin.name)}`)
 
-      if (currentConfigs.length === 1) {
+      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 >= 1000 ? `${(duration / 1000).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) {
+      if (state.currentConfigs.length > 1) {
         console.log(' ')
       }
 
-      if (currentConfigs.length === 1) {
+      if (state.currentConfigs.length === 1) {
         closeGroup(`Plugin: ${plugin.name}`)
       }
+
+      // Show progress step after each plugin
+      showProgressStep()
     })
 
     context.on('files:processing:start', (files) => {
       if (logLevel <= LogLevel.silent) {
         return
       }
-      if (currentConfigs.length === 1) {
+
+      state.totalFiles = files.length
+      state.processedFiles = 0
+
+      if (state.currentConfigs.length === 1) {
         openGroup('File Generation')
       }
       const text = getMessage(`Writing ${files.length} files`)
@@ -165,11 +222,28 @@ export const githubActionsLogger = defineLogger({
 
       console.log(text)
 
-      if (currentConfigs.length === 1) {
+      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
+      }
+
+      // Show final progress step after files are written
+      showProgressStep()
+    })
+
     context.on('generation:end', (config) => {
       const text = getMessage(config.name ? `${pc.blue('✓')} Generation completed for ${pc.dim(config.name)}` : `${pc.blue('✓')} Generation completed`)
 
@@ -211,7 +285,7 @@ export const githubActionsLogger = defineLogger({
 
       const text = getMessage('Format started')
 
-      if (currentConfigs.length === 1) {
+      if (state.currentConfigs.length === 1) {
         openGroup('Formatting')
       }
 
@@ -227,7 +301,7 @@ export const githubActionsLogger = defineLogger({
 
       console.log(text)
 
-      if (currentConfigs.length === 1) {
+      if (state.currentConfigs.length === 1) {
         closeGroup('Formatting')
       }
     })
@@ -239,7 +313,7 @@ export const githubActionsLogger = defineLogger({
 
       const text = getMessage('Lint started')
 
-      if (currentConfigs.length === 1) {
+      if (state.currentConfigs.length === 1) {
         openGroup('Linting')
       }
 
@@ -255,7 +329,7 @@ export const githubActionsLogger = defineLogger({
 
       console.log(text)
 
-      if (currentConfigs.length === 1) {
+      if (state.currentConfigs.length === 1) {
         closeGroup('Linting')
       }
     })
@@ -267,7 +341,7 @@ export const githubActionsLogger = defineLogger({
 
       const text = getMessage(`Hook ${pc.dim(command)} started`)
 
-      if (currentConfigs.length === 1) {
+      if (state.currentConfigs.length === 1) {
         openGroup(`Hook ${command}`)
       }
 
@@ -283,7 +357,7 @@ export const githubActionsLogger = defineLogger({
 
       console.log(text)
 
-      if (currentConfigs.length === 1) {
+      if (state.currentConfigs.length === 1) {
         closeGroup(`Hook ${command}`)
       }
     })
@@ -292,7 +366,7 @@ export const githubActionsLogger = defineLogger({
       const pluginsCount = config.plugins?.length || 0
       const successCount = pluginsCount - failedPlugins.size
 
-      if (currentConfigs.length > 1) {
+      if (state.currentConfigs.length > 1) {
         console.log(' ')
       }
 
@@ -302,7 +376,7 @@ export const githubActionsLogger = defineLogger({
           : `Kubb Summary: ${pc.blue('✓')} ${`${successCount} successful`}, ✗ ${`${failedPlugins.size} failed`}, ${pluginsCount} total`,
       )
 
-      if (currentConfigs.length > 1) {
+      if (state.currentConfigs.length > 1) {
         closeGroup(config.name ? `Generation for ${pc.bold(config.name)}` : 'Generation')
       }
     })

package/src/loggers/plainLogger.ts

@@ -1,5 +1,6 @@
 import { relative } from 'node:path'
 import { defineLogger, LogLevel } from '@kubb/core'
+import { formatMs } from '@kubb/core/utils'
 import { execa } from 'execa'
 import { getSummary } from '../utils/getSummary.ts'
 
@@ -121,13 +122,13 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('plugin:end', (plugin, duration) => {
+    context.on('plugin:end', (plugin, { duration, success }) => {
       if (logLevel <= LogLevel.silent) {
         return
       }
 
-      const durationStr = duration >= 1000 ? `${(duration / 1000).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)
     })

package/src/runners/generate.ts

@@ -125,8 +125,8 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
             )
           },
         )
-      } catch (e) {
-        await events.emit('error', e as Error)
+      } catch (caughtError) {
+        await events.emit('error', caughtError as Error)
       }
 
       await events.emit('success', `Formatted with ${config.output.format}`)
@@ -153,9 +153,9 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
             )
           },
         )
-      } catch (e) {
+      } catch (caughtError) {
         const error = new Error('Biome not found')
-        error.cause = e
+        error.cause = caughtError
         await events.emit('error', error)
       }
     }
@@ -198,9 +198,9 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
             )
           },
         )
-      } catch (e) {
+      } catch (caughtError) {
         const error = new Error('Eslint not found')
-        error.cause = e
+        error.cause = caughtError
         await events.emit('error', error)
       }
     }
@@ -226,9 +226,9 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
             )
           },
         )
-      } catch (e) {
+      } catch (caughtError) {
         const error = new Error('Biome not found')
-        error.cause = e
+        error.cause = caughtError
         await events.emit('error', error)
       }
     }
@@ -254,9 +254,9 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
             )
           },
         )
-      } catch (e) {
+      } catch (caughtError) {
         const error = new Error('Oxlint not found')
-        error.cause = e
+        error.cause = caughtError
         await events.emit('error', error)
       }
     }

package/src/utils/Writables.ts

@@ -15,11 +15,3 @@ export class ClackWritable extends Writable {
     callback()
   }
 }
-
-export class StdoutWritable extends Writable {
-  _write(chunk: any, _encoding: BufferEncoding, callback: (error?: Error | null) => void): void {
-    process.stdout.write(`${pc.dim(chunk?.toString())}`)
-
-    callback()
-  }
-}

package/src/utils/getCosmiConfig.ts

@@ -59,8 +59,8 @@ export async function getCosmiConfig(moduleName: string, config?: string): Promi
 
   try {
     result = config ? ((await explorer.load(config)) as CosmiconfigResult) : ((await explorer.search()) as CosmiconfigResult)
-  } 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) {

package/src/utils/getSummary.ts

@@ -1,7 +1,7 @@
 import path from 'node:path'
 import type { Config, Plugin } from '@kubb/core'
+import { formatHrtime } from '@kubb/core/utils'
 import pc from 'picocolors'
-import { parseHrtimeToSeconds } from './parseHrtimeToSeconds.ts'
 import { randomCliColour } from './randomColour.ts'
 
 type SummaryProps = {
@@ -14,7 +14,7 @@ type SummaryProps = {
 }
 
 export function getSummary({ failedPlugins, filesCreated, status, hrStart, config, pluginTimings }: SummaryProps): string[] {
-  const elapsedSeconds = parseHrtimeToSeconds(process.hrtime(hrStart))
+  const duration = formatHrtime(hrStart)
 
   const pluginsCount = config.plugins?.length || 0
   const successCount = pluginsCount - failedPlugins.size
@@ -26,7 +26,7 @@ export function getSummary({ failedPlugins, filesCreated, status, hrStart, confi
         : `${pc.green(`${successCount} successful`)}, ${pc.red(`${failedPlugins.size} failed`)}, ${pluginsCount} total`,
     pluginsFailed: status === 'failed' ? [...failedPlugins]?.map(({ plugin }) => randomCliColour(plugin.name))?.join(', ') : undefined,
     filesCreated: filesCreated,
-    time: `${elapsedSeconds}s`,
+    time: pc.green(duration),
     output: path.isAbsolute(config.root) ? path.resolve(config.root, config.output.path) : config.root,
   } as const