@peiyanlu/release 0.0.15 → 0.0.16

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 import path, { join, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { bumpPackageVersion, coloredChangeset, eol, execAsync, getAllRemotes, getAuthenticatedUser, getCurrentBranch, getGithubReleaseUrl, getGithubUrl, getLatestTag, getLog, getPackageInfo, getPackageUrl, getPublishedVersion, getRemote, getStatus, gitAddAll, gitAddTracked, gitCommit, gitTagAnnotated, hasWriteAccess, isGitRepo, isOtpError, isPrerelease, isValid, isWorkingDirClean, parseGitHubRepo, parseVersion, pingRegistry, publishPackage, pushBranch, pushTag, readJsonFile, registryArg, resolveChangelogRange, resolvePublishTag, runNpm } from "@peiyanlu/cli-utils";
+import { bumpPackageVersion, canPublish, coloredStatus, eol, execAsync, getAuthenticatedUser, getGithubReleaseUrl, getGithubUrl, getLatestTag, getLogSince, getPackageInfo, getPackageUrl, getPublishedVersion, getRemoteList, getRemoteNames, getShortStatus, gitAddAll, gitAddTracked, gitBranchCurrent, gitCommitMessage, gitPushBranch, gitPushTag, gitResetHardSync, gitTagAnnotated, gitTagDeleteSync, hasWriteAccess, isGitRepo, isOtpError, isPrerelease, isValidVersion, isWorkingTreeClean, parseGitHubRepo, parseVersion, pingRegistry, publishPackage, readJsonFile, resolveChangelogRange, resolvePublishTag } from "@peiyanlu/cli-utils";
 import { dim, green, red, rgb, underline, yellow } from "ansis";
 import { program } from "commander";
 import { createReadStream, createWriteStream, existsSync, readFileSync, statSync, writeFileSync } from "node:fs";
@@ -9,7 +9,6 @@ import { castArray, isFunction, isPlainObject, isUndefined, isZero } from "@peiy
 import { publint } from "publint";
 import { formatMessage } from "publint/utils";
 import { inc, neq } from "semver";
-import { spawnSync } from "node:child_process";
 import { inspect } from "node:util";
 import { ConventionalChangelog } from "conventional-changelog";
 import createPreset from "conventional-changelog-conventionalcommits";
@@ -19,7 +18,7 @@ import { Octokit } from "@octokit/rest";
 import { contentType } from "mime-types";
 import open from "open";
 import { glob } from "tinyglobby";
-//#region node_modules/.pnpm/tsdown@0.22.1_publint@0.3.21_typescript@6.0.3/node_modules/tsdown/esm-shims.js
+//#region node_modules/.pnpm/tsdown@0.22.3_publint@0.3.21_typescript@6.0.3/node_modules/tsdown/esm-shims.js
 const getFilename = () => fileURLToPath(import.meta.url);
 const getDirname = () => path.dirname(getFilename());
 const __dirname = /* @__PURE__ */ getDirname();
@@ -45,11 +44,11 @@ const loadConfig = async (file) => {
 const resolveConfig = async (cwd) => {
 	const configFile = findConfigFile(cwd);
 	if (!configFile) return {
-		configPath: "",
+		configFile: "",
 		config: {}
 	};
 	return {
-		configPath: configFile,
+		configFile,
 		config: await loadConfig(configFile)
 	};
 };
@@ -168,12 +167,12 @@ const gitCheck = async (ctx, config) => {
 		ctx.noGitHub = true;
 		return;
 	}
-	if (requireWorkDirClean && !await isWorkingDirClean()) throw new Error(MSG.ERROR.GIT_WORKDIR);
+	if (requireWorkDirClean && !await isWorkingTreeClean()) throw new Error(MSG.ERROR.GIT_WORKDIR);
 	if (ignoreGithub) {
 		ctx.noGitHub = true;
 		return;
 	}
-	const { remoteName, remoteUrl } = await getRemote();
+	const { name: remoteName, url: remoteUrl } = (await getRemoteList())[0];
 	if (!remoteUrl) if (requireRemote) throw new Error(MSG.ERROR.GIT_REMOTE(name));
 	else {
 		ctx.noGitHub = true;
@@ -194,18 +193,18 @@ const commitAndTag = async (ctx, config) => {
 	const { git: { commit, tag, push, addUntrackedFiles, commitArgs, tagArgs, pushArgs } } = config;
 	if (!commit) return;
 	const args = dryRun ? ["--dry-run"] : [];
-	addUntrackedFiles ? await gitAddAll() : await gitAddTracked(args);
-	await gitCommit(commitMessage, [...commitArgs, ...args]);
+	addUntrackedFiles ? await gitAddAll(args) : await gitAddTracked(args);
+	await gitCommitMessage(commitMessage, [...commitArgs, ...args]);
 	if (!dryRun) Object.assign(ctx.git, { isCommitted: true });
 	if (tag) {
 		await gitTagAnnotated(currentTag, tagMessage, [...tagArgs, ...args]);
 		if (!dryRun) Object.assign(ctx.git, { isTagged: true });
 	}
 	if (push) {
-		const remotes = await getAllRemotes();
+		const remotes = await getRemoteNames();
 		for (const remoteName of remotes) {
-			await pushTag(remoteName, currentTag, args);
-			await pushBranch(remoteName, await getCurrentBranch(), [...pushArgs, ...args]);
+			await gitPushTag(remoteName, currentTag, args);
+			await gitPushBranch(remoteName, await gitBranchCurrent(), [...pushArgs, ...args]);
 		}
 		if (!dryRun) Object.assign(ctx.git, { isPushed: true });
 	}
@@ -213,40 +212,8 @@ const commitAndTag = async (ctx, config) => {
 const gitRollback = (ctx) => {
 	const { git: { currentTag, isCommitted, isTagged, isPushed } } = ctx;
 	if (isPushed) return;
-	spawnSync("git", ["restore", "."]);
-	if (isTagged) spawnSync("git", [
-		"tag",
-		"--delete",
-		currentTag
-	]);
-	spawnSync("git", [
-		"reset",
-		"--hard",
-		isCommitted ? "HEAD~1" : "HEAD"
-	]);
-};
-//#endregion
-//#region src/prompts.ts
-const abortTask = (msg) => {
-	cancel(`${red("✕")} ${msg}`);
-	process.exit(0);
-};
-const abortSinglePrompt = (value) => {
-	if (isCancel(value)) abortTask(MSG.ABORT.CANCEL);
-};
-const abortGroupPrompt = (ctx) => {
-	ctx && gitRollback(ctx);
-	abortTask(MSG.ABORT.CANCEL);
-};
-const abortOnError = (err, ctx, exit = true) => {
-	ctx && gitRollback(ctx);
-	const msg = err.message.replace(/^\[(github|npm|git)]/, (a) => red(a));
-	log.message(`\n${msg}\n`);
-	exit && process.exit(1);
-};
-const taskEnd = (msg) => {
-	outro(msg);
-	process.exit(0);
+	if (isTagged) gitTagDeleteSync(currentTag);
+	gitResetHardSync(isCommitted ? 1 : 0);
 };
 //#endregion
 //#region src/utils.ts
@@ -301,6 +268,27 @@ const formatTemplate = async (ctx, config) => {
 	});
 	Object.assign(ctx.github, { releaseName });
 };
+const abortTask = (msg) => {
+	cancel(`${red("✕")} ${msg}`);
+	process.exit(0);
+};
+const abortSinglePrompt = (value) => {
+	if (isCancel(value)) abortTask(MSG.ABORT.CANCEL);
+};
+const abortGroupPrompt = (ctx) => {
+	ctx && gitRollback(ctx);
+	abortTask(MSG.ABORT.CANCEL);
+};
+const abortOnError = (err, ctx, exit = true) => {
+	ctx && gitRollback(ctx);
+	const msg = err.message.replace(/^\[(github|npm|git)]/, (a) => red(a));
+	log.message(`\n${msg}\n`);
+	exit && process.exit(1);
+};
+const taskEnd = (msg) => {
+	outro(msg);
+	process.exit(0);
+};
 //#endregion
 //#region src/version/prompts.ts
 const createVersionMap = (current) => ({
@@ -348,7 +336,7 @@ const runVersionPrompts = async (ctx, config) => {
 			message: question(MSG.PROMPT.INPUT_VERSION, "version"),
 			initialValue: current,
 			validate: (val) => {
-				if (!isValid(val)) return "Invalid version";
+				if (isUndefined(val) || !isValidVersion(val)) return "Invalid version";
 			}
 		});
 		abortSinglePrompt(version);
@@ -591,8 +579,7 @@ const parsePreset = async () => {
 		hidden: false
 	})) });
 	preset.writer ??= {};
-	preset.writer.headerPartial = `
-## {{#if isPatch~}} <small> {{~/if~}}
+	preset.writer.headerPartial = `## {{#if isPatch~}} <small> {{~/if~}}
 {{#if @root.linkCompare~}}
 [{{version}}](
 {{~#if @root.repository~}}
@@ -616,8 +603,7 @@ const parsePreset = async () => {
 {{~/if}}
 {{~#if isPatch~}} </small> {{~/if}}
 `.trim() + eol();
-	preset.writer.mainTemplate = `
-{{> header}}
+	preset.writer.mainTemplate = `{{> header}}
 {{#if noteGroups}}
 {{#each noteGroups}}
 
@@ -653,7 +639,7 @@ const getChangelog = async ({ getPkgDir, tagPrefix, releaseCount = 1 }) => {
 	});
 	let changelog = "";
 	for await (const chunk of generator.write()) changelog += chunk;
-	return changelog;
+	return changelog.trimEnd();
 };
 const generateChangelog = async ({ getPkgDir, tagPrefix, releaseCount = 1 }) => {
 	const infile = join(getPkgDir(), "CHANGELOG.md");
@@ -932,18 +918,6 @@ const runNpmOptPrompts = async (ctx, config) => {
 };
 //#endregion
 //#region src/npm/publish.ts
-const canPublish = async (registry) => {
-	const res = await runNpm([
-		"publish",
-		"--dry-run",
-		"--no-git-checks",
-		"--access",
-		"public",
-		...registryArg(registry)
-	], { error: "throw" }).catch((err) => err);
-	if (!(res instanceof Error)) return true;
-	return [/previously published versions/i, /cannot publish over/i].some((reg) => reg.test(res.message));
-};
 const npmCheck = async (ctx, config) => {
 	const { pkg: { name, current, publishConfig: { registry } } } = ctx;
 	const { npm: { skipChecks } } = config;
@@ -1009,10 +983,10 @@ var Action = class {
 		const { otp, package: defPkg, ...others } = options;
 		const { showChangelog, showRelease, ci, dryRun } = Object.fromEntries(Object.entries(others).map(([k, v]) => [k, Boolean(v)]));
 		process.env["dryRun"] = String(dryRun);
-		const { configPath, config: local } = await resolveConfig(process.cwd());
+		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(configPath));
+		info(MSG.INFO.CONFIG(configFile));
 		console.log();
 		intro(prepare ? MSG.INTRO_PREPARE(dryRun) : MSG.INTRO(dryRun));
 		const { isMonorepo, packages, getPkgDir, ignoreNpm } = config;
@@ -1142,7 +1116,7 @@ var Action = class {
 			from: "",
 			to: "HEAD"
 		} : await resolveChangelogRange(isIncrement, match);
-		const commits = await getLog(from, to, getPkgDir(selectedPkg));
+		const commits = await getLogSince(from, to, getPkgDir(selectedPkg));
 		const changelog = await getChangelog({
 			getPkgDir: () => getPkgDir(selectedPkg),
 			tagPrefix: tagPrefix?.(selectedPkg),
@@ -1150,7 +1124,7 @@ var Action = class {
 		});
 		Object.assign(ctx.github, { changelog });
 		if (commits) {
-			msg("GIT", `Changelog(${from}...${to}):${eol(2)}` + changelog.trimEnd());
+			msg("GIT", `Changelog(${from}...${to}):${eol(2)}` + changelog);
 			msg("GIT", `Commits(${from}...${to}):${eol(2)}` + commits);
 			if (showChangelog) taskEnd(MSG.LOG.SHOW_CHANGELOG);
 		} else msg("GIT", MSG.LOG.CHANGELOG_EMPTY);
@@ -1172,8 +1146,8 @@ var Action = class {
 			},
 			enabled: isIncrement
 		}]).catch((err) => abortOnError(err, ctx));
-		const changeset = await getStatus();
-		if (changeset) msg("GIT", `Changes:${eol(2)}` + coloredChangeset(changeset));
+		const changeset = await getShortStatus();
+		if (changeset) msg("GIT", `Changes:${eol(2)}` + coloredStatus(changeset));
 		else msg("GIT", MSG.LOG.CHANGES_EMPTY);
 	}
 	async gitTask(ctx, config) {
@@ -1248,8 +1222,8 @@ program.command("init").description("Create a release configuration file").optio
 	const isESM = type === "module";
 	const isTS = existsSync(join(cwd, "tsconfig.json"));
 	const infile = `release.config.${isESM ? "" : "m"}${isTS ? "ts" : "js"}`;
-	const configPath = join(cwd, infile);
-	if (existsSync(configPath) && !force) {
+	const configFile = join(cwd, infile);
+	if (existsSync(configFile) && !force) {
 		console.error(`${red`Error:`} ${yellow(infile)} already exists.\nUse ${green`--force`} to overwrite.`);
 		process.exit(1);
 	}
@@ -1262,7 +1236,7 @@ program.command("init").description("Create a release configuration file").optio
     tagPrefix: (pkg) => \`\${ pkg }@\`,
   },
 }`;
-	writeFileSync(configPath, [`import { defineConfig } from '@peiyanlu/release'`, `export default defineConfig(${monorepo ? monoConfigToString() : "{}"})`].join(eol(2)), "utf-8");
+	writeFileSync(configFile, [`import { defineConfig } from '@peiyanlu/release'`, `export default defineConfig(${monorepo ? monoConfigToString() : "{}"})`].join(eol(2)), "utf-8");
 	console.log(`${green`✔`} ${infile} created successfully`);
 });
 program.parse(process.argv);

package/dist/index.mjs

@@ -132,8 +132,7 @@ const parsePreset = async () => {
 		hidden: false
 	})) });
 	preset.writer ??= {};
-	preset.writer.headerPartial = `
-## {{#if isPatch~}} <small> {{~/if~}}
+	preset.writer.headerPartial = `## {{#if isPatch~}} <small> {{~/if~}}
 {{#if @root.linkCompare~}}
 [{{version}}](
 {{~#if @root.repository~}}
@@ -157,8 +156,7 @@ const parsePreset = async () => {
 {{~/if}}
 {{~#if isPatch~}} </small> {{~/if}}
 `.trim() + eol();
-	preset.writer.mainTemplate = `
-{{> header}}
+	preset.writer.mainTemplate = `{{> header}}
 {{#if noteGroups}}
 {{#each noteGroups}}
 
@@ -194,7 +192,7 @@ const getChangelog = async ({ getPkgDir, tagPrefix, releaseCount = 1 }) => {
 	});
 	let changelog = "";
 	for await (const chunk of generator.write()) changelog += chunk;
-	return changelog;
+	return changelog.trimEnd();
 };
 const generateChangelog = async ({ getPkgDir, tagPrefix, releaseCount = 1 }) => {
 	const infile = join(getPkgDir(), "CHANGELOG.md");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peiyanlu/release",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "Release project tool.",
   "license": "MIT",
   "type": "module",
@@ -30,16 +30,17 @@
     "@actions/github": "^9.1.1",
     "@clack/prompts": "^1.5.0",
     "@octokit/rest": "^22.0.1",
-    "@peiyanlu/cli-utils": "^0.0.9",
+    "@peiyanlu/cli-utils": "^0.0.12",
     "@peiyanlu/ts-utils": "^0.0.7",
     "ansis": "^4.3.1",
     "commander": "^15.0.0",
-    "conventional-changelog": "^7.2.0",
+    "conventional-changelog": "^7.2.1",
     "conventional-changelog-conventionalcommits": "^9.3.1",
+    "conventional-changelog-writer": "^8.3.0",
     "mime-types": "^3.0.2",
     "open": "^11.0.0",
     "publint": "^0.3.21",
-    "semver": "^7.8.1",
+    "semver": "^7.8.5",
     "tinyglobby": "^0.2.17"
   },
   "devDependencies": {
@@ -47,9 +48,9 @@
     "@types/node": "^24.12.4",
     "@types/semver": "^7.7.1",
     "@vitest/coverage-v8": "^4.1.8",
-    "tsdown": "^0.22.1",
+    "tsdown": "^0.22.3",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.8"
+    "vitest": "^4.1.9"
   },
   "author": {
     "name": "YanluPei",