@soybeanjs/cli 0.5.0 → 0.5.2

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

@@ -42,7 +42,7 @@ const cliProgress__default = /*#__PURE__*/_interopDefaultCompat(cliProgress);
 const dayjs__default = /*#__PURE__*/_interopDefaultCompat(dayjs);
 const versionBumpp__default = /*#__PURE__*/_interopDefaultCompat(versionBumpp);
 
-const version = "0.5.0";
+const version = "0.5.2";
 
 async function execCommand(cmd, args, options) {
   const { execa } = await import('execa');
@@ -7525,6 +7525,9 @@ 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");
@@ -7538,13 +7541,12 @@ async function getTagDateMap() {
     "--simplify-by-decoration",
     "--pretty=format:%ci %d"
   ]);
-  const TAG_MARK = "(tag: ";
+  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.trim()).format("YYYY-MM-DD");
-    const VERSION_REG = /v\d+\.\d+\.\d+/;
+    const date = dayjs__default(dateStr).format("YYYY-MM-DD");
     const tag = tagStr.match(VERSION_REG)?.[0];
     if (tag && date) {
       map.set(tag.trim(), date);
@@ -7668,37 +7670,47 @@ function getHeaders(githubToken) {
     authorization: `token ${githubToken}`
   };
 }
-async function getResolvedAuthorLogin(params) {
-  const { github, githubToken, commitHashes, email } = params;
+async function getResolvedAuthorLogin(github, commitHashes, email) {
   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;
   }
+  const { repo, token } = github;
+  if (!token) {
+    return login;
+  }
   if (commitHashes.length) {
     try {
-      const data = await ofetch.ofetch(`https://api.github.com/repos/${github}/commits/${commitHashes[0]}`, {
-        headers: getHeaders(githubToken)
+      const data = await ofetch.ofetch(`https://api.github.com/repos/${repo}/commits/${commitHashes[0]}`, {
+        headers: getHeaders(token)
       });
       login = data?.author?.login || "";
     } catch (e) {
     }
   }
+  if (login) {
+    return login;
+  }
+  try {
+    const data = await ofetch.ofetch(`https://api.github.com/search/users?q=${encodeURIComponent(email)}`, {
+      headers: getHeaders(token)
+    });
+    login = data.items[0].login;
+  } catch (e) {
+  }
   return login;
 }
-async function getGitCommitsAndResolvedAuthors(commits, github, githubToken, resolvedLogins) {
+async function getGitCommitsAndResolvedAuthors(commits, github, resolvedLogins) {
   const resultCommits = [];
   const map = /* @__PURE__ */ new Map();
-  for (const commit of commits) {
+  for await (const commit of commits) {
     const resolvedAuthors = [];
-    for (const [index, author] of Object.entries(commit.authors)) {
+    for await (const [index, author] of Object.entries(commit.authors)) {
       const { email, name } = author;
       if (email && name) {
         const commitHashes = [];
@@ -7712,7 +7724,7 @@ async function getGitCommitsAndResolvedAuthors(commits, github, githubToken, res
           login: ""
         };
         if (!resolvedLogins?.has(email)) {
-          const login = await getResolvedAuthorLogin({ github, githubToken, commitHashes, email });
+          const login = await getResolvedAuthorLogin(github, commitHashes, email);
           resolvedAuthor.login = login;
           resolvedLogins?.set(email, login);
         } else {
@@ -7752,8 +7764,8 @@ function formatReferences(references, github, type) {
   return referencesString;
 }
 function formatLine(commit, options) {
-  const prRefs = formatReferences(commit.references, options.github, "issues");
-  const hashRefs = formatReferences(commit.references, options.github, "hash");
+  const prRefs = formatReferences(commit.references, options.github.repo, "issues");
+  const hashRefs = formatReferences(commit.references, options.github.repo, "hash");
   let authors = join([...new Set(commit.resolvedAuthors.map((i) => i.login ? `@${i.login}` : `**${i.name}**`))]).trim();
   if (authors) {
     authors = `by ${authors}`;
@@ -7795,8 +7807,13 @@ 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 createContributorLine(contributors) {
@@ -7807,25 +7824,26 @@ function createContributorLine(contributors) {
     if (!login) {
       let line = `[${name}](mailto:${email})`;
       if (index < contributors.length - 1) {
-        line += ", ";
+        line += ",&nbsp;";
       }
       unloginLine += line;
     } else {
+      const githubUrl = getUserGithub(login);
       const avatar = getGitUserAvatar(login);
-      loginLine += `![${login}](${avatar}) `;
+      loginLine += `[![${login}](${avatar})](${githubUrl})&nbsp;&nbsp;`;
     }
   });
   return `${loginLine}
 ${unloginLine}`;
 }
 function generateMarkdown(params) {
-  const VERSION_REG = /v\d+\.\d+\.\d+/;
   const { commits, options, showTitle, contributors } = params;
   const lines = [];
-  const url = `https://github.com/${options.github}/compare/${options.from}...${options.to}`;
+  const url = `https://github.com/${options.github.repo}/compare/${options.from}...${options.to}`;
   if (showTitle) {
-    const version = VERSION_REG.test(options.to) ? options.to : options.newVersion;
-    const date = options.tagDateMap.get(options.to);
+    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})`;
@@ -7846,16 +7864,14 @@ function generateMarkdown(params) {
     lines.push("", `##### &nbsp;&nbsp;&nbsp;&nbsp;[View changes on GitHub](${url})`);
   }
   if (showTitle) {
-    lines.push("", "### \u2764\uFE0F Contributors", "");
+    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) {
-  const VERSION_REG_OF_MARKDOWN = /## \[v\d+\.\d+\.\d+\]/g;
   let isIn = false;
   const md = await promises.readFile(mdPath, "utf8");
   if (md) {
@@ -7915,8 +7931,10 @@ function createDefaultOptions() {
       ci: { title: "\u{1F916} CI" }
     },
     scopeMap: {},
-    github: "",
-    githubToken: process.env.GITHUB_TOKEN || "",
+    github: {
+      repo: "",
+      token: process.env.GITHUB_TOKEN || ""
+    },
     from: "",
     to: "",
     tags: [],
@@ -7949,20 +7967,14 @@ async function getOptionsFromPkg(cwd) {
   };
 }
 async function initOptions() {
+  var _a;
   const options = createDefaultOptions();
   const { githubToken, newVersion } = await getOptionsFromPkg(options.cwd);
-  if (!options.githubToken) {
-    options.githubToken = githubToken;
-  }
-  if (newVersion) {
-    options.newVersion = `v${newVersion}`;
-  }
-  if (!options.from) {
-    options.from = await getLastGitTag();
-  }
-  if (!options.to) {
-    options.to = await getCurrentGitBranch();
-  }
+  (_a = options.github).token || (_a.token = githubToken);
+  options.github.repo = await getGitHubRepo();
+  options.newVersion || (options.newVersion = `v${newVersion}`);
+  options.from || (options.from = await getLastGitTag());
+  options.to || (options.to = await getCurrentGitBranch());
   if (options.to === options.from) {
     const lastTag = await getLastGitTag(-1);
     const firstCommit = await getFirstGitCommit();
@@ -7970,17 +7982,12 @@ async function initOptions() {
   }
   options.tags = await getTotalGitTags();
   options.tagDateMap = await getTagDateMap();
-  options.github = await getGitHubRepo();
   options.prerelease = isPrerelease(options.to);
   return options;
 }
 async function generateChangelogByTag(options) {
   const gitCommits = await getGitCommits(options.from, options.to, options.scopeMap);
-  const { commits, contributors } = await getGitCommitsAndResolvedAuthors(
-    gitCommits,
-    options.github,
-    options.githubToken
-  );
+  const { commits, contributors } = await getGitCommitsAndResolvedAuthors(gitCommits, options.github);
   const md = generateMarkdown({ commits, options, showTitle: true, contributors });
   return md;
 }
@@ -7990,21 +7997,16 @@ async function generateChangelogByTags(options) {
   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];
+  for await (const [index, tag] of tags.entries()) {
+    const { from, to } = tag;
     const gitCommits = await getGitCommits(from, to, options.scopeMap);
-    const { commits, contributors } = await getGitCommitsAndResolvedAuthors(
-      gitCommits,
-      options.github,
-      options.githubToken,
-      resolvedLogins
-    );
+    const { commits, contributors } = await getGitCommitsAndResolvedAuthors(gitCommits, options.github, resolvedLogins);
     const opts = { ...options, from, to };
     const nextMd = generateMarkdown({ commits, options: opts, showTitle: true, contributors });
     md = `${nextMd}
 
 ${md}`;
-    bar.update(i + 1);
+    bar.update(index + 1);
   }
   bar.stop();
   return md;

package/dist/index.mjs

@@ -17,7 +17,7 @@ import dayjs from 'dayjs';
 import { convert } from 'convert-gitmoji';
 import versionBumpp from 'bumpp';
 
-const version = "0.5.0";
+const version = "0.5.2";
 
 async function execCommand(cmd, args, options) {
   const { execa } = await import('execa');
@@ -7500,6 +7500,9 @@ 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");
@@ -7513,13 +7516,12 @@ async function getTagDateMap() {
     "--simplify-by-decoration",
     "--pretty=format:%ci %d"
   ]);
-  const TAG_MARK = "(tag: ";
+  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.trim()).format("YYYY-MM-DD");
-    const VERSION_REG = /v\d+\.\d+\.\d+/;
+    const date = dayjs(dateStr).format("YYYY-MM-DD");
     const tag = tagStr.match(VERSION_REG)?.[0];
     if (tag && date) {
       map.set(tag.trim(), date);
@@ -7643,37 +7645,47 @@ function getHeaders(githubToken) {
     authorization: `token ${githubToken}`
   };
 }
-async function getResolvedAuthorLogin(params) {
-  const { github, githubToken, commitHashes, email } = params;
+async function getResolvedAuthorLogin(github, commitHashes, email) {
   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;
   }
+  const { repo, token } = github;
+  if (!token) {
+    return login;
+  }
   if (commitHashes.length) {
     try {
-      const data = await ofetch(`https://api.github.com/repos/${github}/commits/${commitHashes[0]}`, {
-        headers: getHeaders(githubToken)
+      const data = await ofetch(`https://api.github.com/repos/${repo}/commits/${commitHashes[0]}`, {
+        headers: getHeaders(token)
       });
       login = data?.author?.login || "";
     } catch (e) {
     }
   }
+  if (login) {
+    return login;
+  }
+  try {
+    const data = await ofetch(`https://api.github.com/search/users?q=${encodeURIComponent(email)}`, {
+      headers: getHeaders(token)
+    });
+    login = data.items[0].login;
+  } catch (e) {
+  }
   return login;
 }
-async function getGitCommitsAndResolvedAuthors(commits, github, githubToken, resolvedLogins) {
+async function getGitCommitsAndResolvedAuthors(commits, github, resolvedLogins) {
   const resultCommits = [];
   const map = /* @__PURE__ */ new Map();
-  for (const commit of commits) {
+  for await (const commit of commits) {
     const resolvedAuthors = [];
-    for (const [index, author] of Object.entries(commit.authors)) {
+    for await (const [index, author] of Object.entries(commit.authors)) {
       const { email, name } = author;
       if (email && name) {
         const commitHashes = [];
@@ -7687,7 +7699,7 @@ async function getGitCommitsAndResolvedAuthors(commits, github, githubToken, res
           login: ""
         };
         if (!resolvedLogins?.has(email)) {
-          const login = await getResolvedAuthorLogin({ github, githubToken, commitHashes, email });
+          const login = await getResolvedAuthorLogin(github, commitHashes, email);
           resolvedAuthor.login = login;
           resolvedLogins?.set(email, login);
         } else {
@@ -7727,8 +7739,8 @@ function formatReferences(references, github, type) {
   return referencesString;
 }
 function formatLine(commit, options) {
-  const prRefs = formatReferences(commit.references, options.github, "issues");
-  const hashRefs = formatReferences(commit.references, options.github, "hash");
+  const prRefs = formatReferences(commit.references, options.github.repo, "issues");
+  const hashRefs = formatReferences(commit.references, options.github.repo, "hash");
   let authors = join([...new Set(commit.resolvedAuthors.map((i) => i.login ? `@${i.login}` : `**${i.name}**`))]).trim();
   if (authors) {
     authors = `by ${authors}`;
@@ -7770,8 +7782,13 @@ 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 createContributorLine(contributors) {
@@ -7782,25 +7799,26 @@ function createContributorLine(contributors) {
     if (!login) {
       let line = `[${name}](mailto:${email})`;
       if (index < contributors.length - 1) {
-        line += ", ";
+        line += ",&nbsp;";
       }
       unloginLine += line;
     } else {
+      const githubUrl = getUserGithub(login);
       const avatar = getGitUserAvatar(login);
-      loginLine += `![${login}](${avatar}) `;
+      loginLine += `[![${login}](${avatar})](${githubUrl})&nbsp;&nbsp;`;
     }
   });
   return `${loginLine}
 ${unloginLine}`;
 }
 function generateMarkdown(params) {
-  const VERSION_REG = /v\d+\.\d+\.\d+/;
   const { commits, options, showTitle, contributors } = params;
   const lines = [];
-  const url = `https://github.com/${options.github}/compare/${options.from}...${options.to}`;
+  const url = `https://github.com/${options.github.repo}/compare/${options.from}...${options.to}`;
   if (showTitle) {
-    const version = VERSION_REG.test(options.to) ? options.to : options.newVersion;
-    const date = options.tagDateMap.get(options.to);
+    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})`;
@@ -7821,16 +7839,14 @@ function generateMarkdown(params) {
     lines.push("", `##### &nbsp;&nbsp;&nbsp;&nbsp;[View changes on GitHub](${url})`);
   }
   if (showTitle) {
-    lines.push("", "### \u2764\uFE0F Contributors", "");
+    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) {
-  const VERSION_REG_OF_MARKDOWN = /## \[v\d+\.\d+\.\d+\]/g;
   let isIn = false;
   const md = await readFile(mdPath, "utf8");
   if (md) {
@@ -7890,8 +7906,10 @@ function createDefaultOptions() {
       ci: { title: "\u{1F916} CI" }
     },
     scopeMap: {},
-    github: "",
-    githubToken: process.env.GITHUB_TOKEN || "",
+    github: {
+      repo: "",
+      token: process.env.GITHUB_TOKEN || ""
+    },
     from: "",
     to: "",
     tags: [],
@@ -7924,20 +7942,14 @@ async function getOptionsFromPkg(cwd) {
   };
 }
 async function initOptions() {
+  var _a;
   const options = createDefaultOptions();
   const { githubToken, newVersion } = await getOptionsFromPkg(options.cwd);
-  if (!options.githubToken) {
-    options.githubToken = githubToken;
-  }
-  if (newVersion) {
-    options.newVersion = `v${newVersion}`;
-  }
-  if (!options.from) {
-    options.from = await getLastGitTag();
-  }
-  if (!options.to) {
-    options.to = await getCurrentGitBranch();
-  }
+  (_a = options.github).token || (_a.token = githubToken);
+  options.github.repo = await getGitHubRepo();
+  options.newVersion || (options.newVersion = `v${newVersion}`);
+  options.from || (options.from = await getLastGitTag());
+  options.to || (options.to = await getCurrentGitBranch());
   if (options.to === options.from) {
     const lastTag = await getLastGitTag(-1);
     const firstCommit = await getFirstGitCommit();
@@ -7945,17 +7957,12 @@ async function initOptions() {
   }
   options.tags = await getTotalGitTags();
   options.tagDateMap = await getTagDateMap();
-  options.github = await getGitHubRepo();
   options.prerelease = isPrerelease(options.to);
   return options;
 }
 async function generateChangelogByTag(options) {
   const gitCommits = await getGitCommits(options.from, options.to, options.scopeMap);
-  const { commits, contributors } = await getGitCommitsAndResolvedAuthors(
-    gitCommits,
-    options.github,
-    options.githubToken
-  );
+  const { commits, contributors } = await getGitCommitsAndResolvedAuthors(gitCommits, options.github);
   const md = generateMarkdown({ commits, options, showTitle: true, contributors });
   return md;
 }
@@ -7965,21 +7972,16 @@ async function generateChangelogByTags(options) {
   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];
+  for await (const [index, tag] of tags.entries()) {
+    const { from, to } = tag;
     const gitCommits = await getGitCommits(from, to, options.scopeMap);
-    const { commits, contributors } = await getGitCommitsAndResolvedAuthors(
-      gitCommits,
-      options.github,
-      options.githubToken,
-      resolvedLogins
-    );
+    const { commits, contributors } = await getGitCommitsAndResolvedAuthors(gitCommits, options.github, resolvedLogins);
     const opts = { ...options, from, to };
     const nextMd = generateMarkdown({ commits, options: opts, showTitle: true, contributors });
     md = `${nextMd}
 
 ${md}`;
-    bar.update(i + 1);
+    bar.update(index + 1);
   }
   bar.stop();
   return md;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soybeanjs/cli",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "SoybeanJS's command line tools",
   "author": {
     "name": "Soybean",
@@ -61,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",