@kubb/cli 4.12.6 → 4.12.8

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,50 @@ 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 reset() {
+      state.totalPlugins = 0
+      state.completedPlugins = 0
+      state.failedPlugins = 0
+      state.totalFiles = 0
+      state.processedFiles = 0
+      state.hrStart = process.hrtime()
+    }
+
+    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)} elapsed`)
+        console.log(getMessage(parts.join(pc.dim(' | '))))
+      }
+    }
 
     function getMessage(message: string): string {
       if (logLevel >= LogLevel.verbose) {
@@ -75,6 +119,7 @@ export const githubActionsLogger = defineLogger({
 
     context.on('lifecycle:start', (version) => {
       console.log(pc.yellow(`Kubb ${version} 🧩`))
+      reset()
     })
 
     context.on('config:start', () => {
@@ -90,7 +135,7 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('config:end', (configs) => {
-      currentConfigs = configs
+      state.currentConfigs = configs
 
       if (logLevel <= LogLevel.silent) {
         return
@@ -104,15 +149,20 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('generation:start', (config) => {
+      // Initialize progress tracking
+      state.totalPlugins = config.plugins?.length || 0
+
       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))
       }
+
+      reset()
     })
 
     context.on('plugin:start', (plugin) => {
@@ -121,35 +171,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,43 +231,32 @@ export const githubActionsLogger = defineLogger({
 
       console.log(text)
 
-      if (currentConfigs.length === 1) {
+      if (state.currentConfigs.length === 1) {
         closeGroup('File Generation')
       }
     })
 
-    context.on('generation:end', (config) => {
-      const text = getMessage(config.name ? `${pc.blue('✓')} Generation completed for ${pc.dim(config.name)}` : `${pc.blue('✓')} Generation completed`)
+    context.on('file:processing:update', () => {
+      if (logLevel <= LogLevel.silent) {
+        return
+      }
 
-      console.log(text)
+      state.processedFiles++
     })
 
-    context.on('hook:execute', async ({ command, args }, cb) => {
-      try {
-        const result = await execa(command, args, {
-          detached: true,
-          stripFinalNewline: true,
-        })
-
-        await context.emit('debug', {
-          date: new Date(),
-          logs: [result.stdout],
-        })
-
-        console.log(result.stdout)
+    context.on('files:processing:end', () => {
+      if (logLevel <= LogLevel.silent) {
+        return
+      }
 
-        cb()
-      } catch (err) {
-        const error = new Error('Hook execute failed')
-        error.cause = err
+      // Show final progress step after files are written
+      showProgressStep()
+    })
 
-        await context.emit('debug', {
-          date: new Date(),
-          logs: [(err as any).stdout],
-        })
+    context.on('generation:end', (config) => {
+      const text = getMessage(config.name ? `${pc.blue('✓')} Generation completed for ${pc.dim(config.name)}` : `${pc.blue('✓')} Generation completed`)
 
-        await context.emit('error', error)
-      }
+      console.log(text)
     })
 
     context.on('format:start', () => {
@@ -211,7 +266,7 @@ export const githubActionsLogger = defineLogger({
 
       const text = getMessage('Format started')
 
-      if (currentConfigs.length === 1) {
+      if (state.currentConfigs.length === 1) {
         openGroup('Formatting')
       }
 
@@ -227,7 +282,7 @@ export const githubActionsLogger = defineLogger({
 
       console.log(text)
 
-      if (currentConfigs.length === 1) {
+      if (state.currentConfigs.length === 1) {
         closeGroup('Formatting')
       }
     })
@@ -239,7 +294,7 @@ export const githubActionsLogger = defineLogger({
 
       const text = getMessage('Lint started')
 
-      if (currentConfigs.length === 1) {
+      if (state.currentConfigs.length === 1) {
         openGroup('Linting')
       }
 
@@ -255,26 +310,50 @@ export const githubActionsLogger = defineLogger({
 
       console.log(text)
 
-      if (currentConfigs.length === 1) {
+      if (state.currentConfigs.length === 1) {
         closeGroup('Linting')
       }
     })
 
-    context.on('hook:start', (command) => {
-      if (logLevel <= LogLevel.silent) {
-        return
-      }
-
+    context.on('hook:start', async ({ id, command, args }) => {
       const text = getMessage(`Hook ${pc.dim(command)} started`)
 
-      if (currentConfigs.length === 1) {
-        openGroup(`Hook ${command}`)
+      if (logLevel > LogLevel.silent) {
+        if (state.currentConfigs.length === 1) {
+          openGroup(`Hook ${command}`)
+        }
+
+        console.log(text)
       }
 
-      console.log(text)
+      try {
+        const result = await execa(command, args, {
+          detached: true,
+          stripFinalNewline: true,
+        })
+
+        await context.emit('debug', {
+          date: new Date(),
+          logs: [result.stdout],
+        })
+
+        console.log(result.stdout)
+
+        await context.emit('hook:end', { command, id })
+      } catch (err) {
+        const error = new Error('Hook execute failed')
+        error.cause = err
+
+        await context.emit('debug', {
+          date: new Date(),
+          logs: [(err as any).stdout],
+        })
+
+        await context.emit('error', error)
+      }
     })
 
-    context.on('hook:end', (command) => {
+    context.on('hook:end', ({ command }) => {
       if (logLevel <= LogLevel.silent) {
         return
       }
@@ -283,26 +362,27 @@ export const githubActionsLogger = defineLogger({
 
       console.log(text)
 
-      if (currentConfigs.length === 1) {
+      if (state.currentConfigs.length === 1) {
         closeGroup(`Hook ${command}`)
       }
     })
 
-    context.on('generation:summary', (config, { status, failedPlugins }) => {
+    context.on('generation:summary', (config, { status, hrStart, failedPlugins }) => {
       const pluginsCount = config.plugins?.length || 0
       const successCount = pluginsCount - failedPlugins.size
+      const duration = formatHrtime(hrStart)
 
-      if (currentConfigs.length > 1) {
+      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`,
+          ? `Kubb Summary: ${pc.blue('✓')} ${`${successCount} successful`}, ${pluginsCount} total, ${pc.green(duration)}`
+          : `Kubb Summary: ${pc.blue('✓')} ${`${successCount} successful`}, ✗ ${`${failedPlugins.size} failed`}, ${pluginsCount} total, ${pc.green(duration)}`,
       )
 
-      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)
     })
@@ -168,34 +169,6 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('hook:execute', async ({ command, args }, cb) => {
-      try {
-        const result = await execa(command, args, {
-          detached: true,
-          stripFinalNewline: true,
-        })
-
-        await context.emit('debug', {
-          date: new Date(),
-          logs: [result.stdout],
-        })
-
-        console.log(result.stdout)
-
-        cb()
-      } catch (err) {
-        const error = new Error('Hook execute failed')
-        error.cause = err
-
-        await context.emit('debug', {
-          date: new Date(),
-          logs: [(err as any).stdout],
-        })
-
-        await context.emit('error', error)
-      }
-    })
-
     context.on('format:start', () => {
       if (logLevel <= LogLevel.silent) {
         return
@@ -236,14 +209,38 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('hook:start', (command) => {
-      if (logLevel <= LogLevel.silent) {
-        return
+    context.on('hook:start', async ({ id, command, args }) => {
+      const text = getMessage(`Hook ${command} started`)
+
+      if (logLevel > LogLevel.silent) {
+        console.log(text)
       }
 
-      const text = getMessage(`Hook ${command} started`)
+      try {
+        const result = await execa(command, args, {
+          detached: true,
+          stripFinalNewline: true,
+        })
 
-      console.log(text)
+        await context.emit('debug', {
+          date: new Date(),
+          logs: [result.stdout],
+        })
+
+        console.log(result.stdout)
+
+        await context.emit('hook:end', { command, id })
+      } catch (err) {
+        const error = new Error('Hook execute failed')
+        error.cause = err
+
+        await context.emit('debug', {
+          date: new Date(),
+          logs: [(err as any).stdout],
+        })
+
+        await context.emit('error', error)
+      }
     })
 
     context.on('hook:end', (command) => {

package/src/runners/generate.ts

@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto'
 import path from 'node:path'
 import process from 'node:process'
 import { type Config, type KubbEvents, LogLevel, safeBuild, setup } from '@kubb/core'
@@ -106,13 +107,15 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
 
     if (config.output.format === 'prettier') {
       try {
-        await events.emit(
-          'hook:execute',
-          {
-            command: 'prettier',
-            args: ['--ignore-unknown', '--write', path.resolve(definedConfig.root, definedConfig.output.path)],
-          },
-          async () => {
+        const hookId = createHash('sha256').update(config.output.format).digest('hex')
+        await events.emit('hook:start', {
+          id: hookId,
+          command: 'prettier',
+          args: ['--ignore-unknown', '--write', path.resolve(definedConfig.root, definedConfig.output.path)],
+        })
+
+        await events.on('hook:end', async ({ id }) => {
+          if (id === hookId) {
             await events.emit(
               'success',
               [
@@ -123,8 +126,8 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
                 .filter(Boolean)
                 .join(' '),
             )
-          },
-        )
+          }
+        })
       } catch (caughtError) {
         await events.emit('error', caughtError as Error)
       }
@@ -134,13 +137,15 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
 
     if (config.output.format === 'biome') {
       try {
-        await events.emit(
-          'hook:execute',
-          {
-            command: 'biome',
-            args: ['format', '--write', path.resolve(definedConfig.root, definedConfig.output.path)],
-          },
-          async () => {
+        const hookId = createHash('sha256').update(config.output.format).digest('hex')
+        await events.emit('hook:start', {
+          id: hookId,
+          command: 'biome',
+          args: ['format', '--write', path.resolve(definedConfig.root, definedConfig.output.path)],
+        })
+
+        await events.on('hook:end', async ({ id }) => {
+          if (id === hookId) {
             await events.emit(
               'success',
               [
@@ -151,8 +156,8 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
                 .filter(Boolean)
                 .join(' '),
             )
-          },
-        )
+          }
+        })
       } catch (caughtError) {
         const error = new Error('Biome not found')
         error.cause = caughtError
@@ -179,13 +184,15 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
 
     if (config.output.lint === 'eslint') {
       try {
-        await events.emit(
-          'hook:execute',
-          {
-            command: 'eslint',
-            args: [path.resolve(definedConfig.root, definedConfig.output.path), '--fix'],
-          },
-          async () => {
+        const hookId = createHash('sha256').update(config.output.lint).digest('hex')
+        await events.emit('hook:start', {
+          id: hookId,
+          command: 'eslint',
+          args: [path.resolve(definedConfig.root, definedConfig.output.path), '--fix'],
+        })
+
+        await events.on('hook:end', async ({ id }) => {
+          if (id === hookId) {
             await events.emit(
               'success',
               [
@@ -196,8 +203,8 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
                 .filter(Boolean)
                 .join(' '),
             )
-          },
-        )
+          }
+        })
       } catch (caughtError) {
         const error = new Error('Eslint not found')
         error.cause = caughtError
@@ -207,13 +214,15 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
 
     if (config.output.lint === 'biome') {
       try {
-        await events.emit(
-          'hook:execute',
-          {
-            command: 'biome',
-            args: ['lint', '--fix', path.resolve(definedConfig.root, definedConfig.output.path)],
-          },
-          async () => {
+        const hookId = createHash('sha256').update(config.output.lint).digest('hex')
+        await events.emit('hook:start', {
+          id: hookId,
+          command: 'biome',
+          args: ['lint', '--fix', path.resolve(definedConfig.root, definedConfig.output.path)],
+        })
+
+        await events.on('hook:end', async ({ id }) => {
+          if (id === hookId) {
             await events.emit(
               'success',
               [
@@ -224,8 +233,8 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
                 .filter(Boolean)
                 .join(' '),
             )
-          },
-        )
+          }
+        })
       } catch (caughtError) {
         const error = new Error('Biome not found')
         error.cause = caughtError
@@ -235,13 +244,15 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
 
     if (config.output.lint === 'oxlint') {
       try {
-        await events.emit(
-          'hook:execute',
-          {
-            command: 'oxlint',
-            args: ['--fix', path.resolve(definedConfig.root, definedConfig.output.path)],
-          },
-          async () => {
+        const hookId = createHash('sha256').update(config.output.lint).digest('hex')
+        await events.emit('hook:start', {
+          id: hookId,
+          command: 'oxlint',
+          args: ['--fix', path.resolve(definedConfig.root, definedConfig.output.path)],
+        })
+
+        await events.on('hook:end', async ({ id }) => {
+          if (id === hookId) {
             await events.emit(
               'success',
               [
@@ -252,8 +263,8 @@ export async function generate({ input, config, events, logLevel }: GenerateProp
                 .filter(Boolean)
                 .join(' '),
             )
-          },
-        )
+          }
+        })
       } catch (caughtError) {
         const error = new Error('Oxlint not found')
         error.cause = caughtError

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/executeHooks.ts

@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto'
 import type { Config, KubbEvents } from '@kubb/core'
 import type { AsyncEventEmitter } from '@kubb/core/utils'
 
@@ -19,12 +20,14 @@ export async function executeHooks({ hooks, events }: ExecutingHooksProps): Prom
       continue
     }
 
-    await events.emit('hook:start', command)
+    const hookId = createHash('sha256').update(command).digest('hex')
 
-    await events.emit('hook:execute', { command: cmd, args }, async () => {
-      await events.emit('success', `${pc.dim(command)} successfully executed`)
+    await events.emit('hook:start', { id: hookId, command: cmd, args })
 
-      await events.emit('hook:end', command)
+    await events.on('hook:end', async ({ id }) => {
+      if (id === hookId) {
+        await events.emit('success', `${pc.dim(command)} successfully executed`)
+      }
     })
   }
 }

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