@soybeanjs/cli 0.5.1 → 0.5.2

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.1";
+const version = "0.5.2";
 
 async function execCommand(cmd, args, options) {
   const { execa } = await import('execa');
@@ -7670,8 +7670,7 @@ function getHeaders(githubToken) {
     authorization: `token ${githubToken}`
   };
 }
-async function getResolvedAuthorLogin(params) {
-  const { github, githubToken, commitHashes, email } = params;
+async function getResolvedAuthorLogin(github, commitHashes, email) {
   let login = "";
   try {
     const data = await ofetch.ofetch(`https://ungh.cc/users/find/${email}`);
@@ -7681,13 +7680,14 @@ async function getResolvedAuthorLogin(params) {
   if (login) {
     return login;
   }
-  if (!githubToken) {
+  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) {
@@ -7698,19 +7698,19 @@ async function getResolvedAuthorLogin(params) {
   }
   try {
     const data = await ofetch.ofetch(`https://api.github.com/search/users?q=${encodeURIComponent(email)}`, {
-      headers: getHeaders(githubToken)
+      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 = [];
@@ -7724,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 {
@@ -7764,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}`;
@@ -7839,7 +7839,7 @@ ${unloginLine}`;
 function generateMarkdown(params) {
   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 isNewVersion = !VERSION_REG.test(options.to);
     const version = isNewVersion ? options.newVersion : options.to;
@@ -7931,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: [],
@@ -7965,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();
@@ -7986,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;
 }
@@ -8006,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.1";
+const version = "0.5.2";
 
 async function execCommand(cmd, args, options) {
   const { execa } = await import('execa');
@@ -7645,8 +7645,7 @@ function getHeaders(githubToken) {
     authorization: `token ${githubToken}`
   };
 }
-async function getResolvedAuthorLogin(params) {
-  const { github, githubToken, commitHashes, email } = params;
+async function getResolvedAuthorLogin(github, commitHashes, email) {
   let login = "";
   try {
     const data = await ofetch(`https://ungh.cc/users/find/${email}`);
@@ -7656,13 +7655,14 @@ async function getResolvedAuthorLogin(params) {
   if (login) {
     return login;
   }
-  if (!githubToken) {
+  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) {
@@ -7673,19 +7673,19 @@ async function getResolvedAuthorLogin(params) {
   }
   try {
     const data = await ofetch(`https://api.github.com/search/users?q=${encodeURIComponent(email)}`, {
-      headers: getHeaders(githubToken)
+      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 = [];
@@ -7699,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 {
@@ -7739,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}`;
@@ -7814,7 +7814,7 @@ ${unloginLine}`;
 function generateMarkdown(params) {
   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 isNewVersion = !VERSION_REG.test(options.to);
     const version = isNewVersion ? options.newVersion : options.to;
@@ -7906,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: [],
@@ -7940,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();
@@ -7961,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;
 }
@@ -7981,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.1",
+  "version": "0.5.2",
   "description": "SoybeanJS's command line tools",
   "author": {
     "name": "Soybean",