@soybeanjs/cli 0.4.2 → 0.5.1

package/README.md

@@ -20,16 +20,18 @@ pnpm soy -h
 
 ## 命令介绍
 
-| 命令              | 作用                                     |
-| ----------------- | ---------------------------------------- |
-| help              | 查看全部命令用法                         |
-| git-commit        | 生成符合 Angular 规范的 git 提交信息     |
-| git-commit-verify | 校验 git 的提交信息是否符合 Angular 规范 |
-| cleanup           | 清空依赖和构建产物                       |
-| cleanup-deep      | 清空依赖和构建产物(包含 深层级)          |
-| init-git-hooks    | 初始化 simple-gi t-hooks 钩子            |
-| update-pkg        | 升级依赖                                 |
-| prettier-format   | prettier 格式化                          |
+| 命令              | 作用                                                               |
+| ----------------- | ------------------------------------------------------------------ |
+| help              | 查看全部命令用法                                                   |
+| git-commit        | 生成符合 Angular 规范的 git 提交信息                               |
+| git-commit-verify | 校验 git 的提交信息是否符合 Angular 规范                           |
+| cleanup           | 清空依赖和构建产物                                                 |
+| init-git-hooks    | 初始化 simple-git-hooks 钩子                                       |
+| update-pkg        | 升级依赖                                                           |
+| prettier-format   | prettier 格式化                                                    |
+| lint-staged       | 执行 lint-staged                                                   |
+| changelog         | 根据两次 tag 生成 changelog (--total: 根据所有 tag 生成 changelog) |
+| release           | 发布：更新版本号、生成 changelog、提交代码                         |
 
 ### prettier-format
 

package/dist/index.cjs

@@ -12,6 +12,7 @@ const promises = require('fs/promises');
 const EE = require('events');
 const Stream = require('stream');
 const stringdecoder = require('string_decoder');
+const cliProgress = require('cli-progress');
 const ofetch = require('ofetch');
 const dayjs = require('dayjs');
 const convertGitmoji = require('convert-gitmoji');
@@ -37,10 +38,11 @@ const actualFS__namespace = /*#__PURE__*/_interopNamespaceCompat(actualFS);
 const EE__default = /*#__PURE__*/_interopDefaultCompat(EE);
 const Stream__default = /*#__PURE__*/_interopDefaultCompat(Stream);
 const stringdecoder__default = /*#__PURE__*/_interopDefaultCompat(stringdecoder);
+const cliProgress__default = /*#__PURE__*/_interopDefaultCompat(cliProgress);
 const dayjs__default = /*#__PURE__*/_interopDefaultCompat(dayjs);
 const versionBumpp__default = /*#__PURE__*/_interopDefaultCompat(versionBumpp);
 
-const version = "0.4.2";
+const version = "0.5.1";
 
 async function execCommand(cmd, args, options) {
   const { execa } = await import('execa');
@@ -7523,11 +7525,35 @@ function lintStaged() {
   execCommand("npx", ["lint-staged", "--config", "@soybeanjs/cli/lint-staged"], { stdio: "inherit" });
 }
 
+const VERSION_REG = /v\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?/;
+const VERSION_REG_OF_MARKDOWN = /## \[v\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?]/g;
+
 async function getTotalGitTags() {
   const tagStr = await execCommand("git", ["--no-pager", "tag", "-l", "--sort=creatordate"]);
   const tags = tagStr.split("\n");
   return tags;
 }
+async function getTagDateMap() {
+  const tagDateStr = await execCommand("git", [
+    "--no-pager",
+    "log",
+    "--tags",
+    "--simplify-by-decoration",
+    "--pretty=format:%ci %d"
+  ]);
+  const TAG_MARK = "tag: ";
+  const map = /* @__PURE__ */ new Map();
+  const dates = tagDateStr.split("\n").filter((item) => item.includes(TAG_MARK));
+  dates.forEach((item) => {
+    const [dateStr, tagStr] = item.split(TAG_MARK);
+    const date = dayjs__default(dateStr).format("YYYY-MM-DD");
+    const tag = tagStr.match(VERSION_REG)?.[0];
+    if (tag && date) {
+      map.set(tag.trim(), date);
+    }
+  });
+  return map;
+}
 function getFromToTags(tags) {
   const result = [];
   tags.forEach((tag, index) => {
@@ -7647,17 +7673,17 @@ function getHeaders(githubToken) {
 async function getResolvedAuthorLogin(params) {
   const { github, githubToken, commitHashes, email } = params;
   let login = "";
-  if (!githubToken) {
-    return login;
-  }
   try {
-    const data = await ofetch.ofetch(`https://api.github.com/search/users?q=${encodeURIComponent(email)}`);
-    login = data.items[0].login;
+    const data = await ofetch.ofetch(`https://ungh.cc/users/find/${email}`);
+    login = data?.user?.username || "";
   } catch {
   }
   if (login) {
     return login;
   }
+  if (!githubToken) {
+    return login;
+  }
   if (commitHashes.length) {
     try {
       const data = await ofetch.ofetch(`https://api.github.com/repos/${github}/commits/${commitHashes[0]}`, {
@@ -7667,9 +7693,19 @@ async function getResolvedAuthorLogin(params) {
     } catch (e) {
     }
   }
+  if (login) {
+    return login;
+  }
+  try {
+    const data = await ofetch.ofetch(`https://api.github.com/search/users?q=${encodeURIComponent(email)}`, {
+      headers: getHeaders(githubToken)
+    });
+    login = data.items[0].login;
+  } catch (e) {
+  }
   return login;
 }
-async function getGitCommitsAndResolvedAuthors(commits, github, githubToken) {
+async function getGitCommitsAndResolvedAuthors(commits, github, githubToken, resolvedLogins) {
   const resultCommits = [];
   const map = /* @__PURE__ */ new Map();
   for (const commit of commits) {
@@ -7687,14 +7723,18 @@ async function getGitCommitsAndResolvedAuthors(commits, github, githubToken) {
           commits: commitHashes,
           login: ""
         };
-        if (!map.has(email)) {
-          resolvedAuthor.login = await getResolvedAuthorLogin({ github, githubToken, commitHashes, email });
-          map.set(author.email, resolvedAuthor);
+        if (!resolvedLogins?.has(email)) {
+          const login = await getResolvedAuthorLogin({ github, githubToken, commitHashes, email });
+          resolvedAuthor.login = login;
+          resolvedLogins?.set(email, login);
         } else {
-          const resolvedItem = map.get(author.email);
-          Object.assign(resolvedAuthor, resolvedItem);
+          const login = resolvedLogins?.get(email) || "";
+          resolvedAuthor.login = login;
         }
         resolvedAuthors.push(resolvedAuthor);
+        if (!map.has(email)) {
+          map.set(email, resolvedAuthor);
+        }
       }
     }
     const resultCommit = { ...commit, resolvedAuthors };
@@ -7705,9 +7745,7 @@ async function getGitCommitsAndResolvedAuthors(commits, github, githubToken) {
     contributors: Array.from(map.values())
   };
 }
-getTotalGitTags();
 
-const VERSION_REG_OF_MARKDOWN = /## \[v\d+\.\d+\.\d+\]/g;
 function formatReferences(references, github, type) {
   const refs = references.filter((i) => {
     if (type === "issues")
@@ -7769,26 +7807,47 @@ function formatSection(commits, sectionName, options) {
   });
   return lines;
 }
+function getUserGithub(userName) {
+  const githubUrl = `https://github.com/${userName}`;
+  return githubUrl;
+}
 function getGitUserAvatar(userName) {
-  const avatarUrl = `https://github.com/${userName}.png?size=48`;
+  const githubUrl = getUserGithub(userName);
+  const avatarUrl = `${githubUrl}.png?size=48`;
   return avatarUrl;
 }
-function createUserAvatar(userName) {
-  const el = `<a href="https://github.com/${userName}" data-hovercard-type="user" data-hovercard-url="/users/yanbowe/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self">
-  <img src="${getGitUserAvatar(
-    userName
-  )}" alt="@${userName}" size="32" height="32" width="32" data-view-component="true" class="avatar circle">
-</a>`;
-  return el;
+function createContributorLine(contributors) {
+  let loginLine = "";
+  let unloginLine = "";
+  contributors.forEach((contributor, index) => {
+    const { name, email, login } = contributor;
+    if (!login) {
+      let line = `[${name}](mailto:${email})`;
+      if (index < contributors.length - 1) {
+        line += ",&nbsp;";
+      }
+      unloginLine += line;
+    } else {
+      const githubUrl = getUserGithub(login);
+      const avatar = getGitUserAvatar(login);
+      loginLine += `[![${login}](${avatar})](${githubUrl})&nbsp;&nbsp;`;
+    }
+  });
+  return `${loginLine}
+${unloginLine}`;
 }
 function generateMarkdown(params) {
   const { commits, options, showTitle, contributors } = params;
   const lines = [];
   const url = `https://github.com/${options.github}/compare/${options.from}...${options.to}`;
   if (showTitle) {
-    const today = dayjs__default().format("YYYY-MM-DD");
-    const version = VERSION_REG_OF_MARKDOWN.test(options.to) ? options.to : options.newVersion;
-    const title = `## [${version}](${url})(${today})`;
+    const isNewVersion = !VERSION_REG.test(options.to);
+    const version = isNewVersion ? options.newVersion : options.to;
+    const date = isNewVersion ? dayjs__default().format("YY-MM-DD") : options.tagDateMap.get(options.to);
+    let title = `## [${version}](${url})`;
+    if (date) {
+      title += ` (${date})`;
+    }
     lines.push(title);
   }
   const [breaking, changes] = partition(commits, (c) => c.isBreaking);
@@ -7805,13 +7864,12 @@ function generateMarkdown(params) {
     lines.push("", `##### &nbsp;&nbsp;&nbsp;&nbsp;[View changes on GitHub](${url})`);
   }
   if (showTitle) {
-    lines.push("", "### \u2764\uFE0F Contributors", "");
-    const contributorLine = contributors.map((item) => createUserAvatar(item.login)).join(" ");
+    lines.push("", "### &nbsp;&nbsp;&nbsp;\u2764\uFE0F Contributors", "");
+    const contributorLine = createContributorLine(contributors);
     lines.push(contributorLine);
   }
   const md = convertGitmoji.convert(lines.join("\n").trim(), true);
-  const markdown = md.replace(/&nbsp;/g, "");
-  return markdown;
+  return md;
 }
 async function isVersionInMarkdown(version, mdPath) {
   let isIn = false;
@@ -7878,6 +7936,7 @@ function createDefaultOptions() {
     from: "",
     to: "",
     tags: [],
+    tagDateMap: /* @__PURE__ */ new Map(),
     prerelease: false,
     capitalize: true,
     emoji: true,
@@ -7926,6 +7985,7 @@ async function initOptions() {
     options.from = lastTag || firstCommit;
   }
   options.tags = await getTotalGitTags();
+  options.tagDateMap = await getTagDateMap();
   options.github = await getGitHubRepo();
   options.prerelease = isPrerelease(options.to);
   return options;
@@ -7942,21 +8002,27 @@ async function generateChangelogByTag(options) {
 }
 async function generateChangelogByTags(options) {
   const tags = getFromToTags(options.tags);
+  const bar = new cliProgress__default.SingleBar({}, cliProgress__default.Presets.shades_classic);
+  bar.start(tags.length, 0);
   let md = "";
+  const resolvedLogins = /* @__PURE__ */ new Map();
   for (let i = 0; i < tags.length; i += 1) {
     const { from, to } = tags[i];
     const gitCommits = await getGitCommits(from, to, options.scopeMap);
     const { commits, contributors } = await getGitCommitsAndResolvedAuthors(
       gitCommits,
       options.github,
-      options.githubToken
+      options.githubToken,
+      resolvedLogins
     );
     const opts = { ...options, from, to };
     const nextMd = generateMarkdown({ commits, options: opts, showTitle: true, contributors });
     md = `${nextMd}
 
 ${md}`;
+    bar.update(i + 1);
   }
+  bar.stop();
   return md;
 }
 async function generateChangelog(total = false) {

package/dist/index.mjs

@@ -11,12 +11,13 @@ import { lstat, readdir as readdir$1, readlink, realpath, readFile, writeFile }
 import EE from 'events';
 import Stream from 'stream';
 import stringdecoder from 'string_decoder';
+import cliProgress from 'cli-progress';
 import { ofetch } from 'ofetch';
 import dayjs from 'dayjs';
 import { convert } from 'convert-gitmoji';
 import versionBumpp from 'bumpp';
 
-const version = "0.4.2";
+const version = "0.5.1";
 
 async function execCommand(cmd, args, options) {
   const { execa } = await import('execa');
@@ -7499,11 +7500,35 @@ function lintStaged() {
   execCommand("npx", ["lint-staged", "--config", "@soybeanjs/cli/lint-staged"], { stdio: "inherit" });
 }
 
+const VERSION_REG = /v\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?/;
+const VERSION_REG_OF_MARKDOWN = /## \[v\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?]/g;
+
 async function getTotalGitTags() {
   const tagStr = await execCommand("git", ["--no-pager", "tag", "-l", "--sort=creatordate"]);
   const tags = tagStr.split("\n");
   return tags;
 }
+async function getTagDateMap() {
+  const tagDateStr = await execCommand("git", [
+    "--no-pager",
+    "log",
+    "--tags",
+    "--simplify-by-decoration",
+    "--pretty=format:%ci %d"
+  ]);
+  const TAG_MARK = "tag: ";
+  const map = /* @__PURE__ */ new Map();
+  const dates = tagDateStr.split("\n").filter((item) => item.includes(TAG_MARK));
+  dates.forEach((item) => {
+    const [dateStr, tagStr] = item.split(TAG_MARK);
+    const date = dayjs(dateStr).format("YYYY-MM-DD");
+    const tag = tagStr.match(VERSION_REG)?.[0];
+    if (tag && date) {
+      map.set(tag.trim(), date);
+    }
+  });
+  return map;
+}
 function getFromToTags(tags) {
   const result = [];
   tags.forEach((tag, index) => {
@@ -7623,17 +7648,17 @@ function getHeaders(githubToken) {
 async function getResolvedAuthorLogin(params) {
   const { github, githubToken, commitHashes, email } = params;
   let login = "";
-  if (!githubToken) {
-    return login;
-  }
   try {
-    const data = await ofetch(`https://api.github.com/search/users?q=${encodeURIComponent(email)}`);
-    login = data.items[0].login;
+    const data = await ofetch(`https://ungh.cc/users/find/${email}`);
+    login = data?.user?.username || "";
   } catch {
   }
   if (login) {
     return login;
   }
+  if (!githubToken) {
+    return login;
+  }
   if (commitHashes.length) {
     try {
       const data = await ofetch(`https://api.github.com/repos/${github}/commits/${commitHashes[0]}`, {
@@ -7643,9 +7668,19 @@ async function getResolvedAuthorLogin(params) {
     } catch (e) {
     }
   }
+  if (login) {
+    return login;
+  }
+  try {
+    const data = await ofetch(`https://api.github.com/search/users?q=${encodeURIComponent(email)}`, {
+      headers: getHeaders(githubToken)
+    });
+    login = data.items[0].login;
+  } catch (e) {
+  }
   return login;
 }
-async function getGitCommitsAndResolvedAuthors(commits, github, githubToken) {
+async function getGitCommitsAndResolvedAuthors(commits, github, githubToken, resolvedLogins) {
   const resultCommits = [];
   const map = /* @__PURE__ */ new Map();
   for (const commit of commits) {
@@ -7663,14 +7698,18 @@ async function getGitCommitsAndResolvedAuthors(commits, github, githubToken) {
           commits: commitHashes,
           login: ""
         };
-        if (!map.has(email)) {
-          resolvedAuthor.login = await getResolvedAuthorLogin({ github, githubToken, commitHashes, email });
-          map.set(author.email, resolvedAuthor);
+        if (!resolvedLogins?.has(email)) {
+          const login = await getResolvedAuthorLogin({ github, githubToken, commitHashes, email });
+          resolvedAuthor.login = login;
+          resolvedLogins?.set(email, login);
         } else {
-          const resolvedItem = map.get(author.email);
-          Object.assign(resolvedAuthor, resolvedItem);
+          const login = resolvedLogins?.get(email) || "";
+          resolvedAuthor.login = login;
         }
         resolvedAuthors.push(resolvedAuthor);
+        if (!map.has(email)) {
+          map.set(email, resolvedAuthor);
+        }
       }
     }
     const resultCommit = { ...commit, resolvedAuthors };
@@ -7681,9 +7720,7 @@ async function getGitCommitsAndResolvedAuthors(commits, github, githubToken) {
     contributors: Array.from(map.values())
   };
 }
-getTotalGitTags();
 
-const VERSION_REG_OF_MARKDOWN = /## \[v\d+\.\d+\.\d+\]/g;
 function formatReferences(references, github, type) {
   const refs = references.filter((i) => {
     if (type === "issues")
@@ -7745,26 +7782,47 @@ function formatSection(commits, sectionName, options) {
   });
   return lines;
 }
+function getUserGithub(userName) {
+  const githubUrl = `https://github.com/${userName}`;
+  return githubUrl;
+}
 function getGitUserAvatar(userName) {
-  const avatarUrl = `https://github.com/${userName}.png?size=48`;
+  const githubUrl = getUserGithub(userName);
+  const avatarUrl = `${githubUrl}.png?size=48`;
   return avatarUrl;
 }
-function createUserAvatar(userName) {
-  const el = `<a href="https://github.com/${userName}" data-hovercard-type="user" data-hovercard-url="/users/yanbowe/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self">
-  <img src="${getGitUserAvatar(
-    userName
-  )}" alt="@${userName}" size="32" height="32" width="32" data-view-component="true" class="avatar circle">
-</a>`;
-  return el;
+function createContributorLine(contributors) {
+  let loginLine = "";
+  let unloginLine = "";
+  contributors.forEach((contributor, index) => {
+    const { name, email, login } = contributor;
+    if (!login) {
+      let line = `[${name}](mailto:${email})`;
+      if (index < contributors.length - 1) {
+        line += ",&nbsp;";
+      }
+      unloginLine += line;
+    } else {
+      const githubUrl = getUserGithub(login);
+      const avatar = getGitUserAvatar(login);
+      loginLine += `[![${login}](${avatar})](${githubUrl})&nbsp;&nbsp;`;
+    }
+  });
+  return `${loginLine}
+${unloginLine}`;
 }
 function generateMarkdown(params) {
   const { commits, options, showTitle, contributors } = params;
   const lines = [];
   const url = `https://github.com/${options.github}/compare/${options.from}...${options.to}`;
   if (showTitle) {
-    const today = dayjs().format("YYYY-MM-DD");
-    const version = VERSION_REG_OF_MARKDOWN.test(options.to) ? options.to : options.newVersion;
-    const title = `## [${version}](${url})(${today})`;
+    const isNewVersion = !VERSION_REG.test(options.to);
+    const version = isNewVersion ? options.newVersion : options.to;
+    const date = isNewVersion ? dayjs().format("YY-MM-DD") : options.tagDateMap.get(options.to);
+    let title = `## [${version}](${url})`;
+    if (date) {
+      title += ` (${date})`;
+    }
     lines.push(title);
   }
   const [breaking, changes] = partition(commits, (c) => c.isBreaking);
@@ -7781,13 +7839,12 @@ function generateMarkdown(params) {
     lines.push("", `##### &nbsp;&nbsp;&nbsp;&nbsp;[View changes on GitHub](${url})`);
   }
   if (showTitle) {
-    lines.push("", "### \u2764\uFE0F Contributors", "");
-    const contributorLine = contributors.map((item) => createUserAvatar(item.login)).join(" ");
+    lines.push("", "### &nbsp;&nbsp;&nbsp;\u2764\uFE0F Contributors", "");
+    const contributorLine = createContributorLine(contributors);
     lines.push(contributorLine);
   }
   const md = convert(lines.join("\n").trim(), true);
-  const markdown = md.replace(/&nbsp;/g, "");
-  return markdown;
+  return md;
 }
 async function isVersionInMarkdown(version, mdPath) {
   let isIn = false;
@@ -7854,6 +7911,7 @@ function createDefaultOptions() {
     from: "",
     to: "",
     tags: [],
+    tagDateMap: /* @__PURE__ */ new Map(),
     prerelease: false,
     capitalize: true,
     emoji: true,
@@ -7902,6 +7960,7 @@ async function initOptions() {
     options.from = lastTag || firstCommit;
   }
   options.tags = await getTotalGitTags();
+  options.tagDateMap = await getTagDateMap();
   options.github = await getGitHubRepo();
   options.prerelease = isPrerelease(options.to);
   return options;
@@ -7918,21 +7977,27 @@ async function generateChangelogByTag(options) {
 }
 async function generateChangelogByTags(options) {
   const tags = getFromToTags(options.tags);
+  const bar = new cliProgress.SingleBar({}, cliProgress.Presets.shades_classic);
+  bar.start(tags.length, 0);
   let md = "";
+  const resolvedLogins = /* @__PURE__ */ new Map();
   for (let i = 0; i < tags.length; i += 1) {
     const { from, to } = tags[i];
     const gitCommits = await getGitCommits(from, to, options.scopeMap);
     const { commits, contributors } = await getGitCommitsAndResolvedAuthors(
       gitCommits,
       options.github,
-      options.githubToken
+      options.githubToken,
+      resolvedLogins
     );
     const opts = { ...options, from, to };
     const nextMd = generateMarkdown({ commits, options: opts, showTitle: true, contributors });
     md = `${nextMd}
 
 ${md}`;
+    bar.update(i + 1);
   }
+  bar.stop();
   return md;
 }
 async function generateChangelog(total = false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soybeanjs/cli",
-  "version": "0.4.2",
+  "version": "0.5.1",
   "description": "SoybeanJS's command line tools",
   "author": {
     "name": "Soybean",
@@ -34,6 +34,7 @@
   "dependencies": {
     "bumpp": "9.1.0",
     "cac": "6.7.14",
+    "cli-progress": "^3.12.0",
     "convert-gitmoji": "0.1.3",
     "dayjs": "1.11.8",
     "enquirer": "2.3.6",
@@ -47,10 +48,10 @@
   },
   "devDependencies": {
     "@soybeanjs/cli": "link:",
+    "@types/cli-progress": "^3.11.0",
     "@types/node": "20.2.5",
     "eslint": "8.41.0",
     "eslint-config-soybeanjs": "0.4.7",
-    "githublogen": "link:../githublogen",
     "simple-git-hooks": "2.8.1",
     "tsx": "3.12.7",
     "typescript": "5.0.4",
@@ -60,7 +61,7 @@
     "commit-msg": "pnpm soy git-commit-verify",
     "pre-commit": "pnpm typecheck && pnpm soy lint-staged"
   },
-  "github-token": "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",
+  "github-token": "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",
   "scripts": {
     "build": "pnpm typecheck && unbuild",
     "lint": "eslint . --fix",