npm - @kubb/cli - Versions diffs - 1.0.0-beta.9 → 1.0.1 - Mend

@kubb/cli 1.0.0-beta.9 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/dist/index.cjs +193 -74
package/dist/index.js +189 -73
package/package.json +14 -15
package/src/index.ts +6 -6
package/src/run.ts +100 -31
package/src/utils/getConfig.ts +5 -5
package/src/utils/getCosmiConfig.ts +52 -13
package/src/utils/getPlugins.ts +7 -8
package/src/utils/importModule.ts +35 -0
package/src/utils/index.ts +6 -4
package/src/utils/parseHrtimeToSeconds.ts +4 -0
package/dist/index.cjs.map +0 -1
package/dist/index.js.map +0 -1

package/dist/index.cjs CHANGED Viewed

@@ -1,26 +1,48 @@
 #!/usr/bin/env node
 'use strict';
-var module$1 = require('module');
+var mod = require('module');
+var pathParser = require('path');
 var commander = require('commander');
-var pc3 = require('picocolors');
+var pc = require('picocolors');
 var ora = require('ora');
 var execa = require('execa');
 var stringArgv = require('string-argv');
+var PrettyError = require('pretty-error');
 var core = require('@kubb/core');
-var moduleImporter = require('@humanwhocodes/module-importer');
-var isObject = require('lodash.isobject');
+var url = require('url');
 var cosmiconfig = require('cosmiconfig');
-var cosmiconfigTypescriptLoader = require('cosmiconfig-typescript-loader');
+var yaml = require('yaml');
+var tsNode = require('ts-node');
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-var pc3__default = /*#__PURE__*/_interopDefault(pc3);
+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 isObject__default = /*#__PURE__*/_interopDefault(isObject);
+var PrettyError__default = /*#__PURE__*/_interopDefault(PrettyError);
+var yaml__default = /*#__PURE__*/_interopDefault(yaml);
+var tsNode__default = /*#__PURE__*/_interopDefault(tsNode);
-module$1.createRequire((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('out.js', document.baseURI).href)));
+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, {
+  get: (a, b) => (typeof require$1 !== "undefined" ? require$1 : a)[b]
+}) : x)(function(x) {
+  if (typeof require$1 !== "undefined")
+    return require$1.apply(this, arguments);
+  throw new Error('Dynamic require of "' + x + '" is not supported');
+});
+// src/utils/parseHrtimeToSeconds.ts
+function parseHrtimeToSeconds(hrtime) {
+  const seconds = (hrtime[0] + hrtime[1] / 1e9).toFixed(3);
+  return seconds;
+}
+// src/run.ts
 async function run({ config, options, spinner: spinner2 }) {
+  const hrstart = process.hrtime();
   const logger = {
     log(message, logLevel) {
       if (logLevel === "error") {
@@ -37,86 +59,136 @@ async function run({ config, options, spinner: spinner2 }) {
     },
     spinner: spinner2
   };
-  const onDone = async (config2) => {
-    if (!config2.hooks?.done) {
+  const onDone = async (hooks) => {
+    if (!hooks?.done) {
       return;
     }
-    spinner2.start("\u{1FA82} Running hooks");
     let commands = [];
-    if (typeof config2.hooks?.done === "string") {
-      commands = [config2.hooks.done];
+    if (typeof hooks?.done === "string") {
+      commands = [hooks.done];
     } else {
-      commands = config2.hooks.done;
+      commands = hooks.done;
     }
     const promises = commands.map(async (command) => {
       const [cmd, ..._args] = [...stringArgv.parseArgsStringToArgv(command)];
-      return execa.execa(cmd, _args);
+      spinner2.start(`\u{1FA82} Executing hooks(${pc__default.default.yellow("done")}) ${pc__default.default.dim(command)}`);
+      await execa.execa(cmd, _args);
+      spinner2.succeed(`\u{1FA82} Executed hooks(${pc__default.default.yellow("done")}) ${pc__default.default.dim(command)}`);
     });
     await Promise.all(promises);
-    spinner2.succeed("\u{1FA82} Hooks runned");
+  };
+  const printSummary = (pluginManager, status) => {
+    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__default.default.green(`${buildStartPlugins.length} successful`)}, ${pluginsCount} total` : `${pc__default.default.red(`${pluginsCount - buildStartPlugins.length} failed`)}, ${pluginsCount} total`,
+      filesCreated: files.length,
+      time: pc__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}
+     `);
+    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")}`);
+    }
+  };
+  const printErrors = (error) => {
+    const pe = new PrettyError__default.default();
+    if (error instanceof core.ParallelPluginError) {
+      error.errors.map((e) => printErrors(e));
+      return;
+    }
+    if (options.debug) {
+      spinner2.fail(pc__default.default.red(`Something went wrong
+`));
+      const causedError = error?.cause;
+      console.log(pe.render(error));
+      if (causedError) {
+        console.log(pe.render(causedError));
+      }
+    } else {
+      spinner2.fail(pc__default.default.red(`Something went wrong
+${error?.message}`));
+    }
   };
   try {
-    spinner2.start("\u{1F680} Building");
-    await core.build({
+    const { root, ...userConfig } = config;
+    spinner2.start(`\u{1F680} Building(${pc__default.default.dim(options.input ?? userConfig.input.path)})`);
+    const output = await core.build({
       config: {
         root: process.cwd(),
-        ...config,
+        ...userConfig,
+        input: {
+          ...userConfig.input,
+          path: options.input ?? userConfig.input.path
+        },
         output: {
           write: true,
-          ...config.output
+          ...userConfig.output
         }
       },
       logger
     });
-    spinner2.succeed(pc3__default.default.blue("\u{1F308} Generation complete"));
-    await onDone(config);
-  } catch (err) {
-    if (options.debug) {
-      spinner2.fail(`Something went wrong
-`);
-      const causedError = err?.cause;
-      console.log(causedError || err);
-      console.log("\n");
-      if (causedError) {
-        console.log(err);
-      }
-    } else {
-      spinner2.fail(`Something went wrong
-${err?.message}`);
+    spinner2.succeed(`\u{1F680} Build completed(${pc__default.default.dim(options.input ?? userConfig.input.path)})`);
+    await onDone(config.hooks);
+    printSummary(output.pluginManager, "success");
+  } catch (error) {
+    printErrors(error);
+    if (error instanceof core.PluginError || error instanceof core.ParallelPluginError) {
+      printSummary(error.pluginManager, "failed");
     }
+    throw error;
   }
-  return true;
 }
-async function startWatcher(cb, options) {
-  const { spinner: spinner2, path } = options;
-  const { watch } = await import('chokidar');
-  const ignored = ["**/{.git,node_modules}/**"];
-  const watcher = watch(path, {
-    ignorePermissionErrors: true,
-    ignored
-  });
-  watcher.on("all", async (type, file) => {
-    spinner2.succeed(pc3__default.default.yellow(pc3__default.default.bold(`Change detected: ${type} ${file}`)));
-    spinner2.spinner = "clock";
-    try {
-      await cb(options.path);
-    } catch (e) {
-      spinner2.warn(pc3__default.default.red("Watcher failed"));
-    }
-  });
+var SLASHES = /* @__PURE__ */ new Set(["/", "\\"]);
+function normalizeDirectory(directory) {
+  if (!SLASHES.has(directory[directory.length - 1])) {
+    return `${directory}/`;
+  }
+  return directory;
+}
+async function importModule(path, cwd) {
+  let location = path;
+  if (cwd) {
+    const require2 = mod__default.default.createRequire(normalizeDirectory(cwd));
+    location = require2.resolve(path);
+  }
+  const module = await import(url.pathToFileURL(location).href);
+  return module.default;
 }
+// src/utils/getPlugins.ts
 function isJSONPlugins(plugins) {
   return !!plugins?.some((plugin) => {
     return typeof plugin?.[0] === "string";
   });
 }
 function isObjectPlugins(plugins) {
-  return isObject__default.default(plugins) && !Array.isArray(plugins);
+  return plugins instanceof Object && !Array.isArray(plugins);
 }
 async function importPlugin(name, options) {
-  const importer = new moduleImporter.ModuleImporter(process.cwd());
-  const importedPlugin = process.env.NODE_ENV === "test" ? await import(name) : await importer.import(name);
-  return importedPlugin?.default?.default ? importedPlugin.default.default(options) : importedPlugin.default(options);
+  const importedPlugin = process.env.NODE_ENV === "test" ? await import(name) : await importModule(name, process.cwd());
+  return importedPlugin?.default ? importedPlugin.default(options) : importedPlugin(options);
 }
 function getPlugins(plugins) {
   if (isObjectPlugins(plugins)) {
@@ -153,6 +225,49 @@ async function getConfig(result, options) {
   };
   return JSONConfig;
 }
+async function startWatcher(cb, options) {
+  const { spinner: spinner2, path } = options;
+  const { watch } = await import('chokidar');
+  const ignored = ["**/{.git,node_modules}/**"];
+  const watcher = watch(path, {
+    ignorePermissionErrors: true,
+    ignored
+  });
+  watcher.on("all", async (type, file) => {
+    spinner2.succeed(pc__default.default.yellow(pc__default.default.bold(`Change detected: ${type} ${file}`)));
+    spinner2.spinner = "clock";
+    try {
+      await cb(options.path);
+    } catch (e) {
+      spinner2.warn(pc__default.default.red("Watcher failed"));
+    }
+  });
+}
+var jsLoader = async (configFile) => {
+  return importModule(configFile);
+};
+var tsLoader = async (configFile) => {
+  let registerer = { enabled() {
+  } };
+  try {
+    registerer = tsNode__default.default.register({
+      compilerOptions: { module: "commonjs" },
+      swc: true,
+      typeCheck: false
+    });
+    const module = __require(configFile);
+    return module.default;
+  } catch (err) {
+    if (err.code === "MODULE_NOT_FOUND") {
+      throw new Error(`'ts-node' is required for the TypeScript configuration files. Make sure it is installed
+Error: ${err.message}`);
+    }
+    console.log(err);
+    throw err;
+  } finally {
+    registerer.enabled();
+  }
+};
 async function getCosmiConfig(moduleName2, config) {
   const explorer = cosmiconfig.cosmiconfig(moduleName2, {
     cache: false,
@@ -160,21 +275,27 @@ async function getCosmiConfig(moduleName2, config) {
       "package.json",
       `.${moduleName2}rc`,
       `.${moduleName2}rc.json`,
-      // commonjs
+      `.${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`,
-      // esm and typescript
-      `.${moduleName2}rc.ts`,
-      `${moduleName2}.config.ts`
+      `${moduleName2}.config.mjs`
     ],
     loaders: {
-      ".ts": cosmiconfigTypescriptLoader.TypeScriptLoader({
-        swc: true,
-        typeCheck: false
-      }),
-      noExt: cosmiconfig.defaultLoaders[".js"]
+      ".yaml": (filepath, content) => yaml__default.default.parse(content),
+      ".yml": (filepath, content) => yaml__default.default.parse(content),
+      ".js": jsLoader,
+      ".cjs": jsLoader,
+      ".mjs": jsLoader,
+      ".ts": tsLoader,
+      noExt: jsLoader
     }
   });
   const result = config ? await explorer.load(config) : await explorer.search();
@@ -185,27 +306,27 @@ async function getCosmiConfig(moduleName2, config) {
 }
 // package.json
-var version = "1.0.0-beta.9";
+var version = "1.0.1";
 // src/index.ts
 var moduleName = "kubb";
 var spinner = ora__default.default({
   color: "blue",
-  text: pc3__default.default.blue("\u{1F3CE}\uFE0F Kubb generation started"),
+  text: pc__default.default.blue("\u{1F3CE}\uFE0F Kubb generation started"),
   spinner: "clock"
 }).start();
 var program = new commander.Command(moduleName).description("Kubb").action(async (options) => {
   try {
     spinner.start("\u{1F4BE} Loading config");
     const result = await getCosmiConfig(moduleName, options.config);
-    spinner.succeed("\u{1F4BE} Config loaded");
+    spinner.succeed(`\u{1F4BE} Config loaded(${pc__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(pc3__default.default.yellow(pc3__default.default.bold(`Watching for changes in ${paths.join(" and ")}`)));
+          spinner.start(pc__default.default.yellow(pc__default.default.bold(`Watching for changes in ${paths.join(" and ")}`)));
         },
         {
           spinner,
@@ -217,9 +338,7 @@ var program = new commander.Command(moduleName).description("Kubb").action(async
       await run({ config, spinner, options });
     }
   } catch (e) {
-    spinner.fail(pc3__default.default.red(e.message));
+    process.exit(1);
   }
-}).addOption(new commander.Option("-c, --config <path>", "Path to the Kubb config")).addOption(new commander.Option("-d, --debug", "Debug mode").default(false)).addOption(new commander.Option("-w, --watch", "Watch mode based on the input file"));
+}).addOption(new commander.Option("-c, --config <path>", "Path to the Kubb config")).addOption(new commander.Option("-i, --input <path>", "Path of the input file(overrides the on in `kubb.config.js`)")).addOption(new commander.Option("-d, --debug", "Debug mode").default(false)).addOption(new commander.Option("-w, --watch", "Watch mode based on the input file"));
 program.name(moduleName).description("Generate").version(version, "-v").parse();
-//# sourceMappingURL=out.js.map
-//# sourceMappingURL=index.cjs.map

package/dist/index.js CHANGED Viewed

@@ -1,18 +1,37 @@
 #!/usr/bin/env node
 import { createRequire } from 'module';
+import pathParser from 'node:path';
 import { Command, Option } from 'commander';
-import pc3 from 'picocolors';
+import pc from 'picocolors';
 import ora from 'ora';
 import { execa } from 'execa';
 import { parseArgsStringToArgv } from 'string-argv';
-import { build, isPromise } from '@kubb/core';
-import { ModuleImporter } from '@humanwhocodes/module-importer';
-import isObject from 'lodash.isobject';
-import { cosmiconfig, defaultLoaders } from 'cosmiconfig';
-import { TypeScriptLoader } from 'cosmiconfig-typescript-loader';
+import PrettyError from 'pretty-error';
+import { build, PluginError, ParallelPluginError, isPromise } from '@kubb/core';
+import { pathToFileURL } from 'node:url';
+import mod from 'node:module';
+import { cosmiconfig } from 'cosmiconfig';
+import yaml from 'yaml';
+import tsNode from 'ts-node';
-createRequire(import.meta.url);
+const require = createRequire(import.meta.url);
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined")
+    return require.apply(this, arguments);
+  throw new Error('Dynamic require of "' + x + '" is not supported');
+});
+// src/utils/parseHrtimeToSeconds.ts
+function parseHrtimeToSeconds(hrtime) {
+  const seconds = (hrtime[0] + hrtime[1] / 1e9).toFixed(3);
+  return seconds;
+}
+// src/run.ts
 async function run({ config, options, spinner: spinner2 }) {
+  const hrstart = process.hrtime();
   const logger = {
     log(message, logLevel) {
       if (logLevel === "error") {
@@ -29,86 +48,136 @@ async function run({ config, options, spinner: spinner2 }) {
     },
     spinner: spinner2
   };
-  const onDone = async (config2) => {
-    if (!config2.hooks?.done) {
+  const onDone = async (hooks) => {
+    if (!hooks?.done) {
       return;
     }
-    spinner2.start("\u{1FA82} Running hooks");
     let commands = [];
-    if (typeof config2.hooks?.done === "string") {
-      commands = [config2.hooks.done];
+    if (typeof hooks?.done === "string") {
+      commands = [hooks.done];
     } else {
-      commands = config2.hooks.done;
+      commands = hooks.done;
     }
     const promises = commands.map(async (command) => {
       const [cmd, ..._args] = [...parseArgsStringToArgv(command)];
-      return execa(cmd, _args);
+      spinner2.start(`\u{1FA82} Executing hooks(${pc.yellow("done")}) ${pc.dim(command)}`);
+      await execa(cmd, _args);
+      spinner2.succeed(`\u{1FA82} Executed hooks(${pc.yellow("done")}) ${pc.dim(command)}`);
     });
     await Promise.all(promises);
-    spinner2.succeed("\u{1FA82} Hooks runned");
+  };
+  const printSummary = (pluginManager, status) => {
+    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)
+    };
+    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) => {
+    const pe = new PrettyError();
+    if (error instanceof ParallelPluginError) {
+      error.errors.map((e) => printErrors(e));
+      return;
+    }
+    if (options.debug) {
+      spinner2.fail(pc.red(`Something went wrong
+`));
+      const causedError = error?.cause;
+      console.log(pe.render(error));
+      if (causedError) {
+        console.log(pe.render(causedError));
+      }
+    } else {
+      spinner2.fail(pc.red(`Something went wrong
+${error?.message}`));
+    }
   };
   try {
-    spinner2.start("\u{1F680} Building");
-    await build({
+    const { root, ...userConfig } = config;
+    spinner2.start(`\u{1F680} Building(${pc.dim(options.input ?? userConfig.input.path)})`);
+    const output = await build({
       config: {
         root: process.cwd(),
-        ...config,
+        ...userConfig,
+        input: {
+          ...userConfig.input,
+          path: options.input ?? userConfig.input.path
+        },
         output: {
           write: true,
-          ...config.output
+          ...userConfig.output
         }
       },
       logger
     });
-    spinner2.succeed(pc3.blue("\u{1F308} Generation complete"));
-    await onDone(config);
-  } catch (err) {
-    if (options.debug) {
-      spinner2.fail(`Something went wrong
-`);
-      const causedError = err?.cause;
-      console.log(causedError || err);
-      console.log("\n");
-      if (causedError) {
-        console.log(err);
-      }
-    } else {
-      spinner2.fail(`Something went wrong
-${err?.message}`);
+    spinner2.succeed(`\u{1F680} Build completed(${pc.dim(options.input ?? userConfig.input.path)})`);
+    await onDone(config.hooks);
+    printSummary(output.pluginManager, "success");
+  } catch (error) {
+    printErrors(error);
+    if (error instanceof PluginError || error instanceof ParallelPluginError) {
+      printSummary(error.pluginManager, "failed");
     }
+    throw error;
   }
-  return true;
 }
-async function startWatcher(cb, options) {
-  const { spinner: spinner2, path } = options;
-  const { watch } = await import('chokidar');
-  const ignored = ["**/{.git,node_modules}/**"];
-  const watcher = watch(path, {
-    ignorePermissionErrors: true,
-    ignored
-  });
-  watcher.on("all", async (type, file) => {
-    spinner2.succeed(pc3.yellow(pc3.bold(`Change detected: ${type} ${file}`)));
-    spinner2.spinner = "clock";
-    try {
-      await cb(options.path);
-    } catch (e) {
-      spinner2.warn(pc3.red("Watcher failed"));
-    }
-  });
+var SLASHES = /* @__PURE__ */ new Set(["/", "\\"]);
+function normalizeDirectory(directory) {
+  if (!SLASHES.has(directory[directory.length - 1])) {
+    return `${directory}/`;
+  }
+  return directory;
+}
+async function importModule(path, cwd) {
+  let location = path;
+  if (cwd) {
+    const require2 = mod.createRequire(normalizeDirectory(cwd));
+    location = require2.resolve(path);
+  }
+  const module = await import(pathToFileURL(location).href);
+  return module.default;
 }
+// src/utils/getPlugins.ts
 function isJSONPlugins(plugins) {
   return !!plugins?.some((plugin) => {
     return typeof plugin?.[0] === "string";
   });
 }
 function isObjectPlugins(plugins) {
-  return isObject(plugins) && !Array.isArray(plugins);
+  return plugins instanceof Object && !Array.isArray(plugins);
 }
 async function importPlugin(name, options) {
-  const importer = new ModuleImporter(process.cwd());
-  const importedPlugin = process.env.NODE_ENV === "test" ? await import(name) : await importer.import(name);
-  return importedPlugin?.default?.default ? importedPlugin.default.default(options) : importedPlugin.default(options);
+  const importedPlugin = process.env.NODE_ENV === "test" ? await import(name) : await importModule(name, process.cwd());
+  return importedPlugin?.default ? importedPlugin.default(options) : importedPlugin(options);
 }
 function getPlugins(plugins) {
   if (isObjectPlugins(plugins)) {
@@ -145,6 +214,49 @@ async function getConfig(result, options) {
   };
   return JSONConfig;
 }
+async function startWatcher(cb, options) {
+  const { spinner: spinner2, path } = options;
+  const { watch } = await import('chokidar');
+  const ignored = ["**/{.git,node_modules}/**"];
+  const watcher = watch(path, {
+    ignorePermissionErrors: true,
+    ignored
+  });
+  watcher.on("all", async (type, file) => {
+    spinner2.succeed(pc.yellow(pc.bold(`Change detected: ${type} ${file}`)));
+    spinner2.spinner = "clock";
+    try {
+      await cb(options.path);
+    } catch (e) {
+      spinner2.warn(pc.red("Watcher failed"));
+    }
+  });
+}
+var jsLoader = async (configFile) => {
+  return importModule(configFile);
+};
+var tsLoader = async (configFile) => {
+  let registerer = { enabled() {
+  } };
+  try {
+    registerer = tsNode.register({
+      compilerOptions: { module: "commonjs" },
+      swc: true,
+      typeCheck: false
+    });
+    const module = __require(configFile);
+    return module.default;
+  } catch (err) {
+    if (err.code === "MODULE_NOT_FOUND") {
+      throw new Error(`'ts-node' is required for the TypeScript configuration files. Make sure it is installed
+Error: ${err.message}`);
+    }
+    console.log(err);
+    throw err;
+  } finally {
+    registerer.enabled();
+  }
+};
 async function getCosmiConfig(moduleName2, config) {
   const explorer = cosmiconfig(moduleName2, {
     cache: false,
@@ -152,21 +264,27 @@ async function getCosmiConfig(moduleName2, config) {
       "package.json",
       `.${moduleName2}rc`,
       `.${moduleName2}rc.json`,
-      // commonjs
+      `.${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`,
-      // esm and typescript
-      `.${moduleName2}rc.ts`,
-      `${moduleName2}.config.ts`
+      `${moduleName2}.config.mjs`
     ],
     loaders: {
-      ".ts": TypeScriptLoader({
-        swc: true,
-        typeCheck: false
-      }),
-      noExt: defaultLoaders[".js"]
+      ".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();
@@ -177,27 +295,27 @@ async function getCosmiConfig(moduleName2, config) {
 }
 // package.json
-var version = "1.0.0-beta.9";
+var version = "1.0.1";
 // src/index.ts
 var moduleName = "kubb";
 var spinner = ora({
   color: "blue",
-  text: pc3.blue("\u{1F3CE}\uFE0F Kubb generation started"),
+  text: pc.blue("\u{1F3CE}\uFE0F Kubb generation started"),
   spinner: "clock"
 }).start();
 var program = new Command(moduleName).description("Kubb").action(async (options) => {
   try {
     spinner.start("\u{1F4BE} Loading config");
     const result = await getCosmiConfig(moduleName, options.config);
-    spinner.succeed("\u{1F4BE} Config loaded");
+    spinner.succeed(`\u{1F4BE} Config loaded(${pc.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(pc3.yellow(pc3.bold(`Watching for changes in ${paths.join(" and ")}`)));
+          spinner.start(pc.yellow(pc.bold(`Watching for changes in ${paths.join(" and ")}`)));
         },
         {
           spinner,
@@ -209,9 +327,7 @@ var program = new Command(moduleName).description("Kubb").action(async (options)
       await run({ config, spinner, options });
     }
   } catch (e) {
-    spinner.fail(pc3.red(e.message));
+    process.exit(1);
   }
-}).addOption(new Option("-c, --config <path>", "Path to the Kubb config")).addOption(new Option("-d, --debug", "Debug mode").default(false)).addOption(new Option("-w, --watch", "Watch mode based on the input file"));
+}).addOption(new Option("-c, --config <path>", "Path to the Kubb config")).addOption(new Option("-i, --input <path>", "Path of the input file(overrides the on in `kubb.config.js`)")).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();
-//# sourceMappingURL=out.js.map
-//# sourceMappingURL=index.js.map

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/cli",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.1",
   "description": "Generator cli",
   "repository": {
     "type": "git",
@@ -32,33 +32,32 @@
     "!/**/__tests__/**"
   ],
   "dependencies": {
-    "@humanwhocodes/module-importer": "^1.0.1",
-    "@kubb/core": "1.0.0-beta.9",
     "chokidar": "^3.5.3",
-    "commander": "^10.0.0",
+    "commander": "^10.0.1",
     "cosmiconfig": "^8.1.3",
-    "cosmiconfig-typescript-loader": "^4.3.0",
     "execa": "^7.1.1",
-    "ora": "^6.3.0",
+    "ora": "^6.3.1",
     "picocolors": "^1.0.0",
-    "lodash.isobject": "^3.0.2",
-    "string-argv": "^0.3.1",
+    "string-argv": "^0.3.2",
     "ts-node": "^10.9.1",
-    "@swc/core": "^1.3.44"
+    "yaml": "^2.3.1",
+    "@swc/core": "^1.3.62",
+    "pretty-error": "^4.0.0",
+    "@kubb/core": "1.0.1"
   },
   "devDependencies": {
-    "@kubb/swagger": "1.0.0-beta.9",
-    "@types/node": "^18.15.11",
-    "@types/lodash.isobject": "^3.0.7",
+    "@types/node": "^20.2.5",
     "tsup": "^6.7.0",
-    "typescript": "^5.0.3"
+    "typescript": "^5.1.3",
+    "@kubb/swagger": "1.0.1"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
   "engines": {
-    "node": "^12.17.0 || ^14.13 || >=16.0.0"
+    "node": ">=16",
+    "pnpm": ">=8"
   },
   "scripts": {
     "build": "tsup",
@@ -69,6 +68,6 @@
     "test": "vitest --passWithNoTests",
     "upgrade": "ncu -u",
     "upgrade:local": "ncu --interactive --doctor",
-    "typecheck": "tsc -p ./tsconfig.json --noEmit"
+    "typecheck": "tsc -p ./tsconfig.json --noEmit --emitDeclarationOnly false"
   }
 }

package/src/index.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 /* eslint-disable no-console */
+import pathParser from 'node:path'
 import { Command, Option } from 'commander'
 import pc from 'picocolors'
@@ -7,9 +8,8 @@ import ora from 'ora'
 import type { CLIOptions } from '@kubb/core'
-import { run } from './run'
-import { startWatcher } from './utils/watcher'
-import { getConfig, getCosmiConfig } from './utils'
+import { run } from './run.ts'
+import { startWatcher, getConfig, getCosmiConfig } from './utils/index.ts'
 import { version } from '../package.json'
@@ -26,10 +26,9 @@ const program = new Command(moduleName)
   .action(async (options: CLIOptions) => {
     try {
       // CONFIG
       spinner.start('💾 Loading config')
       const result = await getCosmiConfig(moduleName, options.config)
-      spinner.succeed('💾 Config loaded')
+      spinner.succeed(`💾 Config loaded(${pc.dim(pathParser.relative(process.cwd(), result.filepath))})`)
       // END CONFIG
@@ -53,10 +52,11 @@ const program = new Command(moduleName)
         await run({ config, spinner, options })
       }
     } catch (e) {
-      spinner.fail(pc.red((e as Error).message))
+      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 on in `kubb.config.js`)'))
   .addOption(new Option('-d, --debug', 'Debug mode').default(false))
   .addOption(new Option('-w, --watch', 'Watch mode based on the input file'))

package/src/run.ts CHANGED Viewed

@@ -1,20 +1,26 @@
 /* eslint-disable no-console */
+import pathParser from 'node:path'
 import pc from 'picocolors'
 import { execa } from 'execa'
 import { parseArgsStringToArgv } from 'string-argv'
+import PrettyError from 'pretty-error'
+import { ParallelPluginError, PluginError, build } from '@kubb/core'
+import type { Logger, CLIOptions, KubbConfig, BuildOutput } from '@kubb/core'
-import { build } from '@kubb/core'
-import type { Logger, CLIOptions, KubbUserConfig } from '@kubb/core'
+import { parseHrtimeToSeconds } from './utils/parseHrtimeToSeconds.ts'
 import type { Ora } from 'ora'
 type RunProps = {
-  config: KubbUserConfig
+  config: KubbConfig
   spinner: Ora
   options: CLIOptions
 }
-export async function run({ config, options, spinner }: RunProps) {
+export async function run({ config, options, spinner }: RunProps): Promise<void> {
+  const hrstart = process.hrtime()
   const logger: Logger = {
     log(message, logLevel) {
       if (logLevel === 'error') {
@@ -34,61 +40,124 @@ export async function run({ config, options, spinner }: RunProps) {
     spinner,
   }
-  const onDone = async (config: KubbUserConfig) => {
-    if (!config.hooks?.done) {
+  const onDone = async (hooks: KubbConfig['hooks']) => {
+    if (!hooks?.done) {
       return
     }
-    spinner.start('🪂 Running hooks')
     let commands: string[] = []
-    if (typeof config.hooks?.done === 'string') {
-      commands = [config.hooks.done]
+    if (typeof hooks?.done === 'string') {
+      commands = [hooks.done]
     } else {
-      commands = config.hooks.done
+      commands = hooks.done
     }
     const promises = commands.map(async (command) => {
       const [cmd, ..._args] = [...parseArgsStringToArgv(command)]
-      return execa(cmd, _args)
+      spinner.start(`🪂 Executing hooks(${pc.yellow('done')}) ${pc.dim(command)}`)
+      await execa(cmd, _args)
+      spinner.succeed(`🪂 Executed hooks(${pc.yellow('done')}) ${pc.dim(command)}`)
     })
     await Promise.all(promises)
+  }
-    spinner.succeed('🪂 Hooks runned')
+  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 (error instanceof ParallelPluginError) {
+      error.errors.map((e) => printErrors(e))
+      return
+    }
+    if (options.debug) {
+      spinner.fail(pc.red(`Something went wrong\n\n`))
+      const causedError = (error as 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 as Error)?.message}`))
+    }
   }
   try {
-    spinner.start('🚀 Building')
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-vars
+    const { root, ...userConfig } = config
+    spinner.start(`🚀 Building(${pc.dim(options.input ?? userConfig.input.path)})`)
-    await build({
+    const output = await build({
       config: {
         root: process.cwd(),
-        ...config,
+        ...userConfig,
+        input: {
+          ...userConfig.input,
+          path: options.input ?? userConfig.input.path,
+        },
         output: {
           write: true,
-          ...config.output,
+          ...userConfig.output,
         },
       },
       logger,
     })
-    spinner.succeed(pc.blue('🌈 Generation complete'))
+    spinner.succeed(`🚀 Build completed(${pc.dim(options.input ?? userConfig.input.path)})`)
-    await onDone(config)
-  } catch (err) {
-    if (options.debug) {
-      spinner.fail(`Something went wrong\n`)
-      const causedError = (err as Error)?.cause
-      console.log(causedError || err)
-      console.log('\n')
+    await onDone(config.hooks)
-      if (causedError) {
-        console.log(err)
-      }
-    } else {
-      spinner.fail(`Something went wrong\n${(err as Error)?.message}`)
+    printSummary(output.pluginManager, 'success')
+  } catch (error: any) {
+    printErrors(error)
+    if (error instanceof PluginError || error instanceof ParallelPluginError) {
+      printSummary(error.pluginManager, 'failed')
     }
-  }
-  return true
+    throw error
+  }
 }

package/src/utils/getConfig.ts CHANGED Viewed

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

package/src/utils/getCosmiConfig.ts CHANGED Viewed

@@ -1,8 +1,41 @@
-/* eslint-disable consistent-return */
-import { cosmiconfig, defaultLoaders } from 'cosmiconfig'
-import { TypeScriptLoader } from 'cosmiconfig-typescript-loader'
+import { cosmiconfig } from 'cosmiconfig'
+import yaml from 'yaml'
+import tsNode from 'ts-node'
-import type { CosmiconfigResult } from '../types'
+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 = async (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, {
@@ -11,21 +44,27 @@ export async function getCosmiConfig(moduleName: string, config?: string) {
       'package.json',
       `.${moduleName}rc`,
       `.${moduleName}rc.json`,
-      // commonjs
+      `.${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`,
-      // esm and typescript
-      `.${moduleName}rc.ts`,
-      `${moduleName}.config.ts`,
+      `${moduleName}.config.mjs`,
     ],
     loaders: {
-      '.ts': TypeScriptLoader({
-        swc: true,
-        typeCheck: false,
-      }),
-      noExt: defaultLoaders['.js'],
+      '.yaml': (filepath, content) => yaml.parse(content),
+      '.yml': (filepath, content) => yaml.parse(content),
+      '.js': jsLoader,
+      '.cjs': jsLoader,
+      '.mjs': jsLoader,
+      '.ts': tsLoader,
+      noExt: jsLoader,
     },
   })

package/src/utils/getPlugins.ts CHANGED Viewed

@@ -1,9 +1,10 @@
-import { ModuleImporter } from '@humanwhocodes/module-importer'
-import isObject from 'lodash.isobject'
-// see https://github.com/eslint/eslint/blob/740b20826fadc5322ea5547c1ba41793944e571d/lib/cli.js
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 import type { KubbUserConfig, KubbJSONPlugin, KubbObjectPlugin } from '@kubb/core'
+import { importModule } from './importModule.ts'
 function isJSONPlugins(plugins: KubbUserConfig['plugins'] | KubbJSONPlugin[]): plugins is KubbJSONPlugin[] {
   return !!(plugins as KubbJSONPlugin[])?.some((plugin) => {
     return typeof plugin?.[0] === 'string'
@@ -11,15 +12,13 @@ function isJSONPlugins(plugins: KubbUserConfig['plugins'] | KubbJSONPlugin[]): p
 }
 function isObjectPlugins(plugins: KubbUserConfig['plugins'] | KubbJSONPlugin[]): plugins is KubbObjectPlugin {
-  return isObject(plugins) && !Array.isArray(plugins)
+  return plugins instanceof Object && !Array.isArray(plugins)
 }
 async function importPlugin(name: string, options: object) {
-  const importer = new ModuleImporter(process.cwd())
-  const importedPlugin = process.env.NODE_ENV === 'test' ? await import(name) : await importer.import(name)
+  const importedPlugin = process.env.NODE_ENV === 'test' ? await import(name) : await importModule(name, process.cwd())
-  return importedPlugin?.default?.default ? importedPlugin.default.default(options) : importedPlugin.default(options)
+  return importedPlugin?.default ? importedPlugin.default(options) : importedPlugin(options)
 }
 export function getPlugins(plugins: KubbUserConfig['plugins'] | KubbJSONPlugin[]): Promise<KubbUserConfig['plugins']> {

package/src/utils/importModule.ts ADDED Viewed

@@ -0,0 +1,35 @@
+import { pathToFileURL } from 'node:url'
+import mod from 'node:module'
+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.
+ */
+function normalizeDirectory(directory: string) {
+  if (!SLASHES.has(directory[directory.length - 1])) {
+    return `${directory}/`
+  }
+  return directory
+}
+export async function importModule(path: string, cwd?: string) {
+  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
+}

package/src/utils/index.ts CHANGED Viewed

@@ -1,4 +1,6 @@
-export * from './getConfig'
-export * from './getPlugins'
-export * from './watcher'
-export * from './getCosmiConfig'
+export * from './getConfig.ts'
+export * from './getPlugins.ts'
+export * from './watcher.ts'
+export * from './getCosmiConfig.ts'
+export * from './importModule.ts'
+export * from './parseHrtimeToSeconds.ts'

package/src/utils/parseHrtimeToSeconds.ts ADDED Viewed

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

package/dist/index.cjs.map DELETED Viewed

@@ -1 +0,0 @@

- {"version":3,"sources":["../src/index.ts","../src/run.ts","../src/utils/watcher.ts","../src/utils/getConfig.ts","../src/utils/getPlugins.ts","../src/utils/getCosmiConfig.ts","../package.json"],"names":["pc","spinner","config","moduleName"],"mappings":"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","sourcesContent":["#!/usr/bin/env node\n/* eslint-disable no-console */\n\nimport { Command, Option } from 'commander'\nimport pc from 'picocolors'\nimport ora from 'ora'\n\nimport type { CLIOptions } from '@kubb/core'\n\nimport { run } from './run'\nimport { startWatcher } from './utils/watcher'\nimport { getConfig, getCosmiConfig } from './utils'\n\nimport { version } from '../package.json'\n\nconst moduleName = 'kubb'\n\nconst spinner = ora({\n color: 'blue',\n text: pc.blue('🏎️ Kubb generation started'),\n spinner: 'clock',\n}).start()\n\nconst program = new Command(moduleName)\n .description('Kubb')\n .action(async (options: CLIOptions) => {\n try {\n // CONFIG\n\n spinner.start('💾 Loading config')\n const result = await getCosmiConfig(moduleName, options.config)\n spinner.succeed('💾 Config loaded')\n\n // END CONFIG\n\n if (options.watch) {\n const config = await getConfig(result, options)\n\n startWatcher(\n async (paths) => {\n await run({ config, spinner, options })\n spinner.spinner = 'simpleDotsScrolling'\n spinner.start(pc.yellow(pc.bold(`Watching for changes in ${paths.join(' and ')}`)))\n },\n {\n spinner,\n path: [config.input.path],\n }\n )\n } else {\n const config = await getConfig(result, options)\n\n await run({ config, spinner, options })\n }\n } catch (e) {\n spinner.fail(pc.red((e as Error).message))\n }\n })\n .addOption(new Option('-c, --config <path>', 'Path to the Kubb config'))\n .addOption(new Option('-d, --debug', 'Debug mode').default(false))\n .addOption(new Option('-w, --watch', 'Watch mode based on the input file'))\n\nprogram.name(moduleName).description('Generate').version(version, '-v').parse()\n","/* eslint-disable no-console */\nimport pc from 'picocolors'\nimport { execa } from 'execa'\nimport { parseArgsStringToArgv } from 'string-argv'\n\nimport { build } from '@kubb/core'\nimport type { Logger, CLIOptions, KubbUserConfig } from '@kubb/core'\n\nimport type { Ora } from 'ora'\n\ntype RunProps = {\n config: KubbUserConfig\n spinner: Ora\n options: CLIOptions\n}\n\nexport async function run({ config, options, spinner }: RunProps) {\n const logger: Logger = {\n log(message, logLevel) {\n if (logLevel === 'error') {\n spinner.fail(message)\n }\n\n switch (logLevel) {\n case 'error':\n spinner.fail(message)\n break\n\n default:\n spinner.info(message)\n break\n }\n },\n spinner,\n }\n\n const onDone = async (config: KubbUserConfig) => {\n if (!config.hooks?.done) {\n return\n }\n spinner.start('🪂 Running hooks')\n\n let commands: string[] = []\n if (typeof config.hooks?.done === 'string') {\n commands = [config.hooks.done]\n } else {\n commands = config.hooks.done\n }\n\n const promises = commands.map(async (command) => {\n const [cmd, ..._args] = [...parseArgsStringToArgv(command)]\n return execa(cmd, _args)\n })\n\n await Promise.all(promises)\n\n spinner.succeed('🪂 Hooks runned')\n }\n\n try {\n spinner.start('🚀 Building')\n\n await build({\n config: {\n root: process.cwd(),\n ...config,\n output: {\n write: true,\n ...config.output,\n },\n },\n logger,\n })\n\n spinner.succeed(pc.blue('🌈 Generation complete'))\n\n await onDone(config)\n } catch (err) {\n if (options.debug) {\n spinner.fail(`Something went wrong\\n`)\n const causedError = (err as Error)?.cause\n console.log(causedError || err)\n console.log('\\n')\n\n if (causedError) {\n console.log(err)\n }\n } else {\n spinner.fail(`Something went wrong\\n${(err as Error)?.message}`)\n }\n }\n\n return true\n}\n","import pc from 'picocolors'\n\nimport type { Ora } from 'ora'\n\ntype Options = {\n path: string[]\n spinner: Ora\n}\nexport async function startWatcher(cb: (path: string[]) => Promise<void>, options: Options) {\n const { spinner, path } = options\n const { watch } = await import('chokidar')\n\n const ignored = ['**/{.git,node_modules}/**']\n\n const watcher = watch(path, {\n ignorePermissionErrors: true,\n ignored,\n })\n watcher.on('all', async (type, file) => {\n spinner.succeed(pc.yellow(pc.bold(`Change detected: ${type} ${file}`)))\n // revert back\n spinner.spinner = 'clock'\n\n try {\n await cb(options.path)\n } catch (e) {\n spinner.warn(pc.red('Watcher failed'))\n }\n })\n}\n","import type { KubbUserConfig, CLIOptions } from '@kubb/core'\nimport { isPromise } from '@kubb/core'\n\nimport { getPlugins } from './getPlugins'\n\nimport type { CosmiconfigResult } from '../types'\n\nexport async function getConfig(result: CosmiconfigResult, options: CLIOptions) {\n const config = result?.config\n let kubbUserConfig: Promise<KubbUserConfig> = Promise.resolve(config) as Promise<KubbUserConfig>\n\n // for ts or js files\n if (typeof config === 'function') {\n const possiblePromise = config(options)\n if (isPromise(possiblePromise)) {\n kubbUserConfig = possiblePromise\n }\n kubbUserConfig = Promise.resolve(possiblePromise)\n }\n\n let JSONConfig = await kubbUserConfig\n JSONConfig = {\n ...JSONConfig,\n plugins: JSONConfig.plugins ? await getPlugins(JSONConfig.plugins) : undefined,\n }\n\n return JSONConfig\n}\n","import { ModuleImporter } from '@humanwhocodes/module-importer'\nimport isObject from 'lodash.isobject'\n// see https://github.com/eslint/eslint/blob/740b20826fadc5322ea5547c1ba41793944e571d/lib/cli.js\n\nimport type { KubbUserConfig, KubbJSONPlugin, KubbObjectPlugin } from '@kubb/core'\n\nfunction isJSONPlugins(plugins: KubbUserConfig['plugins'] | KubbJSONPlugin[]): plugins is KubbJSONPlugin[] {\n return !!(plugins as KubbJSONPlugin[])?.some((plugin) => {\n return typeof plugin?.[0] === 'string'\n })\n}\n\nfunction isObjectPlugins(plugins: KubbUserConfig['plugins'] | KubbJSONPlugin[]): plugins is KubbObjectPlugin {\n return isObject(plugins) && !Array.isArray(plugins)\n}\n\nasync function importPlugin(name: string, options: object) {\n const importer = new ModuleImporter(process.cwd())\n\n const importedPlugin = process.env.NODE_ENV === 'test' ? await import(name) : await importer.import(name)\n\n return importedPlugin?.default?.default ? importedPlugin.default.default(options) : importedPlugin.default(options)\n}\n\nexport function getPlugins(plugins: KubbUserConfig['plugins'] | KubbJSONPlugin[]): Promise<KubbUserConfig['plugins']> {\n if (isObjectPlugins(plugins)) {\n const promises = Object.keys(plugins).map(async (name) => {\n return importPlugin(name, plugins[name as keyof typeof plugins])\n })\n return Promise.all(promises)\n }\n\n if (isJSONPlugins(plugins)) {\n const promises = plugins.map(async (plugin) => {\n const [name, options = {}] = plugin\n return importPlugin(name, options)\n })\n return Promise.all(promises)\n }\n return Promise.resolve(plugins)\n}\n","/* eslint-disable consistent-return */\nimport { cosmiconfig, defaultLoaders } from 'cosmiconfig'\nimport { TypeScriptLoader } from 'cosmiconfig-typescript-loader'\n\nimport type { CosmiconfigResult } from '../types'\n\nexport async function getCosmiConfig(moduleName: string, config?: string) {\n const explorer = cosmiconfig(moduleName, {\n cache: false,\n searchPlaces: [\n 'package.json',\n `.${moduleName}rc`,\n `.${moduleName}rc.json`,\n // commonjs\n `.${moduleName}rc.js`,\n `.${moduleName}rc.cjs`,\n `${moduleName}.config.js`,\n `${moduleName}.config.cjs`,\n // esm and typescript\n `.${moduleName}rc.ts`,\n `${moduleName}.config.ts`,\n ],\n loaders: {\n '.ts': TypeScriptLoader({\n swc: true,\n typeCheck: false,\n }),\n noExt: defaultLoaders['.js'],\n },\n })\n\n const result = config ? await explorer.load(config) : await explorer.search()\n\n if (result?.isEmpty || !result || !result.config) {\n throw new Error('Config not defined, create a kubb.config.js or pass through your config with the option --config')\n }\n\n return result as CosmiconfigResult\n}\n","{\n \"name\": \"@kubb/cli\",\n \"version\": \"1.0.0-beta.9\",\n \"description\": \"Generator cli\",\n \"repository\": {\n \"type\": \"git\",\n \"url\": \"git://github.com/kubb-project/kubb.git\",\n \"directory\": \"packages/cli\"\n },\n \"license\": \"MIT\",\n \"author\": \"Stijn Van Hulle <stijn@stijnvanhulle.be\",\n \"keywords\": [\n \"typescript\",\n \"plugins\",\n \"kubb\",\n \"codegen\",\n \"cli\"\n ],\n \"sideEffects\": false,\n \"type\": \"module\",\n \"main\": \"dist/index.js\",\n \"module\": \"dist/index.js\",\n \"types\": \"./dist/index.d.ts\",\n \"bin\": {\n \"kubb\": \"dist/index.js\"\n },\n \"preferGlobal\": true,\n \"files\": [\n \"dist\",\n \"src\",\n \"!/**/**.test.**\",\n \"!/**/__tests__/**\"\n ],\n \"scripts\": {\n \"build\": \"tsup\",\n \"start\": \"tsup --watch\",\n \"release\": \"pnpm publish --no-git-check\",\n \"prepack\": \"pnpm build\",\n \"pre-commit\": \"echo 'pre-commit not configured'\",\n \"pre-push\": \"pnpm typecheck\",\n \"test\": \"vitest --passWithNoTests\",\n \"upgrade\": \"ncu -u\",\n \"upgrade:local\": \"ncu --interactive --doctor\",\n \"typecheck\": \"tsc -p ./tsconfig.json --noEmit\"\n },\n \"dependencies\": {\n \"@humanwhocodes/module-importer\": \"^1.0.1\",\n \"@kubb/core\": \"workspace:*\",\n \"chokidar\": \"^3.5.3\",\n \"commander\": \"^10.0.0\",\n \"cosmiconfig\": \"^8.1.3\",\n \"cosmiconfig-typescript-loader\": \"^4.3.0\",\n \"execa\": \"^7.1.1\",\n \"ora\": \"^6.3.0\",\n \"picocolors\": \"^1.0.0\",\n \"lodash.isobject\": \"^3.0.2\",\n \"string-argv\": \"^0.3.1\",\n \"ts-node\": \"^10.9.1\",\n \"@swc/core\": \"^1.3.44\"\n },\n \"devDependencies\": {\n \"@kubb/swagger\": \"workspace:*\",\n \"@types/node\": \"^18.15.11\",\n \"@types/lodash.isobject\": \"^3.0.7\",\n \"tsup\": \"^6.7.0\",\n \"typescript\": \"^5.0.3\"\n },\n \"publishConfig\": {\n \"access\": \"public\",\n \"registry\": \"https://registry.npmjs.org/\"\n },\n \"engines\": {\n \"node\": \"^12.17.0 || ^14.13 || >=16.0.0\"\n }\n}\n"]}

package/dist/index.js.map DELETED Viewed

@@ -1 +0,0 @@