@kubb/cli 5.0.0-alpha.34 → 5.0.0-alpha.35

package/src/loggers/githubActionsLogger.ts

@@ -55,7 +55,7 @@ export const githubActionsLogger = defineLogger({
       console.log('::endgroup::')
     }
 
-    context.on('info', (message, info = '') => {
+    context.on('kubb:info', (message, info = '') => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -65,7 +65,7 @@ export const githubActionsLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('success', (message, info = '') => {
+    context.on('kubb:success', (message, info = '') => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -75,7 +75,7 @@ export const githubActionsLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('warn', (message, info = '') => {
+    context.on('kubb:warn', (message, info = '') => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -85,7 +85,7 @@ export const githubActionsLogger = defineLogger({
       console.warn(`::warning::${text}`)
     })
 
-    context.on('error', (error) => {
+    context.on('kubb:error', (error) => {
       const caused = toCause(error)
 
       if (logLevel <= logLevelMap.silent) {
@@ -112,12 +112,12 @@ export const githubActionsLogger = defineLogger({
       }
     })
 
-    context.on('lifecycle:start', (version) => {
+    context.on('kubb:lifecycle:start', (version) => {
       console.log(styleText('yellow', `Kubb ${version} 🧩`))
       reset()
     })
 
-    context.on('config:start', () => {
+    context.on('kubb:config:start', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -129,7 +129,7 @@ export const githubActionsLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('config:end', (configs) => {
+    context.on('kubb:config:end', (configs) => {
       state.currentConfigs = configs
 
       if (logLevel <= logLevelMap.silent) {
@@ -143,7 +143,7 @@ export const githubActionsLogger = defineLogger({
       closeGroup('Configuration')
     })
 
-    context.on('generation:start', (config) => {
+    context.on('kubb:generation:start', (config) => {
       reset()
 
       // Initialize progress tracking for this generation
@@ -160,7 +160,7 @@ export const githubActionsLogger = defineLogger({
       }
     })
 
-    context.on('plugin:start', (plugin) => {
+    context.on('kubb:plugin:start', (plugin) => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -173,7 +173,7 @@ export const githubActionsLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('plugin:end', (plugin, { duration, success }) => {
+    context.on('kubb:plugin:end', (plugin, { duration, success }) => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -204,7 +204,7 @@ export const githubActionsLogger = defineLogger({
       showProgressStep()
     })
 
-    context.on('files:processing:start', (files) => {
+    context.on('kubb:files:processing:start', (files) => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -220,7 +220,7 @@ export const githubActionsLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('files:processing:end', () => {
+    context.on('kubb:files:processing:end', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -236,7 +236,7 @@ export const githubActionsLogger = defineLogger({
       showProgressStep()
     })
 
-    context.on('file:processing:update', () => {
+    context.on('kubb:file:processing:update', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -244,7 +244,7 @@ export const githubActionsLogger = defineLogger({
       state.processedFiles++
     })
 
-    context.on('generation:end', (config) => {
+    context.on('kubb:generation:end', (config) => {
       const text = getMessage(
         config.name ? `${styleText('blue', '✓')} Generation completed for ${styleText('dim', config.name)}` : `${styleText('blue', '✓')} Generation completed`,
       )
@@ -252,7 +252,7 @@ export const githubActionsLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('format:start', () => {
+    context.on('kubb:format:start', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -266,7 +266,7 @@ export const githubActionsLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('format:end', () => {
+    context.on('kubb:format:end', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -280,7 +280,7 @@ export const githubActionsLogger = defineLogger({
       }
     })
 
-    context.on('lint:start', () => {
+    context.on('kubb:lint:start', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -294,7 +294,7 @@ export const githubActionsLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('lint:end', () => {
+    context.on('kubb:lint:end', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -308,7 +308,7 @@ export const githubActionsLogger = defineLogger({
       }
     })
 
-    context.on('hook:start', async ({ id, command, args }) => {
+    context.on('kubb:hook:start', async ({ id, command, args }) => {
       const commandWithArgs = formatCommandWithArgs(command, args)
       const text = getMessage(`Hook ${styleText('dim', commandWithArgs)} started`)
 
@@ -338,7 +338,7 @@ export const githubActionsLogger = defineLogger({
       })
     })
 
-    context.on('hook:end', ({ command, args }) => {
+    context.on('kubb:hook:end', ({ command, args }) => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -353,7 +353,7 @@ export const githubActionsLogger = defineLogger({
       }
     })
 
-    context.on('generation:summary', (config, { status, hrStart, failedPlugins }) => {
+    context.on('kubb:generation:summary', (config, { status, hrStart, failedPlugins }) => {
       const pluginsCount = config.plugins?.length ?? 0
       const successCount = pluginsCount - failedPlugins.size
       const duration = formatHrtime(hrStart)
@@ -373,7 +373,7 @@ export const githubActionsLogger = defineLogger({
       }
     })
 
-    context.on('lifecycle:end', () => {
+    context.on('kubb:lifecycle:end', () => {
       reset()
     })
   },

package/src/loggers/plainLogger.ts

@@ -19,7 +19,7 @@ export const plainLogger = defineLogger({
       return formatMessage(message, logLevel)
     }
 
-    context.on('info', (message, info) => {
+    context.on('kubb:info', (message, info) => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -29,7 +29,7 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('success', (message, info = '') => {
+    context.on('kubb:success', (message, info = '') => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -39,7 +39,7 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('warn', (message, info) => {
+    context.on('kubb:warn', (message, info) => {
       if (logLevel < logLevelMap.warn) {
         return
       }
@@ -49,7 +49,7 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('error', (error) => {
+    context.on('kubb:error', (error) => {
       const caused = toCause(error)
 
       const text = getMessage(['✗', error.message].join(' '))
@@ -74,11 +74,11 @@ export const plainLogger = defineLogger({
       }
     })
 
-    context.on('lifecycle:start', () => {
+    context.on('kubb:lifecycle:start', () => {
       console.log('Kubb CLI 🧩')
     })
 
-    context.on('config:start', () => {
+    context.on('kubb:config:start', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -88,7 +88,7 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('config:end', () => {
+    context.on('kubb:config:end', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -98,13 +98,13 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('generation:start', () => {
+    context.on('kubb:generation:start', () => {
       const text = getMessage('Generation started')
 
       console.log(text)
     })
 
-    context.on('plugin:start', (plugin) => {
+    context.on('kubb:plugin:start', (plugin) => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -113,7 +113,7 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('plugin:end', (plugin, { duration, success }) => {
+    context.on('kubb:plugin:end', (plugin, { duration, success }) => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -124,7 +124,7 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('files:processing:start', (files) => {
+    context.on('kubb:files:processing:start', (files) => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -134,7 +134,7 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('file:processing:update', ({ file, config }) => {
+    context.on('kubb:file:processing:update', ({ file, config }) => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -144,7 +144,7 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('files:processing:end', () => {
+    context.on('kubb:files:processing:end', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -154,13 +154,13 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('generation:end', (config) => {
+    context.on('kubb:generation:end', (config) => {
       const text = getMessage(config.name ? `Generation completed for ${config.name}` : 'Generation completed')
 
       console.log(text)
     })
 
-    context.on('format:start', () => {
+    context.on('kubb:format:start', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -170,7 +170,7 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('format:end', () => {
+    context.on('kubb:format:end', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -180,7 +180,7 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('lint:start', () => {
+    context.on('kubb:lint:start', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -190,7 +190,7 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('lint:end', () => {
+    context.on('kubb:lint:end', () => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -200,7 +200,7 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('hook:start', async ({ id, command, args }) => {
+    context.on('kubb:hook:start', async ({ id, command, args }) => {
       const commandWithArgs = formatCommandWithArgs(command, args)
       const text = getMessage(`Hook ${commandWithArgs} started`)
 
@@ -226,7 +226,7 @@ export const plainLogger = defineLogger({
       })
     })
 
-    context.on('hook:end', ({ command, args }) => {
+    context.on('kubb:hook:end', ({ command, args }) => {
       if (logLevel <= logLevelMap.silent) {
         return
       }
@@ -237,7 +237,7 @@ export const plainLogger = defineLogger({
       console.log(text)
     })
 
-    context.on('generation:summary', (config, { pluginTimings, status, hrStart, failedPlugins, filesCreated }) => {
+    context.on('kubb:generation:summary', (config, { pluginTimings, status, hrStart, failedPlugins, filesCreated }) => {
       const summary = getSummary({
         failedPlugins,
         filesCreated,

package/src/runners/generate.ts

@@ -8,22 +8,20 @@ import { AsyncEventEmitter as AsyncEventEmitterClass, executeIfOnline, toError }
 import {
   type CLIOptions,
   type Config,
+  createKubb,
   detectFormatter,
   detectLinter,
   formatters,
-  getConfigs,
   isInputPath,
-  type KubbEvents,
+  type KubbHooks,
   linters,
   logLevel as logLevelMap,
-  safeBuild,
-  setup,
-  type UserConfig,
 } from '@kubb/core'
 import { version } from '../../package.json'
 import { KUBB_NPM_PACKAGE_URL } from '../constants.ts'
 import { setupLogger } from '../loggers/utils.ts'
 import { executeHooks } from '../utils/executeHooks.ts'
+import { getConfigs } from '../utils/getConfig.ts'
 import { getCosmiConfig } from '../utils/getCosmiConfig.ts'
 import { buildTelemetryEvent, sendTelemetry } from '../utils/telemetry.ts'
 import { startWatcher } from '../utils/watcher.ts'
@@ -31,7 +29,7 @@ import { startWatcher } from '../utils/watcher.ts'
 type GenerateProps = {
   input?: string
   config: Config
-  events: AsyncEventEmitter<KubbEvents>
+  hooks: AsyncEventEmitter<KubbHooks>
   logLevel: number
 }
 
@@ -49,7 +47,7 @@ type RunToolPassOptions = {
   configName: string | undefined
   outputPath: string
   logLevel: number
-  events: AsyncEventEmitter<KubbEvents>
+  hooks: AsyncEventEmitter<KubbHooks>
   onStart: () => Promise<void>
   onEnd: () => Promise<void>
 }
@@ -64,7 +62,7 @@ async function runToolPass({
   configName,
   outputPath,
   logLevel,
-  events,
+  hooks,
   onStart,
   onEnd,
 }: RunToolPassOptions) {
@@ -74,10 +72,10 @@ async function runToolPass({
   if (resolvedTool === 'auto') {
     const detected = await detect()
     if (!detected) {
-      await events.emit('warn', noToolMessage)
+      await hooks.emit('kubb:warn', noToolMessage)
     } else {
       resolvedTool = detected
-      await events.emit('info', `Auto-detected ${toolLabel}: ${styleText('dim', resolvedTool)}`)
+      await hooks.emit('kubb:info', `Auto-detected ${toolLabel}: ${styleText('dim', resolvedTool)}`)
     }
   }
 
@@ -90,18 +88,18 @@ async function runToolPass({
       const hookId = createHash('sha256').update([configName, resolvedTool].filter(Boolean).join('-')).digest('hex')
 
       // Wire up the hook:end listener BEFORE emitting hook:start to avoid the race condition
-      // where hook:end fires synchronously inside emit('hook:start') before the listener is registered.
+      // where hook:end fires synchronously inside emit('kubb:hook:start') before the listener is registered.
       const hookEndPromise = new Promise<void>((resolve, reject) => {
         const handler = ({ id, success, error }: { id?: string; command: string; args?: readonly string[]; success: boolean; error: Error | null }) => {
           if (id !== hookId) return
-          events.off('hook:end', handler)
+          hooks.off('kubb:hook:end', handler)
           if (!success) {
             reject(error ?? new Error(`${toolConfig.errorMessage}`))
             return
           }
-          events
+          hooks
             .emit(
-              'success',
+              'kubb:success',
               [
                 `${successPrefix} with ${styleText('dim', resolvedTool)}`,
                 logLevel >= logLevelMap.info ? `on ${styleText('dim', outputPath)}` : undefined,
@@ -113,10 +111,10 @@ async function runToolPass({
             .then(resolve)
             .catch(reject)
         }
-        events.on('hook:end', handler)
+        hooks.on('kubb:hook:end', handler)
       })
 
-      await events.emit('hook:start', {
+      await hooks.emit('kubb:hook:start', {
         id: hookId,
         command: toolConfig.command,
         args: toolConfig.args(outputPath),
@@ -126,7 +124,7 @@ async function runToolPass({
     } catch (caughtError) {
       const err = new Error(toolConfig.errorMessage)
       err.cause = caughtError
-      await events.emit('error', err)
+      await hooks.emit('kubb:error', err)
       toolError = err
     }
   }
@@ -139,12 +137,12 @@ async function runToolPass({
 }
 
 async function generate(options: GenerateProps): Promise<void> {
-  const { input, events, logLevel } = options
+  const { input, hooks, logLevel } = options
 
   const hrStart = process.hrtime()
   const inputPath = input ?? ('path' in options.config.input ? options.config.input.path : undefined)
 
-  const userConfig: UserConfig = {
+  const config: Config = {
     ...options.config,
     input: inputPath
       ? {
@@ -153,30 +151,20 @@ async function generate(options: GenerateProps): Promise<void> {
         }
       : options.config.input,
     ...options.config.output,
-  } satisfies UserConfig
+  } satisfies Config
 
-  const setupResult = await setup({
-    config: userConfig,
-    events,
-  })
-
-  const { sources, config, driver } = setupResult
+  const kubb = createKubb({ config, hooks })
+  await kubb.setup()
 
-  await events.emit('generation:start', config)
+  await hooks.emit('kubb:generation:start', config)
 
-  await events.emit('info', config.name ? `Setup generation ${styleText('bold', config.name)}` : 'Setup generation', inputPath)
+  await hooks.emit('kubb:info', config.name ? `Setup generation ${styleText('bold', config.name)}` : 'Setup generation', inputPath)
 
-  await events.emit('info', config.name ? `Build generation ${styleText('bold', config.name)}` : 'Build generation', inputPath)
+  await hooks.emit('kubb:info', config.name ? `Build generation ${styleText('bold', config.name)}` : 'Build generation', inputPath)
 
-  const { files, failedPlugins, pluginTimings, error } = await safeBuild(
-    {
-      config,
-      events,
-    },
-    setupResult,
-  )
+  const { files, failedPlugins, pluginTimings, error, driver } = await kubb.safeBuild()
 
-  await events.emit('info', 'Load summary')
+  await hooks.emit('kubb:info', 'Load summary')
 
   // Handle build failures (either from failed plugins or general errors)
 
@@ -191,12 +179,12 @@ async function generate(options: GenerateProps): Promise<void> {
     ].filter(Boolean)
 
     for (const err of allErrors) {
-      await events.emit('error', err)
+      await hooks.emit('kubb:error', err)
     }
 
-    await events.emit('generation:end', config, files, sources)
+    await hooks.emit('kubb:generation:end', config, files, kubb.sources)
 
-    await events.emit('generation:summary', config, {
+    await hooks.emit('kubb:generation:summary', config, {
       failedPlugins,
       filesCreated: files.length,
       status: 'failed',
@@ -218,8 +206,8 @@ async function generate(options: GenerateProps): Promise<void> {
     process.exit(1)
   }
 
-  await events.emit('success', 'Generation successfully', inputPath)
-  await events.emit('generation:end', config, files, sources)
+  await hooks.emit('kubb:success', 'Generation successfully', inputPath)
+  await hooks.emit('kubb:generation:end', config, files, kubb.sources)
 
   const outputPath = path.resolve(config.root, config.output.path)
 
@@ -234,9 +222,9 @@ async function generate(options: GenerateProps): Promise<void> {
       configName: config.name,
       outputPath,
       logLevel,
-      events,
-      onStart: () => events.emit('format:start'),
-      onEnd: () => events.emit('format:end'),
+      hooks,
+      onStart: () => hooks.emit('kubb:format:start'),
+      onEnd: () => hooks.emit('kubb:format:end'),
     })
   }
 
@@ -251,21 +239,21 @@ async function generate(options: GenerateProps): Promise<void> {
       configName: config.name,
       outputPath,
       logLevel,
-      events,
-      onStart: () => events.emit('lint:start'),
-      onEnd: () => events.emit('lint:end'),
+      hooks,
+      onStart: () => hooks.emit('kubb:lint:start'),
+      onEnd: () => hooks.emit('kubb:lint:end'),
     })
   }
 
   if (config.hooks) {
-    await events.emit('hooks:start')
-    await executeHooks({ hooks: config.hooks, events })
+    await hooks.emit('kubb:hooks:start')
+    await executeHooks({ configHooks: config.hooks, hooks })
 
-    await events.emit('hooks:end')
+    await hooks.emit('kubb:hooks:end')
   }
 
   // Only reached when there are no failures (process.exit(1) is called above otherwise)
-  await events.emit('generation:summary', config, {
+  await hooks.emit('kubb:generation:summary', config, {
     failedPlugins,
     filesCreated: files.length,
     status: 'success',
@@ -294,9 +282,9 @@ type GenerateCommandOptions = {
 
 export async function runGenerateCommand({ input, configPath, logLevel: logLevelKey, watch }: GenerateCommandOptions): Promise<void> {
   const logLevel = logLevelMap[logLevelKey as keyof typeof logLevelMap] ?? logLevelMap.info
-  const events = new AsyncEventEmitterClass<KubbEvents>()
+  const hooks = new AsyncEventEmitterClass<KubbHooks>()
 
-  await setupLogger(events, { logLevel })
+  await setupLogger(hooks, { logLevel })
 
   await executeIfOnline(async () => {
     try {
@@ -305,7 +293,7 @@ export async function runGenerateCommand({ input, configPath, logLevel: logLevel
       const latestVersion = data.version
 
       if (latestVersion && version < latestVersion) {
-        await events.emit('version:new', version, latestVersion)
+        await hooks.emit('kubb:version:new', version, latestVersion)
       }
     } catch {
       // Ignore network errors for version check
@@ -316,31 +304,31 @@ export async function runGenerateCommand({ input, configPath, logLevel: logLevel
     const result = await getCosmiConfig('kubb', configPath)
     const configs = await getConfigs(result.config, { input } as CLIOptions)
 
-    await events.emit('config:start')
-    await events.emit('info', 'Config loaded', path.relative(process.cwd(), result.filepath))
-    await events.emit('success', 'Config loaded successfully', path.relative(process.cwd(), result.filepath))
-    await events.emit('config:end', configs)
+    await hooks.emit('kubb:config:start')
+    await hooks.emit('kubb:info', 'Config loaded', path.relative(process.cwd(), result.filepath))
+    await hooks.emit('kubb:success', 'Config loaded successfully', path.relative(process.cwd(), result.filepath))
+    await hooks.emit('kubb:config:end', configs)
 
-    await events.emit('lifecycle:start', version)
+    await hooks.emit('kubb:lifecycle:start', version)
 
     for (const config of configs) {
       if (isInputPath(config) && watch) {
         await startWatcher([input || config.input.path], async (paths) => {
           // remove to avoid duplicate listeners after each change
-          events.removeAll()
+          hooks.removeAll()
 
-          await generate({ input, config, logLevel, events })
+          await generate({ input, config, logLevel, hooks })
 
           clack.log.step(styleText('yellow', `Watching for changes in ${paths.join(' and ')}`))
         })
       } else {
-        await generate({ input, config, logLevel, events })
+        await generate({ input, config, logLevel, hooks })
       }
     }
 
-    await events.emit('lifecycle:end')
+    await hooks.emit('kubb:lifecycle:end')
   } catch (error) {
-    await events.emit('error', toError(error))
+    await hooks.emit('kubb:error', toError(error))
     process.exit(1)
   }
 }

package/src/runners/init.ts

@@ -123,7 +123,7 @@ function generateConfigFile(selectedPlugins: PluginOption[], inputPath: string,
     })
     .join('\n')
 
-  return `import { defineConfig } from '@kubb/core'
+  return `import { defineConfig } from 'kubb'
 ${imports}
 
 export default defineConfig({