cross-release-cli 0.4.0 → 0.5.0

package/bin/cross-release.js

@@ -2,6 +2,6 @@
 
 "use strict"
 
-const App = await import("../dist/app.js")
+const App = await import("../dist/app.mjs")
 const app = new App.default()
 void app.run()

package/dist/{app.d.ts → app.d.mts}

@@ -1,4 +1,4 @@
-import { ReleaseOptions } from "./types-Bmp7nnWP.js";
+import { n as ReleaseOptions } from "./types-CSTfUwO2.mjs";
 import { ProjectFile } from "cross-bump";
 
 //#region src/app.d.ts

package/dist/{app.js → app.mjs}

@@ -45,8 +45,8 @@ function loadDefaultConfigFile(cwd = process.cwd()) {
 		sources: [{ files: "cross-release.config" }, {
 			extensions: ["json"],
 			files: "package",
-			rewrite(config$1) {
-				return config$1["cross-release"];
+			rewrite(config) {
+				return config["cross-release"];
 			}
 		}]
 	}) ?? {};
@@ -68,14 +68,14 @@ function loadUserConfig(opts) {
 *
 * @see https://nodejs.org/api/process.html#process_exit_codes
 */
-let ExitCode = /* @__PURE__ */ function(ExitCode$1) {
-	ExitCode$1[ExitCode$1["Canceled"] = 2] = "Canceled";
-	ExitCode$1[ExitCode$1["FatalError"] = 1] = "FatalError";
-	ExitCode$1[ExitCode$1["GitDirty"] = 3] = "GitDirty";
-	ExitCode$1[ExitCode$1["GitUnreachable"] = 4] = "GitUnreachable";
-	ExitCode$1[ExitCode$1["InvalidArgument"] = 9] = "InvalidArgument";
-	ExitCode$1[ExitCode$1["Success"] = 0] = "Success";
-	return ExitCode$1;
+let ExitCode = /* @__PURE__ */ function(ExitCode) {
+	ExitCode[ExitCode["Canceled"] = 2] = "Canceled";
+	ExitCode[ExitCode["FatalError"] = 1] = "FatalError";
+	ExitCode[ExitCode["GitDirty"] = 3] = "GitDirty";
+	ExitCode[ExitCode["GitUnreachable"] = 4] = "GitUnreachable";
+	ExitCode[ExitCode["InvalidArgument"] = 9] = "InvalidArgument";
+	ExitCode[ExitCode["Success"] = 0] = "Success";
+	return ExitCode;
 }({});
 const CONFIG_DEFAULT = {
 	commit: {
@@ -151,14 +151,13 @@ const cliOptions = z.object({
 
 //#endregion
 //#region package.json
-var version = "0.3.0";
+var version = "0.4.0";
 
 //#endregion
 //#region src/cli.ts
 const debug$3 = createDebug("cli");
 function createCliProgram(argv) {
-	const cli = cac("cross-release").usage("A release tool that support multi programming language").version(version).usage("[version] [options]").option("-a, --all", "shortcut for --commit.stageAll").option("-c, --config [file]", "Config file (auto detect by default)").option("-D, --dry", "Dry run").option("-d, --debug", "Enable debug mode").option("-e, --exclude [dir...]", "Folders to exclude from search").option("-m, --main [lang]", "Base project language [e.g. java, rust, javascript]").option("-r, --recursive", "Run the command for each project in the workspace").option("-x, --execute [command...]", "Execute the command").option("-y, --yes", "Answer yes to all prompts").option("--cwd [dir]", "Set working directory").option("--commit", "Committing changes").option("--commit.signoff", "Commit with signoff").option("--commit.stageAll", "Stage all changes before commit").option("--commit.template <template>", "Template for commit message").option("--commit.verify", "Verify commit message").option("--push", "Pushing Commit to remote").option("--push.followTags", "Pushing with follow tags").option("--push.branch <branch>", "Branch name to push").option("--tag", "Tagging for release").option("--tag.template <template>", "Template for tag message").help();
-	return cli.parse(argv);
+	return cac("cross-release").usage("A release tool that support multi programming language").version(version).usage("[version] [options]").option("-a, --all", "shortcut for --commit.stageAll").option("-c, --config [file]", "Config file (auto detect by default)").option("-D, --dry", "Dry run").option("-d, --debug", "Enable debug mode").option("-e, --exclude [dir...]", "Folders to exclude from search").option("-m, --main [lang]", "Base project language [e.g. java, rust, javascript]").option("-r, --recursive", "Run the command for each project in the workspace").option("-x, --execute [command...]", "Execute the command").option("-y, --yes", "Answer yes to all prompts").option("--cwd [dir]", "Set working directory").option("--commit", "Committing changes").option("--commit.signoff", "Commit with signoff").option("--commit.stageAll", "Stage all changes before commit").option("--commit.template <template>", "Template for commit message").option("--commit.verify", "Verify commit message").option("--push", "Pushing Commit to remote").option("--push.followTags", "Pushing with follow tags").option("--push.branch <branch>", "Branch name to push").option("--tag", "Tagging for release").option("--tag.template <template>", "Template for tag message").help().parse(argv);
 }
 function argvToReleaseOptions(cli) {
 	const { args, options } = cli;
@@ -182,8 +181,7 @@ function argvToReleaseOptions(cli) {
 	return opts;
 }
 function pathToAbs(opts) {
-	const shouldBeAbsolute = ["cwd", "config"];
-	for (const key of shouldBeAbsolute) {
+	for (const key of ["cwd", "config"]) {
 		if (!opts[key]) continue;
 		if (key === "cwd") opts.cwd = toAbsolute(opts.cwd);
 		opts[key] = path.resolve(opts.cwd, opts[key]);
@@ -209,8 +207,7 @@ function validateOptions(cli) {
 }
 function resolveAppOptions(cli) {
 	const opts = argvToReleaseOptions(cli);
-	const userConfig = loadUserConfig(opts);
-	const crOptions = merge(CONFIG_DEFAULT, userConfig, opts);
+	const crOptions = merge(CONFIG_DEFAULT, loadUserConfig(opts), opts);
 	validateOptions(crOptions);
 	setupDebug(crOptions);
 	resolveGitIgnore(crOptions);
@@ -237,10 +234,10 @@ function gitLsRemote(options) {
 	if (pattern) args.push(pattern);
 	debug$2(`command: git ls-remote ${args.join(" ")}`);
 	if (!dry) {
-		const { all, exitCode, failed, shortMessage } = execa("git", ["ls-remote", ...args], { cwd });
+		const { all, failed, shortMessage } = execa("git", ["ls-remote", ...args], { cwd });
 		debug$2("git ls-remote stdout:", all);
 		if (failed) {
-			s.stop(color.red(shortMessage), exitCode);
+			s.error(shortMessage);
 			return false;
 		}
 	}
@@ -248,21 +245,21 @@ function gitLsRemote(options) {
 	return true;
 }
 function gitTag(options) {
-	const { cwd = process.cwd(), del = false, dry = false, force = false, message: message$1, tagName: name } = options ?? {};
+	const { cwd = process.cwd(), del = false, dry = false, force = false, message, tagName: name } = options ?? {};
 	const s = spinner();
 	s.start("creating tag...");
 	const args = [];
 	if (del) args.push("--delete");
-	else if (!message$1 || message$1?.length === 0) log.warn("no message provided, is recommended to provide a message for create an annotated tag");
-	else args.push("--annotate", "--message", message$1);
+	else if (!message || message?.length === 0) log.warn("no message provided, is recommended to provide a message for create an annotated tag");
+	else args.push("--annotate", "--message", message);
 	if (force) args.push("--force");
 	args.push(name);
 	debug$2(`command: git tag ${args.join(" ")}`);
 	if (!dry) {
-		const { all, exitCode, failed, shortMessage } = execa("git", ["tag", ...args], { cwd });
+		const { all, failed, shortMessage } = execa("git", ["tag", ...args], { cwd });
 		debug$2("git tag stdout:", all);
 		if (failed) {
-			s.stop(color.red(shortMessage), exitCode);
+			s.error(shortMessage);
 			return false;
 		}
 	}
@@ -270,25 +267,25 @@ function gitTag(options) {
 	return true;
 }
 function gitCommit(options) {
-	const { cwd = process.cwd(), dry = false, message: message$1, modifiedFiles = [], signoff, stageAll, verify } = options ?? {};
+	const { cwd = process.cwd(), dry = false, message, modifiedFiles = [], signoff, stageAll, verify } = options ?? {};
 	const s = spinner();
 	s.start("committing...");
 	const args = [];
-	args.push("--message", message$1);
+	args.push("--message", message);
 	!verify && args.push("--no-verify");
 	if (!stageAll && modifiedFiles.length > 0) args.push("--", ...modifiedFiles);
 	else args.push("--all");
 	if (signoff) args.push("--signoff");
 	debug$2(`command: git commit ${args.join(" ")}`);
 	if (!dry) {
-		const { all, exitCode, failed, shortMessage } = execa("git", ["commit", ...args], { cwd });
+		const { all, failed, shortMessage } = execa("git", ["commit", ...args], { cwd });
 		debug$2("git commit stdout: %s", all);
 		if (failed) {
-			s.stop(color.red(shortMessage), exitCode);
+			s.error(shortMessage);
 			return false;
 		}
 	}
-	s.stop(`commit message: ${color.green(message$1)}`);
+	s.stop(`commit message: ${color.green(message)}`);
 	return true;
 }
 function gitPush(options = {}) {
@@ -303,10 +300,10 @@ function gitPush(options = {}) {
 	followTags && args.push("--follow-tags");
 	debug$2(`command: git push ${args.join(" ")}`);
 	if (!dry) {
-		const { all, exitCode, failed, shortMessage } = execa("git", ["push", ...args], { cwd });
+		const { all, failed, shortMessage } = execa("git", ["push", ...args], { cwd });
 		debug$2("git push stdout: %s", all);
 		if (failed) {
-			s.stop(color.red(shortMessage), exitCode);
+			s.error(shortMessage);
 			return false;
 		}
 	}
@@ -315,12 +312,11 @@ function gitPush(options = {}) {
 	return true;
 }
 function gitOriginUrl() {
-	const command = execa("git", [
+	return execa("git", [
 		"remote",
 		"get-url",
 		"origin"
-	]);
-	return command.stdout.trim();
+	]).stdout.trim();
 }
 function gitAdd(options = {}) {
 	const { all = false, cwd = process.cwd(), dry = false, files = [] } = options;
@@ -329,16 +325,15 @@ function gitAdd(options = {}) {
 	else if (files.length > 0) args.push("--", ...files);
 	debug$2("command: git add", args.join(" "));
 	if (!dry) {
-		const { all: all$1, failed } = execa("git", ["add", ...args], { cwd });
-		debug$2("git add stdout:", all$1);
+		const { all, failed } = execa("git", ["add", ...args], { cwd });
+		debug$2("git add stdout:", all);
 		if (failed) return false;
 	}
 	return true;
 }
 function isGitClean(options = {}) {
 	const { cwd = process.cwd() } = options;
-	const args = ["status", "--porcelain"];
-	const { all, failed } = execa("git", args, { cwd });
+	const { all, failed } = execa("git", ["status", "--porcelain"], { cwd });
 	if (all) return false;
 	return !failed;
 }
@@ -371,8 +366,7 @@ function getStagedFiles(opts = {}) {
 * @return The chosen version.
 */
 async function chooseVersion(currentVersion) {
-	const versionObj = parseVersion(currentVersion);
-	const { nextMajor, nextMinor, nextPatch, nextPreMajor, nextPreMinor, nextPrePatch, nextRelease } = getNextVersions(versionObj ?? void 0);
+	const { nextMajor, nextMinor, nextPatch, nextPreMajor, nextPreMinor, nextPrePatch, nextRelease } = getNextVersions(parseVersion(currentVersion) ?? void 0);
 	const C_CUSTOM = "custom";
 	const versions = [
 		{
@@ -466,8 +460,7 @@ var App = class {
 	constructor(argv = process.argv) {
 		const cli = createCliProgram(argv);
 		if (cli.options.help) process.exit(ExitCode.Success);
-		const opts = resolveAppOptions(cli);
-		this._options = opts;
+		this._options = resolveAppOptions(cli);
 	}
 	#addTask(task, idx) {
 		const expect = this._taskQueue.length + 1;
@@ -503,20 +496,18 @@ var App = class {
 	checkGitClean() {
 		const { cwd } = this._options;
 		const commit = resolveAltOptions(this._options, "commit");
-		const isClean = isGitClean({ cwd });
-		if (!isClean && !commit.stageAll) {
+		if (!isGitClean({ cwd }) && !commit.stageAll) {
 			log.warn("git is not clean, please commit or stash your changes");
 			this.#done();
 			process.exit(ExitCode.GitDirty);
 		}
 	}
 	checkGitRemote() {
-		const { cwd, debug: debug$5, dry } = this._options;
-		const hasRemote = gitLsRemote({
+		const { cwd, debug, dry } = this._options;
+		if (!gitLsRemote({
 			cwd,
-			dry: dry || debug$5
-		});
-		if (!hasRemote) {
+			dry: dry || debug
+		})) {
 			log.warn("git remote not found, please add remote or check your network");
 			this.#done();
 			process.exit(ExitCode.GitUnreachable);
@@ -524,12 +515,12 @@ var App = class {
 	}
 	async confirmReleaseOptions() {
 		const { cwd, dry, yes } = this._options;
-		const confirmTask = async (name, message$1, exec) => {
+		const confirmTask = async (name, message, exec) => {
 			if (yes) {
 				if (!this._options[name]) return;
 				this._options[name] = true;
 			} else if (this._options[name]) {
-				const confirmation = await confirm({ message: message$1 });
+				const confirmation = await confirm({ message });
 				this._options[name] = handleUserCancel(confirmation);
 			}
 			if (this._options[name]) this.#addTask({
@@ -624,18 +615,14 @@ var App = class {
 		}
 	}
 	async resolveNextVersion() {
-		const { main, version: version$1 } = this._options;
+		const { main, version } = this._options;
 		const mainProjectFile = this._projectFiles.find((file) => file.category === main);
 		if (!mainProjectFile) throw new Error(`can't found ${main} project file in the project root`);
-		const projectVersion = await getProjectVersion(mainProjectFile);
-		this._currentVersion = projectVersion ?? "";
-		if (isVersionValid(version$1)) {
-			this._nextVersion = version$1;
+		this._currentVersion = await getProjectVersion(mainProjectFile) ?? "";
+		if (isVersionValid(version)) {
+			this._nextVersion = version;
 			log.info(`current version: ${this._currentVersion}, next version: ${color.blue(this._nextVersion)}`);
-		} else {
-			const nextVersion = await chooseVersion(this._currentVersion);
-			this._nextVersion = handleUserCancel(nextVersion);
-		}
+		} else this._nextVersion = handleUserCancel(await chooseVersion(this._currentVersion));
 	}
 	resolveProjectFiles() {
 		const { cwd, exclude, recursive } = this._options;
@@ -691,7 +678,6 @@ var App = class {
 		return this._projectFiles;
 	}
 };
-var app_default = App;
 
 //#endregion
-export { app_default as default };
+export { App as default };

package/dist/{index.d.ts → index.d.mts}

@@ -1,4 +1,4 @@
-import { DefineConfigOptions } from "./types-Bmp7nnWP.js";
+import { t as DefineConfigOptions } from "./types-CSTfUwO2.mjs";
 
 //#region src/index.d.ts
 declare function defineConfig(config: DefineConfigOptions): DefineConfigOptions;

package/dist/{types-Bmp7nnWP.d.ts → types-CSTfUwO2.d.mts}

@@ -2,7 +2,6 @@ import { ProjectCategory } from "cross-bump";
 import "cac";
 
 //#region src/types.d.ts
-
 type DefineConfigOptions = Partial<Omit<ReleaseOptions, "config">>;
 type ReleaseOptions = {
   /**
@@ -111,4 +110,4 @@ type TagOptions = {
   template?: string;
 };
 //#endregion
-export { DefineConfigOptions, ReleaseOptions };
+export { ReleaseOptions as n, DefineConfigOptions as t };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cross-release-cli",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "command line app for cross language bump utility",
   "author": {
     "name": "rainbowatcher",
@@ -17,8 +17,8 @@
   "bugs": {
     "url": "https://github.com/rainbowatcher/cross-release/issues"
   },
-  "main": "dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "dist/index.mjs",
+  "types": "./dist/index.d.mts",
   "bin": {
     "cross-release": "./bin/cross-release.js"
   },
@@ -27,19 +27,19 @@
     "dist"
   ],
   "dependencies": {
-    "@clack/prompts": "^0.11.0",
+    "@clack/prompts": "^1.0.0",
     "@rainbowatcher/common": "^0.7.0",
     "@rainbowatcher/fs-extra": "^0.7.0",
     "@rainbowatcher/path-extra": "^0.7.0",
     "cac": "^6.7.14",
-    "debug": "^4.4.1",
+    "debug": "^4.4.3",
     "defu": "^6.1.4",
-    "execa": "^9.6.0",
+    "execa": "^9.6.1",
     "is-unicode-supported": "^2.1.0",
     "picocolors": "^1.1.1",
-    "unconfig": "^7.3.2",
-    "zod": "^4.0.17",
-    "cross-bump": "0.4.0"
+    "unconfig": "^7.4.2",
+    "zod": "^4.3.6",
+    "cross-bump": "0.5.0"
   },
   "devDependencies": {
     "@rainbowatcher/maybe": "^0.7.0"