@mznjs/mbump 1.0.2 → 1.0.6

package/dist/{bump-CtknNhb9.js → bump-C1ZmU9eM.js}

@@ -1,18 +1,38 @@
-import { ProgressEvent, loadBumpConfig, versionBump, versionBumpInfo } from "bumpp";
+import { generateMarkDown, getGitDiff, getLastGitTag, loadChangelogConfig, parseCommits } from "changelogen";
+import { loadBumpConfig, versionBump, versionBumpInfo } from "bumpp";
 import { consola } from "consola";
 import { oraPromise } from "ora";
+import { spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
 import { readFile, writeFile } from "node:fs/promises";
-import { generateMarkDown, getGitDiff, getLastGitTag, loadChangelogConfig, parseCommits } from "changelogen";
-import { x } from "tinyexec";
 import { defu } from "defu";
 import { loadConfig, presetMini } from "esconf";
 import { glob } from "tinyglobby";
 
 //#region src/changelog.ts
+function x(command, args) {
+	return new Promise((resolve, reject) => {
+		try {
+			let result;
+			if (command === "git" && args[0] === "commit" && args[1] === "-m") result = spawnSync(`git commit -m "${args[2]}"`, [], {
+				stdio: "inherit",
+				shell: true
+			});
+			else result = spawnSync(command, args, {
+				stdio: "inherit",
+				shell: true
+			});
+			if (result.status === 0) resolve();
+			else reject(/* @__PURE__ */ new Error(`Command failed with status ${result.status}`));
+		} catch (error) {
+			reject(error);
+		}
+	});
+}
 /**
-* 获取远程仓库的最新tag
-* @returns
+* 获取最新的 Git 标签
+*
+* @returns 返回最新的 Git 标签，如果获取失败则返回空字符串
 */
 async function getTag() {
 	try {
@@ -32,10 +52,9 @@ async function changelog(rawConfig) {
 		to: `v${rawConfig.to}`,
 		from: `v${rawConfig.from}`
 	};
-	const rawCommits = await getGitDiff(config.from);
-	const commits = parseCommits(rawCommits, config).filter((c) => config.types[c.type] && !(c.type === "chore" && c.scope === "deps" && !c.isBreaking));
-	let markdown = await generateMarkDown(commits, config);
-	markdown = markdown.replace("#### ⚠️ Breaking Changes", `#### ${config.types.BreakingChange.title}`).replace("### ❤️ Contributors", "### ❤️ 贡献者");
+	let markdown = await generateMarkDown(parseCommits(await getGitDiff(config.from), config).filter((c) => config.types[c.type] && !(c.type === "chore" && c.scope === "deps" && !c.isBreaking)), config);
+	const breakingChangeTitle = typeof config.types.BreakingChange === "object" && config.types.BreakingChange !== null ? config.types.BreakingChange.title : "⚠️ Breaking Changes";
+	markdown = markdown.replace("#### ⚠️ Breaking Changes", `#### ${breakingChangeTitle}`).replace("### ❤️ Contributors", "### ❤️ 贡献者");
 	let changelogMD;
 	if (existsSync(config.output)) changelogMD = await readFile(config.output, "utf8");
 	else changelogMD = "# Changelog\n\n";
@@ -104,16 +123,13 @@ async function resolveConfig(rawConfig) {
 		bumpp,
 		accesstoken: {}
 	});
-	if (rawConfig.bumpp?.recursive) {
-		const files = await glob("**/package.json", {
-			ignore: ["**/node_modules/**"],
-			cwd,
-			onlyFiles: true
-		});
-		files.forEach((item) => {
-			_resolveConfig.bumpp.files.push(item);
-		});
-	}
+	if (rawConfig.bumpp?.recursive) (await glob("**/package.json", {
+		ignore: ["**/node_modules/**"],
+		cwd,
+		onlyFiles: true
+	})).forEach((item) => {
+		_resolveConfig.bumpp.files.push(item);
+	});
 	_resolveConfig.bumpp.recursive = false;
 	_resolveConfig.bumpp.files = [...new Set(_resolveConfig.bumpp.files)];
 	return _resolveConfig;
@@ -127,22 +143,22 @@ const defineConfig = (config) => config;
 */
 function progress({ event, script, updatedFiles, skippedFiles, newVersion }) {
 	switch (event) {
-		case ProgressEvent.FileUpdated:
+		case "FILE_UPDATED":
 			consola.success(`Updated ${updatedFiles.pop()} to ${newVersion}`);
 			break;
-		case ProgressEvent.FileSkipped:
+		case "FILE_SKIPPED":
 			consola.info(`${skippedFiles.pop()} did not need to be updated`);
 			break;
-		case ProgressEvent.GitCommit:
+		case "GIT_COMMIT":
 			consola.info("Git commit");
 			break;
-		case ProgressEvent.GitTag:
+		case "GIT_TAG":
 			consola.info("Git tag");
 			break;
-		case ProgressEvent.GitPush:
+		case "GIT_PUSH":
 			consola.success("Git push");
 			break;
-		case ProgressEvent.NpmScript:
+		case "NPM_SCRIPT":
 			consola.success(`Npm run ${script}`);
 			break;
 	}
@@ -193,4 +209,4 @@ async function bumpVersionWithBaseRelease(option = {}, addRelease, provider) {
 }
 
 //#endregion
-export { bumpVersion, bumpVersionWithBaseRelease, defineConfig };
+export { bumpVersionWithBaseRelease as n, defineConfig as r, bumpVersion as t };

package/dist/changelogen.d.ts

@@ -0,0 +1 @@
+export * from "changelogen";

package/dist/{changelogens.d.ts → changelogen.js}

@@ -1 +1,3 @@
 export * from "changelogen"
+
+export {  };

package/dist/cli.d.ts

@@ -1,8 +1,7 @@
-import { Config } from "./types.d-B0g2i1Ge.js";
+import { o as Config } from "./types-DoXYJODS.js";
 
 //#region src/cli.d.ts
 declare function createBaseCli(bumpVersion: (config?: Config) => Promise<any>, version?: string): void;
 declare const createCli: () => void;
-
 //#endregion
 export { createBaseCli, createCli };

package/dist/cli.js

@@ -1,8 +1,12 @@
-import { bumpVersion } from "./bump-CtknNhb9.js";
+import { t as bumpVersion } from "./bump-C1ZmU9eM.js";
 import { cac } from "cac";
 
+//#region package.json
+var version = "1.0.6-beta.0";
+
+//#endregion
 //#region src/cli.ts
-function createBaseCli(bumpVersion$1, version) {
+function createBaseCli(bumpVersion$1, version$1) {
 	const $cac = cac("mbump");
 	$cac.command("[...files]").option("-o,--output [output]", "CHANGELOG.md 生成位置", { default: "CHANGELOG.md" }).option("-r,--recursive", "recursively", { default: false }).action(async (files, options) => {
 		await bumpVersion$1({
@@ -13,7 +17,7 @@ function createBaseCli(bumpVersion$1, version) {
 			changelog: { output: options.output }
 		});
 	});
-	$cac.version(version || "1.0.1");
+	$cac.version(version$1 || version);
 	$cac.help();
 	$cac.parse();
 }

package/dist/index.d.ts

@@ -1,22 +1,21 @@
-import { Accesstokens, BumpVersion, BumppResult, ChangelogOptions, ChangelogResult, Config, ResolveConfig } from "./types.d-B0g2i1Ge.js";
+import { a as ChangelogResult, i as ChangelogOptions, n as BumpVersion, o as Config, r as BumppResult, s as ResolveConfig, t as Accesstokens } from "./types-DoXYJODS.js";
 
 //#region src/bump.d.ts
+
 /**
-* 更新版本
-* @param option
-*/
+ * 更新版本
+ * @param option
+ */
 declare function bumpVersion(option?: Config): Promise<BumpVersion>;
 /**
-* 更新版本伴随基础 release 基础等待动画
-* @param option 更新版本配置
-* @param addRelease release脚本
-* @param provider git 远程储存提供商
-*/
+ * 更新版本伴随基础 release 基础等待动画
+ * @param option 更新版本配置
+ * @param addRelease release脚本
+ * @param provider git 远程储存提供商
+ */
 declare function bumpVersionWithBaseRelease(option: Config | undefined, addRelease: (res: BumpVersion) => Promise<any>, provider: string): Promise<void>;
-
 //#endregion
 //#region src/config.d.ts
 declare const defineConfig: (config: Config) => Config;
-
 //#endregion
 export { Accesstokens, BumpVersion, BumppResult, ChangelogOptions, ChangelogResult, Config, ResolveConfig, bumpVersion, bumpVersionWithBaseRelease, defineConfig };

package/dist/index.js

@@ -1,3 +1,3 @@
-import { bumpVersion, bumpVersionWithBaseRelease, defineConfig } from "./bump-CtknNhb9.js";
+import { n as bumpVersionWithBaseRelease, r as defineConfig, t as bumpVersion } from "./bump-C1ZmU9eM.js";
 
 export { bumpVersion, bumpVersionWithBaseRelease, defineConfig };

package/dist/types-DoXYJODS.d.ts

@@ -0,0 +1,74 @@
+import { ChangelogConfig, ResolvedChangelogConfig } from "changelogen";
+import { VersionBumpOptions, versionBumpInfo } from "bumpp";
+
+//#region src/changelog.d.ts
+
+/**
+ * 生成changelog
+ * @param rawConfig
+ */
+declare function changelog(rawConfig: ResolvedChangelogConfig): Promise<{
+  markdown: string;
+  changelogMD: string;
+}>;
+//#endregion
+//#region src/types.d.ts
+/**
+ * changelog 生成配置信息
+ */
+interface ChangelogOptions extends Omit<Partial<ChangelogConfig>, 'cwd' | 'tokens' | 'newVersion' | 'to' | 'from' | 'publish'> {}
+interface Accesstokens {
+  [key: string]: string;
+}
+/**
+ * 用户配置信息
+ */
+interface Config {
+  /**
+   * changelog 生成配置信息
+   */
+  changelog?: ChangelogOptions;
+  /**
+   * bumpp 配置信息
+   */
+  bumpp?: Omit<VersionBumpOptions, 'progress' | 'cwd'>;
+  accesstoken?: Accesstokens;
+}
+/**
+ * 合并后的配置信息
+ */
+interface ResolveConfig {
+  /**
+   * changelog 生成配置信息
+   */
+  changelog: ResolvedChangelogConfig;
+  /**
+   * bumpp 配置信息
+   */
+  bumpp: Omit<VersionBumpOptions, 'progress'>;
+  accesstoken: Accesstokens;
+}
+/**
+ * bumpp 生成结果
+ */
+type BumppResult = Awaited<ReturnType<typeof versionBumpInfo>>;
+/**
+ * changelog 生成结果
+ */
+type ChangelogResult = Awaited<ReturnType<typeof changelog>>;
+/**
+ * bumppVersion 方法返回结果
+ */
+interface BumpVersion {
+  /**
+   * bumpp 生成结果
+   */
+  bumpp: BumppResult['state'];
+  /**
+   * changelog 生成结果
+   */
+  changelog: ChangelogResult;
+  config: ResolveConfig;
+}
+//#endregion
+export { ChangelogResult as a, ChangelogOptions as i, BumpVersion as n, Config as o, BumppResult as r, ResolveConfig as s, Accesstokens as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mznjs/mbump",
-  "version": "1.0.2",
+  "version": "1.0.6",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -34,8 +34,8 @@
     },
     "./changelogen": {
       "import": {
-        "types": "./dist/changelogens.d.ts",
-        "default": "./dist/changelogens.js"
+        "types": "./dist/changelogen.d.ts",
+        "default": "./dist/changelogen.js"
       }
     },
     "./cli": {
@@ -53,7 +53,6 @@
     "defu": "^6.1.4",
     "esconf": "~0.5.1",
     "ora": "^8.2.0",
-    "tinyexec": "^1.0.1",
     "tinyglobby": "^0.2.13"
   },
   "publishConfig": {

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 白鸢
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/dist/changelogens.js

@@ -1 +0,0 @@
-export * from "changelogen"

package/dist/types.d-B0g2i1Ge.d.ts

@@ -1,76 +0,0 @@
-import { VersionBumpOptions, versionBumpInfo } from "bumpp";
-import { ChangelogConfig, ResolvedChangelogConfig } from "changelogen";
-
-//#region src/changelog.d.ts
-/**
-* 生成changelog
-* @param rawConfig
-*/
-declare function changelog(rawConfig: ResolvedChangelogConfig): Promise<{
-    markdown: string;
-    changelogMD: string;
-}>;
-
-//#endregion
-//#region src/types.d.ts
-/**
-* changelog 生成配置信息
-*/
-interface ChangelogOptions extends Omit<Partial<ChangelogConfig>, 'cwd' | 'tokens' | 'newVersion' | 'to' | 'from' | 'publish'> {
-}
-interface Accesstokens {
-    [key: string]: string;
-}
-/**
-* 用户配置信息
-*/
-interface Config {
-    /**
-     * changelog 生成配置信息
-     */
-    changelog?: ChangelogOptions;
-    /**
-     * bumpp 配置信息
-     */
-    bumpp?: Omit<VersionBumpOptions, 'progress' | 'cwd'>;
-    accesstoken?: Accesstokens;
-}
-/**
-* 合并后的配置信息
-*/
-interface ResolveConfig {
-    /**
-     * changelog 生成配置信息
-     */
-    changelog: ResolvedChangelogConfig;
-    /**
-     * bumpp 配置信息
-     */
-    bumpp: Omit<VersionBumpOptions, 'progress'>;
-    accesstoken: Accesstokens;
-}
-/**
-* bumpp 生成结果
-*/
-type BumppResult = Awaited<ReturnType<typeof versionBumpInfo>>;
-/**
-* changelog 生成结果
-*/
-type ChangelogResult = Awaited<ReturnType<typeof changelog>>;
-/**
-* bumppVersion 方法返回结果
-*/
-interface BumpVersion {
-    /**
-     * bumpp 生成结果
-     */
-    bumpp: BumppResult['state'];
-    /**
-     * changelog 生成结果
-     */
-    changelog: ChangelogResult;
-    config: ResolveConfig;
-}
-
-//#endregion
-export { Accesstokens, BumpVersion, BumppResult, ChangelogOptions, ChangelogResult, Config, ResolveConfig };