juisy 2.0.0-beta.1 → 2.0.0-beta.8

package/bin/cli/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 'use strict'
 

package/dist/cli/index.d.ts

@@ -26,7 +26,6 @@ export type * from './plugins/register-docs-commands/augment';
 export type * from './plugins/register-git-hooks-commands/augment';
 export type * from './plugins/register-lint-commands/augment';
 export type * from './plugins/register-release-command/augment';
-export type * from './plugins/register-test-command/augment';
 export type * from './plugins/default-command-fallbacks/augment';
 export type * from './plugins/command-handler-injections/augment';
 export type * from './plugins/command-meta/augment';

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 /*!
- * juisy v2.0.0-beta.0
+ * juisy v2.0.0-beta.8
  * 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';
@@ -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 = [];
@@ -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 !== undefined) {
+      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",
@@ -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.8
  * 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.8
  * Copyright © 2022-Present Hervé Perchec
  */
 

package/package.json

@@ -1,193 +1,194 @@
-{
-    "name": "juisy",
-    "version": "2.0.0-beta.1",
-    "description": "Make your JavaScript (and/or TypeScript) project juicy!",
-    "type": "module",
-    "files": [
-        "bin",
-        "dist",
-        "template"
-    ],
-    "engines": {
-        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
-    },
-    "imports": {
-        "#juisy": {
-            "types": "./dist/index.d.ts",
-            "import": "./dist/index.js"
-        },
-        "#juisy/cli": {
-            "types": "./dist/cli/index.d.ts",
-            "import": "./dist/cli/index.js"
-        },
-        "#juisy/templater": {
-            "types": "./dist/templater/index.d.ts",
-            "import": "./dist/templater/index.js"
-        }
-    },
-    "exports": {
-        ".": {
-            "types": "./dist/index.d.ts",
-            "import": "./dist/index.js"
-        },
-        "./cli": {
-            "types": "./dist/cli/index.d.ts",
-            "import": "./dist/cli/index.js"
-        },
-        "./templater": {
-            "types": "./dist/templater/index.d.ts",
-            "import": "./dist/templater/index.js"
-        }
-    },
-    "publishConfig": {
-        "access": "public"
-    },
-    "scripts": {
-        "build": "vite build",
-        "audit": "ncu && npm audit",
-        "audit:fix": "ncu --interactive",
-        "docs": "npm run docs:cli && npm run docs:api",
-        "docs:api": "node ./bin/cli docs generate:api",
-        "docs:cli": "npm run docs:cli:private && npm run docs:cli:public",
-        "docs:cli:private": "node ./bin/cli docs generate:cli -c ./docs/cli/private/config.js",
-        "docs:cli:public": "node ./bin/cli docs generate:cli -c ./docs/cli/public/config.js",
-        "example:reset": "git checkout --no-overlay -- example && cd example && git clean -fdX",
-        "example:test": "npm run example:reset && cd example && npm install -D juisy@file:../ && npx juisy squeeze && npm run docs:readme",
-        "print:globals": "node --no-warnings ./bin/cli print:globals",
-        "release": "release-it",
-        "test": "node ./bin/cli test",
-        "test:dev": "npm test -- --watch",
-        "test:ui": "npm test -- --ui"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://gitlab.com/hperchec/juisy.git"
-    },
-    "keywords": [
-        "js",
-        "build",
-        "release",
-        "changelog",
-        "bin",
-        "cmd",
-        "easy"
-    ],
-    "author": {
-        "name": "Hervé Perchec",
-        "email": "contact@herve-perchec.com",
-        "url": "https://gitlab.com/herveperchec"
-    },
-    "license": "GPL-3.0-only",
-    "bugs": {
-        "url": "https://gitlab.com/hperchec/juisy/issues"
-    },
-    "homepage": "https://gitlab.com/hperchec/juisy#readme",
-    "bin": {
-        "juisy": "./bin/cli/index.js"
-    },
-    "peerDependencies": {
-        "@commitlint/cli": "^19.6.1",
-        "@commitlint/config-conventional": "^19.6.0",
-        "@github/markdownlint-github": "^0.7.0",
-        "@release-it/conventional-changelog": "^9.0.4",
-        "@stylistic/eslint-plugin": "^2",
-        "@typescript-eslint/eslint-plugin": "^8",
-        "chalk": "^4.1.2",
-        "conventional-changelog-cli": "^5.0.0",
-        "eslint": "^9",
-        "lint-staged": "^14.0.1",
-        "markdownlint-cli2": "^0.12.0",
-        "markdownlint-cli2-formatter-pretty": "^0.0.7",
-        "prompts": "^2.4.2",
-        "release-it": "^17.11.0",
-        "simple-git-hooks": "^2.9.0",
-        "yargs": "^17.7.2"
-    },
-    "peerDependenciesMeta": {
-        "@github/markdownlint-github": {
-            "optional": true
-        },
-        "markdownlint-cli2-formatter-pretty": {
-            "optional": true
-        }
-    },
-    "devDependencies": {
-        "@babel/eslint-parser": "^7.25.9",
-        "@conventional-changelog/git-client": "^1.0.1",
-        "@rollup/plugin-typescript": "^12.1.2",
-        "@stylistic/eslint-plugin": "^2.12.1",
-        "@types/conventional-changelog": "^3.1.5",
-        "@types/conventional-changelog-config-spec": "^2.1.5",
-        "@types/ejs": "^3.1.5",
-        "@types/fs-extra": "^11.0.4",
-        "@types/lint-staged": "^13.3.0",
-        "@types/lodash.get": "^4.4.9",
-        "@types/lodash.kebabcase": "^4.1.9",
-        "@types/lodash.merge": "^4.6.9",
-        "@types/lodash.set": "^4.3.9",
-        "@types/node": "^22.10.2",
-        "@types/prompts": "^2.4.9",
-        "@types/yargs": "^17.0.33",
-        "@types/yargs-parser": "^21.0.3",
-        "@typescript-eslint/eslint-plugin": "^8.18.1",
-        "@vitest/coverage-v8": "^2.1.8",
-        "@vitest/ui": "^2.1.8",
-        "cpy-cli": "^5.0.0",
-        "eslint": "^9.17.0",
-        "happy-dom": "^15.11.7",
-        "json-schema-to-ts": "^3.1.1",
-        "lint-staged": "^14.0.1",
-        "markdown-table": "^3.0.4",
-        "npm-check-updates": "^17.1.12",
-        "quicktype": "^23.0.170",
-        "typescript": "^5.7.2",
-        "vite": "^5.4.11",
-        "vite-plugin-dts": "^4.3.0",
-        "vite-plugin-generate-file": "^0.2.0",
-        "vitest": "^2.1.8"
-    },
-    "dependencies": {
-        "@dotenvx/dotenvx": "^1.31.0",
-        "ascii-tree": "^0.3.0",
-        "chalk": "^4.1.2",
-        "conventional-recommended-bump": "^10.0.0",
-        "deepmerge": "^4.3.1",
-        "ejs": "^3.1.10",
-        "execa": "^8",
-        "find-up": "^7.0.0",
-        "fs-extra": "^11.2.0",
-        "github-slugger": "^2.0.0",
-        "glob": "^11.0.0",
-        "handlebars": "^4.7.8",
-        "import-single-ts": "^1.2.0",
-        "indent-string": "^5.0.0",
-        "json-2-csv": "^5.5.7",
-        "jstoxml": "^5.0.2",
-        "lodash.get": "^4.4.2",
-        "lodash.kebabcase": "^4.1.1",
-        "lodash.merge": "^4.6.2",
-        "lodash.set": "^4.3.2",
-        "loglevel": "^1.9.2",
-        "markdown-toc": "^1.2.0",
-        "markdown-utils": "^1.0.0",
-        "package-json-type": "^1.0.3",
-        "pkg-dir": "^8.0.0",
-        "prompts": "^2.4.2",
-        "remark": "^15.0.1",
-        "remark-frontmatter": "^5.0.0",
-        "remark-toc": "^9.0.0",
-        "simple-git-hooks": "^2.9.0",
-        "strip-ansi": "^7.1.0",
-        "ts-json-schema-generator": "^2.3.0",
-        "typedoc": "^0.27.5",
-        "typedoc-plugin-frontmatter": "^1.1.2",
-        "typedoc-plugin-markdown": "^4.3.3",
-        "typedoc-vitepress-theme": "^1.1.1",
-        "yaml": "^2.6.1",
-        "yargs": "^17.7.2",
-        "yargs-parser": "^21.1.1"
-    },
-    "release-it": {
-        "git": false
-    }
-}
+{
+    "name": "juisy",
+    "version": "2.0.0-beta.8",
+    "description": "Make your JavaScript (and/or TypeScript) project juicy!",
+    "type": "module",
+    "files": [
+        "bin",
+        "dist"
+    ],
+    "engines": {
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+    },
+    "imports": {
+        "#juisy": {
+            "types": "./dist/index.d.ts",
+            "import": "./dist/index.js"
+        },
+        "#juisy/cli": {
+            "types": "./dist/cli/index.d.ts",
+            "import": "./dist/cli/index.js"
+        },
+        "#juisy/templater": {
+            "types": "./dist/templater/index.d.ts",
+            "import": "./dist/templater/index.js"
+        }
+    },
+    "exports": {
+        ".": {
+            "types": "./dist/index.d.ts",
+            "import": "./dist/index.js"
+        },
+        "./cli": {
+            "types": "./dist/cli/index.d.ts",
+            "import": "./dist/cli/index.js"
+        },
+        "./templater": {
+            "types": "./dist/templater/index.d.ts",
+            "import": "./dist/templater/index.js"
+        }
+    },
+    "publishConfig": {
+        "access": "public"
+    },
+    "scripts": {
+        "build": "vite build",
+        "audit": "ncu && npm audit",
+        "audit:fix": "ncu --interactive",
+        "docs": "npm run docs:cli && npm run docs:api",
+        "docs:api": "node ./bin/cli docs generate:api",
+        "docs:cli": "npm run docs:cli:private && npm run docs:cli:public",
+        "docs:cli:private": "node ./bin/cli docs generate:cli -c ./docs/cli/private/config.js",
+        "docs:cli:public": "node ./bin/cli docs generate:cli -c ./docs/cli/public/config.js",
+        "example:reset": "git checkout --no-overlay -- example && cd example && git clean -fdX",
+        "example:test": "npm run example:reset && cd example && npm install -D juisy@file:../ && npx juisy squeeze && npm run docs:readme",
+        "print:globals": "node --no-warnings ./bin/cli print:globals",
+        "release": "release-it",
+        "test": "node ./bin/cli test",
+        "test:dev": "npm test -- --watch",
+        "test:ui": "npm test -- --ui"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://gitlab.com/hperchec/juisy.git"
+    },
+    "keywords": [
+        "js",
+        "build",
+        "release",
+        "changelog",
+        "bin",
+        "cmd",
+        "easy"
+    ],
+    "author": {
+        "name": "Hervé Perchec",
+        "email": "contact@herve-perchec.com",
+        "url": "https://gitlab.com/herveperchec"
+    },
+    "license": "GPL-3.0-only",
+    "bugs": {
+        "url": "https://gitlab.com/hperchec/juisy/issues"
+    },
+    "homepage": "https://gitlab.com/hperchec/juisy#readme",
+    "bin": {
+        "juisy": "./bin/cli/index.js"
+    },
+    "peerDependencies": {
+        "@commitlint/cli": "^19.6.1",
+        "@commitlint/config-conventional": "^19.6.0",
+        "@github/markdownlint-github": "^0.7.0",
+        "@release-it/conventional-changelog": "^9.0.4",
+        "@stylistic/eslint-plugin": "^2",
+        "@typescript-eslint/eslint-plugin": "^8",
+        "chalk": "^4.1.2",
+        "conventional-changelog-cli": "^5.0.0",
+        "eslint": "^9",
+        "lint-staged": "^14.0.1",
+        "markdownlint-cli2": "^0.12.0",
+        "markdownlint-cli2-formatter-pretty": "^0.0.7",
+        "prompts": "^2.4.2",
+        "release-it": "^17.11.0",
+        "simple-git-hooks": "^2.9.0",
+        "yargs": "^17.7.2"
+    },
+    "peerDependenciesMeta": {
+        "@github/markdownlint-github": {
+            "optional": true
+        },
+        "markdownlint-cli2-formatter-pretty": {
+            "optional": true
+        }
+    },
+    "devDependencies": {
+        "@babel/eslint-parser": "^7.25.9",
+        "@conventional-changelog/git-client": "^1.0.1",
+        "@rollup/plugin-typescript": "^12.1.2",
+        "@stylistic/eslint-plugin": "^2.12.1",
+        "@types/conventional-changelog": "^3.1.5",
+        "@types/conventional-changelog-config-spec": "^2.1.5",
+        "@types/ejs": "^3.1.5",
+        "@types/fs-extra": "^11.0.4",
+        "@types/lint-staged": "^13.3.0",
+        "@types/lodash.get": "^4.4.9",
+        "@types/lodash.kebabcase": "^4.1.9",
+        "@types/lodash.merge": "^4.6.9",
+        "@types/lodash.set": "^4.3.9",
+        "@types/node": "^22.10.2",
+        "@types/prompts": "^2.4.9",
+        "@types/semver": "^7.5.8",
+        "@types/yargs": "^17.0.33",
+        "@types/yargs-parser": "^21.0.3",
+        "@typescript-eslint/eslint-plugin": "^8.18.1",
+        "@vitest/coverage-v8": "^2.1.8",
+        "@vitest/ui": "^2.1.8",
+        "cpy-cli": "^5.0.0",
+        "eslint": "^9.17.0",
+        "happy-dom": "^15.11.7",
+        "json-schema-to-ts": "^3.1.1",
+        "lint-staged": "^14.0.1",
+        "markdown-table": "^3.0.4",
+        "npm-check-updates": "^17.1.12",
+        "quicktype": "^23.0.170",
+        "typescript": "^5.7.2",
+        "vite": "^5.4.11",
+        "vite-plugin-dts": "^4.3.0",
+        "vite-plugin-generate-file": "^0.2.0",
+        "vitest": "^2.1.8"
+    },
+    "dependencies": {
+        "@dotenvx/dotenvx": "^1.31.0",
+        "ascii-tree": "^0.3.0",
+        "chalk": "^4.1.2",
+        "conventional-recommended-bump": "^10.0.0",
+        "deepmerge": "^4.3.1",
+        "ejs": "^3.1.10",
+        "execa": "^8",
+        "find-up": "^7.0.0",
+        "fs-extra": "^11.2.0",
+        "github-slugger": "^2.0.0",
+        "glob": "^11.0.0",
+        "handlebars": "^4.7.8",
+        "import-single-ts": "^1.2.0",
+        "indent-string": "^5.0.0",
+        "json-2-csv": "^5.5.7",
+        "jstoxml": "^5.0.2",
+        "lodash.get": "^4.4.2",
+        "lodash.kebabcase": "^4.1.1",
+        "lodash.merge": "^4.6.2",
+        "lodash.set": "^4.3.2",
+        "loglevel": "^1.9.2",
+        "markdown-toc": "^1.2.0",
+        "markdown-utils": "^1.0.0",
+        "package-json-type": "^1.0.3",
+        "pkg-dir": "^8.0.0",
+        "prompts": "^2.4.2",
+        "remark": "^15.0.1",
+        "remark-frontmatter": "^5.0.0",
+        "remark-toc": "^9.0.0",
+        "semver": "^7.7.1",
+        "simple-git-hooks": "^2.9.0",
+        "strip-ansi": "^7.1.0",
+        "ts-json-schema-generator": "^2.3.0",
+        "typedoc": "^0.27.5",
+        "typedoc-plugin-frontmatter": "^1.1.2",
+        "typedoc-plugin-markdown": "^4.3.3",
+        "typedoc-vitepress-theme": "^1.1.1",
+        "yaml": "^2.6.1",
+        "yargs": "^17.7.2",
+        "yargs-parser": "^21.1.1"
+    },
+    "release-it": {
+        "git": false
+    }
+}

package/dist/cli/plugins/register-test-command/augment.d.ts

@@ -1,3 +0,0 @@
-declare module '../../types' {
-}
-export {};