@peiyanlu/cli-utils 0.0.5 → 0.0.6

package/dist/index.cjs

@@ -414,7 +414,7 @@ const getAllRemotes = async () => {
 };
 /** 获取默认的远程地址 */
 const getDefaultRemote = async (branch) => {
-	const targetBranch = branch ?? await getCurrentBranch();
+	const targetBranch = branch || await getCurrentBranch();
 	return targetBranch ? await getRemoteForBranch(targetBranch) : void 0;
 };
 /** 获取默认远程地址之外的远程地址 */
@@ -432,29 +432,36 @@ const fetchAllBranch = (remoteName = "origin") => {
 	]);
 };
 /**
-* 获取本地所有 tag（不区分远程）
+* 获取本地所有 tag
 * @returns {Promise<string[]>}
-* @defaults git tag
+* @defaults git tag --list
 */
-const getTags = async () => {
-	const tags = await runGit(["tag"]);
-	return tags ? tags.split("\n").sort() : [];
+const getLocalTags = async () => {
+	const tags = await runGit(["tag", "--list"]);
+	return tags ? tags.split("\n").filter(Boolean) : [];
+};
+/** 获取远程 tags */
+const getSortedTags = async (match = "*", exclude = "*-beta.*", sort = "v:refname", count = 0) => {
+	const res = await runGit([
+		"for-each-ref",
+		"--format=%(refname:short)",
+		`--sort=-${sort}`,
+		`--exclude=${exclude}`,
+		`--count=${count}`,
+		`refs/tags/${match}`
+	]);
+	return res ? res.split("\n").filter(Boolean) : [];
 };
 /**
 * 获取远程（或所有 refs）中的 tag
 * 使用 for-each-ref 以支持版本号排序
 * @param {string} match 默认 *
+* @param {string} exclude 默认 beta
 * @returns {Promise<string[]>}
 * @defaults git for-each-ref --sort=-v:refname --format=%(refname:short) refs/tags/<match>
 */
-const getRemoteTags = async (match = "*") => {
-	const tags = await runGit([
-		"for-each-ref",
-		"--sort=-v:refname",
-		"--format=%(refname:short)",
-		`refs/tags/${match}`
-	]);
-	return tags ? tags.split("\n").sort() : [];
+const getRemoteTags = async (match = "*", exclude = "*-beta.*") => {
+	return getSortedTags(match, exclude);
 };
 /**
 * 获取当前工作区状态（不包含未跟踪文件）
@@ -514,7 +521,7 @@ const getRemote = async () => {
 	};
 };
 /**
-* 获取最新 tag（基于 git describe）
+* 获取最新 tag
 *
 * 默认：
 * - 匹配所有 tag
@@ -522,73 +529,40 @@ const getRemote = async () => {
 * @param {string} match 默认 *
 * @param {string} exclude 默认 beta
 * @returns {Promise<string | undefined>}
-* @defaults git describe --tags --abbrev=0 --match=<match> --exclude=<exclude>
 */
 const getLatestTag = async (match = "*", exclude = "*-beta.*") => {
-	return runGit([
-		"describe",
-		"--tags",
-		"--abbrev=0",
-		`--match=${match}`,
-		`--exclude=${exclude}`
-	]);
-};
-/**
-* 从所有 refs 中获取最新 tag
-* 适用于 git describe 不可靠的场景（如 tag 不在当前分支）
-* @param {string} match
-* @returns {Promise<string | undefined>}
-* @defaults git -c versionsort.suffix=- for-each-ref --count=1 --sort=-v:refname --format=%(refname:short) refs/tags/<match>
-*/
-const getLatestTagFromAllRefs = async (match = "*") => {
-	return runGit([
-		"-c",
-		"versionsort.suffix=-",
-		"for-each-ref",
-		"--count=1",
-		"--sort=-v:refname",
-		"--format=%(refname:short)",
-		`refs/tags/${match}`
-	]);
+	const [latestTag] = await getSortedTags(match, exclude, void 0, 1);
+	return latestTag;
 };
 /**
 * 获取上一个 tag
-* @param {string} current
-* @returns {Promise<string | undefined>}
-*/
-const getPreviousTag = async (current) => {
-	return runGit([
-		"describe",
-		"--tags",
-		"--abbrev=0",
-		`${await runGit([
-			"rev-list",
-			"--tags",
-			current ?? "--skip=1",
-			"--max-count=1"
-		])}^`
-	]);
-};
-/**
-* 将短 hash 解析为完整 hash
-* @param {string} short
+*
+* 默认：
+* - 匹配所有 tag
+* - 排除 beta 版本
+* @param {string} latestTag
+* @param {string} match 默认 *
+* @param {string} exclude 默认 beta
 * @returns {Promise<string | undefined>}
 */
-const getFullHash = (short) => {
-	return runGit(["rev-parse", short]);
+const getPreviousTag = async (latestTag, match = "*", exclude = "*-beta.*") => {
+	const all = await getSortedTags(match, exclude, void 0, 2);
+	return all[all.findIndex((k) => latestTag === k) + 1];
 };
 /**
 * 计算 changelog 的 commit 范围
 * @param {boolean} isIncrement 是否为版本递增发布
-* @returns {Promise<{from: string, to: string} | {from: string, to: string} | {from: string, to: string}>}
+* @param {string} match tag match
+* @param {string} exclude tag exclude
+* @returns {Promise<{from: string, to: string}>}
 */
-const resolveChangelogRange = async (isIncrement = true) => {
-	const latestTag = await getLatestTag();
-	const previousTag = await getPreviousTag(latestTag);
+const resolveChangelogRange = async (isIncrement = true, match = "*", exclude = "*-beta.*") => {
+	const latestTag = await getLatestTag(match, exclude);
 	if (!latestTag) return {
 		from: "",
 		to: "HEAD"
 	};
+	const previousTag = await getPreviousTag(latestTag);
 	if (!isIncrement && previousTag) return {
 		from: previousTag,
 		to: `${latestTag}^1`
@@ -599,6 +573,14 @@ const resolveChangelogRange = async (isIncrement = true) => {
 	};
 };
 /**
+* 将短 hash 解析为完整 hash
+* @param {string} short
+* @returns {Promise<string | undefined>}
+*/
+const getFullHash = (short) => {
+	return runGit(["rev-parse", short]);
+};
+/**
 * 获取指定范围内的 commit 日志
 * @param {string} from
 * @param {string} to
@@ -634,7 +616,7 @@ const hasUpstreamBranch = async () => {
 /** 获取 push 所需的 upstream 参数 */
 const getUpstreamArgs = async (remoteName, branch) => {
 	const hasUpstream = await hasUpstreamBranch();
-	const target = branch ?? await getCurrentBranch();
+	const target = branch || await getCurrentBranch();
 	if (!hasUpstream) return [
 		"--set-upstream",
 		remoteName,
@@ -1015,7 +997,7 @@ const getRegistry = async (pkgDir) => {
 const getAccess = async (pkgDir) => {
 	const { name, publishConfig = {} } = readJsonFile((0, node_path.join)(pkgDir, "package.json"));
 	const { access } = publishConfig;
-	return access ?? (name.startsWith("@") ? "restricted" : "public");
+	return access || (name.startsWith("@") ? "restricted" : "public");
 };
 /**
 * 检查与仓库的连接
@@ -1167,7 +1149,7 @@ exports.getGitRemoteUrl = getGitRemoteUrl;
 exports.getGithubReleaseUrl = getGithubReleaseUrl;
 exports.getGithubUrl = getGithubUrl;
 exports.getLatestTag = getLatestTag;
-exports.getLatestTagFromAllRefs = getLatestTagFromAllRefs;
+exports.getLocalTags = getLocalTags;
 exports.getLog = getLog;
 exports.getOtherRemotes = getOtherRemotes;
 exports.getPackageInfo = getPackageInfo;
@@ -1178,8 +1160,8 @@ exports.getRegistry = getRegistry;
 exports.getRemote = getRemote;
 exports.getRemoteForBranch = getRemoteForBranch;
 exports.getRemoteTags = getRemoteTags;
+exports.getSortedTags = getSortedTags;
 exports.getStatus = getStatus;
-exports.getTags = getTags;
 exports.getUpstreamArgs = getUpstreamArgs;
 exports.gitAddAll = gitAddAll;
 exports.gitAddTracked = gitAddTracked;

package/dist/index.d.cts

@@ -155,19 +155,22 @@ declare const getOtherRemotes: (branch?: string) => Promise<string[]>;
 /** 提取所有分支 */
 declare const fetchAllBranch: (remoteName?: string) => Promise<string | undefined>;
 /**
- * 获取本地所有 tag（不区分远程）
+ * 获取本地所有 tag
  * @returns {Promise<string[]>}
- * @defaults git tag
+ * @defaults git tag --list
  */
-declare const getTags: () => Promise<string[]>;
+declare const getLocalTags: () => Promise<string[]>;
+/** 获取远程 tags */
+declare const getSortedTags: (match?: string, exclude?: string, sort?: "v:refname" | "creatordate", count?: number) => Promise<string[]>;
 /**
  * 获取远程（或所有 refs）中的 tag
  * 使用 for-each-ref 以支持版本号排序
  * @param {string} match 默认 *
+ * @param {string} exclude 默认 beta
  * @returns {Promise<string[]>}
  * @defaults git for-each-ref --sort=-v:refname --format=%(refname:short) refs/tags/<match>
  */
-declare const getRemoteTags: (match?: string) => Promise<string[]>;
+declare const getRemoteTags: (match?: string, exclude?: string) => Promise<string[]>;
 /**
  * 获取当前工作区状态（不包含未跟踪文件）
  * @returns {Promise<string | undefined>}
@@ -193,7 +196,7 @@ declare const getRemote: () => Promise<{
   remoteUrl: string | undefined;
 }>;
 /**
- * 获取最新 tag（基于 git describe）
+ * 获取最新 tag
  *
  * 默认：
  * - 匹配所有 tag
@@ -201,38 +204,37 @@ declare const getRemote: () => Promise<{
  * @param {string} match 默认 *
  * @param {string} exclude 默认 beta
  * @returns {Promise<string | undefined>}
- * @defaults git describe --tags --abbrev=0 --match=<match> --exclude=<exclude>
  */
 declare const getLatestTag: (match?: string, exclude?: string) => Promise<string | undefined>;
-/**
- * 从所有 refs 中获取最新 tag
- * 适用于 git describe 不可靠的场景（如 tag 不在当前分支）
- * @param {string} match
- * @returns {Promise<string | undefined>}
- * @defaults git -c versionsort.suffix=- for-each-ref --count=1 --sort=-v:refname --format=%(refname:short) refs/tags/<match>
- */
-declare const getLatestTagFromAllRefs: (match?: string) => Promise<string | undefined>;
 /**
  * 获取上一个 tag
- * @param {string} current
- * @returns {Promise<string | undefined>}
- */
-declare const getPreviousTag: (current?: string) => Promise<string | undefined>;
-/**
- * 将短 hash 解析为完整 hash
- * @param {string} short
+ *
+ * 默认：
+ * - 匹配所有 tag
+ * - 排除 beta 版本
+ * @param {string} latestTag
+ * @param {string} match 默认 *
+ * @param {string} exclude 默认 beta
  * @returns {Promise<string | undefined>}
  */
-declare const getFullHash: (short: string) => Promise<string | undefined>;
+declare const getPreviousTag: (latestTag: string, match?: string, exclude?: string) => Promise<string | undefined>;
 /**
  * 计算 changelog 的 commit 范围
  * @param {boolean} isIncrement 是否为版本递增发布
- * @returns {Promise<{from: string, to: string} | {from: string, to: string} | {from: string, to: string}>}
+ * @param {string} match tag match
+ * @param {string} exclude tag exclude
+ * @returns {Promise<{from: string, to: string}>}
  */
-declare const resolveChangelogRange: (isIncrement?: boolean) => Promise<{
+declare const resolveChangelogRange: (isIncrement?: boolean, match?: string, exclude?: string) => Promise<{
   from: string;
   to: string;
 }>;
+/**
+ * 将短 hash 解析为完整 hash
+ * @param {string} short
+ * @returns {Promise<string | undefined>}
+ */
+declare const getFullHash: (short: string) => Promise<string | undefined>;
 /**
  * 获取指定范围内的 commit 日志
  * @param {string} from
@@ -283,7 +285,7 @@ declare const pushTag: (remoteName: string, tag: string, args?: string[]) => Pro
  * @param {string[]} args
  * @returns {Promise<string | undefined>}
  */
-declare const pushBranch: (remoteName: string, branch: string, args?: string[]) => Promise<void>;
+declare const pushBranch: (remoteName: string, branch?: string, args?: string[]) => Promise<void>;
 /**
  * 撤销【工作区】中某个文件的修改（未暂存的改动）
  * - 不影响暂存区
@@ -520,4 +522,4 @@ declare const publishPackage: (options?: {
   cwd?: string;
 }) => Promise<string | undefined>;
 //#endregion
-export { CliOptions, ConfirmResult, CopyOptions, DEFAULT_ACCESS, DEFAULT_REGISTRY, DEFAULT_TAG, ExecAsyncWithStringOptions, ExecResultOptions, ExecSyncWithStringOptions, HttpLibrary, PkgInfo, PkgManager, SpawnAsyncWithStringOptions, SpawnSyncWithStringOptions, YesOrNo, accessArg, bumpPackageVersion, checkVersion, coloredChangeset, copyDirAsync, countCommitsSinceLatestTag, deleteTag, deleteTagSync, discardAll, discardAllSync, discardFile, editFile, editJsonFile, emptyDir, eol, execAsync, execSyncWithString, fetchAllBranch, getAccess, getAllRemotes, getAuthenticatedUser, getCurrentBranch, getDefaultRemote, getDistTags, getFullHash, getGitConfig, getGitRemoteUrl, getGithubReleaseUrl, getGithubUrl, getLatestTag, getLatestTagFromAllRefs, getLog, getOtherRemotes, getPackageInfo, getPackageUrl, getPreviousTag, getPublishedVersion, getRegistry, getRemote, getRemoteForBranch, getRemoteTags, getStatus, getTags, getUpstreamArgs, gitAddAll, gitAddTracked, gitCommit, gitCommitAmend, gitTagAnnotated, gitTagLightweight, gitUndo, hasUpstreamBranch, hasWriteAccess, isEmpty, isGitRepo, isRemoteName, isTestFile, isValidPackageName, isWorkingDirClean, joinUrl, parseArgs, parseGitHubRepo, pingRegistry, pkgFromUserAgent, publishPackage, pushBranch, pushTag, readJsonFile, readSubDirs, registryArg, resetHard, resetHardSync, resetMixed, resetSoft, resolveChangelogRange, restoreAll, restoreAllSync, restoreFile, restoreFileFromCommit, restoreFromCommit, revertCommit, runCliForTest, runGit, runGitSync, runNode, runNodeSync, runNpm, runNpmSync, space, spawnAsync, spawnSyncWithString, stringifyArgs, tagArg, toValidPackageName, toValidProjectName, trimTemplate, unstageAll, unstageFile };
+export { CliOptions, ConfirmResult, CopyOptions, DEFAULT_ACCESS, DEFAULT_REGISTRY, DEFAULT_TAG, ExecAsyncWithStringOptions, ExecResultOptions, ExecSyncWithStringOptions, HttpLibrary, PkgInfo, PkgManager, SpawnAsyncWithStringOptions, SpawnSyncWithStringOptions, YesOrNo, accessArg, bumpPackageVersion, checkVersion, coloredChangeset, copyDirAsync, countCommitsSinceLatestTag, deleteTag, deleteTagSync, discardAll, discardAllSync, discardFile, editFile, editJsonFile, emptyDir, eol, execAsync, execSyncWithString, fetchAllBranch, getAccess, getAllRemotes, getAuthenticatedUser, getCurrentBranch, getDefaultRemote, getDistTags, getFullHash, getGitConfig, getGitRemoteUrl, getGithubReleaseUrl, getGithubUrl, getLatestTag, getLocalTags, getLog, getOtherRemotes, getPackageInfo, getPackageUrl, getPreviousTag, getPublishedVersion, getRegistry, getRemote, getRemoteForBranch, getRemoteTags, getSortedTags, getStatus, getUpstreamArgs, gitAddAll, gitAddTracked, gitCommit, gitCommitAmend, gitTagAnnotated, gitTagLightweight, gitUndo, hasUpstreamBranch, hasWriteAccess, isEmpty, isGitRepo, isRemoteName, isTestFile, isValidPackageName, isWorkingDirClean, joinUrl, parseArgs, parseGitHubRepo, pingRegistry, pkgFromUserAgent, publishPackage, pushBranch, pushTag, readJsonFile, readSubDirs, registryArg, resetHard, resetHardSync, resetMixed, resetSoft, resolveChangelogRange, restoreAll, restoreAllSync, restoreFile, restoreFileFromCommit, restoreFromCommit, revertCommit, runCliForTest, runGit, runGitSync, runNode, runNodeSync, runNpm, runNpmSync, space, spawnAsync, spawnSyncWithString, stringifyArgs, tagArg, toValidPackageName, toValidProjectName, trimTemplate, unstageAll, unstageFile };

package/dist/index.d.mts

@@ -155,19 +155,22 @@ declare const getOtherRemotes: (branch?: string) => Promise<string[]>;
 /** 提取所有分支 */
 declare const fetchAllBranch: (remoteName?: string) => Promise<string | undefined>;
 /**
- * 获取本地所有 tag（不区分远程）
+ * 获取本地所有 tag
  * @returns {Promise<string[]>}
- * @defaults git tag
+ * @defaults git tag --list
  */
-declare const getTags: () => Promise<string[]>;
+declare const getLocalTags: () => Promise<string[]>;
+/** 获取远程 tags */
+declare const getSortedTags: (match?: string, exclude?: string, sort?: "v:refname" | "creatordate", count?: number) => Promise<string[]>;
 /**
  * 获取远程（或所有 refs）中的 tag
  * 使用 for-each-ref 以支持版本号排序
  * @param {string} match 默认 *
+ * @param {string} exclude 默认 beta
  * @returns {Promise<string[]>}
  * @defaults git for-each-ref --sort=-v:refname --format=%(refname:short) refs/tags/<match>
  */
-declare const getRemoteTags: (match?: string) => Promise<string[]>;
+declare const getRemoteTags: (match?: string, exclude?: string) => Promise<string[]>;
 /**
  * 获取当前工作区状态（不包含未跟踪文件）
  * @returns {Promise<string | undefined>}
@@ -193,7 +196,7 @@ declare const getRemote: () => Promise<{
   remoteUrl: string | undefined;
 }>;
 /**
- * 获取最新 tag（基于 git describe）
+ * 获取最新 tag
  *
  * 默认：
  * - 匹配所有 tag
@@ -201,38 +204,37 @@ declare const getRemote: () => Promise<{
  * @param {string} match 默认 *
  * @param {string} exclude 默认 beta
  * @returns {Promise<string | undefined>}
- * @defaults git describe --tags --abbrev=0 --match=<match> --exclude=<exclude>
  */
 declare const getLatestTag: (match?: string, exclude?: string) => Promise<string | undefined>;
-/**
- * 从所有 refs 中获取最新 tag
- * 适用于 git describe 不可靠的场景（如 tag 不在当前分支）
- * @param {string} match
- * @returns {Promise<string | undefined>}
- * @defaults git -c versionsort.suffix=- for-each-ref --count=1 --sort=-v:refname --format=%(refname:short) refs/tags/<match>
- */
-declare const getLatestTagFromAllRefs: (match?: string) => Promise<string | undefined>;
 /**
  * 获取上一个 tag
- * @param {string} current
- * @returns {Promise<string | undefined>}
- */
-declare const getPreviousTag: (current?: string) => Promise<string | undefined>;
-/**
- * 将短 hash 解析为完整 hash
- * @param {string} short
+ *
+ * 默认：
+ * - 匹配所有 tag
+ * - 排除 beta 版本
+ * @param {string} latestTag
+ * @param {string} match 默认 *
+ * @param {string} exclude 默认 beta
  * @returns {Promise<string | undefined>}
  */
-declare const getFullHash: (short: string) => Promise<string | undefined>;
+declare const getPreviousTag: (latestTag: string, match?: string, exclude?: string) => Promise<string | undefined>;
 /**
  * 计算 changelog 的 commit 范围
  * @param {boolean} isIncrement 是否为版本递增发布
- * @returns {Promise<{from: string, to: string} | {from: string, to: string} | {from: string, to: string}>}
+ * @param {string} match tag match
+ * @param {string} exclude tag exclude
+ * @returns {Promise<{from: string, to: string}>}
  */
-declare const resolveChangelogRange: (isIncrement?: boolean) => Promise<{
+declare const resolveChangelogRange: (isIncrement?: boolean, match?: string, exclude?: string) => Promise<{
   from: string;
   to: string;
 }>;
+/**
+ * 将短 hash 解析为完整 hash
+ * @param {string} short
+ * @returns {Promise<string | undefined>}
+ */
+declare const getFullHash: (short: string) => Promise<string | undefined>;
 /**
  * 获取指定范围内的 commit 日志
  * @param {string} from
@@ -283,7 +285,7 @@ declare const pushTag: (remoteName: string, tag: string, args?: string[]) => Pro
  * @param {string[]} args
  * @returns {Promise<string | undefined>}
  */
-declare const pushBranch: (remoteName: string, branch: string, args?: string[]) => Promise<void>;
+declare const pushBranch: (remoteName: string, branch?: string, args?: string[]) => Promise<void>;
 /**
  * 撤销【工作区】中某个文件的修改（未暂存的改动）
  * - 不影响暂存区
@@ -520,4 +522,4 @@ declare const publishPackage: (options?: {
   cwd?: string;
 }) => Promise<string | undefined>;
 //#endregion
-export { CliOptions, ConfirmResult, CopyOptions, DEFAULT_ACCESS, DEFAULT_REGISTRY, DEFAULT_TAG, ExecAsyncWithStringOptions, ExecResultOptions, ExecSyncWithStringOptions, HttpLibrary, PkgInfo, PkgManager, SpawnAsyncWithStringOptions, SpawnSyncWithStringOptions, YesOrNo, accessArg, bumpPackageVersion, checkVersion, coloredChangeset, copyDirAsync, countCommitsSinceLatestTag, deleteTag, deleteTagSync, discardAll, discardAllSync, discardFile, editFile, editJsonFile, emptyDir, eol, execAsync, execSyncWithString, fetchAllBranch, getAccess, getAllRemotes, getAuthenticatedUser, getCurrentBranch, getDefaultRemote, getDistTags, getFullHash, getGitConfig, getGitRemoteUrl, getGithubReleaseUrl, getGithubUrl, getLatestTag, getLatestTagFromAllRefs, getLog, getOtherRemotes, getPackageInfo, getPackageUrl, getPreviousTag, getPublishedVersion, getRegistry, getRemote, getRemoteForBranch, getRemoteTags, getStatus, getTags, getUpstreamArgs, gitAddAll, gitAddTracked, gitCommit, gitCommitAmend, gitTagAnnotated, gitTagLightweight, gitUndo, hasUpstreamBranch, hasWriteAccess, isEmpty, isGitRepo, isRemoteName, isTestFile, isValidPackageName, isWorkingDirClean, joinUrl, parseArgs, parseGitHubRepo, pingRegistry, pkgFromUserAgent, publishPackage, pushBranch, pushTag, readJsonFile, readSubDirs, registryArg, resetHard, resetHardSync, resetMixed, resetSoft, resolveChangelogRange, restoreAll, restoreAllSync, restoreFile, restoreFileFromCommit, restoreFromCommit, revertCommit, runCliForTest, runGit, runGitSync, runNode, runNodeSync, runNpm, runNpmSync, space, spawnAsync, spawnSyncWithString, stringifyArgs, tagArg, toValidPackageName, toValidProjectName, trimTemplate, unstageAll, unstageFile };
+export { CliOptions, ConfirmResult, CopyOptions, DEFAULT_ACCESS, DEFAULT_REGISTRY, DEFAULT_TAG, ExecAsyncWithStringOptions, ExecResultOptions, ExecSyncWithStringOptions, HttpLibrary, PkgInfo, PkgManager, SpawnAsyncWithStringOptions, SpawnSyncWithStringOptions, YesOrNo, accessArg, bumpPackageVersion, checkVersion, coloredChangeset, copyDirAsync, countCommitsSinceLatestTag, deleteTag, deleteTagSync, discardAll, discardAllSync, discardFile, editFile, editJsonFile, emptyDir, eol, execAsync, execSyncWithString, fetchAllBranch, getAccess, getAllRemotes, getAuthenticatedUser, getCurrentBranch, getDefaultRemote, getDistTags, getFullHash, getGitConfig, getGitRemoteUrl, getGithubReleaseUrl, getGithubUrl, getLatestTag, getLocalTags, getLog, getOtherRemotes, getPackageInfo, getPackageUrl, getPreviousTag, getPublishedVersion, getRegistry, getRemote, getRemoteForBranch, getRemoteTags, getSortedTags, getStatus, getUpstreamArgs, gitAddAll, gitAddTracked, gitCommit, gitCommitAmend, gitTagAnnotated, gitTagLightweight, gitUndo, hasUpstreamBranch, hasWriteAccess, isEmpty, isGitRepo, isRemoteName, isTestFile, isValidPackageName, isWorkingDirClean, joinUrl, parseArgs, parseGitHubRepo, pingRegistry, pkgFromUserAgent, publishPackage, pushBranch, pushTag, readJsonFile, readSubDirs, registryArg, resetHard, resetHardSync, resetMixed, resetSoft, resolveChangelogRange, restoreAll, restoreAllSync, restoreFile, restoreFileFromCommit, restoreFromCommit, revertCommit, runCliForTest, runGit, runGitSync, runNode, runNodeSync, runNpm, runNpmSync, space, spawnAsync, spawnSyncWithString, stringifyArgs, tagArg, toValidPackageName, toValidProjectName, trimTemplate, unstageAll, unstageFile };

package/dist/index.mjs

@@ -414,7 +414,7 @@ const getAllRemotes = async () => {
 };
 /** 获取默认的远程地址 */
 const getDefaultRemote = async (branch) => {
-	const targetBranch = branch ?? await getCurrentBranch();
+	const targetBranch = branch || await getCurrentBranch();
 	return targetBranch ? await getRemoteForBranch(targetBranch) : void 0;
 };
 /** 获取默认远程地址之外的远程地址 */
@@ -432,29 +432,36 @@ const fetchAllBranch = (remoteName = "origin") => {
 	]);
 };
 /**
-* 获取本地所有 tag（不区分远程）
+* 获取本地所有 tag
 * @returns {Promise<string[]>}
-* @defaults git tag
+* @defaults git tag --list
 */
-const getTags = async () => {
-	const tags = await runGit(["tag"]);
-	return tags ? tags.split("\n").sort() : [];
+const getLocalTags = async () => {
+	const tags = await runGit(["tag", "--list"]);
+	return tags ? tags.split("\n").filter(Boolean) : [];
+};
+/** 获取远程 tags */
+const getSortedTags = async (match = "*", exclude = "*-beta.*", sort = "v:refname", count = 0) => {
+	const res = await runGit([
+		"for-each-ref",
+		"--format=%(refname:short)",
+		`--sort=-${sort}`,
+		`--exclude=${exclude}`,
+		`--count=${count}`,
+		`refs/tags/${match}`
+	]);
+	return res ? res.split("\n").filter(Boolean) : [];
 };
 /**
 * 获取远程（或所有 refs）中的 tag
 * 使用 for-each-ref 以支持版本号排序
 * @param {string} match 默认 *
+* @param {string} exclude 默认 beta
 * @returns {Promise<string[]>}
 * @defaults git for-each-ref --sort=-v:refname --format=%(refname:short) refs/tags/<match>
 */
-const getRemoteTags = async (match = "*") => {
-	const tags = await runGit([
-		"for-each-ref",
-		"--sort=-v:refname",
-		"--format=%(refname:short)",
-		`refs/tags/${match}`
-	]);
-	return tags ? tags.split("\n").sort() : [];
+const getRemoteTags = async (match = "*", exclude = "*-beta.*") => {
+	return getSortedTags(match, exclude);
 };
 /**
 * 获取当前工作区状态（不包含未跟踪文件）
@@ -514,7 +521,7 @@ const getRemote = async () => {
 	};
 };
 /**
-* 获取最新 tag（基于 git describe）
+* 获取最新 tag
 *
 * 默认：
 * - 匹配所有 tag
@@ -522,73 +529,40 @@ const getRemote = async () => {
 * @param {string} match 默认 *
 * @param {string} exclude 默认 beta
 * @returns {Promise<string | undefined>}
-* @defaults git describe --tags --abbrev=0 --match=<match> --exclude=<exclude>
 */
 const getLatestTag = async (match = "*", exclude = "*-beta.*") => {
-	return runGit([
-		"describe",
-		"--tags",
-		"--abbrev=0",
-		`--match=${match}`,
-		`--exclude=${exclude}`
-	]);
-};
-/**
-* 从所有 refs 中获取最新 tag
-* 适用于 git describe 不可靠的场景（如 tag 不在当前分支）
-* @param {string} match
-* @returns {Promise<string | undefined>}
-* @defaults git -c versionsort.suffix=- for-each-ref --count=1 --sort=-v:refname --format=%(refname:short) refs/tags/<match>
-*/
-const getLatestTagFromAllRefs = async (match = "*") => {
-	return runGit([
-		"-c",
-		"versionsort.suffix=-",
-		"for-each-ref",
-		"--count=1",
-		"--sort=-v:refname",
-		"--format=%(refname:short)",
-		`refs/tags/${match}`
-	]);
+	const [latestTag] = await getSortedTags(match, exclude, void 0, 1);
+	return latestTag;
 };
 /**
 * 获取上一个 tag
-* @param {string} current
-* @returns {Promise<string | undefined>}
-*/
-const getPreviousTag = async (current) => {
-	return runGit([
-		"describe",
-		"--tags",
-		"--abbrev=0",
-		`${await runGit([
-			"rev-list",
-			"--tags",
-			current ?? "--skip=1",
-			"--max-count=1"
-		])}^`
-	]);
-};
-/**
-* 将短 hash 解析为完整 hash
-* @param {string} short
+*
+* 默认：
+* - 匹配所有 tag
+* - 排除 beta 版本
+* @param {string} latestTag
+* @param {string} match 默认 *
+* @param {string} exclude 默认 beta
 * @returns {Promise<string | undefined>}
 */
-const getFullHash = (short) => {
-	return runGit(["rev-parse", short]);
+const getPreviousTag = async (latestTag, match = "*", exclude = "*-beta.*") => {
+	const all = await getSortedTags(match, exclude, void 0, 2);
+	return all[all.findIndex((k) => latestTag === k) + 1];
 };
 /**
 * 计算 changelog 的 commit 范围
 * @param {boolean} isIncrement 是否为版本递增发布
-* @returns {Promise<{from: string, to: string} | {from: string, to: string} | {from: string, to: string}>}
+* @param {string} match tag match
+* @param {string} exclude tag exclude
+* @returns {Promise<{from: string, to: string}>}
 */
-const resolveChangelogRange = async (isIncrement = true) => {
-	const latestTag = await getLatestTag();
-	const previousTag = await getPreviousTag(latestTag);
+const resolveChangelogRange = async (isIncrement = true, match = "*", exclude = "*-beta.*") => {
+	const latestTag = await getLatestTag(match, exclude);
 	if (!latestTag) return {
 		from: "",
 		to: "HEAD"
 	};
+	const previousTag = await getPreviousTag(latestTag);
 	if (!isIncrement && previousTag) return {
 		from: previousTag,
 		to: `${latestTag}^1`
@@ -599,6 +573,14 @@ const resolveChangelogRange = async (isIncrement = true) => {
 	};
 };
 /**
+* 将短 hash 解析为完整 hash
+* @param {string} short
+* @returns {Promise<string | undefined>}
+*/
+const getFullHash = (short) => {
+	return runGit(["rev-parse", short]);
+};
+/**
 * 获取指定范围内的 commit 日志
 * @param {string} from
 * @param {string} to
@@ -634,7 +616,7 @@ const hasUpstreamBranch = async () => {
 /** 获取 push 所需的 upstream 参数 */
 const getUpstreamArgs = async (remoteName, branch) => {
 	const hasUpstream = await hasUpstreamBranch();
-	const target = branch ?? await getCurrentBranch();
+	const target = branch || await getCurrentBranch();
 	if (!hasUpstream) return [
 		"--set-upstream",
 		remoteName,
@@ -1015,7 +997,7 @@ const getRegistry = async (pkgDir) => {
 const getAccess = async (pkgDir) => {
 	const { name, publishConfig = {} } = readJsonFile(join(pkgDir, "package.json"));
 	const { access } = publishConfig;
-	return access ?? (name.startsWith("@") ? "restricted" : "public");
+	return access || (name.startsWith("@") ? "restricted" : "public");
 };
 /**
 * 检查与仓库的连接
@@ -1130,4 +1112,4 @@ const publishPackage = (options) => {
 };
 
 //#endregion
-export { ConfirmResult, DEFAULT_ACCESS, DEFAULT_REGISTRY, DEFAULT_TAG, HttpLibrary, PkgManager, YesOrNo, accessArg, bumpPackageVersion, checkVersion, coloredChangeset, copyDirAsync, countCommitsSinceLatestTag, deleteTag, deleteTagSync, discardAll, discardAllSync, discardFile, editFile, editJsonFile, emptyDir, eol, execAsync, execSyncWithString, fetchAllBranch, getAccess, getAllRemotes, getAuthenticatedUser, getCurrentBranch, getDefaultRemote, getDistTags, getFullHash, getGitConfig, getGitRemoteUrl, getGithubReleaseUrl, getGithubUrl, getLatestTag, getLatestTagFromAllRefs, getLog, getOtherRemotes, getPackageInfo, getPackageUrl, getPreviousTag, getPublishedVersion, getRegistry, getRemote, getRemoteForBranch, getRemoteTags, getStatus, getTags, getUpstreamArgs, gitAddAll, gitAddTracked, gitCommit, gitCommitAmend, gitTagAnnotated, gitTagLightweight, gitUndo, hasUpstreamBranch, hasWriteAccess, isEmpty, isGitRepo, isRemoteName, isTestFile, isValidPackageName, isWorkingDirClean, joinUrl, parseArgs, parseGitHubRepo, pingRegistry, pkgFromUserAgent, publishPackage, pushBranch, pushTag, readJsonFile, readSubDirs, registryArg, resetHard, resetHardSync, resetMixed, resetSoft, resolveChangelogRange, restoreAll, restoreAllSync, restoreFile, restoreFileFromCommit, restoreFromCommit, revertCommit, runCliForTest, runGit, runGitSync, runNode, runNodeSync, runNpm, runNpmSync, space, spawnAsync, spawnSyncWithString, stringifyArgs, tagArg, toValidPackageName, toValidProjectName, trimTemplate, unstageAll, unstageFile };
+export { ConfirmResult, DEFAULT_ACCESS, DEFAULT_REGISTRY, DEFAULT_TAG, HttpLibrary, PkgManager, YesOrNo, accessArg, bumpPackageVersion, checkVersion, coloredChangeset, copyDirAsync, countCommitsSinceLatestTag, deleteTag, deleteTagSync, discardAll, discardAllSync, discardFile, editFile, editJsonFile, emptyDir, eol, execAsync, execSyncWithString, fetchAllBranch, getAccess, getAllRemotes, getAuthenticatedUser, getCurrentBranch, getDefaultRemote, getDistTags, getFullHash, getGitConfig, getGitRemoteUrl, getGithubReleaseUrl, getGithubUrl, getLatestTag, getLocalTags, getLog, getOtherRemotes, getPackageInfo, getPackageUrl, getPreviousTag, getPublishedVersion, getRegistry, getRemote, getRemoteForBranch, getRemoteTags, getSortedTags, getStatus, getUpstreamArgs, gitAddAll, gitAddTracked, gitCommit, gitCommitAmend, gitTagAnnotated, gitTagLightweight, gitUndo, hasUpstreamBranch, hasWriteAccess, isEmpty, isGitRepo, isRemoteName, isTestFile, isValidPackageName, isWorkingDirClean, joinUrl, parseArgs, parseGitHubRepo, pingRegistry, pkgFromUserAgent, publishPackage, pushBranch, pushTag, readJsonFile, readSubDirs, registryArg, resetHard, resetHardSync, resetMixed, resetSoft, resolveChangelogRange, restoreAll, restoreAllSync, restoreFile, restoreFileFromCommit, restoreFromCommit, revertCommit, runCliForTest, runGit, runGitSync, runNode, runNodeSync, runNpm, runNpmSync, space, spawnAsync, spawnSyncWithString, stringifyArgs, tagArg, toValidPackageName, toValidProjectName, trimTemplate, unstageAll, unstageFile };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peiyanlu/cli-utils",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Shared utils for building interactive Node.js CLI applications.",
   "license": "MIT",
   "type": "module",