@kubb/cli 4.32.4 → 4.33.1

package/src/loggers/githubActionsLogger.ts

@@ -1,8 +1,8 @@
 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 { formatMsWithColor } from '../utils/formatMsWithColor.ts'
+import { formatHrtime, formatMs, formatMsWithColor, toCause } from '@internals/utils'
+import { type Config, defineLogger, logLevel as logLevelMap } from '@kubb/core'
+import { runHook } from '../utils/runHook.ts'
+import { buildProgressLine, formatCommandWithArgs, formatMessage } from './utils.ts'
 
 /**
  * GitHub Actions adapter for CI environments
@@ -11,7 +11,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 ?? logLevelMap.info
     const state = {
       totalPlugins: 0,
       completedPlugins: 0,
@@ -29,47 +29,22 @@ export const githubActionsLogger = defineLogger({
       state.totalFiles = 0
       state.processedFiles = 0
       state.hrStart = process.hrtime()
+      state.currentConfigs = []
     }
 
     function showProgressStep() {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         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) {
@@ -81,7 +56,7 @@ export const githubActionsLogger = defineLogger({
     }
 
     context.on('info', (message, info = '') => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -91,36 +66,36 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('success', (message, info = '') => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
-      const text = getMessage([styleText('blue', '✓'), message, logLevel >= LogLevel.info ? styleText('dim', info) : undefined].filter(Boolean).join(' '))
+      const text = getMessage([styleText('blue', '✓'), message, logLevel >= logLevelMap.info ? styleText('dim', info) : undefined].filter(Boolean).join(' '))
 
       console.log(text)
     })
 
     context.on('warn', (message, info = '') => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
-      const text = getMessage([styleText('yellow', '⚠'), message, logLevel >= LogLevel.info ? styleText('dim', info) : undefined].filter(Boolean).join(' '))
+      const text = getMessage([styleText('yellow', '⚠'), message, logLevel >= logLevelMap.info ? styleText('dim', info) : undefined].filter(Boolean).join(' '))
 
       console.warn(`::warning::${text}`)
     })
 
     context.on('error', (error) => {
-      const caused = error.cause as Error | undefined
+      const caused = toCause(error)
 
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
       const message = error.message || String(error)
       console.error(`::error::${message}`)
 
       // Show stack trace in debug mode (first 3 frames)
-      if (logLevel >= LogLevel.debug && error.stack) {
+      if (logLevel >= logLevelMap.debug && error.stack) {
         const frames = error.stack.split('\n').slice(1, 4)
         for (const frame of frames) {
           console.log(getMessage(styleText('dim', frame.trim())))
@@ -143,7 +118,7 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('config:start', () => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -157,7 +132,7 @@ export const githubActionsLogger = defineLogger({
     context.on('config:end', (configs) => {
       state.currentConfigs = configs
 
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -169,8 +144,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,12 +158,10 @@ export const githubActionsLogger = defineLogger({
       if (state.currentConfigs.length === 1) {
         console.log(getMessage(text))
       }
-
-      reset()
     })
 
     context.on('plugin:start', (plugin) => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
       const text = getMessage(`Generating ${styleText('bold', plugin.name)}`)
@@ -199,7 +174,7 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('plugin:end', (plugin, { duration, success }) => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -230,7 +205,7 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('files:processing:start', (files) => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -246,7 +221,7 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('files:processing:end', () => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
       const text = getMessage('Files written successfully')
@@ -256,25 +231,19 @@ 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', () => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.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 ? `${styleText('blue', '✓')} Generation completed for ${styleText('dim', config.name)}` : `${styleText('blue', '✓')} Generation completed`,
@@ -284,7 +253,7 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('format:start', () => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -298,7 +267,7 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('format:end', () => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -312,7 +281,7 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('lint:start', () => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -326,7 +295,7 @@ export const githubActionsLogger = defineLogger({
     })
 
     context.on('lint:end', () => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -340,14 +309,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 (logLevel > logLevelMap.silent) {
         if (state.currentConfigs.length === 1) {
           openGroup(`Hook ${commandWithArgs}`)
         }
-
         console.log(text)
       }
 
@@ -356,65 +324,26 @@ 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 > logLevelMap.silent ? (s) => console.log(s) : undefined,
+          onStderr: logLevel > logLevelMap.silent ? (s) => console.error(`::error::${s}`) : undefined,
+        },
+      })
     })
 
     context.on('hook:end', ({ command, args }) => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         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 +354,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 +372,9 @@ export const githubActionsLogger = defineLogger({
         closeGroup(config.name ? `Generation for ${styleText('bold', config.name)}` : 'Generation')
       }
     })
+
+    context.on('lifecycle:end', () => {
+      reset()
+    })
   },
 })

package/src/loggers/plainLogger.ts

@@ -1,8 +1,10 @@
 import { relative } from 'node:path'
-import { defineLogger, LogLevel } from '@kubb/core'
-import { formatMs } from '@kubb/core/utils'
-import { type NonZeroExitError, x } from 'tinyexec'
+import { formatMs, toCause } from '@internals/utils'
+import { defineLogger, logLevel as logLevelMap } from '@kubb/core'
+import { SUMMARY_SEPARATOR } from '../constants.ts'
 import { getSummary } from '../utils/getSummary.ts'
+import { runHook } from '../utils/runHook.ts'
+import { formatCommandWithArgs, formatMessage } from './utils.ts'
 
 /**
  * Plain console adapter for non-TTY environments
@@ -11,25 +13,14 @@ import { getSummary } from '../utils/getSummary.ts'
 export const plainLogger = defineLogger({
   name: 'plain',
   install(context, options) {
-    const logLevel = options?.logLevel || 3
+    const logLevel = options?.logLevel ?? logLevelMap.info
 
     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 [`[${timestamp}]`, message].join(' ')
-      }
-
-      return message
+      return formatMessage(message, logLevel)
     }
 
     context.on('info', (message, info) => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -39,34 +30,34 @@ export const plainLogger = defineLogger({
     })
 
     context.on('success', (message, info = '') => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
-      const text = getMessage(['✓', message, logLevel >= LogLevel.info ? info : undefined].filter(Boolean).join(' '))
+      const text = getMessage(['✓', message, logLevel >= logLevelMap.info ? info : undefined].filter(Boolean).join(' '))
 
       console.log(text)
     })
 
     context.on('warn', (message, info) => {
-      if (logLevel < LogLevel.warn) {
+      if (logLevel < logLevelMap.warn) {
         return
       }
 
-      const text = getMessage(['⚠', message, logLevel >= LogLevel.info ? info : undefined].filter(Boolean).join(' '))
+      const text = getMessage(['⚠', message, logLevel >= logLevelMap.info ? info : undefined].filter(Boolean).join(' '))
 
       console.log(text)
     })
 
     context.on('error', (error) => {
-      const caused = error.cause as Error | undefined
+      const caused = toCause(error)
 
       const text = getMessage(['✗', error.message].join(' '))
 
       console.log(text)
 
       // Show stack trace in debug mode (first 3 frames)
-      if (logLevel >= LogLevel.debug && error.stack) {
+      if (logLevel >= logLevelMap.debug && error.stack) {
         const frames = error.stack.split('\n').slice(1, 4)
         for (const frame of frames) {
           console.log(getMessage(frame.trim()))
@@ -88,7 +79,7 @@ export const plainLogger = defineLogger({
     })
 
     context.on('config:start', () => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -98,7 +89,7 @@ export const plainLogger = defineLogger({
     })
 
     context.on('config:end', () => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -108,13 +99,13 @@ export const plainLogger = defineLogger({
     })
 
     context.on('generation:start', () => {
-      const text = getMessage('Configuration started')
+      const text = getMessage('Generation started')
 
       console.log(text)
     })
 
     context.on('plugin:start', (plugin) => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
       const text = getMessage(`Generating ${plugin.name}`)
@@ -123,7 +114,7 @@ export const plainLogger = defineLogger({
     })
 
     context.on('plugin:end', (plugin, { duration, success }) => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -134,7 +125,7 @@ export const plainLogger = defineLogger({
     })
 
     context.on('files:processing:start', (files) => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -144,7 +135,7 @@ export const plainLogger = defineLogger({
     })
 
     context.on('file:processing:update', ({ file, config }) => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -154,7 +145,7 @@ export const plainLogger = defineLogger({
     })
 
     context.on('files:processing:end', () => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -170,7 +161,7 @@ export const plainLogger = defineLogger({
     })
 
     context.on('format:start', () => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -180,7 +171,7 @@ export const plainLogger = defineLogger({
     })
 
     context.on('format:end', () => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -190,7 +181,7 @@ export const plainLogger = defineLogger({
     })
 
     context.on('lint:start', () => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -200,7 +191,7 @@ export const plainLogger = defineLogger({
     })
 
     context.on('lint:end', () => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
@@ -210,10 +201,10 @@ export const plainLogger = 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 ${commandWithArgs} started`)
 
-      if (logLevel > LogLevel.silent) {
+      if (logLevel > logLevelMap.silent) {
         console.log(text)
       }
 
@@ -222,64 +213,25 @@ export const plainLogger = 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),
-        })
-
-        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: {
+          onStdout: logLevel > logLevelMap.silent ? (s) => console.log(s) : undefined,
+          onStderr: logLevel > logLevelMap.silent ? (s) => console.error(s) : undefined,
+        },
+      })
     })
 
     context.on('hook:end', ({ command, args }) => {
-      if (logLevel <= LogLevel.silent) {
+      if (logLevel <= logLevelMap.silent) {
         return
       }
 
-      const commandWithArgs = args?.length ? `${command} ${args.join(' ')}` : command
+      const commandWithArgs = formatCommandWithArgs(command, args)
       const text = getMessage(`Hook ${commandWithArgs} completed`)
 
       console.log(text)
@@ -292,12 +244,12 @@ export const plainLogger = defineLogger({
         config,
         status,
         hrStart,
-        pluginTimings: logLevel >= LogLevel.verbose ? pluginTimings : undefined,
+        pluginTimings: logLevel >= logLevelMap.verbose ? pluginTimings : undefined,
       })
 
-      console.log('---------------------------')
+      console.log(SUMMARY_SEPARATOR)
       console.log(summary.join('\n'))
-      console.log('---------------------------')
+      console.log(SUMMARY_SEPARATOR)
     })
   },
 })