@kubb/cli 3.0.0-alpha.4 → 3.0.0-alpha.5

package/src/generate.ts

@@ -1,4 +1,4 @@
-import { createLogger } from '@kubb/core/logger'
+import { createLogger, LogMapper } from '@kubb/core/logger'
 
 import c from 'tinyrainbow'
 
@@ -8,9 +8,11 @@ import { executeHooks } from './utils/executeHooks.ts'
 import { getErrorCauses } from './utils/getErrorCauses.ts'
 import { getSummary } from './utils/getSummary.ts'
 import { writeLog } from './utils/writeLog.ts'
-import { LogMapper } from '@kubb/core/logger'
+import type * as KubbFile from '@kubb/fs/types'
 
-import { MultiBar, Presets } from 'cli-progress'
+import { SingleBar, Presets } from 'cli-progress'
+import { getRelativePath } from '@kubb/fs'
+import { relative } from 'node:path'
 
 type GenerateProps = {
   input?: string
@@ -18,39 +20,33 @@ type GenerateProps = {
   args: Args
 }
 
-export function createMultiProgressBar() {
-  return new MultiBar(
+export async function generate({ input, config, args }: GenerateProps): Promise<void> {
+  const logLevel = LogMapper[args.logLevel as keyof typeof LogMapper] || 3
+  const logger = createLogger({
+    logLevel,
+    name: config.name,
+  })
+
+  const progress = new SingleBar(
     {
-      format: 'progress [{bar}] {percentage}% | ETA: {eta}s | {value}/{total}',
+      format: logLevel === LogMapper.info ? '{percentage}% {bar} {value}/{total} files | ETA: {eta}s | {filename}' : '{percentage}% {bar} ETA: {eta}s',
       barsize: 40,
       fps: 5,
-      stream: process.stderr,
       clearOnComplete: true,
     },
     Presets.shades_grey,
   )
-}
 
-export async function generate({ input, config, args }: GenerateProps): Promise<void> {
-  const logLevel = LogMapper[args.logLevel as keyof typeof LogMapper] || 3
-  const logger = createLogger({
-    logLevel,
-    name: config.name,
+  logger.on('progress', ({ count, size, file }) => {
+    if (count === 0) {
+      progress.start(size, 0)
+    } else if (count === size) {
+      progress.stop()
+    } else {
+      progress.update(count, { filename: relative(config.root, file.path) || '' })
+    }
   })
 
-  // const progress = createMultiProgressBar()
-  // let progressFiles: any
-  //
-  // logger.on('progress', (count, size) => {
-  //   if (count === 0) {
-  //     progressFiles = progress.create(size, 0)
-  //   }
-  //   progressFiles.update(count)
-  //   if (count === size) {
-  //     progressFiles.stop()
-  //   }
-  // })
-
   logger.on('debug', async (messages: string[]) => {
     await writeLog(messages.join('\n'))
   })
@@ -58,7 +54,7 @@ export async function generate({ input, config, args }: GenerateProps): Promise<
   const { root = process.cwd(), ...userConfig } = config
   const inputPath = input ?? ('path' in userConfig.input ? userConfig.input.path : undefined)
 
-  logger.emit('start', `🚀 Building ${logLevel !== LogMapper.silent ? c.dim(inputPath) : ''}`)
+  logger.emit('start', `Building ${logLevel !== LogMapper.silent ? c.dim(inputPath) : ''}`)
 
   const definedConfig: Config = {
     root,
@@ -89,7 +85,7 @@ export async function generate({ input, config, args }: GenerateProps): Promise<
   })
 
   if (error && logger.consola) {
-    logger.consola.error(`🚀 Build failed ${logLevel !== LogMapper.silent ? c.dim(inputPath) : ''}`)
+    logger.consola.error(`Build failed ${logLevel !== LogMapper.silent ? c.dim(inputPath) : ''}`)
 
     logger.consola.box({
       title: `${config.name || ''}`,
@@ -117,7 +113,7 @@ export async function generate({ input, config, args }: GenerateProps): Promise<
     await executeHooks({ hooks: config.hooks, logger })
   }
 
-  logger.consola?.success(`🚀 Build completed ${logLevel !== LogMapper.silent ? c.dim(inputPath) : ''}`)
+  logger.consola?.log(`⚡️Build completed ${logLevel !== LogMapper.silent ? c.dim(inputPath) : ''}`)
 
   logger.consola?.box({
     title: `${config.name || ''}`,

package/src/utils/Writables.ts

@@ -4,23 +4,7 @@ import c from 'tinyrainbow'
 
 import type { WritableOptions } from 'node:stream'
 import type { ConsolaInstance } from 'consola'
-
-export class BasicWritables extends Writable {
-  #frame = 'Loading ...'
-  set frame(frame: string) {
-    this.#frame = frame
-  }
-  get frame() {
-    return this.#frame
-  }
-  _write(chunk: any, _encoding: BufferEncoding, callback: (error?: Error | null) => void): void {
-    if (chunk?.toString() !== this.frame && chunk?.toString()) {
-      this.frame = chunk?.toString()
-    }
-
-    callback()
-  }
-}
+import * as process from 'node:process'
 
 export class ConsolaWritable extends Writable {
   consola: ConsolaInstance
@@ -32,11 +16,7 @@ export class ConsolaWritable extends Writable {
     this.consola = consola
   }
   _write(chunk: any, _encoding: BufferEncoding, callback: (error?: Error | null) => void): void {
-    if (this.command) {
-      this.consola.log(`${c.bold(c.blue(this.command))}: ${chunk?.toString()}`)
-    } else {
-      this.consola.log(`${c.bold(c.blue(this.command))}: ${chunk?.toString()}`)
-    }
+    process.stdout.write(c.dim(chunk?.toString()))
 
     callback()
   }

package/src/utils/executeHooks.ts

@@ -7,6 +7,7 @@ import { ConsolaWritable } from './Writables.ts'
 
 import type { Config } from '@kubb/core'
 import { LogMapper } from '@kubb/core/logger'
+import PQueue from 'p-queue'
 
 type ExecutingHooksProps = {
   hooks: NonNullable<Config['hooks']>
@@ -15,37 +16,34 @@ type ExecutingHooksProps = {
 
 export async function executeHooks({ hooks, logger }: ExecutingHooksProps): Promise<void> {
   const commands = Array.isArray(hooks.done) ? hooks.done : [hooks.done].filter(Boolean)
+  const queue = new PQueue({ concurrency: 1 })
 
-  const executors = commands
-    .map(async (command) => {
-      const consolaWritable = new ConsolaWritable(logger.consola!, command)
-      const abortController = new AbortController()
-      const [cmd, ..._args] = [...parseArgsStringToArgv(command)]
+  const promises = commands.map(async (command) => {
+    const consolaWritable = new ConsolaWritable(logger.consola!, command)
+    const [cmd, ..._args] = [...parseArgsStringToArgv(command)]
 
-      if (!cmd) {
-        return null
-      }
+    if (!cmd) {
+      return null
+    }
 
+    await queue.add(async () => {
       logger.emit('start', `Executing hook ${logger.logLevel !== LogMapper.silent ? c.dim(command) : ''}`)
 
       const subProcess = await execa(cmd, _args, {
         detached: true,
-        cancelSignal: abortController.signal,
         stdout: logger.logLevel === LogMapper.silent ? undefined : ['pipe', consolaWritable],
+        stripFinalNewline: true,
       })
 
       logger.emit('success', `Executing hook ${logger.logLevel !== LogMapper.silent ? c.dim(command) : ''}`)
 
       if (subProcess) {
-        logger.emit('info', `Executing hooks\n ${subProcess.stdout}`)
+        logger.emit('debug', [subProcess.stdout])
       }
-
-      consolaWritable.destroy()
-      return { subProcess, abort: abortController.abort.bind(abortController) }
     })
-    .filter(Boolean)
+  })
 
-  await Promise.all(executors)
+  await Promise.all(promises)
 
   logger.emit('success', 'Executing hooks')
 }

package/src/utils/getSummary.ts

@@ -53,12 +53,6 @@ export function getSummary({ pluginManager, status, hrStart, config, logger }: S
     output: path.isAbsolute(config.root) ? path.resolve(config.root, config.output.path) : config.root,
   } as const
 
-  logger.emit('debug', ['\nGenerated files:\n'])
-  logger.emit(
-    'debug',
-    files.map((file) => `${randomCliColour(JSON.stringify(file.meta?.pluginKey))} ${file.path}`),
-  )
-
   logs.push(
     [
       [`${c.bold('Plugins:')}        ${meta.plugins}`, true],