bumpp 7.2.0 → 8.0.0

package/README.md

@@ -6,9 +6,13 @@ Forked from [`version-bump-prompt`](https://github.com/JS-DevTools/version-bump-
 
 ###### Changes in this fork
 
-- Renamed to `bumpp` - so you can use `npx bumpp` directly
-- Ships ESM and CJS bundles
-- Add a new argument `--execute` to execute the command before committing 
+- Renamed to `bumpp` - so you can use `npx bumpp` directly.
+- Ships ESM and CJS bundles.
+- Add a new argument `--execute` to execute the command before committing.
+- Use current version's `preid` when avaliable.
+- Confirmation before bumping.
+- Enable `--commit` `--tag` `--push` by default. (opt-out by `--no-push`, etc.)
+- Conventional Commits by default. 
 
 <details>
 <summary>Original README</summary>
@@ -25,10 +29,6 @@ Forked from [`version-bump-prompt`](https://github.com/JS-DevTools/version-bump-
 [![License](https://img.shields.io/npm/l/@jsdevtools/version-bump-prompt.svg)](LICENSE)
 [![Buy us a tree](https://img.shields.io/badge/Treeware-%F0%9F%8C%B3-lightgreen)](https://plant.treeware.earth/JS-DevTools/version-bump-prompt)
 
-![Screenshot](https://jstools.dev/version-bump-prompt/img/screenshot.gif)
-
-
-
 ### Automate your release process with a single command that can:
 
 - Prompt for the type of version bump

package/bin/bumpp.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-"use strict";
-const { main } = require("../dist/cli");
-main(process.argv.slice(2));
+'use strict'
+const { main } = require('../dist/cli')
+main(process.argv.slice(2))

package/dist/{chunk-2TP63A7S.mjs → chunk-HM6FRF4P.mjs}

@@ -127,7 +127,7 @@ var require_detect_newline = __commonJS({
 // src/release-type.ts
 init_esm_shims();
 import { ReleaseType } from "semver";
-var prereleaseTypes = ["prerelease"];
+var prereleaseTypes = ["premajor", "preminor", "prepatch", "prerelease"];
 var releaseTypes = prereleaseTypes.concat(["major", "minor", "patch"]);
 function isPrerelease(value) {
   return prereleaseTypes.includes(value);
@@ -147,33 +147,34 @@ var ProgressEvent = /* @__PURE__ */ ((ProgressEvent2) => {
   ProgressEvent2["NpmScript"] = "npm script";
   return ProgressEvent2;
 })(ProgressEvent || {});
-var NpmScript = /* @__PURE__ */ ((NpmScript3) => {
-  NpmScript3["PreVersion"] = "preversion";
-  NpmScript3["Version"] = "version";
-  NpmScript3["PostVersion"] = "postversion";
-  return NpmScript3;
+var NpmScript = /* @__PURE__ */ ((NpmScript2) => {
+  NpmScript2["PreVersion"] = "preversion";
+  NpmScript2["Version"] = "version";
+  NpmScript2["PostVersion"] = "postversion";
+  return NpmScript2;
 })(NpmScript || {});
 
 // src/version-bump.ts
 init_esm_shims();
+var import_log_symbols = __toESM(require_log_symbols());
 import * as ezSpawn3 from "@jsdevtools/ez-spawn";
+import { bold as bold2, cyan, green as green2 } from "chalk";
+import prompts2 from "prompts";
 
 // src/get-new-version.ts
 init_esm_shims();
 import { bold, green } from "chalk";
 import prompts from "prompts";
-import { valid as isValidVersion, clean as cleanVersion } from "semver";
-import semver, { SemVer } from "semver";
+import semver, { SemVer, clean as cleanVersion, valid as isValidVersion } from "semver";
 async function getNewVersion(operation) {
-  let { release } = operation.options;
-  let { oldVersion } = operation.state;
+  const { release } = operation.options;
+  const { oldVersion } = operation.state;
   switch (release.type) {
     case "prompt":
       return promptForNewVersion(operation);
     case "version":
-      let newSemVer = new SemVer(release.version, true);
       return operation.update({
-        newVersion: newSemVer.version
+        newVersion: new SemVer(release.version, true).version
       });
     default:
       return operation.update({
@@ -183,8 +184,8 @@ async function getNewVersion(operation) {
   }
 }
 function getNextVersion(oldVersion, bump) {
-  let oldSemVer = new SemVer(oldVersion);
-  let newSemVer = oldSemVer.inc(bump.type, bump.preid);
+  const oldSemVer = new SemVer(oldVersion);
+  const newSemVer = oldSemVer.inc(bump.type, bump.preid);
   if (isPrerelease(bump.type) && newSemVer.prerelease.length === 2 && newSemVer.prerelease[0] === bump.preid && String(newSemVer.prerelease[1]) === "0") {
     newSemVer.prerelease[1] = "1";
     newSemVer.format();
@@ -193,36 +194,34 @@ function getNextVersion(oldVersion, bump) {
 }
 function getNextVersions(oldVersion, preid) {
   var _a;
-  let next = {};
+  const next = {};
   const parse = semver.parse(oldVersion);
-  if (typeof (parse == null ? void 0 : parse.prerelease[0]) === "string") {
+  if (typeof (parse == null ? void 0 : parse.prerelease[0]) === "string")
     preid = (parse == null ? void 0 : parse.prerelease[0]) || "preid";
-  }
-  for (let type of releaseTypes) {
+  for (const type of releaseTypes)
     next[type] = semver.inc(oldVersion, type, preid);
-  }
   next.next = ((_a = parse == null ? void 0 : parse.prerelease) == null ? void 0 : _a.length) ? semver.inc(oldVersion, "prerelease", preid) : semver.inc(oldVersion, "patch");
   return next;
 }
 async function promptForNewVersion(operation) {
-  let { oldVersion } = operation.state;
-  let release = operation.options.release;
-  let next = getNextVersions(oldVersion, release.preid);
-  let answers;
-  answers = await prompts([
+  const { oldVersion } = operation.state;
+  const release = operation.options.release;
+  const next = getNextVersions(oldVersion, release.preid);
+  const PADDING = 13;
+  const answers = await prompts([
     {
       type: "autocomplete",
       name: "release",
-      message: `Current version: ${green(oldVersion)}`,
+      message: `Current version ${green(oldVersion)}`,
       initial: "next",
       choices: [
-        { value: "major", title: "major - " + bold(next.major) },
-        { value: "minor", title: "minor - " + bold(next.minor) },
-        { value: "patch", title: "patch - " + bold(next.patch) },
-        { value: "next", title: "next - " + bold(next.next) },
-        { value: "prerelease", title: "pre-release - " + bold(next.prerelease) },
-        { value: "none", title: "as-is - " + bold(oldVersion) },
-        { value: "custom", title: "custom..." }
+        { value: "major", title: `${"major".padStart(PADDING, " ")} ${bold(next.major)}` },
+        { value: "minor", title: `${"minor".padStart(PADDING, " ")} ${bold(next.minor)}` },
+        { value: "patch", title: `${"patch".padStart(PADDING, " ")} ${bold(next.patch)}` },
+        { value: "next", title: `${"next".padStart(PADDING, " ")} ${bold(next.next)}` },
+        { value: "prerelease", title: `${"pre-release".padStart(PADDING, " ")} ${bold(next.prerelease)}` },
+        { value: "none", title: `${"as-is".padStart(PADDING, " ")} ${bold(oldVersion)}` },
+        { value: "custom", title: "custom ...".padStart(PADDING + 4, " ") }
       ]
     },
     {
@@ -236,11 +235,11 @@ async function promptForNewVersion(operation) {
     }
   ]);
   const newVersion = answers.release === "none" ? oldVersion : answers.release === "custom" ? cleanVersion(answers.custom) : next[answers.release];
-  if (!newVersion) {
+  if (!newVersion)
     process.exit(1);
-  }
   switch (answers.release) {
     case "custom":
+    case "next":
     case "none":
       return operation.update({ newVersion });
     default:
@@ -254,6 +253,8 @@ import { valid as isValidVersion2 } from "semver";
 
 // src/fs.ts
 init_esm_shims();
+import fs from "fs";
+import path from "path";
 
 // node_modules/.pnpm/detect-indent@7.0.0/node_modules/detect-indent/index.js
 init_esm_shims();
@@ -355,25 +356,22 @@ function detectIndent(string) {
 
 // src/fs.ts
 var import_detect_newline = __toESM(require_detect_newline());
-import fs from "fs";
-import path from "path";
 async function readJsonFile(name, cwd) {
-  let file = await readTextFile(name, cwd);
-  let data = JSON.parse(file.data);
-  let indent = detectIndent(file.data).indent;
-  let newline = (0, import_detect_newline.default)(file.data);
+  const file = await readTextFile(name, cwd);
+  const data = JSON.parse(file.data);
+  const indent = detectIndent(file.data).indent;
+  const newline = (0, import_detect_newline.default)(file.data);
   return __spreadProps(__spreadValues({}, file), { data, indent, newline });
 }
 async function writeJsonFile(file) {
   let json = JSON.stringify(file.data, void 0, file.indent);
-  if (file.newline) {
+  if (file.newline)
     json += file.newline;
-  }
   return writeTextFile(__spreadProps(__spreadValues({}, file), { data: json }));
 }
 function readTextFile(name, cwd) {
   return new Promise((resolve, reject) => {
-    let filePath = path.join(cwd, name);
+    const filePath = path.join(cwd, name);
     fs.readFile(filePath, "utf8", (err, text) => {
       if (err) {
         reject(err);
@@ -389,11 +387,10 @@ function readTextFile(name, cwd) {
 function writeTextFile(file) {
   return new Promise((resolve, reject) => {
     fs.writeFile(file.path, file.data, (err) => {
-      if (err) {
+      if (err)
         reject(err);
-      } else {
+      else
         resolve();
-      }
     });
   });
 }
@@ -404,19 +401,18 @@ function isManifest(obj) {
   return obj && typeof obj === "object" && isOptionalString(obj.name) && isOptionalString(obj.version) && isOptionalString(obj.description);
 }
 function isOptionalString(value) {
-  let type = typeof value;
+  const type = typeof value;
   return value === null || type === "undefined" || type === "string";
 }
 
 // src/get-old-version.ts
 async function getOldVersion(operation) {
-  let { cwd, files } = operation.options;
-  let filesToCheck = files.filter((file) => file.endsWith(".json"));
-  if (!filesToCheck.includes("package.json")) {
+  const { cwd, files } = operation.options;
+  const filesToCheck = files.filter((file) => file.endsWith(".json"));
+  if (!filesToCheck.includes("package.json"))
     filesToCheck.push("package.json");
-  }
-  for (let file of filesToCheck) {
-    let version = await readVersion(file, cwd);
+  for (const file of filesToCheck) {
+    const version = await readVersion(file, cwd);
     if (version) {
       return operation.update({
         oldVersionSource: file,
@@ -428,11 +424,10 @@ async function getOldVersion(operation) {
 }
 async function readVersion(file, cwd) {
   try {
-    let { data: manifest } = await readJsonFile(file, cwd);
+    const { data: manifest } = await readJsonFile(file, cwd);
     if (isManifest(manifest)) {
-      if (isValidVersion2(manifest.version)) {
+      if (isValidVersion2(manifest.version))
         return manifest.version;
-      }
     }
   } catch (error) {
     return void 0;
@@ -443,11 +438,10 @@ async function readVersion(file, cwd) {
 init_esm_shims();
 import * as ezSpawn from "@jsdevtools/ez-spawn";
 async function gitCommit(operation) {
-  if (!operation.options.commit) {
+  if (!operation.options.commit)
     return operation;
-  }
-  let { all, noVerify, message } = operation.options.commit;
-  let { updatedFiles, newVersion } = operation.state;
+  const { all, noVerify, message } = operation.options.commit;
+  const { updatedFiles, newVersion } = operation.state;
   let args = [];
   if (all) {
     args.push("--all");
@@ -455,34 +449,31 @@ async function gitCommit(operation) {
   if (noVerify) {
     args.push("--no-verify");
   }
-  let commitMessage = formatVersionString(message, newVersion);
+  const commitMessage = formatVersionString(message, newVersion);
   args.push("--message", commitMessage);
-  if (!all) {
+  if (!all)
     args = args.concat(updatedFiles);
-  }
   await ezSpawn.async("git", ["commit", ...args]);
   return operation.update({ event: "git commit" /* GitCommit */, commitMessage });
 }
 async function gitTag(operation) {
-  if (!operation.options.tag) {
+  if (!operation.options.tag)
     return operation;
-  }
-  let { commit, tag } = operation.options;
-  let { newVersion } = operation.state;
-  let args = [
+  const { commit, tag } = operation.options;
+  const { newVersion } = operation.state;
+  const args = [
     "--annotate",
     "--message",
     formatVersionString(commit.message, newVersion)
   ];
-  let tagName = formatVersionString(tag.name, newVersion);
+  const tagName = formatVersionString(tag.name, newVersion);
   args.push(tagName);
   await ezSpawn.async("git", ["tag", ...args]);
   return operation.update({ event: "git tag" /* GitTag */, tagName });
 }
 async function gitPush(operation) {
-  if (!operation.options.push) {
+  if (!operation.options.push)
     return operation;
-  }
   await ezSpawn.async("git", "push");
   if (operation.options.tag) {
     await ezSpawn.async("git", ["push", "--tags"]);
@@ -490,11 +481,10 @@ async function gitPush(operation) {
   return operation.update({ event: "git push" /* GitPush */ });
 }
 function formatVersionString(template, newVersion) {
-  if (template.includes("%s")) {
+  if (template.includes("%s"))
     return template.replace(/%s/g, newVersion);
-  } else {
+  else
     return template + newVersion;
-  }
 }
 
 // src/operation.ts
@@ -502,36 +492,32 @@ init_esm_shims();
 
 // src/normalize-options.ts
 init_esm_shims();
-import globby from "globby";
-import { hasMagic } from "globby";
+import globby, { hasMagic } from "globby";
 async function normalizeOptions(raw) {
-  let preid = typeof raw.preid === "string" ? raw.preid : "beta";
-  let push = Boolean(raw.push);
-  let all = Boolean(raw.all);
-  let noVerify = Boolean(raw.noVerify);
-  let cwd = raw.cwd || process.cwd();
-  let ignoreScripts = Boolean(raw.ignoreScripts);
-  let execute = raw.execute;
+  const preid = typeof raw.preid === "string" ? raw.preid : "beta";
+  const push = Boolean(raw.push);
+  const all = Boolean(raw.all);
+  const noVerify = Boolean(raw.noVerify);
+  const cwd = raw.cwd || process.cwd();
+  const ignoreScripts = Boolean(raw.ignoreScripts);
+  const execute = raw.execute;
   let release;
-  if (!raw.release || raw.release === "prompt") {
+  if (!raw.release || raw.release === "prompt")
     release = { type: "prompt", preid };
-  } else if (isReleaseType(raw.release)) {
+  else if (isReleaseType(raw.release))
     release = { type: raw.release, preid };
-  } else {
+  else
     release = { type: "version", version: raw.release };
-  }
   let tag;
-  if (typeof raw.tag === "string") {
+  if (typeof raw.tag === "string")
     tag = { name: raw.tag };
-  } else if (raw.tag) {
+  else if (raw.tag)
     tag = { name: "v" };
-  }
   let commit;
-  if (typeof raw.commit === "string") {
+  if (typeof raw.commit === "string")
     commit = { all, noVerify, message: raw.commit };
-  } else if (raw.commit || tag || push) {
-    commit = { all, noVerify, message: "release v" };
-  }
+  else if (raw.commit || tag || push)
+    commit = { all, noVerify, message: "chore: release v" };
   let files;
   if (Array.isArray(raw.files) && raw.files.length > 0) {
     files = await strictGlobMatches(raw.files, { cwd });
@@ -545,37 +531,32 @@ async function normalizeOptions(raw) {
     ui = { input: process.stdin, output: process.stdout };
   } else {
     let _a = raw.interface, { input, output } = _a, other = __objRest(_a, ["input", "output"]);
-    if (input === true || input !== false && !input) {
+    if (input === true || input !== false && !input)
       input = process.stdin;
-    }
-    if (output === true || output !== false && !output) {
+    if (output === true || output !== false && !output)
       output = process.stdout;
-    }
     ui = __spreadValues({ input, output }, other);
   }
-  if (release.type === "prompt" && !(ui.input && ui.output)) {
+  if (release.type === "prompt" && !(ui.input && ui.output))
     throw new Error("Cannot prompt for the version number because input or output has been disabled.");
-  }
   return { release, commit, tag, push, files, cwd, interface: ui, ignoreScripts, execute };
 }
 async function strictGlobMatches(files, options) {
-  let matches = await Promise.all(files.map((file) => strictGlobMatch(file, options)));
-  let matchedFiles = /* @__PURE__ */ new Set();
-  for (let match of matches) {
-    for (let file of match) {
+  const matches = await Promise.all(files.map((file) => strictGlobMatch(file, options)));
+  const matchedFiles = /* @__PURE__ */ new Set();
+  for (const match of matches) {
+    for (const file of match)
       matchedFiles.add(file);
-    }
   }
   return [...matchedFiles];
 }
 async function strictGlobMatch(file, options) {
-  let matches = await globby(file, options);
+  const matches = await globby(file, options);
   if (matches.length === 0) {
-    if (hasMagic(file)) {
+    if (hasMagic(file))
       throw new Error(`Could not find any files matching "${file}".`);
-    } else {
+    else
       throw new Error(`Could not find file: ${file}.`);
-    }
   }
   return matches.sort();
 }
@@ -597,8 +578,8 @@ var Operation = class {
     this._progress = progress;
   }
   get results() {
-    let options = this.options;
-    let state = this.state;
+    const options = this.options;
+    const state = this.state;
     return {
       release: state.release,
       oldVersion: state.oldVersion,
@@ -610,7 +591,7 @@ var Operation = class {
     };
   }
   static async start(input) {
-    let options = await normalizeOptions(input);
+    const options = await normalizeOptions(input);
     return new Operation(options, input.progress);
   }
   update(_a) {
@@ -627,9 +608,9 @@ var Operation = class {
 init_esm_shims();
 import * as ezSpawn2 from "@jsdevtools/ez-spawn";
 async function runNpmScript(script, operation) {
-  let { cwd, ignoreScripts } = operation.options;
+  const { cwd, ignoreScripts } = operation.options;
   if (!ignoreScripts) {
-    let { data: manifest } = await readJsonFile("package.json", cwd);
+    const { data: manifest } = await readJsonFile("package.json", cwd);
     if (isManifest(manifest) && hasScript(manifest, script)) {
       await ezSpawn2.async("npm", ["run", script, "--silent"], { stdio: "inherit" });
       operation.update({ event: "npm script" /* NpmScript */, script });
@@ -638,10 +619,9 @@ async function runNpmScript(script, operation) {
   return operation;
 }
 function hasScript(manifest, script) {
-  let scripts = manifest.scripts;
-  if (scripts && typeof scripts === "object") {
+  const scripts = manifest.scripts;
+  if (scripts && typeof scripts === "object")
     return Boolean(scripts[script]);
-  }
   return false;
 }
 
@@ -649,9 +629,9 @@ function hasScript(manifest, script) {
 init_esm_shims();
 import * as path2 from "path";
 async function updateFiles(operation) {
-  let { files } = operation.options;
-  for (let relPath of files) {
-    let modified = await updateFile(relPath, operation);
+  const { files } = operation.options;
+  for (const relPath of files) {
+    const modified = await updateFile(relPath, operation);
     if (modified) {
       operation.update({
         event: "file updated" /* FileUpdated */,
@@ -667,7 +647,7 @@ async function updateFiles(operation) {
   return operation;
 }
 async function updateFile(relPath, operation) {
-  let name = path2.basename(relPath).trim().toLowerCase();
+  const name = path2.basename(relPath).trim().toLowerCase();
   switch (name) {
     case "package.json":
     case "package-lock.json":
@@ -679,10 +659,10 @@ async function updateFile(relPath, operation) {
   }
 }
 async function updateManifestFile(relPath, operation) {
-  let { cwd } = operation.options;
-  let { newVersion } = operation.state;
+  const { cwd } = operation.options;
+  const { newVersion } = operation.state;
   let modified = false;
-  let file = await readJsonFile(relPath, cwd);
+  const file = await readJsonFile(relPath, cwd);
   if (isManifest(file.data) && file.data.version !== newVersion) {
     file.data.version = newVersion;
     await writeJsonFile(file);
@@ -691,14 +671,14 @@ async function updateManifestFile(relPath, operation) {
   return modified;
 }
 async function updateTextFile(relPath, operation) {
-  let { cwd } = operation.options;
-  let { oldVersion, newVersion } = operation.state;
-  let modified = false;
-  let file = await readTextFile(relPath, cwd);
+  const { cwd } = operation.options;
+  const { oldVersion, newVersion } = operation.state;
+  const modified = false;
+  const file = await readTextFile(relPath, cwd);
   if (file.data.includes(oldVersion)) {
-    let sanitizedVersion = oldVersion.replace(/(\W)/g, "\\$1");
-    let replacePattern = new RegExp("(\\b|v)" + sanitizedVersion + "\\b", "g");
-    file.data = file.data.replace(replacePattern, "$1" + newVersion);
+    const sanitizedVersion = oldVersion.replace(/(\W)/g, "\\$1");
+    const replacePattern = new RegExp(`(\\b|v)${sanitizedVersion}\\b`, "g");
+    file.data = file.data.replace(replacePattern, `$1${newVersion}`);
     await writeTextFile(file);
     return true;
   }
@@ -706,14 +686,34 @@ async function updateTextFile(relPath, operation) {
 }
 
 // src/version-bump.ts
-var import_log_symbols = __toESM(require_log_symbols());
 async function versionBump(arg = {}) {
-  if (typeof arg === "string") {
+  if (typeof arg === "string")
     arg = { release: arg };
-  }
-  let operation = await Operation.start(arg);
+  const operation = await Operation.start(arg);
   await getOldVersion(operation);
   await getNewVersion(operation);
+  if (arg.confirm) {
+    console.log();
+    console.log(`   files ${operation.options.files.map((i) => bold2(i)).join(", ")}`);
+    if (operation.options.commit)
+      console.log(`  commit ${bold2(formatVersionString(operation.options.commit.message, operation.state.newVersion))}`);
+    if (operation.options.tag)
+      console.log(`     tag ${bold2(formatVersionString(operation.options.tag.name, operation.state.newVersion))}`);
+    if (operation.options.execute)
+      console.log(` execute ${bold2(operation.options.execute)}`);
+    if (operation.options.push)
+      console.log(`    push ${cyan(bold2("yes"))}`);
+    console.log();
+    console.log(`    from ${bold2(operation.state.oldVersion)}`);
+    console.log(`      to ${green2(bold2(operation.state.newVersion))}`);
+    console.log();
+    if (!await prompts2({
+      name: "yes",
+      type: "confirm",
+      message: "Bump"
+    }).then((r) => r.yes))
+      return;
+  }
   await runNpmScript("preversion" /* PreVersion */, operation);
   await updateFiles(operation);
   if (operation.options.execute) {
@@ -732,10 +732,10 @@ async function versionBump(arg = {}) {
 export {
   __toESM,
   init_esm_shims,
+  require_log_symbols,
   ReleaseType,
   isReleaseType,
   ProgressEvent,
   NpmScript,
-  require_log_symbols,
   versionBump
 };