@peiyanlu/release 1.1.0 → 1.1.2

package/dist/cli.mjs

@@ -5,7 +5,7 @@ import { dim, green, red, rgb, underline, yellow } from "ansis";
 import { program } from "commander";
 import { createReadStream, createWriteStream, existsSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { cancel, confirm, group, intro, isCancel, log, outro, select, tasks, text } from "@clack/prompts";
-import { castArray, isFunction, isPlainObject, isUndefined, isZero, mapObjectValues } from "@peiyanlu/ts-utils";
+import { castArray, isFunction, isPlainObject, isUndefined, isZero, mapObject } from "@peiyanlu/ts-utils";
 import { publint } from "publint";
 import { formatMessage } from "publint/utils";
 import { inc, neq } from "semver";
@@ -553,12 +553,6 @@ const defaultTypes = [
 		effect: "hidden",
 		description: "持续集成配置"
 	},
-	{
-		type: "deps",
-		section: "📦 依赖更新",
-		effect: "changelog",
-		description: "依赖版本变更"
-	},
 	{
 		type: "security",
 		section: "🛡️ 安全修复",
@@ -584,16 +578,22 @@ const defaultTypes = [
 		description: "用户体验改进"
 	},
 	{
-		type: "config",
-		section: "⚙️ 配置",
-		effect: "hidden",
-		description: "配置文件更新"
+		type: "deps",
+		section: "📦 依赖更新",
+		effect: "changelog",
+		description: "依赖版本变更"
 	},
 	{
 		type: "tool",
 		section: "🛠️ 工具链",
 		effect: "hidden",
 		description: "工具链变更"
+	},
+	{
+		type: "config",
+		section: "⚙️ 配置",
+		effect: "hidden",
+		description: "配置文件更新"
 	}
 ];
 //#endregion
@@ -607,7 +607,7 @@ function headerPartial(context) {
 function template(context) {
 	const { headerPartial, preamblePartial, commitPartial, footerPartial, noteGroups, commitGroups } = context;
 	return segments(headerPartial(context), preamblePartial(context), each(noteGroups, (group) => segments(heading(3, words("⚠", group.title)), list(group.notes, (note) => {
-		return each([words(note.commit.scope && bold(`${note.commit.scope}:`), commitPartial(context, note.commit)), list([note.text], (t) => t)], (t) => t, newline());
+		return each([words(note.commit.scope && bold(`${note.commit.scope}:`), commitPartial(context, note.commit)), note.commit.subject.trim() !== note.text.trim() ? list([note.text], (t) => t) : ""], (t) => t, newline());
 	})), newline(2)), each(commitGroups, (group) => segments(group.title && heading(3, group.title), list(group.commits, (commit) => commitPartial(context, commit))), newline(2)), footerPartial(context));
 }
 //#endregion
@@ -627,8 +627,13 @@ const parsePreset = (options = {}) => {
 };
 const inferReleaseType = async (options) => {
 	const preset = parsePreset(options);
-	const res = await new Bumper().bump(preset.whatBump);
-	return "releaseType" in res ? res.releaseType : void 0;
+	const res = await new Bumper().config(preset).bump(preset.whatBump);
+	if (!("releaseType" in res)) return void 0;
+	const { releaseType, reason } = res;
+	return options?.json ? {
+		releaseType,
+		reason
+	} : releaseType;
 };
 const createGenerator = async (options) => {
 	const { getPkgDir, tagPrefix, releaseCount = 1, includeHidden, transformTypes } = options;
@@ -981,14 +986,14 @@ var Action = class {
 	async createContext(cmdArgs, options, prepare = false) {
 		const { version: cVersion, name: cName } = readJsonFile(join(__dirname, "../package.json"));
 		const { otp, package: defPkg, releaseCount, ...others } = options;
-		const { showChangelog, showRelease, ci, dryRun, onlyChangelog } = mapObjectValues(others, (v) => Boolean(v));
+		const { showChangelog, showRelease, ci, dryRun, onlyChangelog } = mapObject(others, (k, v) => [k, Boolean(v)]);
 		process.env["dryRun"] = String(dryRun);
 		const { configFile, config: local } = await resolveConfig(process.cwd());
 		const config = mergeConfig(createDefaultConfig(ci ? true : void 0), local);
 		info(MSG.INFO.TOOL(cName, cVersion));
 		info(MSG.INFO.CONFIG(configFile));
 		{
-			const { requireCleanWorkingTree, skipGit, skipNpm, skipGithub, isMonorepo, includeHidden } = mapObjectValues(others, (v) => Boolean(v));
+			const { requireCleanWorkingTree, skipGit, skipNpm, skipGithub, isMonorepo, includeHidden } = mapObject(others, (k, v) => [k, Boolean(v)]);
 			const count = Number(releaseCount);
 			config.changelog.releaseCount = isNaN(count) ? 0 : count;
 			config.changelog.includeHidden = includeHidden;
@@ -1124,10 +1129,13 @@ var Action = class {
 			return !next && isIncrement;
 		};
 		if (need(ctx)) {
-			const inferred = await inferReleaseType({
+			const res = await inferReleaseType({
 				includeHidden,
-				transformTypes
+				transformTypes,
+				json: true
 			});
+			if (res) msg("BUMP", res.reason);
+			const inferred = res?.releaseType;
 			const nextVersion = (isCI ? inferred ?? inc(current, "patch") : void 0) || await runVersionPrompts(ctx, config, inferred);
 			ctx.isIncrement = neq(current, nextVersion);
 			const { version: next, isPrerelease: toPreRelease, preId, preBase } = parseVersion(nextVersion);
@@ -1270,7 +1278,7 @@ program.command("init").description("Create a release configuration file").optio
 	if (add) gitAddSync([infile]);
 	console.log(`\n${content}`);
 });
-program.addHelpText("afterAll", "\nThanks for using!");
+program.addHelpText("afterAll", "\nCASE: release -C -r0 --include-hidden --only-changelog\n\nThanks for using!");
 program.parse(process.argv);
 program.on("command:*", () => {
 	console.error(`\n${red`Error`} Invalid command: ${red`%s`}`, program.args.join(" "));

package/dist/index.d.mts

@@ -1,9 +1,16 @@
 import { DeepPartial, DeepRequired } from "@peiyanlu/ts-utils";
 import { ConventionalChangelog } from "conventional-changelog";
-import { CommitType } from "conventional-changelog-conventionalcommits";
+import { CommitType as CommitType$1 } from "conventional-changelog-conventionalcommits";
 import { log } from "@clack/prompts";
 
 //#region src/types.d.ts
+interface CommitType {
+  type: string;
+  section?: string;
+  effect?: 'bump' | 'changelog' | 'hidden';
+  scope?: string;
+  description?: string;
+}
 type Logger = typeof log;
 type HookTiming = 'before' | 'after';
 type HookAction = 'bump' | 'publish' | 'push' | 'release';
@@ -192,7 +199,7 @@ interface ParsePresetOptions {
   /** 生成 CHANGELOG 时包含默认隐藏的 commit 类型 */
   includeHidden?: boolean;
   /** 对默认 commit types 进行转换 */
-  transformTypes?: (types: CommitType[]) => CommitType[];
+  transformTypes?: (types: CommitType$1[]) => CommitType$1[];
 }
 declare const createGenerator: (options: GenerateOptions & ParsePresetOptions) => Promise<ConventionalChangelog>;
 declare const getChangelog: (options: GenerateOptions & ParsePresetOptions) => Promise<string>;
@@ -222,4 +229,4 @@ interface PublishTagOptions {
 }
 declare const publishTagToNpm: (options: PublishTagOptions) => Promise<void>;
 //#endregion
-export { type Logger, type UserConfig, createGenerator, defineConfig, generateChangelog, getChangelog, mergeConfig, publishTagToNpm };
+export { type CommitType, type Logger, type UserConfig, createGenerator, defineConfig, generateChangelog, getChangelog, mergeConfig, publishTagToNpm };

package/dist/index.mjs

@@ -102,12 +102,6 @@ const defaultTypes = [
 		effect: "hidden",
 		description: "持续集成配置"
 	},
-	{
-		type: "deps",
-		section: "📦 依赖更新",
-		effect: "changelog",
-		description: "依赖版本变更"
-	},
 	{
 		type: "security",
 		section: "🛡️ 安全修复",
@@ -133,16 +127,22 @@ const defaultTypes = [
 		description: "用户体验改进"
 	},
 	{
-		type: "config",
-		section: "⚙️ 配置",
-		effect: "hidden",
-		description: "配置文件更新"
+		type: "deps",
+		section: "📦 依赖更新",
+		effect: "changelog",
+		description: "依赖版本变更"
 	},
 	{
 		type: "tool",
 		section: "🛠️ 工具链",
 		effect: "hidden",
 		description: "工具链变更"
+	},
+	{
+		type: "config",
+		section: "⚙️ 配置",
+		effect: "hidden",
+		description: "配置文件更新"
 	}
 ];
 //#endregion
@@ -156,7 +156,7 @@ function headerPartial(context) {
 function template(context) {
 	const { headerPartial, preamblePartial, commitPartial, footerPartial, noteGroups, commitGroups } = context;
 	return segments(headerPartial(context), preamblePartial(context), each(noteGroups, (group) => segments(heading(3, words("⚠", group.title)), list(group.notes, (note) => {
-		return each([words(note.commit.scope && bold(`${note.commit.scope}:`), commitPartial(context, note.commit)), list([note.text], (t) => t)], (t) => t, newline());
+		return each([words(note.commit.scope && bold(`${note.commit.scope}:`), commitPartial(context, note.commit)), note.commit.subject.trim() !== note.text.trim() ? list([note.text], (t) => t) : ""], (t) => t, newline());
 	})), newline(2)), each(commitGroups, (group) => segments(group.title && heading(3, group.title), list(group.commits, (commit) => commitPartial(context, commit))), newline(2)), footerPartial(context));
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peiyanlu/release",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Release project tool.",
   "license": "MIT",
   "type": "module",
@@ -30,8 +30,8 @@
     "@actions/github": "^9.1.1",
     "@clack/prompts": "^1.5.0",
     "@octokit/rest": "^22.0.1",
-    "@peiyanlu/cli-utils": "^0.0.12",
-    "@peiyanlu/ts-utils": "^0.0.8",
+    "@peiyanlu/cli-utils": "^0.0.13",
+    "@peiyanlu/ts-utils": "^0.0.9",
     "ansis": "^4.3.1",
     "commander": "^15.0.0",
     "conventional-changelog": "^8.0.0",