@kubb/cli 1.1.5 → 1.1.7

package/dist/index.cjs

@@ -4,26 +4,26 @@
 var mod = require('module');
 var pathParser = require('path');
 var commander = require('commander');
-var pc = require('picocolors');
 var ora = require('ora');
+var pc2 = require('picocolors');
+var core = require('@kubb/core');
 var execa = require('execa');
-var stringArgv = require('string-argv');
 var PrettyError = require('pretty-error');
-var core = require('@kubb/core');
+var stringArgv = require('string-argv');
 var url = require('url');
 var cosmiconfig = require('cosmiconfig');
-var yaml = require('yaml');
 var tsNode = require('ts-node');
+var yaml = require('yaml');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var mod__default = /*#__PURE__*/_interopDefault(mod);
 var pathParser__default = /*#__PURE__*/_interopDefault(pathParser);
-var pc__default = /*#__PURE__*/_interopDefault(pc);
 var ora__default = /*#__PURE__*/_interopDefault(ora);
+var pc2__default = /*#__PURE__*/_interopDefault(pc2);
 var PrettyError__default = /*#__PURE__*/_interopDefault(PrettyError);
-var yaml__default = /*#__PURE__*/_interopDefault(yaml);
 var tsNode__default = /*#__PURE__*/_interopDefault(tsNode);
+var yaml__default = /*#__PURE__*/_interopDefault(yaml);
 
 const require$1 = mod.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('out.js', document.baseURI).href)));
 var __require = /* @__PURE__ */ ((x) => typeof require$1 !== "undefined" ? require$1 : typeof Proxy !== "undefined" ? new Proxy(x, {
@@ -34,9 +34,60 @@ var __require = /* @__PURE__ */ ((x) => typeof require$1 !== "undefined" ? requi
   throw new Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// src/utils/parseText.ts
-function parseText(baseText, config, logLevel = "silent") {
-  return `${baseText}${config[logLevel] || ""}`;
+// package.json
+var version = "1.1.7";
+var presets = {
+  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 "\u{1F389} 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"]
+  }
+};
+async function init({ spinner: spinner2, preset = "simple", logLevel = "silent", packageManager = "pnpm" }) {
+  try {
+    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)}`);
+    await core.write(presetMeta["kubb.config"], path);
+    spinner2.succeed(`\u{1F4C0} Wrote \`kubb.config.js\` ${pc2__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)}`);
+        const { stdout } = await execa.$({ preferLocal: false })`${packageManager} ${installCommand} ${pack}`;
+        spinner2.succeed(`\u{1F4C0} Installed ${pc2__default.default.dim(pack)}`);
+        return stdout;
+      })
+    ]);
+    if (logLevel === "info") {
+      data.forEach((text) => console.log(text));
+    }
+  } catch (error) {
+    spinner2.fail(pc2__default.default.red(`Something went wrong
+
+${error?.message}`));
+  }
 }
 
 // src/utils/parseHrtimeToSeconds.ts
@@ -45,6 +96,11 @@ function parseHrtimeToSeconds(hrtime) {
   return seconds;
 }
 
+// src/utils/parseText.ts
+function parseText(baseText, config, logLevel = "silent") {
+  return `${baseText}${config[logLevel] || ""}`;
+}
+
 // src/run.ts
 async function run({ config, options, spinner: spinner2 }) {
   const hrstart = process.hrtime();
@@ -70,9 +126,9 @@ async function run({ config, options, spinner: spinner2 }) {
     }
     const promises = commands.map(async (command) => {
       const [cmd, ..._args] = [...stringArgv.parseArgsStringToArgv(command)];
-      spinner2.start(parseText(`\u{1FA82} Executing hooks(${pc__default.default.yellow("done")})`, { info: ` ${pc__default.default.dim(command)}` }, logLevel));
+      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(${pc__default.default.yellow("done")})`, { info: ` ${pc__default.default.dim(command)}` }, logLevel));
+      spinner2.succeed(parseText(`\u{1FA82} Executing hooks(${pc2__default.default.yellow("done")})`, { info: ` ${pc2__default.default.dim(command)}` }, logLevel));
       if (logLevel === "info") {
         console.log(stdout);
       }
@@ -96,20 +152,20 @@ async function run({ config, options, spinner: spinner2 }) {
       return 0;
     });
     const meta = {
-      plugins: status === "success" ? `${pc__default.default.green(`${buildStartPlugins.length} successful`)}, ${pluginsCount} total` : `${pc__default.default.red(`${pluginsCount - buildStartPlugins.length} failed`)}, ${pluginsCount} total`,
+      plugins: status === "success" ? `${pc2__default.default.green(`${buildStartPlugins.length} successful`)}, ${pluginsCount} total` : `${pc2__default.default.red(`${pluginsCount - buildStartPlugins.length} failed`)}, ${pluginsCount} total`,
       filesCreated: files.length,
-      time: pc__default.default.yellow(`${elapsedSeconds}s`),
+      time: pc2__default.default.yellow(`${elapsedSeconds}s`),
       output: pathParser__default.default.resolve(config.root, config.output.path)
     };
     console.log(`
-  ${pc__default.default.bold("Plugins:")}      ${meta.plugins}
-${pc__default.default.bold("Generated:")}      ${meta.filesCreated} files
-     ${pc__default.default.bold("Time:")}      ${meta.time}
-   ${pc__default.default.bold("Output:")}      ${meta.output}
+  ${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}
      `);
     if (options.debug) {
-      console.log(`${pc__default.default.bold("Generated files:")}`);
-      console.log(`${files.map((file) => `${pc__default.default.blue(file.meta?.pluginName)} ${file.path}`).join("\n")}`);
+      console.log(`${pc2__default.default.bold("Generated files:")}`);
+      console.log(`${files.map((file) => `${pc2__default.default.blue(file.meta?.pluginName)} ${file.path}`).join("\n")}`);
     }
   };
   const printErrors = (error) => {
@@ -119,7 +175,7 @@ ${pc__default.default.bold("Generated:")}      ${meta.filesCreated} files
       return;
     }
     if (options.debug) {
-      spinner2.fail(pc__default.default.red(`Something went wrong
+      spinner2.fail(pc2__default.default.red(`Something went wrong
 
 `));
       const causedError = error?.cause;
@@ -128,7 +184,7 @@ ${pc__default.default.bold("Generated:")}      ${meta.filesCreated} files
         console.log(pe.render(causedError));
       }
     } else {
-      spinner2.fail(pc__default.default.red(`Something went wrong
+      spinner2.fail(pc2__default.default.red(`Something went wrong
 
 ${error?.message}`));
     }
@@ -137,7 +193,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: `(${pc__default.default.dim(inputPath)})` }, logLevel));
+    spinner2.start(parseText(`\u{1F680} Building`, { info: `(${pc2__default.default.dim(inputPath)})` }, logLevel));
     const output = await core.build({
       config: {
         root: process.cwd(),
@@ -154,7 +210,7 @@ ${error?.message}`));
       },
       logger
     });
-    spinner2.succeed(parseText(`\u{1F680} Build completed`, { info: `(${pc__default.default.dim(inputPath)})` }, logLevel));
+    spinner2.succeed(parseText(`\u{1F680} Build completed`, { info: `(${pc2__default.default.dim(inputPath)})` }, logLevel));
     await onDone(config.hooks, logLevel);
     printSummary(output.pluginManager, "success");
   } catch (error) {
@@ -179,7 +235,7 @@ async function importModule(path, cwd) {
     location = require2.resolve(path);
   }
   const module = await import(url.pathToFileURL(location).href);
-  return module.default;
+  return module?.default ?? module;
 }
 
 // src/utils/getPlugins.ts
@@ -238,20 +294,20 @@ async function startWatcher(cb, options) {
     ignorePermissionErrors: true,
     ignored
   });
-  watcher.on("all", async (type, file) => {
-    spinner2.succeed(pc__default.default.yellow(pc__default.default.bold(`Change detected: ${type} ${file}`)));
+  watcher.on("all", (type, file) => {
+    spinner2.succeed(pc2__default.default.yellow(pc2__default.default.bold(`Change detected: ${type} ${file}`)));
     spinner2.spinner = "clock";
     try {
-      await cb(options.path);
+      cb(options.path);
     } catch (e) {
-      spinner2.warn(pc__default.default.red("Watcher failed"));
+      spinner2.warn(pc2__default.default.red("Watcher failed"));
     }
   });
 }
 var jsLoader = async (configFile) => {
   return importModule(configFile);
 };
-var tsLoader = async (configFile) => {
+var tsLoader = (configFile) => {
   let registerer = { enabled() {
   } };
   try {
@@ -309,62 +365,6 @@ async function getCosmiConfig(moduleName2, config) {
   }
   return result;
 }
-var presets = {
-  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 "\u{1F389} 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"]
-  }
-};
-async function init({ spinner: spinner2, preset = "simple", logLevel = "silent", packageManager = "pnpm" }) {
-  try {
-    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\` ${pc__default.default.dim(path)}`);
-    await core.write(presetMeta["kubb.config"], path);
-    spinner2.succeed(`\u{1F4C0} Wrote \`kubb.config.js\` ${pc__default.default.dim(path)}`);
-    const data = await Promise.all([
-      execa.$`npm init es6 -y`,
-      ...presetMeta.packages.map(async (pack) => {
-        spinner2.start(`\u{1F4C0} Installing ${pc__default.default.dim(pack)}`);
-        const { stdout } = await execa.$({ preferLocal: false })`${packageManager} ${installCommand} ${pack}`;
-        spinner2.succeed(`\u{1F4C0} Installed ${pc__default.default.dim(pack)}`);
-        return stdout;
-      })
-    ]);
-    if (logLevel === "info") {
-      data.forEach((text) => console.log(text));
-    }
-  } catch (error) {
-    spinner2.fail(pc__default.default.red(`Something went wrong
-
-${error?.message}`));
-  }
-}
-
-// package.json
-var version = "1.1.5";
 
 // src/index.ts
 var moduleName = "kubb";
@@ -381,14 +381,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(${pc__default.default.dim(pathParser__default.default.relative(process.cwd(), result.filepath))})`);
+    spinner.succeed(`\u{1F4BE} Config loaded(${pc2__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(pc__default.default.yellow(pc__default.default.bold(`Watching for changes in ${paths.join(" and ")}`)));
+          spinner.start(pc2__default.default.yellow(pc2__default.default.bold(`Watching for changes in ${paths.join(" and ")}`)));
         },
         {
           spinner,

package/dist/index.js

@@ -2,17 +2,17 @@
 import { createRequire } from 'module';
 import pathParser from 'node:path';
 import { Command, Option } from 'commander';
-import pc from 'picocolors';
 import ora from 'ora';
+import pc2 from 'picocolors';
+import { write, build, PluginError, ParallelPluginError, isPromise } from '@kubb/core';
 import { $, execa } from 'execa';
-import { parseArgsStringToArgv } from 'string-argv';
 import PrettyError from 'pretty-error';
-import { build, PluginError, ParallelPluginError, isPromise, write } from '@kubb/core';
-import { pathToFileURL } from 'node:url';
+import { parseArgsStringToArgv } from 'string-argv';
 import mod from 'node:module';
+import { pathToFileURL } from 'node:url';
 import { cosmiconfig } from 'cosmiconfig';
-import yaml from 'yaml';
 import tsNode from 'ts-node';
+import yaml from 'yaml';
 
 const require = createRequire(import.meta.url);
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
@@ -23,9 +23,60 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw new Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// src/utils/parseText.ts
-function parseText(baseText, config, logLevel = "silent") {
-  return `${baseText}${config[logLevel] || ""}`;
+// package.json
+var version = "1.1.7";
+var presets = {
+  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 "\u{1F389} 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"]
+  }
+};
+async function init({ spinner: spinner2, preset = "simple", logLevel = "silent", packageManager = "pnpm" }) {
+  try {
+    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)}`);
+    await write(presetMeta["kubb.config"], path);
+    spinner2.succeed(`\u{1F4C0} Wrote \`kubb.config.js\` ${pc2.dim(path)}`);
+    const data = await Promise.all([
+      $`npm init es6 -y`,
+      ...presetMeta.packages.map(async (pack) => {
+        spinner2.start(`\u{1F4C0} Installing ${pc2.dim(pack)}`);
+        const { stdout } = await $({ preferLocal: false })`${packageManager} ${installCommand} ${pack}`;
+        spinner2.succeed(`\u{1F4C0} Installed ${pc2.dim(pack)}`);
+        return stdout;
+      })
+    ]);
+    if (logLevel === "info") {
+      data.forEach((text) => console.log(text));
+    }
+  } catch (error) {
+    spinner2.fail(pc2.red(`Something went wrong
+
+${error?.message}`));
+  }
 }
 
 // src/utils/parseHrtimeToSeconds.ts
@@ -34,6 +85,11 @@ function parseHrtimeToSeconds(hrtime) {
   return seconds;
 }
 
+// src/utils/parseText.ts
+function parseText(baseText, config, logLevel = "silent") {
+  return `${baseText}${config[logLevel] || ""}`;
+}
+
 // src/run.ts
 async function run({ config, options, spinner: spinner2 }) {
   const hrstart = process.hrtime();
@@ -59,9 +115,9 @@ async function run({ config, options, spinner: spinner2 }) {
     }
     const promises = commands.map(async (command) => {
       const [cmd, ..._args] = [...parseArgsStringToArgv(command)];
-      spinner2.start(parseText(`\u{1FA82} Executing hooks(${pc.yellow("done")})`, { info: ` ${pc.dim(command)}` }, logLevel));
+      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(${pc.yellow("done")})`, { info: ` ${pc.dim(command)}` }, logLevel));
+      spinner2.succeed(parseText(`\u{1FA82} Executing hooks(${pc2.yellow("done")})`, { info: ` ${pc2.dim(command)}` }, logLevel));
       if (logLevel === "info") {
         console.log(stdout);
       }
@@ -85,20 +141,20 @@ async function run({ config, options, spinner: spinner2 }) {
       return 0;
     });
     const meta = {
-      plugins: status === "success" ? `${pc.green(`${buildStartPlugins.length} successful`)}, ${pluginsCount} total` : `${pc.red(`${pluginsCount - buildStartPlugins.length} failed`)}, ${pluginsCount} total`,
+      plugins: status === "success" ? `${pc2.green(`${buildStartPlugins.length} successful`)}, ${pluginsCount} total` : `${pc2.red(`${pluginsCount - buildStartPlugins.length} failed`)}, ${pluginsCount} total`,
       filesCreated: files.length,
-      time: pc.yellow(`${elapsedSeconds}s`),
+      time: pc2.yellow(`${elapsedSeconds}s`),
       output: pathParser.resolve(config.root, config.output.path)
     };
     console.log(`
-  ${pc.bold("Plugins:")}      ${meta.plugins}
-${pc.bold("Generated:")}      ${meta.filesCreated} files
-     ${pc.bold("Time:")}      ${meta.time}
-   ${pc.bold("Output:")}      ${meta.output}
+  ${pc2.bold("Plugins:")}      ${meta.plugins}
+${pc2.bold("Generated:")}      ${meta.filesCreated} files
+     ${pc2.bold("Time:")}      ${meta.time}
+   ${pc2.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")}`);
+      console.log(`${pc2.bold("Generated files:")}`);
+      console.log(`${files.map((file) => `${pc2.blue(file.meta?.pluginName)} ${file.path}`).join("\n")}`);
     }
   };
   const printErrors = (error) => {
@@ -108,7 +164,7 @@ ${pc.bold("Generated:")}      ${meta.filesCreated} files
       return;
     }
     if (options.debug) {
-      spinner2.fail(pc.red(`Something went wrong
+      spinner2.fail(pc2.red(`Something went wrong
 
 `));
       const causedError = error?.cause;
@@ -117,7 +173,7 @@ ${pc.bold("Generated:")}      ${meta.filesCreated} files
         console.log(pe.render(causedError));
       }
     } else {
-      spinner2.fail(pc.red(`Something went wrong
+      spinner2.fail(pc2.red(`Something went wrong
 
 ${error?.message}`));
     }
@@ -126,7 +182,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: `(${pc.dim(inputPath)})` }, logLevel));
+    spinner2.start(parseText(`\u{1F680} Building`, { info: `(${pc2.dim(inputPath)})` }, logLevel));
     const output = await build({
       config: {
         root: process.cwd(),
@@ -143,7 +199,7 @@ ${error?.message}`));
       },
       logger
     });
-    spinner2.succeed(parseText(`\u{1F680} Build completed`, { info: `(${pc.dim(inputPath)})` }, logLevel));
+    spinner2.succeed(parseText(`\u{1F680} Build completed`, { info: `(${pc2.dim(inputPath)})` }, logLevel));
     await onDone(config.hooks, logLevel);
     printSummary(output.pluginManager, "success");
   } catch (error) {
@@ -168,7 +224,7 @@ async function importModule(path, cwd) {
     location = require2.resolve(path);
   }
   const module = await import(pathToFileURL(location).href);
-  return module.default;
+  return module?.default ?? module;
 }
 
 // src/utils/getPlugins.ts
@@ -227,20 +283,20 @@ async function startWatcher(cb, options) {
     ignorePermissionErrors: true,
     ignored
   });
-  watcher.on("all", async (type, file) => {
-    spinner2.succeed(pc.yellow(pc.bold(`Change detected: ${type} ${file}`)));
+  watcher.on("all", (type, file) => {
+    spinner2.succeed(pc2.yellow(pc2.bold(`Change detected: ${type} ${file}`)));
     spinner2.spinner = "clock";
     try {
-      await cb(options.path);
+      cb(options.path);
     } catch (e) {
-      spinner2.warn(pc.red("Watcher failed"));
+      spinner2.warn(pc2.red("Watcher failed"));
     }
   });
 }
 var jsLoader = async (configFile) => {
   return importModule(configFile);
 };
-var tsLoader = async (configFile) => {
+var tsLoader = (configFile) => {
   let registerer = { enabled() {
   } };
   try {
@@ -298,62 +354,6 @@ async function getCosmiConfig(moduleName2, config) {
   }
   return result;
 }
-var presets = {
-  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 "\u{1F389} 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"]
-  }
-};
-async function init({ spinner: spinner2, preset = "simple", logLevel = "silent", packageManager = "pnpm" }) {
-  try {
-    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\` ${pc.dim(path)}`);
-    await write(presetMeta["kubb.config"], path);
-    spinner2.succeed(`\u{1F4C0} Wrote \`kubb.config.js\` ${pc.dim(path)}`);
-    const data = await Promise.all([
-      $`npm init es6 -y`,
-      ...presetMeta.packages.map(async (pack) => {
-        spinner2.start(`\u{1F4C0} Installing ${pc.dim(pack)}`);
-        const { stdout } = await $({ preferLocal: false })`${packageManager} ${installCommand} ${pack}`;
-        spinner2.succeed(`\u{1F4C0} Installed ${pc.dim(pack)}`);
-        return stdout;
-      })
-    ]);
-    if (logLevel === "info") {
-      data.forEach((text) => console.log(text));
-    }
-  } catch (error) {
-    spinner2.fail(pc.red(`Something went wrong
-
-${error?.message}`));
-  }
-}
-
-// package.json
-var version = "1.1.5";
 
 // src/index.ts
 var moduleName = "kubb";
@@ -370,14 +370,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(${pc.dim(pathParser.relative(process.cwd(), result.filepath))})`);
+    spinner.succeed(`\u{1F4BE} Config loaded(${pc2.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(pc.yellow(pc.bold(`Watching for changes in ${paths.join(" and ")}`)));
+          spinner.start(pc2.yellow(pc2.bold(`Watching for changes in ${paths.join(" and ")}`)));
         },
         {
           spinner,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/cli",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "Generator cli",
   "repository": {
     "type": "git",
@@ -43,28 +43,29 @@
     "yaml": "^2.3.1",
     "@swc/core": "^1.3.62",
     "pretty-error": "^4.0.0",
-    "@kubb/core": "1.1.5"
+    "@kubb/core": "1.1.7"
   },
   "devDependencies": {
-    "@types/node": "^20.2.5",
     "tsup": "^6.7.0",
+    "@types/node": "^20.2.5",
     "typescript": "^5.1.3",
-    "@kubb/swagger": "1.1.5"
+    "@kubb/swagger": "1.1.7",
+    "@kubb/tsup-config": "0.1.0"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
   "engines": {
-    "node": ">=16",
+    "node": ">=18",
     "pnpm": ">=8"
   },
   "scripts": {
     "build": "tsup",
     "start": "tsup --watch",
     "release": "pnpm publish --no-git-check",
-    "pre-commit": "echo 'pre-commit not configured'",
-    "pre-push": "pnpm typecheck",
+    "lint": "eslint \"**/*.{ts,tsx}\"",
+    "lint-fix": "eslint \"**/*.{ts,tsx}\" --quiet --fix",
     "test": "vitest --passWithNoTests",
     "upgrade": "pnpm update",
     "typecheck": "tsc -p ./tsconfig.json --noEmit --emitDeclarationOnly false"

package/src/index.ts

@@ -3,16 +3,15 @@
 import pathParser from 'node:path'
 
 import { Command, Option } from 'commander'
-import pc from 'picocolors'
 import ora from 'ora'
+import pc from 'picocolors'
 
-import type { CLIOptions } from '@kubb/core'
-
-import { run } from './run.ts'
-import { startWatcher, getConfig, getCosmiConfig } from './utils/index.ts'
+import { version } from '../package.json'
 import { init } from './init.ts'
+import { run } from './run.ts'
+import { getConfig, getCosmiConfig, startWatcher } from './utils/index.ts'
 
-import { version } from '../package.json'
+import type { CLIOptions } from '@kubb/core'
 
 const moduleName = 'kubb'
 

package/src/init.ts

@@ -1,11 +1,11 @@
 import pathParser from 'node:path'
 
-import pc from 'picocolors'
+import { write } from '@kubb/core'
+
 import { $ } from 'execa'
+import pc from 'picocolors'
 
 import type { LogLevel } from '@kubb/core'
-import { write } from '@kubb/core'
-
 import type { Ora } from 'ora'
 
 export type Preset = 'simple'

package/src/run.ts

@@ -1,17 +1,17 @@
 /* eslint-disable no-console */
 import pathParser from 'node:path'
 
-import pc from 'picocolors'
+import { build, ParallelPluginError, PluginError } from '@kubb/core'
+
 import { execa } from 'execa'
-import { parseArgsStringToArgv } from 'string-argv'
+import pc from 'picocolors'
 import PrettyError from 'pretty-error'
+import { parseArgsStringToArgv } from 'string-argv'
 
-import { ParallelPluginError, PluginError, build } from '@kubb/core'
-import type { Logger, CLIOptions, KubbConfig, BuildOutput, LogLevel } from '@kubb/core'
-
-import { parseText } from './utils/parseText.ts'
 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 = {
@@ -109,7 +109,7 @@ ${pc.bold('Generated:')}      ${meta.filesCreated} files
 
     if (options.debug) {
       spinner.fail(pc.red(`Something went wrong\n\n`))
-      const causedError = (error as Error)?.cause as Error
+      const causedError = error?.cause as Error
 
       console.log(pe.render(error))
 
@@ -117,12 +117,11 @@ ${pc.bold('Generated:')}      ${meta.filesCreated} files
         console.log(pe.render(causedError))
       }
     } else {
-      spinner.fail(pc.red(`Something went wrong\n\n${(error as Error)?.message}`))
+      spinner.fail(pc.red(`Something went wrong\n\n${error?.message}`))
     }
   }
 
   try {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-vars
     const { root, ...userConfig } = config
     const logLevel = options.logLevel ?? userConfig.logLevel ?? 'silent'
     const inputPath = options.input ?? userConfig.input.path
@@ -152,7 +151,7 @@ ${pc.bold('Generated:')}      ${meta.filesCreated} files
 
     printSummary(output.pluginManager, 'success')
   } catch (error: any) {
-    printErrors(error)
+    printErrors(error as Error)
 
     if (error instanceof PluginError || error instanceof ParallelPluginError) {
       printSummary(error.pluginManager, 'failed')

package/src/utils/getConfig.ts

@@ -1,8 +1,8 @@
-import type { KubbUserConfig, KubbConfig, CLIOptions } from '@kubb/core'
 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> {

package/src/utils/getCosmiConfig.ts

@@ -1,6 +1,7 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
 import { cosmiconfig } from 'cosmiconfig'
-import yaml from 'yaml'
 import tsNode from 'ts-node'
+import yaml from 'yaml'
 
 import { importModule } from './importModule.ts'
 
@@ -11,7 +12,7 @@ const jsLoader = async (configFile: string) => {
 }
 // TODO fix tsLoader for node 20
 // https://github.com/TypeStrong/ts-node/issues/1997
-const tsLoader = async (configFile: string) => {
+const tsLoader = (configFile: string) => {
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   let registerer = { enabled() {} }
 
@@ -24,6 +25,7 @@ const tsLoader = async (configFile: string) => {
     })
 
     const module = require(configFile)
+
     return module.default
   } catch (err: any) {
     if (err.code === 'MODULE_NOT_FOUND') {

package/src/utils/getPlugins.ts

@@ -1,10 +1,10 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 
-import type { KubbUserConfig, KubbJSONPlugin, KubbObjectPlugin } from '@kubb/core'
-
 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'

package/src/utils/importModule.ts

@@ -1,5 +1,6 @@
-import { pathToFileURL } from 'node:url'
+/* eslint-disable @typescript-eslint/no-unsafe-return */
 import mod from 'node:module'
+import { pathToFileURL } from 'node:url'
 
 const SLASHES = new Set(['/', '\\'])
 
@@ -13,7 +14,7 @@ const SLASHES = new Set(['/', '\\'])
  * @param {string} directory The directory to check.
  * @returns {string} The normalized directory.
  */
-function normalizeDirectory(directory: string) {
+export function normalizeDirectory(directory: string) {
   if (!SLASHES.has(directory[directory.length - 1])) {
     return `${directory}/`
   }
@@ -21,7 +22,7 @@ function normalizeDirectory(directory: string) {
   return directory
 }
 
-export async function importModule(path: string, cwd?: string) {
+export async function importModule(path: string, cwd?: string): Promise<any> {
   let location = path
 
   if (cwd) {
@@ -31,5 +32,5 @@ export async function importModule(path: string, cwd?: string) {
 
   const module = await import(pathToFileURL(location).href)
 
-  return module.default
+  return module?.default ?? module
 }

package/src/utils/mocks/noop.cjs

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

package/src/utils/mocks/noop.js

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

package/src/utils/watcher.ts

@@ -16,13 +16,13 @@ export async function startWatcher(cb: (path: string[]) => Promise<void>, option
     ignorePermissionErrors: true,
     ignored,
   })
-  watcher.on('all', async (type, file) => {
+  watcher.on('all', (type, file) => {
     spinner.succeed(pc.yellow(pc.bold(`Change detected: ${type} ${file}`)))
     // revert back
     spinner.spinner = 'clock'
 
     try {
-      await cb(options.path)
+      cb(options.path)
     } catch (e) {
       spinner.warn(pc.red('Watcher failed'))
     }