@quiteer/scripts 0.0.5 → 0.0.6

package/dist/index.mjs

@@ -12,7 +12,7 @@ import enquirer from "enquirer";
 import { versionBump } from "bumpp";
 
 //#region package.json
-var version = "0.0.4";
+var version = "0.0.5";
 
 //#endregion
 //#region src/locales/changelog.ts
@@ -493,6 +493,137 @@ async function generateConfig() {
 	].join("\n"), "utf8");
 }
 
+//#endregion
+//#region src/commands/git-branches.ts
+/**
+* 列出远程仓库所有分支（含最新提交时间），并按时间倒序打印
+* - 会先执行 `git fetch --prune --tags` 同步远程引用
+* - 通过 `git for-each-ref` 获取 `refs/remotes/<remote>` 下的分支与提交时间
+* @param remote 远程仓库名，默认 `origin`
+* @returns Promise<void>
+*/
+async function gitRemoteBranches(urlOrRemote) {
+	const temp = "gb-temp";
+	const target = (urlOrRemote || "").trim();
+	let refBase = "";
+	try {
+		if (target) {
+			await execCommand("git", [
+				"fetch",
+				target,
+				`+refs/heads/*:refs/remotes/${temp}/*`,
+				"--prune",
+				"--no-tags"
+			]);
+			refBase = `refs/remotes/${temp}`;
+		} else {
+			const r = "origin";
+			await execCommand("git", [
+				"fetch",
+				r,
+				"--prune",
+				"--tags"
+			]);
+			refBase = `refs/remotes/${r}`;
+		}
+	} catch {
+		console.log("拉取远程分支失败，请检查 URL 或网络连接");
+		return;
+	}
+	const lines = (await execCommand("git", [
+		"for-each-ref",
+		"--format=%(refname:short)	%(committerdate:relative)	%(objectname:short)	%(contents:subject)",
+		"--sort=-committerdate",
+		refBase
+	])).split("\n").filter(Boolean);
+	if (lines.length === 0) {
+		console.log("未找到远程分支，请确认已配置远程并有追踪分支");
+		return;
+	}
+	/**
+	* 英文相对时间转中文
+	* @param rel 英文相对时间字符串（如：2 hours ago）
+	* @returns 中文相对时间（如：2小时前）
+	*/
+	function zhRelative(rel) {
+		const s = rel.toLowerCase().trim();
+		let m;
+		if (m = s.match(/^(\d+)\s+seconds?\s+ago$/)) return `${m[1]}秒前`;
+		if (m = s.match(/^(\d+)\s+minutes?\s+ago$/)) return `${m[1]}分钟前`;
+		if (m = s.match(/^(\d+)\s+hours?\s+ago$/)) return `${m[1]}小时前`;
+		if (m = s.match(/^(\d+)\s+days?\s+ago$/)) return `${m[1]}天前`;
+		if (m = s.match(/^(\d+)\s+weeks?\s+ago$/)) return `${m[1]}周前`;
+		if (m = s.match(/^(\d+)\s+months?\s+ago$/)) return `${m[1]}个月前`;
+		if (m = s.match(/^(\d+)\s+years?\s+ago$/)) return `${m[1]}年前`;
+		if (s === "yesterday") return "昨天";
+		if (s === "today") return "今天";
+		if (m = s.match(/^about\s+(\d+)\s+hours?\s+ago$/)) return `${m[1]}小时前`;
+		if (m = s.match(/^about\s+(\d+)\s+minutes?\s+ago$/)) return `${m[1]}分钟前`;
+		if (m = s.match(/^about\s+(\d+)\s+days?\s+ago$/)) return `${m[1]}天前`;
+		if (m = s.match(/^about\s+(\d+)\s+months?\s+ago$/)) return `${m[1]}个月前`;
+		if (m = s.match(/^about\s+(\d+)\s+years?\s+ago$/)) return `${m[1]}年前`;
+		return rel;
+	}
+	/**
+	* 计算字符串在等宽终端中的显示宽度（简单处理全角字符为宽度 2）
+	* @param s 输入字符串（不含 ANSI 颜色码）
+	* @returns 可视宽度
+	*/
+	function displayWidth(s) {
+		let w = 0;
+		for (const ch of s) {
+			const code = ch.codePointAt(0) || 0;
+			w += code >= 4352 && code <= 4447 || code >= 11904 && code <= 42191 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65040 && code <= 65049 || code >= 65072 && code <= 65135 || code >= 65280 && code <= 65376 || code >= 65504 && code <= 65510 ? 2 : 1;
+		}
+		return w;
+	}
+	/**
+	* 基于显示宽度的左对齐填充
+	* @param s 源字符串
+	* @param width 目标显示宽度
+	* @returns 左对齐并填充空格的字符串
+	*/
+	function padEndDisplay(s, width) {
+		const w = displayWidth(s);
+		if (w >= width) return s;
+		return s + " ".repeat(width - w);
+	}
+	const rows = lines.map((line) => {
+		const [nameRaw, relRaw, shaRaw, subjectRaw] = line.split("	");
+		return {
+			name: nameRaw.replace(/^.+\//, ""),
+			relZh: zhRelative(relRaw || ""),
+			sha: (shaRaw || "").slice(0, 7),
+			subject: subjectRaw || ""
+		};
+	}).filter((item) => item.name && item.name !== "HEAD");
+	const nameWidth = Math.max(...rows.map((r) => displayWidth(r.name)));
+	const relValues = rows.map((r) => `(${r.relZh})`);
+	const relWidth = Math.max(...relValues.map((v) => displayWidth(v)), 0);
+	const label = " 最新 ";
+	const labelWidth = displayWidth(label);
+	const tag = bgGreen(white(label));
+	const pad = " ".repeat(labelWidth);
+	rows.forEach((row, i) => {
+		const relText = padEndDisplay(`(${row.relZh})`, relWidth);
+		const line = `${padEndDisplay(row.name, nameWidth)}  ${relText}  ${row.sha} ${row.subject}`;
+		if (i === 0) console.log(`${tag} ${lightGreen(line)}`);
+		else console.log(`${pad} ${white(line)}`);
+	});
+	if (target) {
+		const refnames = await execCommand("git", [
+			"for-each-ref",
+			"--format=%(refname)",
+			refBase
+		]);
+		for (const ref of refnames.split("\n").filter(Boolean)) await execCommand("git", [
+			"update-ref",
+			"-d",
+			ref
+		]);
+	}
+}
+
 //#endregion
 //#region src/commands/git-commit.ts
 /**
@@ -670,133 +801,49 @@ async function updatePkg(args = ["--deep", "-u"]) {
 }
 
 //#endregion
-//#region src/commands/git-branches.ts
+//#region src/commands/self-update.ts
 /**
-* 列出远程仓库所有分支（含最新提交时间），并按时间倒序打印
-* - 会先执行 `git fetch --prune --tags` 同步远程引用
-* - 通过 `git for-each-ref` 获取 `refs/remotes/<remote>` 下的分支与提交时间
-* @param remote 远程仓库名，默认 `origin`
-* @returns Promise<void>
+* 检查 @quiteer/scripts 是否有新版本并提示更新
+* - 启动任意命令时调用，仅提示不执行安装
 */
-async function gitRemoteBranches(urlOrRemote) {
-	const temp = "gb-temp";
-	const target = (urlOrRemote || "").trim();
-	let refBase = "";
+async function checkUpdateAndNotify() {
 	try {
-		if (target) {
-			await execCommand("git", [
-				"fetch",
-				target,
-				`+refs/heads/*:refs/remotes/${temp}/*`,
-				"--prune",
-				"--no-tags"
-			]);
-			refBase = `refs/remotes/${temp}`;
-		} else {
-			const r = "origin";
-			await execCommand("git", [
-				"fetch",
-				r,
-				"--prune",
-				"--tags"
-			]);
-			refBase = `refs/remotes/${r}`;
-		}
-	} catch {
-		console.log("拉取远程分支失败，请检查 URL 或网络连接");
+		const latest = await execCommand("pnpm", [
+			"view",
+			"@quiteer/scripts",
+			"version"
+		]);
+		if (latest && latest !== version) console.info("quiteer-script :>> ", lightCyan(`检测到新版本 ${lightGreen(latest)}，当前版本 ${lightBlue(version)}，建议执行 ${bgGreen(white("qui su"))} 进行更新`));
+	} catch {}
+}
+/**
+* 自更新到最新版本
+* - 对比当前版本与远端版本，不一致则使用 pnpm 全局更新
+*/
+async function selfUpdate() {
+	const latest = await execCommand("pnpm", [
+		"view",
+		"@quiteer/scripts",
+		"version"
+	]);
+	if (!latest) {
+		console.info("quiteer-script :>> ", lightBlue("无法获取远端版本，请检查网络后重试"));
 		return;
 	}
-	const lines = (await execCommand("git", [
-		"for-each-ref",
-		"--format=%(refname:short)	%(committerdate:relative)	%(objectname:short)	%(contents:subject)",
-		"--sort=-committerdate",
-		refBase
-	])).split("\n").filter(Boolean);
-	if (lines.length === 0) {
-		console.log("未找到远程分支，请确认已配置远程并有追踪分支");
+	if (latest === version) {
+		console.info("quiteer-script :>> ", lightGreen(`已是最新版本 ${latest}`));
 		return;
 	}
-	/**
-	* 英文相对时间转中文
-	* @param rel 英文相对时间字符串（如：2 hours ago）
-	* @returns 中文相对时间（如：2小时前）
-	*/
-	function zhRelative(rel) {
-		const s = rel.toLowerCase().trim();
-		let m;
-		if (m = s.match(/^(\d+)\s+seconds?\s+ago$/)) return `${m[1]}秒前`;
-		if (m = s.match(/^(\d+)\s+minutes?\s+ago$/)) return `${m[1]}分钟前`;
-		if (m = s.match(/^(\d+)\s+hours?\s+ago$/)) return `${m[1]}小时前`;
-		if (m = s.match(/^(\d+)\s+days?\s+ago$/)) return `${m[1]}天前`;
-		if (m = s.match(/^(\d+)\s+weeks?\s+ago$/)) return `${m[1]}周前`;
-		if (m = s.match(/^(\d+)\s+months?\s+ago$/)) return `${m[1]}个月前`;
-		if (m = s.match(/^(\d+)\s+years?\s+ago$/)) return `${m[1]}年前`;
-		if (s === "yesterday") return "昨天";
-		if (s === "today") return "今天";
-		if (m = s.match(/^about\s+(\d+)\s+hours?\s+ago$/)) return `${m[1]}小时前`;
-		if (m = s.match(/^about\s+(\d+)\s+minutes?\s+ago$/)) return `${m[1]}分钟前`;
-		if (m = s.match(/^about\s+(\d+)\s+days?\s+ago$/)) return `${m[1]}天前`;
-		if (m = s.match(/^about\s+(\d+)\s+months?\s+ago$/)) return `${m[1]}个月前`;
-		if (m = s.match(/^about\s+(\d+)\s+years?\s+ago$/)) return `${m[1]}年前`;
-		return rel;
-	}
-	/**
-	* 计算字符串在等宽终端中的显示宽度（简单处理全角字符为宽度 2）
-	* @param s 输入字符串（不含 ANSI 颜色码）
-	* @returns 可视宽度
-	*/
-	function displayWidth(s) {
-		let w = 0;
-		for (const ch of s) {
-			const code = ch.codePointAt(0) || 0;
-			w += code >= 4352 && code <= 4447 || code >= 11904 && code <= 42191 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65040 && code <= 65049 || code >= 65072 && code <= 65135 || code >= 65280 && code <= 65376 || code >= 65504 && code <= 65510 ? 2 : 1;
-		}
-		return w;
-	}
-	/**
-	* 基于显示宽度的左对齐填充
-	* @param s 源字符串
-	* @param width 目标显示宽度
-	* @returns 左对齐并填充空格的字符串
-	*/
-	function padEndDisplay(s, width) {
-		const w = displayWidth(s);
-		if (w >= width) return s;
-		return s + " ".repeat(width - w);
-	}
-	const rows = lines.map((line) => {
-		const [nameRaw, relRaw, shaRaw, subjectRaw] = line.split("	");
-		return {
-			name: nameRaw.replace(/^.+\//, ""),
-			relZh: zhRelative(relRaw || ""),
-			sha: (shaRaw || "").slice(0, 7),
-			subject: subjectRaw || ""
-		};
-	}).filter((item) => item.name && item.name !== "HEAD");
-	const nameWidth = Math.max(...rows.map((r) => displayWidth(r.name)));
-	const relValues = rows.map((r) => `(${r.relZh})`);
-	const relWidth = Math.max(...relValues.map((v) => displayWidth(v)), 0);
-	const label = " 最新 ";
-	const labelWidth = displayWidth(label);
-	const tag = bgGreen(white(label));
-	const pad = " ".repeat(labelWidth);
-	rows.forEach((row, i) => {
-		const relText = padEndDisplay(`(${row.relZh})`, relWidth);
-		const line = `${padEndDisplay(row.name, nameWidth)}  ${relText}  ${row.sha} ${row.subject}`;
-		if (i === 0) console.log(`${tag} ${lightGreen(line)}`);
-		else console.log(`${pad} ${white(line)}`);
-	});
-	if (target) {
-		const refnames = await execCommand("git", [
-			"for-each-ref",
-			"--format=%(refname)",
-			refBase
-		]);
-		for (const ref of refnames.split("\n").filter(Boolean)) await execCommand("git", [
-			"update-ref",
-			"-d",
-			ref
-		]);
+	console.info("quiteer-script :>> ", lightCyan(`开始更新到最新版本 ${latest}（当前 ${version}）`));
+	try {
+		await execa("pnpm", [
+			"add",
+			"-g",
+			`@quiteer/scripts@${latest}`
+		], { stdio: "inherit" });
+		console.info("quiteer-script :>> ", lightGreen("更新完成，请重新运行命令"));
+	} catch (e) {
+		console.info("quiteer-script :>> ", lightBlue(`更新失败：${e?.message || "未知错误"}`));
 	}
 }
 
@@ -811,6 +858,7 @@ async function setupCli() {
 	*/
 	const cliOptions = await loadCliOptions();
 	const cli = cac(blue("quiteer"));
+	await checkUpdateAndNotify();
 	cli.command("generate-config", `${bgGreen(white("便捷命令"))} ${lightCyan("qui g")}  在项目根目录下生成配置文件`).alias("g").action(async () => {
 		await generateConfig();
 	});
@@ -827,6 +875,9 @@ async function setupCli() {
 	cli.command("update-pkg", `${bgGreen(white("便捷命令"))} ${lightBlue("qui u")}  更新 package.json 依赖版本`).alias("u").action(async () => {
 		await updatePkg(cliOptions.ncuCommandArgs);
 	});
+	cli.command("self-update", `${bgGreen(white("便捷命令"))} ${lightCyan("qui su")}  自更新：检查并更新 @quiteer/scripts 到最新版本`).alias("su").action(async () => {
+		await selfUpdate();
+	});
 	cli.command("git-commit", `${bgGreen(white("便捷命令"))} ${lightBlue("qui gc")}  git 提交前后的操作和规范等`).alias("gc").option("--add", "添加所有变更文件到暂存区", { default: cliOptions.gitCommit.add }).option("-l ,--lang", "校验提交信息的语言", { default: cliOptions.lang }).action(async (args) => {
 		if (args?.add) await gitCommitAdd();
 		await gitCommit(args?.lang);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@quiteer/scripts",
   "type": "module",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "homepage": "https://taiaiac.github.io/web/ci/scripts.html",
   "publishConfig": {
     "access": "public",