bumpp 9.3.1 → 9.4.1

package/dist/index.d.ts

@@ -1,5 +1,6 @@
-import _semver, { ReleaseType } from 'semver';
-export { ReleaseType } from 'semver';
+import _semver, { ReleaseType as ReleaseType$1 } from 'semver';
+
+type ReleaseType = ReleaseType$1 | 'next';
 
 /**
  * Information about the work that was performed by the `versionBump()` function.
@@ -12,7 +13,7 @@ interface VersionBumpResults {
     /**
      * The previous version number in package.json.
      */
-    oldVersion: string;
+    currentVersion: string;
     /**
      * The new version number.
      */
@@ -82,6 +83,11 @@ interface VersionBumpOptions {
      * Defaults to "prompt".
      */
     release?: string;
+    /**
+     * The current version number to be bumpped.
+     * If not provide, it will be read from the first file in the `files` array.
+     */
+    currentVersion?: string;
     /**
      * The prerelease type (e.g. "alpha", "beta", "next").
      *
@@ -94,7 +100,7 @@ interface VersionBumpOptions {
      * with the new version number.  If the message string does _not_ contain any `%s` placeholders,
      * then the new version number will be appended to the message.
      *
-     * Defaults to `false`.
+     * Defaults to `true`.
      */
     commit?: boolean | string;
     /**
@@ -103,13 +109,13 @@ interface VersionBumpOptions {
      * with the new version number.  If the tag string does _not_ contain any `%s` placeholders,
      * then the new version number will be appended to the tag.
      *
-     * Defaults to `false`.
+     * Defaults to `true`.
      */
     tag?: boolean | string;
     /**
      * Indicates whether to push the git commit and tag.
      *
-     * Defaults to `false`.
+     * Defaults to `true`.
      */
     push?: boolean;
     /**
@@ -122,7 +128,7 @@ interface VersionBumpOptions {
     /**
      * Prompt for confirmation
      *
-     * @default false
+     * @default true
      */
     confirm?: boolean;
     /**
@@ -165,7 +171,7 @@ interface VersionBumpOptions {
     /**
      * A callback that is provides information about the progress of the `versionBump()` function.
      */
-    progress?(progress: VersionBumpProgress): void;
+    progress?: (progress: VersionBumpProgress) => void;
     /**
      * Excute additional command after bumping and before commiting
      */
@@ -263,12 +269,13 @@ interface NormalizedOptions {
     ignoreScripts: boolean;
     execute?: string;
     customVersion?: VersionBumpOptions['customVersion'];
+    currentVersion?: string;
 }
 
 interface OperationState {
     release: ReleaseType | undefined;
-    oldVersionSource: string;
-    oldVersion: string;
+    currentVersionSource: string;
+    currentVersion: string;
     newVersion: string;
     commitMessage: string;
     tagName: string;
@@ -344,4 +351,4 @@ declare const bumpConfigDefaults: VersionBumpOptions;
 declare function loadBumpConfig(overrides?: Partial<VersionBumpOptions>, cwd?: string): Promise<VersionBumpOptions>;
 declare function defineConfig(config: Partial<VersionBumpOptions>): Partial<VersionBumpOptions>;
 
-export { type InterfaceOptions, NpmScript, ProgressEvent, type VersionBumpOptions, type VersionBumpProgress, type VersionBumpResults, bumpConfigDefaults, versionBump as default, defineConfig, loadBumpConfig, versionBump, versionBumpInfo };
+export { type InterfaceOptions, NpmScript, ProgressEvent, type ReleaseType, type VersionBumpOptions, type VersionBumpProgress, type VersionBumpResults, bumpConfigDefaults, versionBump as default, defineConfig, loadBumpConfig, versionBump, versionBumpInfo };

package/dist/index.js

@@ -60,7 +60,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 
 // node_modules/.pnpm/picocolors@1.0.0/node_modules/picocolors/picocolors.js
 var require_picocolors = __commonJS({
-  "node_modules/.pnpm/picocolors@1.0.0/node_modules/picocolors/picocolors.js"(exports, module2) {
+  "node_modules/.pnpm/picocolors@1.0.0/node_modules/picocolors/picocolors.js"(exports2, module2) {
     var tty2 = require("tty");
     var isColorSupported = !("NO_COLOR" in process.env || process.argv.includes("--no-color")) && ("FORCE_COLOR" in process.env || process.argv.includes("--color") || process.platform === "win32" || tty2.isatty(1) && process.env.TERM !== "dumb" || "CI" in process.env);
     var formatter = (open, close, replace = open) => (input) => {
@@ -649,7 +649,7 @@ var import_semver = __toESM(require("semver"));
 
 // src/release-type.ts
 var prereleaseTypes = ["premajor", "preminor", "prepatch", "prerelease"];
-var releaseTypes = prereleaseTypes.concat(["major", "minor", "patch"]);
+var releaseTypes = prereleaseTypes.concat(["major", "minor", "patch", "next"]);
 function isPrerelease(value) {
   return prereleaseTypes.includes(value);
 }
@@ -660,7 +660,7 @@ function isReleaseType(value) {
 // src/get-new-version.ts
 async function getNewVersion(operation) {
   const { release } = operation.options;
-  const { oldVersion } = operation.state;
+  const { currentVersion } = operation.state;
   switch (release.type) {
     case "prompt":
       return promptForNewVersion(operation);
@@ -671,42 +671,41 @@ async function getNewVersion(operation) {
     default:
       return operation.update({
         release: release.type,
-        newVersion: getNextVersion(oldVersion, release)
+        newVersion: getNextVersion(currentVersion, release)
       });
   }
 }
-function getNextVersion(oldVersion, bump) {
-  const oldSemVer = new import_semver.SemVer(oldVersion);
-  const newSemVer = oldSemVer.inc(bump.type, bump.preid);
+function getNextVersion(currentVersion, bump) {
+  const oldSemVer = new import_semver.SemVer(currentVersion);
+  const type = bump.type === "next" ? oldSemVer.prerelease.length ? "prerelease" : "patch" : bump.type;
+  const newSemVer = oldSemVer.inc(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();
   }
   return newSemVer.version;
 }
-function getNextVersions(oldVersion, preid) {
-  var _a;
+function getNextVersions(currentVersion, preid) {
   const next = {};
-  const parse = import_semver.default.parse(oldVersion);
+  const parse = import_semver.default.parse(currentVersion);
   if (typeof (parse == null ? void 0 : parse.prerelease[0]) === "string")
     preid = (parse == null ? void 0 : parse.prerelease[0]) || "preid";
   for (const type of releaseTypes)
-    next[type] = import_semver.default.inc(oldVersion, type, preid);
-  next.next = ((_a = parse == null ? void 0 : parse.prerelease) == null ? void 0 : _a.length) ? import_semver.default.inc(oldVersion, "prerelease", preid) : import_semver.default.inc(oldVersion, "patch");
+    next[type] = getNextVersion(currentVersion, { type, preid });
   return next;
 }
 async function promptForNewVersion(operation) {
   var _a, _b;
-  const { oldVersion } = operation.state;
+  const { currentVersion } = operation.state;
   const release = operation.options.release;
-  const next = getNextVersions(oldVersion, release.preid);
-  const configCustomVersion = await ((_b = (_a = operation.options).customVersion) == null ? void 0 : _b.call(_a, oldVersion, import_semver.default));
+  const next = getNextVersions(currentVersion, release.preid);
+  const configCustomVersion = await ((_b = (_a = operation.options).customVersion) == null ? void 0 : _b.call(_a, currentVersion, import_semver.default));
   const PADDING = 13;
   const answers = await (0, import_prompts.default)([
     {
       type: "autocomplete",
       name: "release",
-      message: `Current version ${import_picocolors.default.green(oldVersion)}`,
+      message: `Current version ${import_picocolors.default.green(currentVersion)}`,
       initial: configCustomVersion ? "config" : "next",
       choices: [
         { value: "major", title: `${"major".padStart(PADDING, " ")} ${import_picocolors.default.bold(next.major)}` },
@@ -719,7 +718,7 @@ async function promptForNewVersion(operation) {
         { value: "prepatch", title: `${"pre-patch".padStart(PADDING, " ")} ${import_picocolors.default.bold(next.prepatch)}` },
         { value: "preminor", title: `${"pre-minor".padStart(PADDING, " ")} ${import_picocolors.default.bold(next.preminor)}` },
         { value: "premajor", title: `${"pre-major".padStart(PADDING, " ")} ${import_picocolors.default.bold(next.premajor)}` },
-        { value: "none", title: `${"as-is".padStart(PADDING, " ")} ${import_picocolors.default.bold(oldVersion)}` },
+        { value: "none", title: `${"as-is".padStart(PADDING, " ")} ${import_picocolors.default.bold(currentVersion)}` },
         { value: "custom", title: "custom ...".padStart(PADDING + 4, " ") }
       ]
     },
@@ -727,13 +726,13 @@ async function promptForNewVersion(operation) {
       type: (prev) => prev === "custom" ? "text" : null,
       name: "custom",
       message: "Enter the new version number:",
-      initial: oldVersion,
+      initial: currentVersion,
       validate: (custom) => {
         return (0, import_semver.valid)(custom) ? true : "That's not a valid version number";
       }
     }
   ]);
-  const newVersion = answers.release === "none" ? oldVersion : answers.release === "custom" ? (0, import_semver.clean)(answers.custom) : answers.release === "config" ? (0, import_semver.clean)(configCustomVersion) : next[answers.release];
+  const newVersion = answers.release === "none" ? currentVersion : answers.release === "custom" ? (0, import_semver.clean)(answers.custom) : answers.release === "config" ? (0, import_semver.clean)(configCustomVersion) : next[answers.release];
   if (!newVersion)
     import_node_process3.default.exit(1);
   switch (answers.release) {
@@ -747,7 +746,7 @@ async function promptForNewVersion(operation) {
   }
 }
 
-// src/get-old-version.ts
+// src/get-current-version.ts
 var import_semver2 = require("semver");
 
 // src/fs.ts
@@ -921,8 +920,10 @@ function isOptionalString(value) {
   return value === null || type === "undefined" || type === "string";
 }
 
-// src/get-old-version.ts
-async function getOldVersion(operation) {
+// src/get-current-version.ts
+async function getCurrentVersion(operation) {
+  if (operation.state.currentVersion)
+    return operation;
   const { cwd, files } = operation.options;
   const filesToCheck = files.filter((file) => file.endsWith(".json"));
   if (!filesToCheck.includes("package.json"))
@@ -931,8 +932,8 @@ async function getOldVersion(operation) {
     const version = await readVersion(file, cwd);
     if (version) {
       return operation.update({
-        oldVersionSource: file,
-        oldVersion: version
+        currentVersionSource: file,
+        currentVersion: version
       });
     }
   }
@@ -1028,9 +1029,12 @@ function formatVersionString(template, newVersion) {
 
 // src/normalize-options.ts
 var import_node_process4 = __toESM(require("process"));
+var import_promises = __toESM(require("fs/promises"));
+var import_node_fs2 = __toESM(require("fs"));
 var import_fast_glob = __toESM(require("fast-glob"));
+var import_js_yaml = __toESM(require("js-yaml"));
 async function normalizeOptions(raw) {
-  var _a;
+  var _a, _b;
   const preid = typeof raw.preid === "string" ? raw.preid : "beta";
   const push = Boolean(raw.push);
   const all = Boolean(raw.all);
@@ -1038,10 +1042,11 @@ async function normalizeOptions(raw) {
   const cwd = raw.cwd || import_node_process4.default.cwd();
   const ignoreScripts = Boolean(raw.ignoreScripts);
   const execute = raw.execute;
+  const recursive = Boolean(raw.recursive);
   let release;
   if (!raw.release || raw.release === "prompt")
     release = { type: "prompt", preid };
-  else if (isReleaseType(raw.release))
+  else if (isReleaseType(raw.release) || raw.release === "next")
     release = { type: raw.release, preid };
   else
     release = { type: "version", version: raw.release };
@@ -1055,8 +1060,29 @@ async function normalizeOptions(raw) {
     commit = { all, noVerify, message: raw.commit };
   else if (raw.commit || tag || push)
     commit = { all, noVerify, message: "chore: release v" };
+  if (recursive && !((_a = raw.files) == null ? void 0 : _a.length)) {
+    raw.files = [
+      "package.json",
+      "package-lock.json",
+      "packages/**/package.json",
+      "jsr.json",
+      "jsr.jsonc"
+    ];
+    if (import_node_fs2.default.existsSync("pnpm-workspace.yaml")) {
+      const pnpmWorkspace = await import_promises.default.readFile("pnpm-workspace.yaml", "utf8");
+      const workspaces = import_js_yaml.default.load(pnpmWorkspace);
+      const workspacesWithPackageJson = workspaces.packages.map((workspace) => `${workspace}/package.json`);
+      const withoutExcludedWorkspaces = workspacesWithPackageJson.filter((workspace) => {
+        var _a2;
+        return !workspace.startsWith("!") && !((_a2 = raw.files) == null ? void 0 : _a2.includes(workspace));
+      });
+      raw.files = raw.files.concat(withoutExcludedWorkspaces);
+    }
+  } else {
+    raw.files = ((_b = raw.files) == null ? void 0 : _b.length) ? raw.files : ["package.json", "package-lock.json", "jsr.json", "jsr.jsonc"];
+  }
   const files = await (0, import_fast_glob.default)(
-    ((_a = raw.files) == null ? void 0 : _a.length) ? raw.files : ["package.json", "package-lock.json", "jsr.json", "jsr.jsonc"],
+    raw.files,
     {
       cwd,
       onlyFiles: true,
@@ -1071,7 +1097,7 @@ async function normalizeOptions(raw) {
   } else if (raw.interface === true || !raw.interface) {
     ui = { input: import_node_process4.default.stdin, output: import_node_process4.default.stdout };
   } else {
-    let _b = raw.interface, { input, output } = _b, other = __objRest(_b, ["input", "output"]);
+    let _c = raw.interface, { input, output } = _c, other = __objRest(_c, ["input", "output"]);
     if (input === true || input !== false && !input)
       input = import_node_process4.default.stdin;
     if (output === true || output !== false && !output)
@@ -1090,7 +1116,8 @@ async function normalizeOptions(raw) {
     interface: ui,
     ignoreScripts,
     execute,
-    customVersion: raw.customVersion
+    customVersion: raw.customVersion,
+    currentVersion: raw.currentVersion
   };
 }
 
@@ -1105,8 +1132,8 @@ var Operation = class _Operation {
      */
     this.state = {
       release: void 0,
-      oldVersion: "",
-      oldVersionSource: "",
+      currentVersion: "",
+      currentVersionSource: "",
       newVersion: "",
       commitMessage: "",
       tagName: "",
@@ -1115,6 +1142,12 @@ var Operation = class _Operation {
     };
     this.options = options;
     this._progress = progress;
+    if (options.currentVersion) {
+      this.update({
+        currentVersion: options.currentVersion,
+        currentVersionSource: "user"
+      });
+    }
   }
   /**
    * The results of the operation.
@@ -1124,7 +1157,7 @@ var Operation = class _Operation {
     const state = this.state;
     return {
       release: state.release,
-      oldVersion: state.oldVersion,
+      currentVersion: state.currentVersion,
       newVersion: state.newVersion,
       commit: options.commit ? state.commitMessage : false,
       tag: options.tag ? state.tagName : false,
@@ -1212,9 +1245,8 @@ async function updateManifestFile(relPath, operation) {
   const file = await readJsonFile(relPath, cwd);
   if (isManifest(file.data) && file.data.version !== newVersion) {
     file.data.version = newVersion;
-    if (isPackageLockManifest(file.data)) {
+    if (isPackageLockManifest(file.data))
       file.data.packages[""].version = newVersion;
-    }
     await writeJsonFile(file);
     modified = true;
   }
@@ -1222,11 +1254,11 @@ async function updateManifestFile(relPath, operation) {
 }
 async function updateTextFile(relPath, operation) {
   const { cwd } = operation.options;
-  const { oldVersion, newVersion } = operation.state;
+  const { currentVersion, newVersion } = operation.state;
   const modified = false;
   const file = await readTextFile(relPath, cwd);
-  if (file.data.includes(oldVersion)) {
-    const sanitizedVersion = oldVersion.replace(/(\W)/g, "\\$1");
+  if (file.data.includes(currentVersion)) {
+    const sanitizedVersion = currentVersion.replace(/(\W)/g, "\\$1");
     const replacePattern = new RegExp(`(\\b|v)${sanitizedVersion}\\b`, "g");
     file.data = file.data.replace(replacePattern, `$1${newVersion}`);
     await writeTextFile(file);
@@ -1240,7 +1272,7 @@ async function versionBump(arg = {}) {
   if (typeof arg === "string")
     arg = { release: arg };
   const operation = await Operation.start(arg);
-  await getOldVersion(operation);
+  await getCurrentVersion(operation);
   await getNewVersion(operation);
   if (arg.confirm) {
     printSummary(operation);
@@ -1278,7 +1310,7 @@ function printSummary(operation) {
   if (operation.options.push)
     console.log(`    push ${import_picocolors2.default.cyan(import_picocolors2.default.bold("yes"))}`);
   console.log();
-  console.log(`    from ${import_picocolors2.default.bold(operation.state.oldVersion)}`);
+  console.log(`    from ${import_picocolors2.default.bold(operation.state.currentVersion)}`);
   console.log(`      to ${import_picocolors2.default.green(import_picocolors2.default.bold(operation.state.newVersion))}`);
   console.log();
 }
@@ -1286,14 +1318,16 @@ async function versionBumpInfo(arg = {}) {
   if (typeof arg === "string")
     arg = { release: arg };
   const operation = await Operation.start(arg);
-  await getOldVersion(operation);
+  await getCurrentVersion(operation);
   await getNewVersion(operation);
   return operation;
 }
 
 // src/config.ts
 var import_node_process6 = __toESM(require("process"));
+var import_node_path2 = require("path");
 var import_c12 = require("c12");
+var import_sync = __toESM(require("escalade/sync"));
 var bumpConfigDefaults = {
   commit: true,
   push: true,
@@ -1306,14 +1340,41 @@ var bumpConfigDefaults = {
   files: []
 };
 async function loadBumpConfig(overrides, cwd = import_node_process6.default.cwd()) {
+  const name = "bump";
+  const configFile = findConfigFile(name, cwd);
   const { config } = await (0, import_c12.loadConfig)({
-    name: "bump",
+    name,
     defaults: bumpConfigDefaults,
     overrides: __spreadValues({}, overrides),
-    cwd
+    cwd: configFile ? (0, import_node_path2.dirname)(configFile) : cwd
   });
   return config;
 }
+function findConfigFile(name, cwd) {
+  let foundRepositoryRoot = false;
+  try {
+    const candidates = ["js", "mjs", "ts", "mts", "json"].map((ext) => `${name}.config.${ext}`);
+    return (0, import_sync.default)(cwd, (_dir, files) => {
+      const match = files.find((file) => {
+        if (candidates.includes(file))
+          return true;
+        if (file === ".git")
+          foundRepositoryRoot = true;
+        return false;
+      });
+      if (match)
+        return match;
+      if (foundRepositoryRoot) {
+        throw null;
+      }
+      return false;
+    });
+  } catch (error) {
+    if (foundRepositoryRoot)
+      return null;
+    throw error;
+  }
+}
 function defineConfig(config) {
   return config;
 }

package/dist/index.mjs

@@ -7,7 +7,7 @@ import {
   loadBumpConfig,
   versionBump,
   versionBumpInfo
-} from "./chunk-2LHJGPFO.mjs";
+} from "./chunk-ZH3O6GQ3.mjs";
 
 // src/index.ts
 var src_default = versionBump;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bumpp",
-  "version": "9.3.1",
-  "packageManager": "pnpm@8.15.4",
+  "version": "9.4.1",
+  "packageManager": "pnpm@9.0.6",
   "description": "Bump version, commit changes, tag, and push to Git",
   "author": {
     "name": "James Messinger",
@@ -51,35 +51,39 @@
     "build": "tsup src/index.ts src/cli/index.ts --format esm,cjs --dts --clean",
     "watch": "npm run build -- --watch src",
     "start": "esno src/cli/run.ts",
+    "test": "vitest",
     "upgrade": "npm-check -u && npm audit fix",
     "bumpp": "esno src/cli/run.ts",
     "prepublishOnly": "npm run clean && npm run build",
-    "release": "npm run bumpp && npm publish"
+    "release": "npm run bumpp && npm publish",
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
     "@jsdevtools/ez-spawn": "^3.0.4",
-    "c12": "^1.9.0",
+    "c12": "^1.10.0",
     "cac": "^6.7.14",
+    "escalade": "^3.1.2",
     "fast-glob": "^3.3.2",
     "js-yaml": "^4.1.0",
     "prompts": "^2.4.2",
     "semver": "^7.6.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.7.0",
+    "@antfu/eslint-config": "^2.16.0",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^20.11.24",
+    "@types/node": "^20.12.7",
     "@types/prompts": "^2.4.9",
     "@types/semver": "^7.5.8",
     "detect-indent": "^7.0.1",
     "detect-newline": "^4.0.1",
-    "eslint": "^8.57.0",
-    "esno": "^4.0.0",
+    "eslint": "^9.1.1",
+    "esno": "^4.7.0",
     "log-symbols": "^6.0.0",
     "npm-check": "^6.0.1",
     "picocolors": "^1.0.0",
     "rimraf": "^5.0.5",
     "tsup": "^8.0.2",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5",
+    "vitest": "^1.5.2"
   }
 }