juisy 2.0.0-beta.1 → 2.0.0-beta.10

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 /*!
- * juisy v2.0.0-beta.0
+ * juisy v2.0.0-beta.10
  * Copyright © 2022-Present Hervé Perchec
  */
 
@@ -17,10 +17,11 @@ import chalk from 'chalk';
 import indent from 'indent-string';
 import _stripAnsi from 'strip-ansi';
 import dotenv from '@dotenvx/dotenvx';
+import semver from 'semver';
+import { getPackageInfo } from 'juisy';
 import kebabcase from 'lodash.kebabcase';
 import { ReadmeTemplater } from 'juisy/templater';
 import path from 'node:path';
-import { getPackageInfo } from 'juisy';
 import { ESLint } from 'eslint';
 import fs$1 from 'node:fs';
 import yargsParser from 'yargs-parser';
@@ -173,7 +174,7 @@ const proxify = (target) => {
         }
         return obj[prop];
       }
-      return undefined;
+      return void 0;
     }
   });
   for (const property in target) {
@@ -182,13 +183,7 @@ const proxify = (target) => {
   return tmp;
 };
 const defaultGlobalSettings = {
-  release: {
-    git: {
-      commitMessage: "chore(release): v${version}",
-      requireBranch: "main",
-      tagAnnotation: "v${version}"
-    }
-  }
+  // ...
 };
 const defaultCommands = [];
 const registeredPlugins = [];
@@ -417,7 +412,7 @@ class OutputUtils {
   static formatOutputMessage(msg, options = {}) {
     let formatted = `${msg}`;
     if (options.indentChar) {
-      if (options.indent === undefined) {
+      if (options.indent === void 0) {
         options.indent = 1;
       }
     } else {
@@ -472,7 +467,7 @@ class OutputUtils {
    */
   static error(msg, err) {
     OutputUtils.log(OutputUtils.$style.red(`⨉ ERROR: ${msg}`));
-    if (err !== undefined) {
+    if (err !== void 0) {
       OutputUtils.log();
       throw err;
     }
@@ -488,7 +483,7 @@ class OutputUtils {
    */
   static step(msg, options = {}) {
     OutputUtils.stepsCache.index++;
-    if (options.index === undefined) {
+    if (options.index === void 0) {
       options.index = OutputUtils.stepsCache.index;
     }
     OutputUtils.log(`${options.index !== null ? options.index + " - " : ""}${msg}`, { indentChar: "● " });
@@ -623,6 +618,103 @@ const LoadEnvFile = new Plugin("built-in:load-env-file", {
   }
 });
 
+const bumpVersion = new Command({
+  command: "bump-version",
+  describe: "Bump version in package.json file",
+  meta: {
+    private: true
+  },
+  builder: function(cli) {
+    cli.option("p", {
+      alias: "preid",
+      type: "string",
+      describe: "Pre-release id",
+      requiresArg: true
+    });
+    return cli;
+  },
+  async handler(argv) {
+    const { $style, step, substep, error } = OutputUtils;
+    const { run, prompts, abort } = InterfaceUtils;
+    const packageJson = getPackageInfo();
+    let targetVersion;
+    const currentVersion = packageJson.version;
+    packageJson.name;
+    const preId = argv.preid || semver.prerelease(currentVersion) && semver.prerelease(currentVersion)[0];
+    const inc = (i) => semver.inc(currentVersion, i, preId);
+    const versionIncrements = [
+      "patch",
+      "minor",
+      "major",
+      ...preId ? ["prepatch", "preminor", "premajor", "prerelease"] : []
+    ];
+    step("Bump version");
+    const { release } = await prompts([
+      {
+        type: "select",
+        name: "release",
+        message: "Release type:",
+        choices: versionIncrements.map((i) => ({ title: `${i} (${inc(i)})`, value: inc(i) })).concat([{ title: "custom", value: "custom" }])
+      }
+    ]);
+    if (release === "custom") {
+      const { version: customVersion } = await prompts([
+        {
+          type: "text",
+          name: "version",
+          message: "New custom version:",
+          initial: currentVersion,
+          validate: (value) => Boolean(semver.valid(value))
+        }
+      ]);
+      targetVersion = customVersion;
+    } else {
+      targetVersion = release;
+    }
+    const { yes } = await prompts([
+      {
+        type: "confirm",
+        name: "yes",
+        message: `Releasing v${targetVersion}. Confirm?`,
+        initial: true
+      }
+    ]);
+    if (!yes) {
+      abort();
+      return;
+    }
+    this.log();
+    let commandError = false;
+    try {
+      await run("npm", [
+        "--no-git-tag-version",
+        "version",
+        targetVersion
+      ], { stdio: "inherit" });
+    } catch (e) {
+      commandError = e;
+    }
+    if (commandError) {
+      substep($style.red("❌ An error has occured."), { last: true });
+      error("An error has occured.", commandError);
+      abort(1);
+    } else {
+      substep($style.green("✔ Version successfuly bumped"), { last: true });
+      this.log();
+    }
+  }
+});
+
+const RegisterBumpVersionCommand = new Plugin("built-in:register-bump-version-command", {
+  beforeCreate({ defineDefaultCommand, defineSettings, builder, factoryOptions }) {
+    defineDefaultCommand({
+      fullSignature: "bump-version",
+      commandObject: bumpVersion,
+      children: []
+    });
+  }
+});
+
 const changelog = new Command({
   command: "changelog",
   describe: "Generate CHANGELOG file",
@@ -669,7 +761,8 @@ const RegisterChangelogCommand = new Plugin("built-in:register-changelog-command
     defineSettings("changelog", {
       infile: "CHANGELOG.md",
       preset: "angular",
-      sameFile: true
+      sameFile: true,
+      onReleaseConfig: {}
     });
     defineDefaultCommand({
       fullSignature: "changelog",
@@ -931,7 +1024,7 @@ const lint = new Command({
     private: true
   },
   builder(cli) {
-    cli.option("fix", {
+    cli.strict(false).option("fix", {
       alias: "f",
       describe: "Automatically fix problems",
       type: "boolean",
@@ -1244,8 +1337,6 @@ const release = new Command({
   async handler(argv) {
     const { $style, step, substep, error, wait } = OutputUtils;
     const { abort, run } = InterfaceUtils;
-    console.log("argv ? ", argv);
-    abort(1);
     step("Prepare for release");
     const tempConfigFilePath = "./__TEMP_RELEASE_IT_CONFIG__.json";
     const releaseItCmdArgs = [];
@@ -1296,6 +1387,7 @@ const release = new Command({
             strictSemVer: onReleaseConfig.strictSemVer
           };
           tempConfig = {
+            ...releaseSettings,
             plugins: {
               "@release-it/conventional-changelog": releaseItChangelogConfig
             }
@@ -1307,9 +1399,13 @@ const release = new Command({
     if (argv["dry-run"]) {
       releaseItCmdArgs.push("--dry-run");
     }
-    if (argv.increment) {
-      releaseItCmdArgs.push("--increment");
-      releaseItCmdArgs.push(argv.increment);
+    if (argv.increment !== void 0) {
+      if (argv.increment === false) {
+        releaseItCmdArgs.push("--no-increment");
+      } else {
+        releaseItCmdArgs.push("--increment");
+        releaseItCmdArgs.push(argv.increment);
+      }
     }
     if (argv.ci) {
       releaseItCmdArgs.push("--ci");
@@ -1357,7 +1453,11 @@ const release = new Command({
 const RegisterReleaseCommand = new Plugin("built-in:register-release-command", {
   beforeCreate({ defineDefaultCommand, defineSettings, builder, factoryOptions }) {
     defineSettings("release", {
-      // ...
+      git: {
+        commitMessage: "chore(release): v${version}",
+        requireBranch: "main",
+        tagAnnotation: "v${version}"
+      }
     });
     defineDefaultCommand({
       fullSignature: "release",
@@ -1513,13 +1613,13 @@ async function extractUsage(factory, recursive = false, args = [""], locale = "e
   const innerYargs = factory([""]);
   innerYargs.locale(locale);
   const doclet = {
-    command: undefined,
-    args: undefined,
-    aliases: undefined,
+    command: void 0,
+    args: void 0,
+    aliases: void 0,
     deprecated: false,
-    extractedUsage: undefined,
-    rawUsage: undefined,
-    children: recursive ? {} : undefined
+    extractedUsage: void 0,
+    rawUsage: void 0,
+    children: recursive ? {} : void 0
   };
   const parseCallback = function(err, argv, output) {
     if (err)
@@ -1567,6 +1667,7 @@ globalThis.CLI = {
   OutputUtils
 };
 CLIFactory.use(LoadEnvFile);
+CLIFactory.use(RegisterBumpVersionCommand);
 CLIFactory.use(RegisterChangelogCommand);
 CLIFactory.use(RegisterDocsCommands);
 CLIFactory.use(RegisterGitHooksCommands);

package/dist/cli/plugins/register-bump-version-command/cmds/index.d.ts

@@ -0,0 +1,3 @@
+import { Command } from '../../../Command';
+declare const _default: Command;
+export default _default;

package/dist/cli/plugins/register-bump-version-command/index.d.ts

@@ -0,0 +1,3 @@
+import { Plugin } from '../../Plugin';
+declare const _default: Plugin;
+export default _default;

package/dist/index.js

@@ -1,5 +1,5 @@
 /*!
- * juisy v2.0.0-beta.0
+ * juisy v2.0.0-beta.10
  * Copyright © 2022-Present Hervé Perchec
  */
 

package/dist/templater/index.js

@@ -1,5 +1,5 @@
 /*!
- * juisy v2.0.0-beta.0
+ * juisy v2.0.0-beta.10
  * Copyright © 2022-Present Hervé Perchec
  */
 
@@ -28,7 +28,7 @@ class Templater {
         this.methodsMap.compile = async (template) => {
           return handlebars.compile(template, options.engineOptions);
         };
-        this.methodsMap.render = async (template, data = undefined, opts = undefined) => {
+        this.methodsMap.render = async (template, data = void 0, opts = void 0) => {
           return this.methodsMap.compile(template).template(data);
         };
         break;
@@ -37,7 +37,7 @@ class Templater {
         this.methodsMap.compile = async (template) => {
           return ejs.compile(template, options.engineOptions);
         };
-        this.methodsMap.render = async (template, data = undefined, opts) => {
+        this.methodsMap.render = async (template, data = void 0, opts) => {
           return ejs.render(template, data, {
             ...options.engineOptions,
             ...opts || {}
@@ -66,7 +66,7 @@ class Templater {
   /**
    * Renders a template with the given context.
    */
-  async render(template, data = undefined, options = undefined) {
+  async render(template, data = void 0, options = void 0) {
     const mergedData = { ...this.defaultData, ...data || {} };
     return await this.methodsMap.render(template, mergedData, options);
   }
@@ -99,8 +99,8 @@ class MarkdownTemplater extends Templater {
       use: [
         ...options.use || []
       ],
-      toc: options.toc === true ? defaultRemarkTocOptions : options.toc !== undefined ? options.toc : defaultRemarkTocOptions,
-      frontmatter: options.frontmatter === true ? defaultRemarkFrontmatterOptions : options.frontmatter !== undefined ? options.frontmatter : defaultRemarkFrontmatterOptions
+      toc: options.toc === true ? defaultRemarkTocOptions : options.toc !== void 0 ? options.toc : defaultRemarkTocOptions,
+      frontmatter: options.frontmatter === true ? defaultRemarkFrontmatterOptions : options.frontmatter !== void 0 ? options.frontmatter : defaultRemarkFrontmatterOptions
     };
   }
   initProcessor() {
@@ -116,7 +116,7 @@ class MarkdownTemplater extends Templater {
   /**
    * Renders a template with the given context.
    */
-  async render(template, data = undefined, options = undefined) {
+  async render(template, data = void 0, options = void 0) {
     const content = await super.render(template, data, options);
     return (await this.processor.process(content)).toString();
   }
@@ -229,9 +229,9 @@ class ReadmeTemplater {
     } else {
       result.ejsOptions = ReadmeTemplater.defaultConfig.ejsOptions;
     }
-    result.appendAutoGenMessage = customConfig.appendAutoGenMessage !== undefined ? customConfig.appendAutoGenMessage : ReadmeTemplater.defaultConfig.appendAutoGenMessage;
-    result.autoToc = customConfig.autoToc !== undefined ? customConfig.autoToc : ReadmeTemplater.defaultConfig.autoToc;
-    result.slugify = customConfig.slugify !== undefined ? customConfig.slugify : ReadmeTemplater.defaultConfig.slugify;
+    result.appendAutoGenMessage = customConfig.appendAutoGenMessage !== void 0 ? customConfig.appendAutoGenMessage : ReadmeTemplater.defaultConfig.appendAutoGenMessage;
+    result.autoToc = customConfig.autoToc !== void 0 ? customConfig.autoToc : ReadmeTemplater.defaultConfig.autoToc;
+    result.slugify = customConfig.slugify !== void 0 ? customConfig.slugify : ReadmeTemplater.defaultConfig.slugify;
     return result;
   }
   /**