@kubb/cli 0.56.0 → 0.56.1

package/dist/index.js

@@ -1,23 +1,16 @@
 #!/usr/bin/env node
-'use strict';
+import { createRequire } from 'module';
+import { Command, Option } from 'commander';
+import pc3 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 { cosmiconfig, defaultLoaders } from 'cosmiconfig';
+import { TypeScriptLoader } from 'cosmiconfig-typescript-loader';
 
-var module$1 = require('module');
-var commander = require('commander');
-var pc3 = require('picocolors');
-var ora = require('ora');
-var execa = require('execa');
-var stringArgv = require('string-argv');
-var core = require('@kubb/core');
-var moduleImporter = require('@humanwhocodes/module-importer');
-var cosmiconfig = require('cosmiconfig');
-var cosmiconfigTypescriptLoader = require('cosmiconfig-typescript-loader');
-
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
-var pc3__default = /*#__PURE__*/_interopDefault(pc3);
-var ora__default = /*#__PURE__*/_interopDefault(ora);
-
-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)));
+createRequire(import.meta.url);
 async function run({ config, options, spinner: spinner2 }) {
   const logger = {
     log(message, logLevel) {
@@ -40,15 +33,15 @@ async function run({ config, options, spinner: spinner2 }) {
       commands = config2.hooks.done;
     }
     const promises = commands.map(async (command) => {
-      const [cmd, ..._args] = [...stringArgv.parseArgsStringToArgv(command)];
-      return execa.execa(cmd, _args);
+      const [cmd, ..._args] = [...parseArgsStringToArgv(command)];
+      return execa(cmd, _args);
     });
     await Promise.all(promises);
     spinner2.succeed("\u{1FA82} Hooks runned");
   };
   try {
     spinner2.start("\u{1F680} Building");
-    await core.build({
+    await build({
       config: {
         root: process.cwd(),
         ...config,
@@ -60,7 +53,7 @@ async function run({ config, options, spinner: spinner2 }) {
       mode: options.mode || "development",
       logger
     });
-    spinner2.succeed(pc3__default.default.blue("\u{1F308} Generation complete"));
+    spinner2.succeed(pc3.blue("\u{1F308} Generation complete"));
     await onDone(config);
   } catch (err) {
     if (options.debug) {
@@ -83,12 +76,12 @@ var startWatcher = async (cb, options) => {
     ignored
   });
   watcher.on("all", async (type, file) => {
-    spinner2.succeed(pc3__default.default.yellow(pc3__default.default.bold(`Change detected: ${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__default.default.red(e));
+      spinner2.warn(pc3.red(e));
     }
   });
 };
@@ -98,7 +91,7 @@ var isJSONPlugins = (plugins) => {
   });
 };
 var importPlugin = async (name, options) => {
-  const importer = new moduleImporter.ModuleImporter(process.cwd());
+  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);
 };
@@ -119,7 +112,7 @@ var getConfig = async (result, options) => {
   let kubbUserConfig = Promise.resolve(config);
   if (typeof config === "function") {
     const possiblePromise = config(options);
-    if (core.isPromise(possiblePromise)) {
+    if (isPromise(possiblePromise)) {
       kubbUserConfig = possiblePromise;
     }
     kubbUserConfig = Promise.resolve(possiblePromise);
@@ -132,7 +125,7 @@ var getConfig = async (result, options) => {
   return JSONConfig;
 };
 var getCosmiConfig = async (moduleName2, config) => {
-  const explorer = cosmiconfig.cosmiconfig(moduleName2, {
+  const explorer = cosmiconfig(moduleName2, {
     cache: false,
     searchPlaces: [
       "package.json",
@@ -148,11 +141,11 @@ var getCosmiConfig = async (moduleName2, config) => {
       `${moduleName2}.config.ts`
     ],
     loaders: {
-      ".ts": cosmiconfigTypescriptLoader.TypeScriptLoader({
+      ".ts": TypeScriptLoader({
         swc: true,
         typeCheck: false
       }),
-      noExt: cosmiconfig.defaultLoaders[".js"]
+      noExt: defaultLoaders[".js"]
     }
   });
   const result = config ? await explorer.load(config) : await explorer.search();
@@ -163,16 +156,16 @@ var getCosmiConfig = async (moduleName2, config) => {
 };
 
 // package.json
-var version = "0.56.0";
+var version = "0.56.1";
 
 // src/index.ts
 var moduleName = "kubb";
-var spinner = ora__default.default({
+var spinner = ora({
   color: "blue",
-  text: pc3__default.default.blue("\u{1F3CE}\uFE0F Kubb generation started"),
+  text: pc3.blue("\u{1F3CE}\uFE0F Kubb generation started"),
   spinner: "clock"
 }).start();
-var program = new commander.Command(moduleName).description("Kubb").action(async (options) => {
+var program = new Command(moduleName).description("Kubb").action(async (options) => {
   try {
     spinner.start("\u{1F4BE} Loading config");
     const result = await getCosmiConfig(moduleName, options.config);
@@ -183,7 +176,7 @@ var program = new commander.Command(moduleName).description("Kubb").action(async
         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(pc3.yellow(pc3.bold(`Watching for changes in ${paths.join(" and ")}`)));
         },
         {
           spinner,
@@ -195,7 +188,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));
+    spinner.fail(pc3.red(e.message));
   }
-}).addOption(new commander.Option("-m, --mode <mode>", "Mode of Kubb, development or production").default("development")).addOption(new commander.Option("-c, --config <path>", "Path to @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 Option("-m, --mode <mode>", "Mode of Kubb, development or production").default("development")).addOption(new Option("-c, --config <path>", "Path to @kubb config")).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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/cli",
-  "version": "0.56.0",
+  "version": "0.56.1",
   "description": "Generator cli",
   "repository": {
     "type": "git",
@@ -17,6 +17,10 @@
     "cli"
   ],
   "sideEffects": false,
+  "type": "module",
+  "main": "dist/index.mjs",
+  "module": "dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "bin": {
     "kubb": "dist/index.mjs"
   },
@@ -28,10 +32,10 @@
   ],
   "dependencies": {
     "@humanwhocodes/module-importer": "^1.0.1",
-    "@kubb/core": "0.56.0",
+    "@kubb/core": "0.56.1",
     "chokidar": "^3.5.3",
     "commander": "^10.0.0",
-    "cosmiconfig": "^8.0.0",
+    "cosmiconfig": "^8.1.0",
     "cosmiconfig-typescript-loader": "^4.3.0",
     "execa": "^7.0.0",
     "ora": "^6.1.2",
@@ -40,8 +44,7 @@
     "ts-node": "^10.9.1"
   },
   "devDependencies": {
-    "@kubb/swagger": "0.56.0",
-    "@types/node": "^18.14.1",
+    "@types/node": "^18.14.2",
     "tsup": "^6.6.3",
     "typescript": "^4.9.5"
   },
@@ -49,15 +52,18 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
+  "engines": {
+    "node": "^12.17.0 || ^14.13 || >=16.0.0"
+  },
   "scripts": {
     "build": "tsup",
     "start": "tsup --watch",
     "release": "pnpm publish --no-git-check",
     "pre-commit": "echo 'pre-commit not configured'",
     "pre-push": "pnpm typecheck",
-    "test": "jest --config ../../jest.config.js --passWithNoTests --runInBand --testPathPattern=packages/core/src",
-    "test:local": "jest --config ../../jest.config.js --testPathPattern=packages/core/src --maxWorkers=50%",
-    "test:watch": "jest --config ../../jest.config.js --testPathPattern=packages/core/src --maxWorkers=25% --watch",
+    "test": "jest --config ../../jest.config.ts --passWithNoTests --runInBand --testPathPattern=packages/cli/src",
+    "test:local": "jest --config ../../jest.config.ts --testPathPattern=packages/cli/src --maxWorkers=50%",
+    "test:watch": "jest --config ../../jest.config.ts --testPathPattern=packages/cli/src --maxWorkers=25% --watch",
     "upgrade": "ncu -u",
     "upgrade:local": "ncu --interactive --doctor",
     "typecheck": "tsc -p ./tsconfig.json --noEmit"

package/dist/index.mjs

@@ -1,194 +0,0 @@
-#!/usr/bin/env node
-import { createRequire } from 'module';
-import { Command, Option } from 'commander';
-import pc3 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 { cosmiconfig, defaultLoaders } from 'cosmiconfig';
-import { TypeScriptLoader } from 'cosmiconfig-typescript-loader';
-
-createRequire(import.meta.url);
-async function run({ config, options, spinner: spinner2 }) {
-  const logger = {
-    log(message, logLevel) {
-      if (logLevel === "error") {
-        spinner2.fail(message);
-      }
-      spinner2[logLevel](message);
-    },
-    spinner: spinner2
-  };
-  const onDone = async (config2) => {
-    if (!config2.hooks?.done) {
-      return;
-    }
-    spinner2.start("\u{1FA82} Running hooks");
-    let commands = [];
-    if (typeof config2.hooks?.done === "string") {
-      commands = [config2.hooks.done];
-    } else {
-      commands = config2.hooks.done;
-    }
-    const promises = commands.map(async (command) => {
-      const [cmd, ..._args] = [...parseArgsStringToArgv(command)];
-      return execa(cmd, _args);
-    });
-    await Promise.all(promises);
-    spinner2.succeed("\u{1FA82} Hooks runned");
-  };
-  try {
-    spinner2.start("\u{1F680} Building");
-    await build({
-      config: {
-        root: process.cwd(),
-        ...config,
-        output: {
-          write: true,
-          ...config.output
-        }
-      },
-      mode: options.mode || "development",
-      logger
-    });
-    spinner2.succeed(pc3.blue("\u{1F308} Generation complete"));
-    await onDone(config);
-  } catch (err) {
-    if (options.debug) {
-      spinner2.fail(`Something went wrong
-`);
-      console.log(err?.cause || err);
-    } else {
-      spinner2.fail(`Something went wrong
-${err?.message}`);
-    }
-  }
-  return true;
-}
-var startWatcher = async (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(e));
-    }
-  });
-};
-var isJSONPlugins = (plugins) => {
-  return !!plugins?.some((plugin) => {
-    return typeof plugin?.[0] === "string";
-  });
-};
-var importPlugin = async (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);
-};
-var getPlugins = (plugins) => {
-  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);
-};
-
-// src/utils/getConfig.ts
-var getConfig = async (result, options) => {
-  const config = result?.config;
-  let kubbUserConfig = Promise.resolve(config);
-  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) : void 0
-  };
-  return JSONConfig;
-};
-var getCosmiConfig = async (moduleName2, config) => {
-  const explorer = cosmiconfig(moduleName2, {
-    cache: false,
-    searchPlaces: [
-      "package.json",
-      `.${moduleName2}rc`,
-      `.${moduleName2}rc.json`,
-      // commonjs
-      `.${moduleName2}rc.js`,
-      `.${moduleName2}rc.cjs`,
-      `${moduleName2}.config.js`,
-      `${moduleName2}.config.cjs`,
-      // esm and typescript
-      `.${moduleName2}rc.ts`,
-      `${moduleName2}.config.ts`
-    ],
-    loaders: {
-      ".ts": TypeScriptLoader({
-        swc: true,
-        typeCheck: false
-      }),
-      noExt: defaultLoaders[".js"]
-    }
-  });
-  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;
-};
-
-// package.json
-var version = "0.56.0";
-
-// src/index.ts
-var moduleName = "kubb";
-var spinner = ora({
-  color: "blue",
-  text: pc3.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");
-    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,
-          path: [config.input.path]
-        }
-      );
-    } else {
-      const config = await getConfig(result, options);
-      await run({ config, spinner, options });
-    }
-  } catch (e) {
-    spinner.fail(pc3.red(e.message));
-  }
-}).addOption(new Option("-m, --mode <mode>", "Mode of Kubb, development or production").default("development")).addOption(new Option("-c, --config <path>", "Path to @kubb config")).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();