@kubb/cli 4.32.3 → 4.33.0

package/src/loggers/clackLogger.ts

@@ -3,12 +3,14 @@ import process from 'node:process'
 import { styleText } from 'node:util'
 import * as clack from '@clack/prompts'
 import { defineLogger, LogLevel } from '@kubb/core'
-import { formatHrtime, formatMs } from '@kubb/core/utils'
-import { type NonZeroExitError, x } from 'tinyexec'
+import { formatMs } from '@kubb/core/utils'
+import { toCause } from '../utils/errors.ts'
 import { formatMsWithColor } from '../utils/formatMsWithColor.ts'
 import { getIntro } from '../utils/getIntro.ts'
 import { getSummary } from '../utils/getSummary.ts'
+import { runHook } from '../utils/runHook.ts'
 import { ClackWritable } from '../utils/Writables.ts'
+import { buildProgressLine, formatCommandWithArgs, formatMessage } from './utils.ts'
 
 /**
  * Clack adapter for local TTY environments
@@ -17,7 +19,7 @@ import { ClackWritable } from '../utils/Writables.ts'
 export const clackLogger = defineLogger({
   name: 'clack',
   install(context, options) {
-    const logLevel = options?.logLevel || LogLevel.info
+    const logLevel = options?.logLevel ?? LogLevel.info
     const state = {
       totalPlugins: 0,
       completedPlugins: 0,
@@ -54,40 +56,14 @@ export const clackLogger = defineLogger({
         return
       }
 
-      const parts: string[] = []
-      const duration = formatHrtime(state.hrStart)
-
-      if (state.totalPlugins > 0) {
-        const pluginStr =
-          state.failedPlugins > 0
-            ? `Plugins ${styleText('green', state.completedPlugins.toString())}/${state.totalPlugins} ${styleText('red', `(${state.failedPlugins} failed)`)}`
-            : `Plugins ${styleText('green', state.completedPlugins.toString())}/${state.totalPlugins}`
-        parts.push(pluginStr)
-      }
-
-      if (state.totalFiles > 0) {
-        parts.push(`Files ${styleText('green', state.processedFiles.toString())}/${state.totalFiles}`)
-      }
-
-      if (parts.length > 0) {
-        parts.push(`${styleText('green', duration)} elapsed`)
-        clack.log.step(getMessage(parts.join(styleText('dim', ' | '))))
+      const line = buildProgressLine(state)
+      if (line) {
+        clack.log.step(getMessage(line))
       }
     }
 
     function getMessage(message: string): string {
-      if (logLevel >= LogLevel.verbose) {
-        const timestamp = new Date().toLocaleTimeString('en-US', {
-          hour12: false,
-          hour: '2-digit',
-          minute: '2-digit',
-          second: '2-digit',
-        })
-
-        return [styleText('dim', `[${timestamp}]`), message].join(' ')
-      }
-
-      return message
+      return formatMessage(message, logLevel)
     }
 
     function startSpinner(text?: string) {
@@ -141,7 +117,7 @@ export const clackLogger = defineLogger({
     })
 
     context.on('error', (error) => {
-      const caused = error.cause as Error | undefined
+      const caused = toCause(error)
 
       const text = [styleText('red', '✗'), error.message].join(' ')
 
@@ -217,13 +193,14 @@ Run \`npm install -g @kubb/cli\` to update`,
     })
 
     context.on('generation:start', (config) => {
-      // Initialize progress tracking
-      state.totalPlugins = config.plugins?.length || 0
+      reset()
+
+      // Initialize progress tracking for this generation
+      state.totalPlugins = config.plugins?.length ?? 0
 
       const text = getMessage(['Generation started', config.name ? `for ${styleText('dim', config.name)}` : undefined].filter(Boolean).join(' '))
 
       clack.intro(text)
-      reset()
     })
 
     context.on('plugin:start', (plugin) => {
@@ -387,7 +364,7 @@ Run \`npm install -g @kubb/cli\` to update`,
     })
 
     context.on('hook:start', async ({ id, command, args }) => {
-      const commandWithArgs = args?.length ? `${command} ${args.join(' ')}` : command
+      const commandWithArgs = formatCommandWithArgs(command, args)
       const text = getMessage(`Hook ${styleText('dim', commandWithArgs)} started`)
 
       // Skip hook execution if no id is provided (e.g., during benchmarks or tests)
@@ -396,53 +373,17 @@ Run \`npm install -g @kubb/cli\` to update`,
       }
 
       if (logLevel <= LogLevel.silent) {
-        try {
-          const result = await x(command, [...(args ?? [])], {
-            nodeOptions: { detached: true },
-            throwOnError: true,
-          })
-
-          await context.emit('debug', {
-            date: new Date(),
-            logs: [result.stdout.trimEnd()],
-          })
-
-          await context.emit('hook:end', {
-            command,
-            args,
-            id,
-            success: true,
-            error: null,
-          })
-        } catch (err) {
-          const error = err as NonZeroExitError
-          const stderr = error.output?.stderr ?? ''
-          const stdout = error.output?.stdout ?? ''
-
-          await context.emit('debug', {
-            date: new Date(),
-            logs: [stdout, stderr].filter(Boolean),
-          })
-
-          if (stderr) {
-            console.error(stderr)
-          }
-          if (stdout) {
-            console.log(stdout)
-          }
-
-          const errorMessage = new Error(`Hook execute failed: ${commandWithArgs}`)
-
-          await context.emit('hook:end', {
-            command,
-            args,
-            id,
-            success: false,
-            error: errorMessage,
-          })
-          await context.emit('error', errorMessage)
-        }
-
+        await runHook({
+          id,
+          command,
+          args,
+          commandWithArgs,
+          context,
+          sink: {
+            onStderr: (s) => console.error(s),
+            onStdout: (s) => console.log(s),
+          },
+        })
         return
       }
 
@@ -454,46 +395,19 @@ Run \`npm install -g @kubb/cli\` to update`,
 
       const writable = new ClackWritable(logger)
 
-      try {
-        const proc = x(command, [...(args ?? [])], {
-          nodeOptions: { detached: true },
-          throwOnError: true,
-        })
-
-        for await (const line of proc) {
-          writable.write(line)
-        }
-
-        const result = await proc
-
-        await context.emit('debug', {
-          date: new Date(),
-          logs: [result.stdout.trimEnd()],
-        })
-
-        await context.emit('hook:end', { command, args, id, success: true, error: null })
-      } catch (err) {
-        const error = err as NonZeroExitError
-        const stderr = error.output?.stderr ?? ''
-        const stdout = error.output?.stdout ?? ''
-
-        await context.emit('debug', {
-          date: new Date(),
-          logs: [stdout, stderr].filter(Boolean),
-        })
-
-        if (stderr) {
-          logger.error(stderr)
-        }
-        if (stdout) {
-          logger.message(stdout)
-        }
-
-        const errorMessage = new Error(`Hook execute failed: ${commandWithArgs}`)
-
-        await context.emit('hook:end', { command, args, id, success: false, error: errorMessage })
-        await context.emit('error', errorMessage)
-      }
+      await runHook({
+        id,
+        command,
+        args,
+        commandWithArgs,
+        context,
+        stream: true,
+        sink: {
+          onLine: (line) => writable.write(line),
+          onStderr: (s) => logger.error(s),
+          onStdout: (s) => logger.message(s),
+        },
+      })
     })
 
     context.on('hook:end', ({ command, args }) => {
@@ -501,7 +415,7 @@ Run \`npm install -g @kubb/cli\` to update`,
         return
       }
 
-      const commandWithArgs = args?.length ? `${command} ${args.join(' ')}` : command
+      const commandWithArgs = formatCommandWithArgs(command, args)
       const text = getMessage(`Hook ${styleText('dim', commandWithArgs)} successfully executed`)
 
       clack.outro(text)
@@ -521,22 +435,10 @@ Run \`npm install -g @kubb/cli\` to update`,
       summary.unshift('\n')
       summary.push('\n')
 
-      if (status === 'success') {
-        clack.box(summary.join('\n'), getMessage(title), {
-          width: 'auto',
-          formatBorder: (s: string) => styleText('green', s),
-          rounded: true,
-          withGuide: false,
-          contentAlign: 'left',
-          titleAlign: 'center',
-        })
-
-        return
-      }
-
+      const borderColor = status === 'success' ? 'green' : 'red'
       clack.box(summary.join('\n'), getMessage(title), {
         width: 'auto',
-        formatBorder: (s: string) => styleText('red', s),
+        formatBorder: (s: string) => styleText(borderColor, s),
         rounded: true,
         withGuide: false,
         contentAlign: 'left',

package/src/loggers/fileSystemLogger.ts

@@ -1,4 +1,5 @@
 import { relative, resolve } from 'node:path'
+import process from 'node:process'
 import { defineLogger } from '@kubb/core'
 import { write } from '@kubb/core/fs'
 import { formatMs } from '@kubb/core/utils'
@@ -63,7 +64,6 @@ export const fileSystemLogger = defineLogger({
       state.cachedLogs.add({
         date: new Date(),
         logs: [`ℹ ${message} ${info}`],
-        fileName: undefined,
       })
     })
 
@@ -71,7 +71,6 @@ export const fileSystemLogger = defineLogger({
       state.cachedLogs.add({
         date: new Date(),
         logs: [`✓ ${message} ${info}`],
-        fileName: undefined,
       })
     })
 
@@ -79,7 +78,6 @@ export const fileSystemLogger = defineLogger({
       state.cachedLogs.add({
         date: new Date(),
         logs: [`⚠ ${message} ${info}`],
-        fileName: undefined,
       })
     })
 
@@ -87,7 +85,6 @@ export const fileSystemLogger = defineLogger({
       state.cachedLogs.add({
         date: new Date(),
         logs: [`✗ ${error.message}`, error.stack || 'unknown stack'],
-        fileName: undefined,
       })
     })
 
@@ -95,7 +92,6 @@ export const fileSystemLogger = defineLogger({
       state.cachedLogs.add({
         date: new Date(),
         logs: message.logs,
-        fileName: undefined,
       })
     })
 
@@ -103,7 +99,6 @@ export const fileSystemLogger = defineLogger({
       state.cachedLogs.add({
         date: new Date(),
         logs: [`Generating ${plugin.name}`],
-        fileName: undefined,
       })
     })
 
@@ -113,7 +108,6 @@ export const fileSystemLogger = defineLogger({
       state.cachedLogs.add({
         date: new Date(),
         logs: [success ? `${plugin.name} completed in ${durationStr}` : `${plugin.name} failed in ${durationStr}`],
-        fileName: undefined,
       })
     })
 
@@ -121,7 +115,6 @@ export const fileSystemLogger = defineLogger({
       state.cachedLogs.add({
         date: new Date(),
         logs: [`Start ${files.length} writing:`, ...files.map((file) => file.path)],
-        fileName: undefined,
       })
     })
 
@@ -134,10 +127,6 @@ export const fileSystemLogger = defineLogger({
       reset()
     })
 
-    context.on('lifecycle:end', async () => {
-      // lifecycle:end handler can be used for cleanup if needed in the future
-    })
-
     // Fallback: Write logs on process exit to handle crashes
     const exitHandler = () => {
       // Synchronous write on exit - best effort

package/src/loggers/githubActionsLogger.ts

@@ -1,8 +1,10 @@
 import { styleText } from 'node:util'
 import { type Config, defineLogger, LogLevel } from '@kubb/core'
 import { formatHrtime, formatMs } from '@kubb/core/utils'
-import { type NonZeroExitError, x } from 'tinyexec'
+import { toCause } from '../utils/errors.ts'
 import { formatMsWithColor } from '../utils/formatMsWithColor.ts'
+import { runHook } from '../utils/runHook.ts'
+import { buildProgressLine, formatCommandWithArgs, formatMessage } from './utils.ts'
 
 /**
  * GitHub Actions adapter for CI environments
@@ -11,7 +13,7 @@ import { formatMsWithColor } from '../utils/formatMsWithColor.ts'
 export const githubActionsLogger = defineLogger({
   name: 'github-actions',
   install(context, options) {
-    const logLevel = options?.logLevel || LogLevel.info
+    const logLevel = options?.logLevel ?? LogLevel.info
     const state = {
       totalPlugins: 0,
       completedPlugins: 0,
@@ -29,6 +31,7 @@ export const githubActionsLogger = defineLogger({
       state.totalFiles = 0
       state.processedFiles = 0
       state.hrStart = process.hrtime()
+      state.currentConfigs = []
     }
 
     function showProgressStep() {
@@ -36,40 +39,14 @@ export const githubActionsLogger = defineLogger({
         return
       }
 
-      const parts: string[] = []
-      const duration = formatHrtime(state.hrStart)
-
-      if (state.totalPlugins > 0) {
-        const pluginStr =
-          state.failedPlugins > 0
-            ? `Plugins ${styleText('green', state.completedPlugins.toString())}/${state.totalPlugins} ${styleText('red', `(${state.failedPlugins} failed)`)}`
-            : `Plugins ${styleText('green', state.completedPlugins.toString())}/${state.totalPlugins}`
-        parts.push(pluginStr)
-      }
-
-      if (state.totalFiles > 0) {
-        parts.push(`Files ${styleText('green', state.processedFiles.toString())}/${state.totalFiles}`)
-      }
-
-      if (parts.length > 0) {
-        parts.push(`${styleText('green', duration)} elapsed`)
-        console.log(getMessage(parts.join(styleText('dim', ' | '))))
+      const line = buildProgressLine(state)
+      if (line) {
+        console.log(getMessage(line))
       }
     }
 
     function getMessage(message: string): string {
-      if (logLevel >= LogLevel.verbose) {
-        const timestamp = new Date().toLocaleTimeString('en-US', {
-          hour12: false,
-          hour: '2-digit',
-          minute: '2-digit',
-          second: '2-digit',
-        })
-
-        return [styleText('dim', `[${timestamp}]`), message].join(' ')
-      }
-
-      return message
+      return formatMessage(message, logLevel)
     }
 
     function openGroup(name: string) {
@@ -111,7 +88,7 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('error', (error) => {
-      const caused = error.cause as Error | undefined
+      const caused = toCause(error)
 
       if (logLevel <= LogLevel.silent) {
         return
@@ -169,8 +146,10 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('generation:start', (config) => {
-      // Initialize progress tracking
-      state.totalPlugins = config.plugins?.length || 0
+      reset()
+
+      // Initialize progress tracking for this generation
+      state.totalPlugins = config.plugins?.length ?? 0
 
       const text = config.name ? `Generation for ${styleText('bold', config.name)}` : 'Generation'
 
@@ -181,8 +160,6 @@ export const githubActionsLogger = defineLogger({
       if (state.currentConfigs.length === 1) {
         console.log(getMessage(text))
       }
-
-      reset()
     })
 
     context.on('plugin:start', (plugin) => {
@@ -256,6 +233,9 @@ export const githubActionsLogger = defineLogger({
       if (state.currentConfigs.length === 1) {
         closeGroup('File Generation')
       }
+
+      // Show final progress step after files are written
+      showProgressStep()
     })
 
     context.on('file:processing:update', () => {
@@ -266,15 +246,6 @@ export const githubActionsLogger = defineLogger({
       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 ? `${styleText('blue', '✓')} Generation completed for ${styleText('dim', config.name)}` : `${styleText('blue', '✓')} Generation completed`,
@@ -340,14 +311,13 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('hook:start', async ({ id, command, args }) => {
-      const commandWithArgs = args?.length ? `${command} ${args.join(' ')}` : command
+      const commandWithArgs = formatCommandWithArgs(command, args)
       const text = getMessage(`Hook ${styleText('dim', commandWithArgs)} started`)
 
       if (logLevel > LogLevel.silent) {
         if (state.currentConfigs.length === 1) {
           openGroup(`Hook ${commandWithArgs}`)
         }
-
         console.log(text)
       }
 
@@ -356,57 +326,18 @@ export const githubActionsLogger = defineLogger({
         return
       }
 
-      try {
-        const result = await x(command, [...(args ?? [])], {
-          nodeOptions: { detached: true },
-          throwOnError: true,
-        })
-
-        await context.emit('debug', {
-          date: new Date(),
-          logs: [result.stdout.trimEnd()],
-        })
-
-        if (logLevel > LogLevel.silent) {
-          console.log(result.stdout.trimEnd())
-        }
-
-        await context.emit('hook:end', {
-          command,
-          args,
-          id,
-          success: true,
-          error: null,
-        })
-      } catch (err) {
-        const error = err as NonZeroExitError
-        const stderr = error.output?.stderr ?? ''
-        const stdout = error.output?.stdout ?? ''
-
-        await context.emit('debug', {
-          date: new Date(),
-          logs: [stdout, stderr].filter(Boolean),
-        })
-
-        // Display stderr/stdout in GitHub Actions format
-        if (stderr) {
-          console.error(`::error::${stderr}`)
-        }
-        if (stdout) {
-          console.log(stdout)
-        }
-
-        const errorMessage = new Error(`Hook execute failed: ${commandWithArgs}`)
-
-        await context.emit('hook:end', {
-          command,
-          args,
-          id,
-          success: false,
-          error: errorMessage,
-        })
-        await context.emit('error', errorMessage)
-      }
+      await runHook({
+        id,
+        command,
+        args,
+        commandWithArgs,
+        context,
+        sink: {
+          // GHA formats errors with the ::error:: annotation
+          onStdout: logLevel > LogLevel.silent ? (s) => console.log(s) : undefined,
+          onStderr: logLevel > LogLevel.silent ? (s) => console.error(`::error::${s}`) : undefined,
+        },
+      })
     })
 
     context.on('hook:end', ({ command, args }) => {
@@ -414,7 +345,7 @@ export const githubActionsLogger = defineLogger({
         return
       }
 
-      const commandWithArgs = args?.length ? `${command} ${args.join(' ')}` : command
+      const commandWithArgs = formatCommandWithArgs(command, args)
       const text = getMessage(`Hook ${styleText('dim', commandWithArgs)} completed`)
 
       console.log(text)
@@ -425,7 +356,7 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('generation:summary', (config, { status, hrStart, failedPlugins }) => {
-      const pluginsCount = config.plugins?.length || 0
+      const pluginsCount = config.plugins?.length ?? 0
       const successCount = pluginsCount - failedPlugins.size
       const duration = formatHrtime(hrStart)
 
@@ -443,5 +374,9 @@ export const githubActionsLogger = defineLogger({
         closeGroup(config.name ? `Generation for ${styleText('bold', config.name)}` : 'Generation')
       }
     })
+
+    context.on('lifecycle:end', () => {
+      reset()
+    })
   },
 })