@kubb/cli 1.1.10 → 1.1.12

package/dist/index.cjs

@@ -4,11 +4,12 @@
 var pathParser = require('path');
 var commander = require('commander');
 var ora = require('ora');
-var pc2 = require('picocolors');
+var pc3 = require('picocolors');
 var core = require('@kubb/core');
 var execa = require('execa');
 var PrettyError = require('pretty-error');
 var stringArgv = require('string-argv');
+var stream = require('stream');
 var mod = require('module');
 var url = require('url');
 var cosmiconfig = require('cosmiconfig');
@@ -19,7 +20,7 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var pathParser__default = /*#__PURE__*/_interopDefault(pathParser);
 var ora__default = /*#__PURE__*/_interopDefault(ora);
-var pc2__default = /*#__PURE__*/_interopDefault(pc2);
+var pc3__default = /*#__PURE__*/_interopDefault(pc3);
 var PrettyError__default = /*#__PURE__*/_interopDefault(PrettyError);
 var mod__default = /*#__PURE__*/_interopDefault(mod);
 var tsNode__default = /*#__PURE__*/_interopDefault(tsNode);
@@ -34,7 +35,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // package.json
-var version = "1.1.10";
+var version = "1.1.12";
 var presets = {
   simple: {
     "kubb.config": `
@@ -67,15 +68,15 @@ async function init({ spinner: spinner2, preset = "simple", logLevel = "silent",
     const presetMeta = presets[preset];
     const path = pathParser__default.default.resolve(process.cwd(), "./kubb.config.js");
     const installCommand = packageManager === "npm" ? "install" : "add";
-    spinner2.start(`\u{1F4C0} Writing \`kubb.config.js\` ${pc2__default.default.dim(path)}`);
+    spinner2.start(`\u{1F4C0} Writing \`kubb.config.js\` ${pc3__default.default.dim(path)}`);
     await core.write(presetMeta["kubb.config"], path);
-    spinner2.succeed(`\u{1F4C0} Wrote \`kubb.config.js\` ${pc2__default.default.dim(path)}`);
+    spinner2.succeed(`\u{1F4C0} Wrote \`kubb.config.js\` ${pc3__default.default.dim(path)}`);
     const data = await Promise.all([
       execa.$`npm init es6 -y`,
       ...presetMeta.packages.map(async (pack) => {
-        spinner2.start(`\u{1F4C0} Installing ${pc2__default.default.dim(pack)}`);
+        spinner2.start(`\u{1F4C0} Installing ${pc3__default.default.dim(pack)}`);
         const { stdout } = await execa.$({ preferLocal: false })`${packageManager} ${installCommand} ${pack}`;
-        spinner2.succeed(`\u{1F4C0} Installed ${pc2__default.default.dim(pack)}`);
+        spinner2.succeed(`\u{1F4C0} Installed ${pc3__default.default.dim(pack)}`);
         return stdout;
       })
     ]);
@@ -83,7 +84,7 @@ async function init({ spinner: spinner2, preset = "simple", logLevel = "silent",
       data.forEach((text) => console.log(text));
     }
   } catch (error) {
-    spinner2.fail(pc2__default.default.red(`Something went wrong
+    spinner2.fail(pc3__default.default.red(`Something went wrong
 
 ${error?.message}`));
   }
@@ -99,18 +100,42 @@ function parseHrtimeToSeconds(hrtime) {
 function parseText(baseText, config, logLevel = "silent") {
   return `${baseText}${config[logLevel] || ""}`;
 }
+var OraWritable = class extends stream.Writable {
+  command;
+  spinner;
+  constructor(spinner2, command, opts) {
+    super(opts);
+    this.command = command;
+    this.spinner = spinner2;
+  }
+  _write(chunk, _encoding, callback) {
+    this.spinner.suffixText = `
+
+${pc3__default.default.bold(pc3__default.default.blue(this.command))}: ${chunk?.toString()}`;
+    callback();
+  }
+};
 
 // src/run.ts
 async function run({ config, options, spinner: spinner2 }) {
   const hrstart = process.hrtime();
-  const logger = {
-    log(message, logLevel) {
-      if (logLevel === "error") {
-        spinner2.fail(message);
+  const [log] = core.throttle((message, { logLevel, params }) => {
+    if (logLevel === "error") {
+      spinner2.fail(pc3__default.default.red(`${message}
+
+` || `Something went wrong
+
+`));
+    } else if (logLevel === "info") {
+      if (message) {
+        spinner2.text = message;
       } else {
-        spinner2.info(message);
+        spinner2.text = `\u{1FA82} Executing ${params?.hookName || "unknown"}(${pc3__default.default.yellow(params?.pluginName || "unknown")})`;
       }
-    },
+    }
+  }, 100);
+  const logger = {
+    log,
     spinner: spinner2
   };
   const onDone = async (hooks, logLevel) => {
@@ -124,15 +149,21 @@ async function run({ config, options, spinner: spinner2 }) {
       commands = hooks.done;
     }
     const promises = commands.map(async (command) => {
+      const oraWritable = new OraWritable(spinner2, command);
       const [cmd, ..._args] = [...stringArgv.parseArgsStringToArgv(command)];
-      spinner2.start(parseText(`\u{1FA82} Executing hooks(${pc2__default.default.yellow("done")})`, { info: ` ${pc2__default.default.dim(command)}` }, logLevel));
-      const { stdout } = await execa.execa(cmd, _args);
-      spinner2.succeed(parseText(`\u{1FA82} Executing hooks(${pc2__default.default.yellow("done")})`, { info: ` ${pc2__default.default.dim(command)}` }, logLevel));
+      spinner2.start(parseText(`\u{1FA82} Executing hooks(${pc3__default.default.yellow("done")})`, { info: ` ${pc3__default.default.dim(command)}` }, logLevel));
+      const { stdout } = await execa.execa(cmd, _args, {}).pipeStdout(oraWritable);
+      spinner2.suffixText = "";
+      oraWritable.destroy();
       if (logLevel === "info") {
+        spinner2.succeed(parseText(`\u{1FA82} Executing hooks(${pc3__default.default.yellow("done")})`, { info: ` ${pc3__default.default.dim(command)}` }, logLevel));
         console.log(stdout);
       }
     });
     await Promise.all(promises);
+    if (logLevel === "silent") {
+      spinner2.succeed(parseText(`\u{1FA82} Executing hooks(${pc3__default.default.yellow("done")})`, {}, logLevel));
+    }
   };
   const printSummary = (pluginManager, status) => {
     const elapsedSeconds = parseHrtimeToSeconds(process.hrtime(hrstart));
@@ -153,26 +184,26 @@ async function run({ config, options, spinner: spinner2 }) {
       return 0;
     });
     const meta = {
-      plugins: status === "success" ? `${pc2__default.default.green(`${buildStartPlugins.length} successful`)}, ${pluginsCount} total` : `${pc2__default.default.red(`${pluginsCount - buildStartPlugins.length} failed`)}, ${pluginsCount} total`,
+      plugins: status === "success" ? `${pc3__default.default.green(`${buildStartPlugins.length} successful`)}, ${pluginsCount} total` : `${pc3__default.default.red(`${pluginsCount - buildStartPlugins.length} failed`)}, ${pluginsCount} total`,
       filesCreated: files.length,
-      time: pc2__default.default.yellow(`${elapsedSeconds}s`),
+      time: pc3__default.default.yellow(`${elapsedSeconds}s`),
       output: pathParser__default.default.resolve(config.root, config.output.path)
     };
     console.log(`
-  ${pc2__default.default.bold("Plugins:")}      ${meta.plugins}
-${pc2__default.default.bold("Generated:")}      ${meta.filesCreated} files
-     ${pc2__default.default.bold("Time:")}      ${meta.time}
-   ${pc2__default.default.bold("Output:")}      ${meta.output}
+  ${pc3__default.default.bold("Plugins:")}      ${meta.plugins}
+${pc3__default.default.bold("Generated:")}      ${meta.filesCreated} files
+     ${pc3__default.default.bold("Time:")}      ${meta.time}
+   ${pc3__default.default.bold("Output:")}      ${meta.output}
      `);
     if (options.debug) {
-      console.log(`${pc2__default.default.bold("Generated files:")}`);
-      console.log(`${files.map((file) => `${pc2__default.default.blue(file.meta?.pluginName)} ${file.path}`).join("\n")}`);
+      console.log(`${pc3__default.default.bold("Generated files:")}`);
+      console.log(`${files.map((file) => `${pc3__default.default.blue(file.meta?.pluginName)} ${file.path}`).join("\n")}`);
     }
   };
   const printErrors = (error) => {
     const pe = new PrettyError__default.default();
     if (options.debug) {
-      spinner2.fail(pc2__default.default.red(`Something went wrong
+      spinner2.fail(pc3__default.default.red(`Something went wrong
 
 `));
       const causedError = error?.cause;
@@ -181,7 +212,7 @@ ${pc2__default.default.bold("Generated:")}      ${meta.filesCreated} files
         console.log(pe.render(causedError));
       }
     } else {
-      spinner2.fail(pc2__default.default.red(`Something went wrong
+      spinner2.fail(pc3__default.default.red(`Something went wrong
 
 ${error?.message}`));
     }
@@ -190,7 +221,7 @@ ${error?.message}`));
     const { root, ...userConfig } = config;
     const logLevel = options.logLevel ?? userConfig.logLevel ?? "silent";
     const inputPath = options.input ?? userConfig.input.path;
-    spinner2.start(parseText(`\u{1F680} Building`, { info: `(${pc2__default.default.dim(inputPath)})` }, logLevel));
+    spinner2.start(parseText(`\u{1F680} Building`, { info: `(${pc3__default.default.dim(inputPath)})` }, logLevel));
     const output = await core.build({
       config: {
         root: process.cwd(),
@@ -207,7 +238,7 @@ ${error?.message}`));
       },
       logger
     });
-    spinner2.succeed(parseText(`\u{1F680} Build completed`, { info: `(${pc2__default.default.dim(inputPath)})` }, logLevel));
+    spinner2.succeed(parseText(`\u{1F680} Build completed`, { info: `(${pc3__default.default.dim(inputPath)})` }, logLevel));
     await onDone(config.hooks, logLevel);
     printSummary(output.pluginManager, "success");
   } catch (error) {
@@ -296,12 +327,12 @@ async function startWatcher(cb, options) {
     ignored
   });
   watcher.on("all", (type, file) => {
-    spinner2.succeed(pc2__default.default.yellow(pc2__default.default.bold(`Change detected: ${type} ${file}`)));
+    spinner2.succeed(pc3__default.default.yellow(pc3__default.default.bold(`Change detected: ${type} ${file}`)));
     spinner2.spinner = "clock";
     try {
       cb(options.path);
     } catch (e) {
-      spinner2.warn(pc2__default.default.red("Watcher failed"));
+      spinner2.warn(pc3__default.default.red("Watcher failed"));
     }
   });
 }
@@ -339,12 +370,10 @@ async function getCosmiConfig(moduleName2, config) {
       `.${moduleName2}rc.json`,
       `.${moduleName2}rc.yaml`,
       `.${moduleName2}rc.yml`,
-      // TODO fix tsLoader
       `.${moduleName2}rc.ts`,
       `.${moduleName2}rc.js`,
       `.${moduleName2}rc.cjs`,
       `.${moduleName2}rc.mjs`,
-      // TODO fix tsLoader
       `${moduleName2}.config.ts`,
       `${moduleName2}.config.js`,
       `${moduleName2}.config.cjs`,
@@ -382,14 +411,14 @@ var program = new commander.Command(moduleName).description("Kubb").action(async
     }
     spinner.start("\u{1F4BE} Loading config");
     const result = await getCosmiConfig(moduleName, options.config);
-    spinner.succeed(`\u{1F4BE} Config loaded(${pc2__default.default.dim(pathParser__default.default.relative(process.cwd(), result.filepath))})`);
+    spinner.succeed(`\u{1F4BE} Config loaded(${pc3__default.default.dim(pathParser__default.default.relative(process.cwd(), result.filepath))})`);
     if (options.watch) {
       const config = await getConfig(result, options);
       startWatcher(
         async (paths) => {
           await run({ config, spinner, options });
           spinner.spinner = "simpleDotsScrolling";
-          spinner.start(pc2__default.default.yellow(pc2__default.default.bold(`Watching for changes in ${paths.join(" and ")}`)));
+          spinner.start(pc3__default.default.yellow(pc3__default.default.bold(`Watching for changes in ${paths.join(" and ")}`)));
         },
         {
           spinner,

package/dist/index.js

@@ -3,11 +3,12 @@ import { createRequire } from 'module';
 import pathParser from 'node:path';
 import { Command, Option } from 'commander';
 import ora from 'ora';
-import pc2 from 'picocolors';
-import { write, build, ParallelPluginError, PluginError, isPromise } from '@kubb/core';
+import pc3 from 'picocolors';
+import { write, throttle, build, ParallelPluginError, PluginError, isPromise } from '@kubb/core';
 import { $, execa } from 'execa';
 import PrettyError from 'pretty-error';
 import { parseArgsStringToArgv } from 'string-argv';
+import { Writable } from 'node:stream';
 import mod from 'node:module';
 import { pathToFileURL } from 'node:url';
 import { cosmiconfig } from 'cosmiconfig';
@@ -25,7 +26,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // package.json
-var version = "1.1.10";
+var version = "1.1.12";
 var presets = {
   simple: {
     "kubb.config": `
@@ -58,15 +59,15 @@ async function init({ spinner: spinner2, preset = "simple", logLevel = "silent",
     const presetMeta = presets[preset];
     const path = pathParser.resolve(process.cwd(), "./kubb.config.js");
     const installCommand = packageManager === "npm" ? "install" : "add";
-    spinner2.start(`\u{1F4C0} Writing \`kubb.config.js\` ${pc2.dim(path)}`);
+    spinner2.start(`\u{1F4C0} Writing \`kubb.config.js\` ${pc3.dim(path)}`);
     await write(presetMeta["kubb.config"], path);
-    spinner2.succeed(`\u{1F4C0} Wrote \`kubb.config.js\` ${pc2.dim(path)}`);
+    spinner2.succeed(`\u{1F4C0} Wrote \`kubb.config.js\` ${pc3.dim(path)}`);
     const data = await Promise.all([
       $`npm init es6 -y`,
       ...presetMeta.packages.map(async (pack) => {
-        spinner2.start(`\u{1F4C0} Installing ${pc2.dim(pack)}`);
+        spinner2.start(`\u{1F4C0} Installing ${pc3.dim(pack)}`);
         const { stdout } = await $({ preferLocal: false })`${packageManager} ${installCommand} ${pack}`;
-        spinner2.succeed(`\u{1F4C0} Installed ${pc2.dim(pack)}`);
+        spinner2.succeed(`\u{1F4C0} Installed ${pc3.dim(pack)}`);
         return stdout;
       })
     ]);
@@ -74,7 +75,7 @@ async function init({ spinner: spinner2, preset = "simple", logLevel = "silent",
       data.forEach((text) => console.log(text));
     }
   } catch (error) {
-    spinner2.fail(pc2.red(`Something went wrong
+    spinner2.fail(pc3.red(`Something went wrong
 
 ${error?.message}`));
   }
@@ -90,18 +91,42 @@ function parseHrtimeToSeconds(hrtime) {
 function parseText(baseText, config, logLevel = "silent") {
   return `${baseText}${config[logLevel] || ""}`;
 }
+var OraWritable = class extends Writable {
+  command;
+  spinner;
+  constructor(spinner2, command, opts) {
+    super(opts);
+    this.command = command;
+    this.spinner = spinner2;
+  }
+  _write(chunk, _encoding, callback) {
+    this.spinner.suffixText = `
+
+${pc3.bold(pc3.blue(this.command))}: ${chunk?.toString()}`;
+    callback();
+  }
+};
 
 // src/run.ts
 async function run({ config, options, spinner: spinner2 }) {
   const hrstart = process.hrtime();
-  const logger = {
-    log(message, logLevel) {
-      if (logLevel === "error") {
-        spinner2.fail(message);
+  const [log] = throttle((message, { logLevel, params }) => {
+    if (logLevel === "error") {
+      spinner2.fail(pc3.red(`${message}
+
+` || `Something went wrong
+
+`));
+    } else if (logLevel === "info") {
+      if (message) {
+        spinner2.text = message;
       } else {
-        spinner2.info(message);
+        spinner2.text = `\u{1FA82} Executing ${params?.hookName || "unknown"}(${pc3.yellow(params?.pluginName || "unknown")})`;
       }
-    },
+    }
+  }, 100);
+  const logger = {
+    log,
     spinner: spinner2
   };
   const onDone = async (hooks, logLevel) => {
@@ -115,15 +140,21 @@ async function run({ config, options, spinner: spinner2 }) {
       commands = hooks.done;
     }
     const promises = commands.map(async (command) => {
+      const oraWritable = new OraWritable(spinner2, command);
       const [cmd, ..._args] = [...parseArgsStringToArgv(command)];
-      spinner2.start(parseText(`\u{1FA82} Executing hooks(${pc2.yellow("done")})`, { info: ` ${pc2.dim(command)}` }, logLevel));
-      const { stdout } = await execa(cmd, _args);
-      spinner2.succeed(parseText(`\u{1FA82} Executing hooks(${pc2.yellow("done")})`, { info: ` ${pc2.dim(command)}` }, logLevel));
+      spinner2.start(parseText(`\u{1FA82} Executing hooks(${pc3.yellow("done")})`, { info: ` ${pc3.dim(command)}` }, logLevel));
+      const { stdout } = await execa(cmd, _args, {}).pipeStdout(oraWritable);
+      spinner2.suffixText = "";
+      oraWritable.destroy();
       if (logLevel === "info") {
+        spinner2.succeed(parseText(`\u{1FA82} Executing hooks(${pc3.yellow("done")})`, { info: ` ${pc3.dim(command)}` }, logLevel));
         console.log(stdout);
       }
     });
     await Promise.all(promises);
+    if (logLevel === "silent") {
+      spinner2.succeed(parseText(`\u{1FA82} Executing hooks(${pc3.yellow("done")})`, {}, logLevel));
+    }
   };
   const printSummary = (pluginManager, status) => {
     const elapsedSeconds = parseHrtimeToSeconds(process.hrtime(hrstart));
@@ -144,26 +175,26 @@ async function run({ config, options, spinner: spinner2 }) {
       return 0;
     });
     const meta = {
-      plugins: status === "success" ? `${pc2.green(`${buildStartPlugins.length} successful`)}, ${pluginsCount} total` : `${pc2.red(`${pluginsCount - buildStartPlugins.length} failed`)}, ${pluginsCount} total`,
+      plugins: status === "success" ? `${pc3.green(`${buildStartPlugins.length} successful`)}, ${pluginsCount} total` : `${pc3.red(`${pluginsCount - buildStartPlugins.length} failed`)}, ${pluginsCount} total`,
       filesCreated: files.length,
-      time: pc2.yellow(`${elapsedSeconds}s`),
+      time: pc3.yellow(`${elapsedSeconds}s`),
       output: pathParser.resolve(config.root, config.output.path)
     };
     console.log(`
-  ${pc2.bold("Plugins:")}      ${meta.plugins}
-${pc2.bold("Generated:")}      ${meta.filesCreated} files
-     ${pc2.bold("Time:")}      ${meta.time}
-   ${pc2.bold("Output:")}      ${meta.output}
+  ${pc3.bold("Plugins:")}      ${meta.plugins}
+${pc3.bold("Generated:")}      ${meta.filesCreated} files
+     ${pc3.bold("Time:")}      ${meta.time}
+   ${pc3.bold("Output:")}      ${meta.output}
      `);
     if (options.debug) {
-      console.log(`${pc2.bold("Generated files:")}`);
-      console.log(`${files.map((file) => `${pc2.blue(file.meta?.pluginName)} ${file.path}`).join("\n")}`);
+      console.log(`${pc3.bold("Generated files:")}`);
+      console.log(`${files.map((file) => `${pc3.blue(file.meta?.pluginName)} ${file.path}`).join("\n")}`);
     }
   };
   const printErrors = (error) => {
     const pe = new PrettyError();
     if (options.debug) {
-      spinner2.fail(pc2.red(`Something went wrong
+      spinner2.fail(pc3.red(`Something went wrong
 
 `));
       const causedError = error?.cause;
@@ -172,7 +203,7 @@ ${pc2.bold("Generated:")}      ${meta.filesCreated} files
         console.log(pe.render(causedError));
       }
     } else {
-      spinner2.fail(pc2.red(`Something went wrong
+      spinner2.fail(pc3.red(`Something went wrong
 
 ${error?.message}`));
     }
@@ -181,7 +212,7 @@ ${error?.message}`));
     const { root, ...userConfig } = config;
     const logLevel = options.logLevel ?? userConfig.logLevel ?? "silent";
     const inputPath = options.input ?? userConfig.input.path;
-    spinner2.start(parseText(`\u{1F680} Building`, { info: `(${pc2.dim(inputPath)})` }, logLevel));
+    spinner2.start(parseText(`\u{1F680} Building`, { info: `(${pc3.dim(inputPath)})` }, logLevel));
     const output = await build({
       config: {
         root: process.cwd(),
@@ -198,7 +229,7 @@ ${error?.message}`));
       },
       logger
     });
-    spinner2.succeed(parseText(`\u{1F680} Build completed`, { info: `(${pc2.dim(inputPath)})` }, logLevel));
+    spinner2.succeed(parseText(`\u{1F680} Build completed`, { info: `(${pc3.dim(inputPath)})` }, logLevel));
     await onDone(config.hooks, logLevel);
     printSummary(output.pluginManager, "success");
   } catch (error) {
@@ -287,12 +318,12 @@ async function startWatcher(cb, options) {
     ignored
   });
   watcher.on("all", (type, file) => {
-    spinner2.succeed(pc2.yellow(pc2.bold(`Change detected: ${type} ${file}`)));
+    spinner2.succeed(pc3.yellow(pc3.bold(`Change detected: ${type} ${file}`)));
     spinner2.spinner = "clock";
     try {
       cb(options.path);
     } catch (e) {
-      spinner2.warn(pc2.red("Watcher failed"));
+      spinner2.warn(pc3.red("Watcher failed"));
     }
   });
 }
@@ -330,12 +361,10 @@ async function getCosmiConfig(moduleName2, config) {
       `.${moduleName2}rc.json`,
       `.${moduleName2}rc.yaml`,
       `.${moduleName2}rc.yml`,
-      // TODO fix tsLoader
       `.${moduleName2}rc.ts`,
       `.${moduleName2}rc.js`,
       `.${moduleName2}rc.cjs`,
       `.${moduleName2}rc.mjs`,
-      // TODO fix tsLoader
       `${moduleName2}.config.ts`,
       `${moduleName2}.config.js`,
       `${moduleName2}.config.cjs`,
@@ -373,14 +402,14 @@ var program = new Command(moduleName).description("Kubb").action(async (options)
     }
     spinner.start("\u{1F4BE} Loading config");
     const result = await getCosmiConfig(moduleName, options.config);
-    spinner.succeed(`\u{1F4BE} Config loaded(${pc2.dim(pathParser.relative(process.cwd(), result.filepath))})`);
+    spinner.succeed(`\u{1F4BE} Config loaded(${pc3.dim(pathParser.relative(process.cwd(), result.filepath))})`);
     if (options.watch) {
       const config = await getConfig(result, options);
       startWatcher(
         async (paths) => {
           await run({ config, spinner, options });
           spinner.spinner = "simpleDotsScrolling";
-          spinner.start(pc2.yellow(pc2.bold(`Watching for changes in ${paths.join(" and ")}`)));
+          spinner.start(pc3.yellow(pc3.bold(`Watching for changes in ${paths.join(" and ")}`)));
         },
         {
           spinner,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/cli",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "description": "Generator cli",
   "keywords": [
     "typescript",
@@ -27,12 +27,11 @@
   "files": [
     "dist",
     "bin",
-    "src",
     "!/**/**.test.**",
     "!/**/__tests__/**"
   ],
   "dependencies": {
-    "@swc/core": "^1.3.62",
+    "@swc/core": "^1.3.63",
     "chokidar": "^3.5.3",
     "commander": "^10.0.1",
     "cosmiconfig": "^8.2.0",
@@ -43,13 +42,13 @@
     "string-argv": "^0.3.2",
     "ts-node": "^10.9.1",
     "yaml": "^2.3.1",
-    "@kubb/core": "1.1.10"
+    "@kubb/core": "1.1.12"
   },
   "devDependencies": {
-    "@types/node": "^20.2.6",
+    "@types/node": "^20.3.1",
     "tsup": "^6.7.0",
     "typescript": "^5.1.3",
-    "@kubb/swagger": "1.1.10",
+    "@kubb/swagger": "1.1.12",
     "@kubb/ts-config": "0.1.0",
     "@kubb/tsup-config": "1.1.8"
   },

package/src/index.ts

@@ -1,69 +0,0 @@
-#!/usr/bin/env node
-import pathParser from 'node:path'
-
-import { Command, Option } from 'commander'
-import ora from 'ora'
-import pc from 'picocolors'
-
-import { version } from '../package.json'
-import { init } from './init.ts'
-import { run } from './run.ts'
-import { getConfig, getCosmiConfig, startWatcher } from './utils/index.ts'
-
-import type { CLIOptions } from '@kubb/core'
-
-const moduleName = 'kubb'
-
-const spinner = ora({
-  spinner: 'clock',
-}).start()
-
-const program = new Command(moduleName)
-  .description('Kubb')
-  .action(async (options: CLIOptions) => {
-    try {
-      if (options.init) {
-        spinner.start('📦 Initializing Kubb')
-        await init({ spinner, logLevel: options.logLevel })
-        spinner.succeed(`📦 initialized Kubb`)
-        return
-      }
-
-      // CONFIG
-      spinner.start('💾 Loading config')
-      const result = await getCosmiConfig(moduleName, options.config)
-      spinner.succeed(`💾 Config loaded(${pc.dim(pathParser.relative(process.cwd(), result.filepath))})`)
-
-      // END CONFIG
-
-      if (options.watch) {
-        const config = await getConfig(result, options)
-
-        startWatcher(
-          async (paths) => {
-            await run({ config, spinner, options })
-            spinner.spinner = 'simpleDotsScrolling'
-            spinner.start(pc.yellow(pc.bold(`Watching for changes in ${paths.join(' and ')}`)))
-          },
-          {
-            spinner,
-            path: [config.input.path],
-          }
-        )
-      } else {
-        const config = await getConfig(result, options)
-
-        await run({ config, spinner, options })
-      }
-    } catch (e) {
-      process.exit(1)
-    }
-  })
-  .addOption(new Option('-c, --config <path>', 'Path to the Kubb config'))
-  .addOption(new Option('-i, --input <path>', 'Path of the input file(overrides the one in `kubb.config.js`)'))
-  .addOption(new Option('-l, --logLevel <type>', 'Type of the logging(overrides the one in `kubb.config.js`)').choices(['error', 'info', 'silent']))
-  .addOption(new Option('--init', 'Init Kubb'))
-  .addOption(new Option('-d, --debug', 'Debug mode').default(false))
-  .addOption(new Option('-w, --watch', 'Watch mode based on the input file'))
-
-program.name(moduleName).description('Generate').version(version, '-v').parse()

package/src/init.ts

@@ -1,91 +0,0 @@
-import pathParser from 'node:path'
-
-import { write } from '@kubb/core'
-
-import { $ } from 'execa'
-import pc from 'picocolors'
-
-import type { LogLevel } from '@kubb/core'
-import type { Ora } from 'ora'
-
-export type Preset = 'simple'
-
-export type PackageManager = 'pnpm' | 'npm' | 'yarn'
-
-export type PresetMeta = {
-  'kubb.config': string
-  packages: string[]
-}
-
-type RunProps = {
-  spinner: Ora
-  /**
-   * @default `'silent'`
-   */
-  logLevel?: LogLevel
-  /**
-   * @default `'simple'`
-   */
-  preset?: Preset
-  /**
-   * @default `'pnpm'`
-   */
-  packageManager?: PackageManager
-}
-
-const presets: Record<Preset, PresetMeta> = {
-  simple: {
-    'kubb.config': `
-import { defineConfig } from '@kubb/core'
-import createSwagger from '@kubb/swagger'
-import createSwaggerTS from '@kubb/swagger-ts'
-import createSwaggerTanstackQuery from '@kubb/swagger-tanstack-query'
-
-export default defineConfig({
-  root: '.',
-  input: {
-    path: 'https://petstore3.swagger.io/api/v3/openapi.json',
-  },
-  output: {
-    path: './src/gen',
-    clean: true,
-  },
-  hooks: {
-    done: 'echo "🎉 done"',
-  },
-  logLevel: 'info',
-  plugins: [createSwagger({}), createSwaggerTS({ output: 'models', enumType: 'enum' }), createSwaggerTanstackQuery({ output: './hooks' })],
-})
-  `,
-    packages: ['@kubb/core', '@kubb/cli', '@kubb/swagger', '@kubb/swagger-ts', '@kubb/swagger-tanstack-query'],
-  },
-}
-
-export async function init({ spinner, preset = 'simple', logLevel = 'silent', packageManager = 'pnpm' }: RunProps): Promise<void> {
-  try {
-    const presetMeta = presets[preset]
-    const path = pathParser.resolve(process.cwd(), './kubb.config.js')
-    const installCommand = packageManager === 'npm' ? 'install' : 'add'
-
-    spinner.start(`📀 Writing \`kubb.config.js\` ${pc.dim(path)}`)
-    await write(presetMeta['kubb.config'], path)
-    spinner.succeed(`📀 Wrote \`kubb.config.js\` ${pc.dim(path)}`)
-
-    const data = await Promise.all([
-      $`npm init es6 -y`,
-      ...presetMeta.packages.map(async (pack) => {
-        spinner.start(`📀 Installing ${pc.dim(pack)}`)
-        const { stdout } = await $({ preferLocal: false })`${packageManager} ${installCommand} ${pack}`
-        spinner.succeed(`📀 Installed ${pc.dim(pack)}`)
-
-        return stdout
-      }),
-    ])
-
-    if (logLevel === 'info') {
-      data.forEach((text) => console.log(text))
-    }
-  } catch (error) {
-    spinner.fail(pc.red(`Something went wrong\n\n${(error as Error)?.message}`))
-  }
-}

package/src/run.ts

@@ -1,163 +0,0 @@
-import pathParser from 'node:path'
-
-import { build, ParallelPluginError, PluginError } from '@kubb/core'
-
-import { execa } from 'execa'
-import pc from 'picocolors'
-import PrettyError from 'pretty-error'
-import { parseArgsStringToArgv } from 'string-argv'
-
-import { parseHrtimeToSeconds } from './utils/parseHrtimeToSeconds.ts'
-import { parseText } from './utils/parseText.ts'
-
-import type { BuildOutput, CLIOptions, KubbConfig, Logger, LogLevel } from '@kubb/core'
-import type { Ora } from 'ora'
-
-type RunProps = {
-  config: KubbConfig
-  spinner: Ora
-  options: CLIOptions
-}
-
-export async function run({ config, options, spinner }: RunProps): Promise<void> {
-  const hrstart = process.hrtime()
-  const logger: Logger = {
-    log(message, logLevel) {
-      if (logLevel === 'error') {
-        spinner.fail(message)
-      } else {
-        spinner.info(message)
-      }
-    },
-    spinner,
-  }
-
-  const onDone = async (hooks: KubbConfig['hooks'], logLevel: LogLevel) => {
-    if (!hooks?.done) {
-      return
-    }
-
-    let commands: string[] = []
-    if (typeof hooks?.done === 'string') {
-      commands = [hooks.done]
-    } else {
-      commands = hooks.done
-    }
-
-    const promises = commands.map(async (command) => {
-      const [cmd, ..._args] = [...parseArgsStringToArgv(command)]
-      spinner.start(parseText(`🪂 Executing hooks(${pc.yellow('done')})`, { info: ` ${pc.dim(command)}` }, logLevel))
-      const { stdout } = await execa(cmd, _args)
-      spinner.succeed(parseText(`🪂 Executing hooks(${pc.yellow('done')})`, { info: ` ${pc.dim(command)}` }, logLevel))
-
-      if (logLevel === 'info') {
-        console.log(stdout)
-      }
-    })
-
-    await Promise.all(promises)
-  }
-
-  const printSummary = (pluginManager: BuildOutput['pluginManager'], status: 'success' | 'failed') => {
-    const elapsedSeconds = parseHrtimeToSeconds(process.hrtime(hrstart))
-
-    const buildStartPlugins = [
-      ...new Set(pluginManager.executed.filter((item) => item.hookName === 'buildStart' && item.plugin.name !== 'core').map((item) => item.plugin.name)),
-    ]
-    const pluginsCount = config.plugins?.length || 0
-    const files = pluginManager.fileManager.files.sort((a, b) => {
-      if (!a.meta?.pluginName || !b.meta?.pluginName) {
-        return 0
-      }
-      if (a.meta?.pluginName.length < b.meta?.pluginName.length) {
-        return 1
-      }
-      if (a.meta?.pluginName.length > b.meta?.pluginName.length) {
-        return -1
-      }
-      return 0
-    })
-
-    const meta = {
-      plugins:
-        status === 'success'
-          ? `${pc.green(`${buildStartPlugins.length} successful`)}, ${pluginsCount} total`
-          : `${pc.red(`${pluginsCount - buildStartPlugins.length} failed`)}, ${pluginsCount} total`,
-      filesCreated: files.length,
-      time: pc.yellow(`${elapsedSeconds}s`),
-      output: pathParser.resolve(config.root, config.output.path),
-    } as const
-
-    console.log(`
-  ${pc.bold('Plugins:')}      ${meta.plugins}
-${pc.bold('Generated:')}      ${meta.filesCreated} files
-     ${pc.bold('Time:')}      ${meta.time}
-   ${pc.bold('Output:')}      ${meta.output}
-     `)
-
-    if (options.debug) {
-      console.log(`${pc.bold('Generated files:')}`)
-      console.log(`${files.map((file) => `${pc.blue(file.meta?.pluginName)} ${file.path}`).join('\n')}`)
-    }
-  }
-
-  const printErrors = (error: Error) => {
-    const pe = new PrettyError()
-
-    if (options.debug) {
-      spinner.fail(pc.red(`Something went wrong\n\n`))
-      const causedError = error?.cause as Error
-
-      console.log(pe.render(error))
-
-      if (causedError) {
-        console.log(pe.render(causedError))
-      }
-    } else {
-      spinner.fail(pc.red(`Something went wrong\n\n${error?.message}`))
-    }
-  }
-
-  try {
-    const { root, ...userConfig } = config
-    const logLevel = options.logLevel ?? userConfig.logLevel ?? 'silent'
-    const inputPath = options.input ?? userConfig.input.path
-
-    spinner.start(parseText(`🚀 Building`, { info: `(${pc.dim(inputPath)})` }, logLevel))
-
-    const output = await build({
-      config: {
-        root: process.cwd(),
-        ...userConfig,
-        logLevel,
-        input: {
-          ...userConfig.input,
-          path: inputPath,
-        },
-        output: {
-          write: true,
-          ...userConfig.output,
-        },
-      },
-      logger,
-    })
-
-    spinner.succeed(parseText(`🚀 Build completed`, { info: `(${pc.dim(inputPath)})` }, logLevel))
-
-    await onDone(config.hooks, logLevel)
-
-    printSummary(output.pluginManager, 'success')
-  } catch (error: any) {
-    if (error instanceof ParallelPluginError) {
-      error.errors.map((e) => printErrors(e))
-    } else {
-      printErrors(error as Error)
-    }
-
-    if (error instanceof PluginError || error instanceof ParallelPluginError) {
-      printSummary(error.pluginManager, 'failed')
-    }
-
-    throw error
-  }
-}

package/src/types.ts

@@ -1,7 +0,0 @@
-import type { defineConfig, KubbUserConfig } from '@kubb/core'
-
-export type CosmiconfigResult = {
-  filepath: string
-  isEmpty?: boolean
-  config: ReturnType<typeof defineConfig> | KubbUserConfig
-}

package/src/utils/getConfig.ts

@@ -1,28 +0,0 @@
-import { isPromise } from '@kubb/core'
-
-import { getPlugins } from './getPlugins.ts'
-
-import type { CLIOptions, KubbConfig, KubbUserConfig } from '@kubb/core'
-import type { CosmiconfigResult } from '../types.ts'
-
-export async function getConfig(result: CosmiconfigResult, options: CLIOptions): Promise<KubbConfig> {
-  const config = result?.config
-  let kubbUserConfig: Promise<KubbUserConfig> = Promise.resolve(config) as Promise<KubbUserConfig>
-
-  // for ts or js files
-  if (typeof config === 'function') {
-    const possiblePromise = config(options)
-    if (isPromise(possiblePromise)) {
-      kubbUserConfig = possiblePromise
-    }
-    kubbUserConfig = Promise.resolve(possiblePromise)
-  }
-
-  let JSONConfig = await kubbUserConfig
-  JSONConfig = {
-    ...JSONConfig,
-    plugins: JSONConfig.plugins ? await getPlugins(JSONConfig.plugins) : undefined,
-  }
-
-  return JSONConfig as KubbConfig
-}

package/src/utils/getCosmiConfig.ts

@@ -1,80 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-import { cosmiconfig } from 'cosmiconfig'
-import tsNode from 'ts-node'
-import yaml from 'yaml'
-
-import { importModule } from './importModule.ts'
-
-import type { CosmiconfigResult } from '../types.ts'
-
-const jsLoader = async (configFile: string) => {
-  return importModule(configFile)
-}
-// TODO fix tsLoader for node 20
-// https://github.com/TypeStrong/ts-node/issues/1997
-const tsLoader = (configFile: string) => {
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  let registerer = { enabled() {} }
-
-  try {
-    // Register TypeScript compiler instance
-    registerer = tsNode.register({
-      compilerOptions: { module: 'commonjs' },
-      swc: true,
-      typeCheck: false,
-    })
-
-    const module = require(configFile)
-
-    return module.default
-  } catch (err: any) {
-    if (err.code === 'MODULE_NOT_FOUND') {
-      throw new Error(`'ts-node' is required for the TypeScript configuration files. Make sure it is installed\nError: ${err.message}`)
-    }
-    console.log(err)
-
-    throw err
-  } finally {
-    registerer.enabled()
-  }
-}
-
-export async function getCosmiConfig(moduleName: string, config?: string) {
-  const explorer = cosmiconfig(moduleName, {
-    cache: false,
-    searchPlaces: [
-      'package.json',
-      `.${moduleName}rc`,
-      `.${moduleName}rc.json`,
-      `.${moduleName}rc.yaml`,
-      `.${moduleName}rc.yml`,
-      // TODO fix tsLoader
-      `.${moduleName}rc.ts`,
-      `.${moduleName}rc.js`,
-      `.${moduleName}rc.cjs`,
-      `.${moduleName}rc.mjs`,
-      // TODO fix tsLoader
-      `${moduleName}.config.ts`,
-      `${moduleName}.config.js`,
-      `${moduleName}.config.cjs`,
-      `${moduleName}.config.mjs`,
-    ],
-    loaders: {
-      '.yaml': (filepath, content) => yaml.parse(content),
-      '.yml': (filepath, content) => yaml.parse(content),
-      '.js': jsLoader,
-      '.cjs': jsLoader,
-      '.mjs': jsLoader,
-      '.ts': tsLoader,
-      noExt: jsLoader,
-    },
-  })
-
-  const result = config ? await explorer.load(config) : await explorer.search()
-
-  if (result?.isEmpty || !result || !result.config) {
-    throw new Error('Config not defined, create a kubb.config.js or pass through your config with the option --config')
-  }
-
-  return result as CosmiconfigResult
-}

package/src/utils/getPlugins.ts

@@ -1,40 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-
-import { importModule } from './importModule.ts'
-
-import type { KubbJSONPlugin, KubbObjectPlugin, KubbUserConfig } from '@kubb/core'
-
-function isJSONPlugins(plugins: KubbUserConfig['plugins'] | KubbJSONPlugin[]): plugins is KubbJSONPlugin[] {
-  return !!(plugins as KubbJSONPlugin[])?.some((plugin) => {
-    return typeof plugin?.[0] === 'string'
-  })
-}
-
-function isObjectPlugins(plugins: KubbUserConfig['plugins'] | KubbJSONPlugin[]): plugins is KubbObjectPlugin {
-  return plugins instanceof Object && !Array.isArray(plugins)
-}
-
-async function importPlugin(name: string, options: object) {
-  const importedPlugin = process.env.NODE_ENV === 'test' ? await import(name) : await importModule(name, process.cwd())
-
-  return importedPlugin?.default ? importedPlugin.default(options) : importedPlugin(options)
-}
-
-export function getPlugins(plugins: KubbUserConfig['plugins'] | KubbJSONPlugin[]): Promise<KubbUserConfig['plugins']> {
-  if (isObjectPlugins(plugins)) {
-    const promises = Object.keys(plugins).map(async (name) => {
-      return importPlugin(name, plugins[name as keyof typeof plugins])
-    })
-    return Promise.all(promises)
-  }
-
-  if (isJSONPlugins(plugins)) {
-    const promises = plugins.map(async (plugin) => {
-      const [name, options = {}] = plugin
-      return importPlugin(name, options)
-    })
-    return Promise.all(promises)
-  }
-  return Promise.resolve(plugins)
-}

package/src/utils/importModule.ts

@@ -1,36 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-import mod from 'node:module'
-import { pathToFileURL } from 'node:url'
-
-const SLASHES = new Set(['/', '\\'])
-
-/**
- * Normalizes directories to have a trailing slash.
- * Resolve is pretty finicky -- if the directory name doesn't have
- * a trailing slash then it tries to look in the parent directory.
- * i.e., if the directory is "/usr/nzakas/foo" it will start the
- * search in /usr/nzakas. However, if the directory is "/user/nzakas/foo/",
- * then it will start the search in /user/nzakas/foo.
- * @param {string} directory The directory to check.
- * @returns {string} The normalized directory.
- */
-export function normalizeDirectory(directory: string) {
-  if (!SLASHES.has(directory[directory.length - 1])) {
-    return `${directory}/`
-  }
-
-  return directory
-}
-
-export async function importModule(path: string, cwd?: string): Promise<any> {
-  let location = path
-
-  if (cwd) {
-    const require = mod.createRequire(normalizeDirectory(cwd))
-    location = require.resolve(path)
-  }
-
-  const module = await import(pathToFileURL(location).href)
-
-  return module?.default ?? module
-}

package/src/utils/index.ts

@@ -1,7 +0,0 @@
-export * from './getConfig.ts'
-export * from './getPlugins.ts'
-export * from './watcher.ts'
-export * from './getCosmiConfig.ts'
-export * from './importModule.ts'
-export * from './parseHrtimeToSeconds.ts'
-export * from './parseText.ts'

package/src/utils/mocks/noop.cjs

@@ -1,3 +0,0 @@
-module.exports = function noop() {
-  return 'cjs-noop'
-}

package/src/utils/mocks/noop.js

@@ -1,3 +0,0 @@
-export function noop() {
-  return 'js-noop'
-}

package/src/utils/parseHrtimeToSeconds.ts

@@ -1,4 +0,0 @@
-export function parseHrtimeToSeconds(hrtime: [number, number]) {
-  const seconds = (hrtime[0] + hrtime[1] / 1e9).toFixed(3)
-  return seconds
-}

package/src/utils/parseText.ts

@@ -1,5 +0,0 @@
-import type { LogLevel } from '@kubb/core'
-
-export function parseText(baseText: string, config: Partial<Record<LogLevel, string>>, logLevel: LogLevel = 'silent') {
-  return `${baseText}${config[logLevel] || ''}`
-}

package/src/utils/watcher.ts

@@ -1,30 +0,0 @@
-import pc from 'picocolors'
-
-import type { Ora } from 'ora'
-
-type Options = {
-  path: string[]
-  spinner: Ora
-}
-export async function startWatcher(cb: (path: string[]) => Promise<void>, options: Options) {
-  const { spinner, path } = options
-  const { watch } = await import('chokidar')
-
-  const ignored = ['**/{.git,node_modules}/**']
-
-  const watcher = watch(path, {
-    ignorePermissionErrors: true,
-    ignored,
-  })
-  watcher.on('all', (type, file) => {
-    spinner.succeed(pc.yellow(pc.bold(`Change detected: ${type} ${file}`)))
-    // revert back
-    spinner.spinner = 'clock'
-
-    try {
-      cb(options.path)
-    } catch (e) {
-      spinner.warn(pc.red('Watcher failed'))
-    }
-  })
-}