@deot/dev-releaser 2.8.0 → 2.9.1

package/dist/index.cjs

@@ -7,9 +7,9 @@ const devShared = require('@deot/dev-shared');
 const path = require('node:path');
 const node_module = require('node:module');
 const fs = require('fs-extra');
-const parser = require('conventional-commits-parser');
+const conventionalCommitsParser = require('conventional-commits-parser');
 const semver = require('semver');
-const inquirer = require('inquirer');
+const prompts = require('@inquirer/prompts');
 
 function _interopNamespaceDefault(e) {
 	const n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } });
@@ -32,13 +32,13 @@ const path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 
 const cwd = process.cwd();
 const require$ = node_module.createRequire(cwd);
-const { prompt } = inquirer;
 const HASH = "-hash-";
 const SUFFIX = "🐒💨🙊";
 const parserOptions = {
   noteKeywords: ["BREAKING CHANGE", "Breaking Change"]
 };
 const reBreaking = new RegExp(`(${parserOptions.noteKeywords.join(")|(")})`);
+const commitParser = new conventionalCommitsParser.CommitParser();
 class Release {
   packageDir;
   packageName;
@@ -104,12 +104,10 @@ class Release {
       const chunk = commit.trim();
       return chunk && (rePlugin.test(chunk) || reAll && reAll.test(chunk));
     }).map((commit) => {
-      const node = parser.sync(commit);
+      const node = commitParser.parse(commit);
       const body = node.body || node.footer;
-      if (!node.type)
-        node.type = parser.sync(node.header?.replace(/\(.+\)!?:/, ":") || "").type;
-      if (!node.hash)
-        node.hash = commit.split(HASH).pop()?.trim();
+      if (!node.type) node.type = commitParser.parse(node.header?.replace(/\(.+\)!?:/, ":") || "").type;
+      if (!node.hash) node.hash = commit.split(HASH).pop()?.trim();
       node.breaking = reBreaking.test(body) || /!:/.test(node.header);
       node.effect = false;
       node.custom = false;
@@ -126,15 +124,10 @@ class Release {
     if (commits.length && skipUpdatePackage) {
       let skip = false;
       if (typeof skipUpdatePackage === "boolean" && skipUpdatePackage) {
-        const result = await prompt([
-          {
-            type: "confirm",
-            name: "skip",
-            message: `Skip Update（${this.packageName}@${this.packageOptions.version}）：`,
-            default: true
-          }
-        ]);
-        skip = result.skip;
+        skip = await prompts.confirm({
+          message: `Skip Update（${this.packageName}@${this.packageOptions.version}）：`,
+          default: true
+        });
       } else if (typeof skipUpdatePackage === "string" && (skipUpdatePackage === "*" || skipUpdatePackage.split(",").includes(this.packageName))) {
         skip = true;
       }
@@ -150,15 +143,10 @@ class Release {
     if (!commits.length && forceUpdatePackage) {
       let force = false;
       if (typeof forceUpdatePackage === "boolean" && forceUpdatePackage) {
-        const result = await prompt([
-          {
-            type: "confirm",
-            name: "force",
-            message: `Force Update（${this.packageName}@${this.packageOptions.version}）：`,
-            default: true
-          }
-        ]);
-        force = result.force;
+        force = await prompts.confirm({
+          message: `Force Update（${this.packageName}@${this.packageOptions.version}）：`,
+          default: true
+        });
       } else if (typeof forceUpdatePackage === "string" && (forceUpdatePackage === "*" || forceUpdatePackage.split(",").includes(this.packageName))) {
         force = true;
       }
@@ -247,10 +235,8 @@ class Release {
     if (commandOptions.customVersion) {
       newVersion = commandOptions.customVersion;
       if (!/\d+.\d+.\d+/.test(newVersion) || version === newVersion) {
-        const result = await prompt([
+        newVersion = await prompts.input(
           {
-            type: "input",
-            name: "version",
             message: `Custom Update Version（${this.packageName}@${version}）：`,
             default: "",
             validate: (answer) => {
@@ -263,8 +249,7 @@ class Release {
               return true;
             }
           }
-        ]);
-        newVersion = result.version;
+        );
       }
     } else {
       const intersection = [
@@ -289,8 +274,7 @@ class Release {
     return !!this.commits.length;
   }
   async updateCommits(commits, source) {
-    if (!commits.length)
-      return;
+    if (!commits.length) return;
     const { packageName } = this;
     const olds = this.commits.map((i) => JSON.stringify({ ...i, effect: false }));
     const newCommits = commits.filter((i) => {
@@ -321,8 +305,7 @@ class Release {
     }
   }
   async updatePackageOptions(relationVerisons = {}) {
-    if (!this.isChanged())
-      return;
+    if (!this.isChanged()) return;
     const { packageDir, packageOptions, commandOptions } = this;
     const { dependencies, devDependencies } = packageOptions;
     const newVersion = this.version;
@@ -347,8 +330,7 @@ class Release {
     fs.outputFileSync(`${packageDir}/package.json`, JSON.stringify(packageOptions, null, 2));
   }
   async updateChangelog() {
-    if (!this.isChanged())
-      return;
+    if (!this.isChanged()) return;
     const { packageName, packageDir, packageOptions, commandOptions } = this;
     const title = `# ${packageName} ChangeLog`;
     const [date] = (/* @__PURE__ */ new Date()).toISOString().split("T");
@@ -368,13 +350,11 @@ ${newLog}`);
     }
     devShared.Logger.log(chalk.yellow(`Updating `) + `CHANGELOG.md`);
     let content = [title, newLog, oldNotes].filter(Boolean).join("\n\n");
-    if (!content.endsWith("\n"))
-      content += "\n";
+    if (!content.endsWith("\n")) content += "\n";
     fs.writeFileSync(logPath, content, "utf-8");
   }
   async test() {
-    if (!this.isChanged())
-      return;
+    if (!this.isChanged()) return;
     const { commandOptions } = this;
     if (commandOptions.dryRun) {
       devShared.Logger.log(chalk.yellow("Skipping Test"));
@@ -385,8 +365,7 @@ ${newLog}`);
     await devShared.Shell.exec(`npm run test -- --package-name ${this.packageName}`);
   }
   async build() {
-    if (!this.isChanged())
-      return;
+    if (!this.isChanged()) return;
     const { commandOptions } = this;
     if (commandOptions.dryRun) {
       devShared.Logger.log(chalk.yellow("Skipping Build"));
@@ -398,8 +377,7 @@ ${newLog}`);
   }
   async publish() {
     const { commandOptions } = this;
-    if (!this.isChanged() || !commandOptions.publish)
-      return;
+    if (!this.isChanged() || !commandOptions.publish) return;
     const { packageDir, packageName } = this;
     devShared.Logger.log(chalk.magenta(`PUBLISH: `) + packageName);
     if (commandOptions.dryRun) {
@@ -418,8 +396,7 @@ ${newLog}`);
   }
   async tag() {
     const { commandOptions } = this;
-    if (!this.isChanged() || !commandOptions.tag)
-      return;
+    if (!this.isChanged() || !commandOptions.tag) return;
     const { packageDir, packageName, packageOptions } = this;
     devShared.Logger.log(chalk.magenta(`TAG: `) + packageName);
     if (commandOptions.dryRun) {
@@ -443,12 +420,10 @@ ${newLog}`);
    */
   async cleanTagsAndKeepLastTag() {
     const { commandOptions } = this;
-    if (!commandOptions.keepLastTag)
-      return;
+    if (!commandOptions.keepLastTag) return;
     let tags = await this.getTags();
     tags = tags.slice(1).filter((i) => !!i).reverse();
-    if (!tags.length)
-      return;
+    if (!tags.length) return;
     const { packageName } = this;
     devShared.Logger.log(chalk.magenta(`CLEAN TAGS: `) + packageName);
     if (commandOptions.dryRun) {

package/dist/index.js

@@ -3,19 +3,19 @@ import { Locals, Logger, Shell, Utils } from '@deot/dev-shared';
 import * as path from 'node:path';
 import { createRequire } from 'node:module';
 import fs from 'fs-extra';
-import parser from 'conventional-commits-parser';
+import { CommitParser } from 'conventional-commits-parser';
 import semver from 'semver';
-import inquirer from 'inquirer';
+import { confirm, input } from '@inquirer/prompts';
 
 const cwd = process.cwd();
 const require$ = createRequire(cwd);
-const { prompt } = inquirer;
 const HASH = "-hash-";
 const SUFFIX = "🐒💨🙊";
 const parserOptions = {
   noteKeywords: ["BREAKING CHANGE", "Breaking Change"]
 };
 const reBreaking = new RegExp(`(${parserOptions.noteKeywords.join(")|(")})`);
+const commitParser = new CommitParser();
 class Release {
   packageDir;
   packageName;
@@ -81,12 +81,10 @@ class Release {
       const chunk = commit.trim();
       return chunk && (rePlugin.test(chunk) || reAll && reAll.test(chunk));
     }).map((commit) => {
-      const node = parser.sync(commit);
+      const node = commitParser.parse(commit);
       const body = node.body || node.footer;
-      if (!node.type)
-        node.type = parser.sync(node.header?.replace(/\(.+\)!?:/, ":") || "").type;
-      if (!node.hash)
-        node.hash = commit.split(HASH).pop()?.trim();
+      if (!node.type) node.type = commitParser.parse(node.header?.replace(/\(.+\)!?:/, ":") || "").type;
+      if (!node.hash) node.hash = commit.split(HASH).pop()?.trim();
       node.breaking = reBreaking.test(body) || /!:/.test(node.header);
       node.effect = false;
       node.custom = false;
@@ -103,15 +101,10 @@ class Release {
     if (commits.length && skipUpdatePackage) {
       let skip = false;
       if (typeof skipUpdatePackage === "boolean" && skipUpdatePackage) {
-        const result = await prompt([
-          {
-            type: "confirm",
-            name: "skip",
-            message: `Skip Update（${this.packageName}@${this.packageOptions.version}）：`,
-            default: true
-          }
-        ]);
-        skip = result.skip;
+        skip = await confirm({
+          message: `Skip Update（${this.packageName}@${this.packageOptions.version}）：`,
+          default: true
+        });
       } else if (typeof skipUpdatePackage === "string" && (skipUpdatePackage === "*" || skipUpdatePackage.split(",").includes(this.packageName))) {
         skip = true;
       }
@@ -127,15 +120,10 @@ class Release {
     if (!commits.length && forceUpdatePackage) {
       let force = false;
       if (typeof forceUpdatePackage === "boolean" && forceUpdatePackage) {
-        const result = await prompt([
-          {
-            type: "confirm",
-            name: "force",
-            message: `Force Update（${this.packageName}@${this.packageOptions.version}）：`,
-            default: true
-          }
-        ]);
-        force = result.force;
+        force = await confirm({
+          message: `Force Update（${this.packageName}@${this.packageOptions.version}）：`,
+          default: true
+        });
       } else if (typeof forceUpdatePackage === "string" && (forceUpdatePackage === "*" || forceUpdatePackage.split(",").includes(this.packageName))) {
         force = true;
       }
@@ -224,10 +212,8 @@ class Release {
     if (commandOptions.customVersion) {
       newVersion = commandOptions.customVersion;
       if (!/\d+.\d+.\d+/.test(newVersion) || version === newVersion) {
-        const result = await prompt([
+        newVersion = await input(
           {
-            type: "input",
-            name: "version",
             message: `Custom Update Version（${this.packageName}@${version}）：`,
             default: "",
             validate: (answer) => {
@@ -240,8 +226,7 @@ class Release {
               return true;
             }
           }
-        ]);
-        newVersion = result.version;
+        );
       }
     } else {
       const intersection = [
@@ -266,8 +251,7 @@ class Release {
     return !!this.commits.length;
   }
   async updateCommits(commits, source) {
-    if (!commits.length)
-      return;
+    if (!commits.length) return;
     const { packageName } = this;
     const olds = this.commits.map((i) => JSON.stringify({ ...i, effect: false }));
     const newCommits = commits.filter((i) => {
@@ -298,8 +282,7 @@ class Release {
     }
   }
   async updatePackageOptions(relationVerisons = {}) {
-    if (!this.isChanged())
-      return;
+    if (!this.isChanged()) return;
     const { packageDir, packageOptions, commandOptions } = this;
     const { dependencies, devDependencies } = packageOptions;
     const newVersion = this.version;
@@ -324,8 +307,7 @@ class Release {
     fs.outputFileSync(`${packageDir}/package.json`, JSON.stringify(packageOptions, null, 2));
   }
   async updateChangelog() {
-    if (!this.isChanged())
-      return;
+    if (!this.isChanged()) return;
     const { packageName, packageDir, packageOptions, commandOptions } = this;
     const title = `# ${packageName} ChangeLog`;
     const [date] = (/* @__PURE__ */ new Date()).toISOString().split("T");
@@ -345,13 +327,11 @@ ${newLog}`);
     }
     Logger.log(chalk.yellow(`Updating `) + `CHANGELOG.md`);
     let content = [title, newLog, oldNotes].filter(Boolean).join("\n\n");
-    if (!content.endsWith("\n"))
-      content += "\n";
+    if (!content.endsWith("\n")) content += "\n";
     fs.writeFileSync(logPath, content, "utf-8");
   }
   async test() {
-    if (!this.isChanged())
-      return;
+    if (!this.isChanged()) return;
     const { commandOptions } = this;
     if (commandOptions.dryRun) {
       Logger.log(chalk.yellow("Skipping Test"));
@@ -362,8 +342,7 @@ ${newLog}`);
     await Shell.exec(`npm run test -- --package-name ${this.packageName}`);
   }
   async build() {
-    if (!this.isChanged())
-      return;
+    if (!this.isChanged()) return;
     const { commandOptions } = this;
     if (commandOptions.dryRun) {
       Logger.log(chalk.yellow("Skipping Build"));
@@ -375,8 +354,7 @@ ${newLog}`);
   }
   async publish() {
     const { commandOptions } = this;
-    if (!this.isChanged() || !commandOptions.publish)
-      return;
+    if (!this.isChanged() || !commandOptions.publish) return;
     const { packageDir, packageName } = this;
     Logger.log(chalk.magenta(`PUBLISH: `) + packageName);
     if (commandOptions.dryRun) {
@@ -395,8 +373,7 @@ ${newLog}`);
   }
   async tag() {
     const { commandOptions } = this;
-    if (!this.isChanged() || !commandOptions.tag)
-      return;
+    if (!this.isChanged() || !commandOptions.tag) return;
     const { packageDir, packageName, packageOptions } = this;
     Logger.log(chalk.magenta(`TAG: `) + packageName);
     if (commandOptions.dryRun) {
@@ -420,12 +397,10 @@ ${newLog}`);
    */
   async cleanTagsAndKeepLastTag() {
     const { commandOptions } = this;
-    if (!commandOptions.keepLastTag)
-      return;
+    if (!commandOptions.keepLastTag) return;
     let tags = await this.getTags();
     tags = tags.slice(1).filter((i) => !!i).reverse();
-    if (!tags.length)
-      return;
+    if (!tags.length) return;
     const { packageName } = this;
     Logger.log(chalk.magenta(`CLEAN TAGS: `) + packageName);
     if (commandOptions.dryRun) {

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@deot/dev-releaser",
-  "version": "2.8.0",
+  "version": "2.9.1",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
-      "require": "./dist/index.cjs",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.cjs"
     }
   },
   "files": [
@@ -19,13 +19,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@deot/dev-shared": "^2.8.0",
-    "conventional-commits-parser": "^5.0.0",
-    "chalk": "^5.3.0",
-    "fs-extra": "^11.2.0",
-    "inquirer": "^9.2.12",
-    "inquirer-autocomplete-prompt": "^3.0.1",
-    "semver": "^7.5.4"
+    "@deot/dev-shared": "^2.9.1",
+    "conventional-commits-parser": "^6.1.0",
+    "chalk": "^5.4.1",
+    "fs-extra": "^11.3.0",
+    "inquirer": "^12.5.2",
+    "semver": "^7.7.1"
   },
   "devDependencies": {
     "cross-env": "^7.0.3"