githublogen 0.0.3 → 0.0.4

package/dist/cli.cjs

@@ -13,13 +13,12 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const cac__default = /*#__PURE__*/_interopDefaultCompat(cac);
 
-const version = "0.0.3";
+const version = "0.0.4";
 
 const cli = cac__default("githublogen");
 cli.version(version).option("-t, --token <path>", "GitHub Token").option("--from <ref>", "From tag").option("--to <ref>", "To tag").option("--github <path>", "GitHub Repository, e.g. soybeanjs/githublogen").option("--name <name>", "Name of the release").option("--contributors", "Show contributors section").option("--prerelease", "Mark release as prerelease").option("-d, --draft", "Mark release as draft").option("--output <path>", "Output to file instead of sending to GitHub").option("--capitalize", "Should capitalize for each comment message").option("--emoji", "Use emojis in section titles", { default: true }).option("--group", "Nest commit messages under their scopes").option("--dry", "Dry run").help();
 cli.command("").action(async (args) => {
   args.token = args.token || process.env.GITHUB_TOKEN;
-  console.log("args.token: ", args.token);
   try {
     console.log();
     console.log(kolorist.dim(`${kolorist.bold("github")}logen `) + kolorist.dim(`v${version}`));
@@ -61,8 +60,9 @@ cli.command("").action(async (args) => {
     await index.sendRelease(config, md);
   } catch (e) {
     console.error(kolorist.red(String(e)));
-    if (e?.stack)
+    if (e?.stack) {
       console.error(kolorist.dim(e.stack?.split("\n").slice(1).join("\n")));
+    }
     process.exit(1);
   }
 });

package/dist/cli.mjs

@@ -6,13 +6,12 @@ import { generate, hasTagOnGitHub, isRepoShallow, sendRelease } from './index.mj
 import 'ohmyfetch';
 import 'convert-gitmoji';
 
-const version = "0.0.3";
+const version = "0.0.4";
 
 const cli = cac("githublogen");
 cli.version(version).option("-t, --token <path>", "GitHub Token").option("--from <ref>", "From tag").option("--to <ref>", "To tag").option("--github <path>", "GitHub Repository, e.g. soybeanjs/githublogen").option("--name <name>", "Name of the release").option("--contributors", "Show contributors section").option("--prerelease", "Mark release as prerelease").option("-d, --draft", "Mark release as draft").option("--output <path>", "Output to file instead of sending to GitHub").option("--capitalize", "Should capitalize for each comment message").option("--emoji", "Use emojis in section titles", { default: true }).option("--group", "Nest commit messages under their scopes").option("--dry", "Dry run").help();
 cli.command("").action(async (args) => {
   args.token = args.token || process.env.GITHUB_TOKEN;
-  console.log("args.token: ", args.token);
   try {
     console.log();
     console.log(dim(`${bold("github")}logen `) + dim(`v${version}`));
@@ -54,8 +53,9 @@ cli.command("").action(async (args) => {
     await sendRelease(config, md);
   } catch (e) {
     console.error(red(String(e)));
-    if (e?.stack)
+    if (e?.stack) {
       console.error(dim(e.stack?.split("\n").slice(1).join("\n")));
+    }
     process.exit(1);
   }
 });

package/dist/index.cjs

@@ -99,24 +99,19 @@ async function resolveAuthorInfo(options, info) {
     const data = await ohmyfetch.$fetch(`https://api.github.com/search/users?q=${encodeURIComponent(info.email)}`, {
       headers: getHeaders(options)
     });
-    console.log("fetch github user: ", data);
     authorInfo.login = data.items[0].login;
-  } catch (error) {
-    console.log("error: ", error);
-    console.log("error fetch github user");
+  } catch {
+  }
+  if (authorInfo.login) {
+    return authorInfo;
   }
-  if (info.login)
-    return info;
   if (info.commits.length) {
     try {
       const data = await ohmyfetch.$fetch(`https://api.github.com/repos/${options.github}/commits/${info.commits[0]}`, {
         headers: getHeaders(options)
       });
-      console.log("data: ", data);
       authorInfo.login = data.author.login;
-    } catch (e) {
-      console.log("e: ", e);
-      console.log("error fetch github commit");
+    } catch {
     }
   }
   return authorInfo;
@@ -125,8 +120,9 @@ async function resolveAuthors(commits, options) {
   const map = /* @__PURE__ */ new Map();
   commits.forEach((commit) => {
     commit.resolvedAuthors = commit.authors.map((a, idx) => {
-      if (!a.email || !a.name)
+      if (!a.email || !a.name) {
         return null;
+      }
       if (!map.has(a.email)) {
         map.set(a.email, {
           commits: [],
@@ -135,8 +131,9 @@ async function resolveAuthors(commits, options) {
         });
       }
       const info = map.get(a.email);
-      if (idx === 0)
+      if (idx === 0) {
         info.commits.push(commit.shortHash);
+      }
       return info;
     }).filter(notNullish);
   });
@@ -145,13 +142,15 @@ async function resolveAuthors(commits, options) {
   const loginSet = /* @__PURE__ */ new Set();
   const nameSet = /* @__PURE__ */ new Set();
   return resolved.sort((a, b) => (a.login || a.name).localeCompare(b.login || b.name)).filter((i) => {
-    if (i.login && loginSet.has(i.login))
+    if (i.login && loginSet.has(i.login)) {
       return false;
+    }
     if (i.login) {
       loginSet.add(i.login);
     } else {
-      if (nameSet.has(i.name))
+      if (nameSet.has(i.name)) {
         return false;
+      }
       nameSet.add(i.name);
     }
     return true;
@@ -171,8 +170,9 @@ async function hasTagOnGitHub(tag, options) {
 async function getGitHubRepo() {
   const url = await execCommand("git", ["config", "--get", "remote.origin.url"]);
   const match = url.match(/github\.com[\/:]([\w\d._-]+?)\/([\w\d._-]+?)(\.git)?$/i);
-  if (!match)
+  if (!match) {
     throw new Error(`Can not parse GitHub repo from url ${url}`);
+  }
   return `${match[1]}/${match[2]}`;
 }
 async function getCurrentGitBranch() {
@@ -231,19 +231,23 @@ async function getGitDiff(from, to = "HEAD") {
 const emojisRE = /([\u2700-\u27BF]|[\uE000-\uF8FF]|\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDFFF]|[\u2011-\u26FF]|\uD83E[\uDD10-\uDDFF])/g;
 function formatReferences(references, github, type) {
   const refs = references.filter((i) => {
-    if (type === "issues")
+    if (type === "issues") {
       return i.type === "issue" || i.type === "pull-request";
+    }
     return i.type === "hash";
   }).map((ref) => {
-    if (!github)
+    if (!github) {
       return ref.value;
-    if (ref.type === "pull-request" || ref.type === "issue")
+    }
+    if (ref.type === "pull-request" || ref.type === "issue") {
       return `https://github.com/${github}/issues/${ref.value.slice(1)}`;
+    }
     return `[<samp>(${ref.value.slice(0, 5)})</samp>](https://github.com/${github}/commit/${ref.value})`;
   });
   const referencesString = join(refs).trim();
-  if (type === "issues")
+  if (type === "issues") {
     return referencesString && `in ${referencesString}`;
+  }
   return referencesString;
 }
 function formatLine(commit, options) {
@@ -252,11 +256,13 @@ function formatLine(commit, options) {
   let authors = join([
     ...new Set(commit.resolvedAuthors?.map((i) => i.login ? `@${i.login}` : `**${i.name}**`))
   ])?.trim();
-  if (authors)
+  if (authors) {
     authors = `by ${authors}`;
+  }
   let refs = [authors, prRefs, hashRefs].filter((i) => i?.trim()).join(" ");
-  if (refs)
+  if (refs) {
     refs = `&nbsp;-&nbsp; ${refs}`;
+  }
   const description = options.capitalize ? capitalize(commit.description) : commit.description;
   return [description, refs].filter((i) => i?.trim()).join(" ");
 }
@@ -268,13 +274,15 @@ function formatTitle(name, options) {
   return `### &nbsp;&nbsp;&nbsp;${formatName}`;
 }
 function formatSection(commits, sectionName, options) {
-  if (!commits.length)
+  if (!commits.length) {
     return [];
+  }
   const lines = ["", formatTitle(sectionName, options), ""];
   const scopes = groupBy(commits, "scope");
   let useScopeGroup = options.group;
-  if (!Object.entries(scopes).some(([k, v]) => k && v.length > 1))
+  if (!Object.entries(scopes).some(([k, v]) => k && v.length > 1)) {
     useScopeGroup = false;
+  }
   Object.keys(scopes).sort().forEach((scope) => {
     let padding = "";
     let prefix = "";
@@ -346,7 +354,6 @@ async function resolveConfig(options) {
   if (config.to === config.from) {
     config.from = await getLastGitTag(-1) || await getFirstGitCommit();
   }
-  console.log("resolveConfig => config.token: ", config.token);
   return config;
 }
 
@@ -404,7 +411,8 @@ async function generate(options) {
   const rawCommits = await getGitDiff(resolved.from, resolved.to);
   const commits = parseCommits(rawCommits, resolved);
   if (resolved.contributors) {
-    await resolveAuthors(commits, resolved);
+    const authorInfo = await resolveAuthors(commits, resolved);
+    Object.assign(resolved, authorInfo);
   }
   const md = generateMarkdown(commits, resolved);
   return { config: resolved, md, commits };

package/dist/index.mjs

@@ -97,24 +97,19 @@ async function resolveAuthorInfo(options, info) {
     const data = await $fetch(`https://api.github.com/search/users?q=${encodeURIComponent(info.email)}`, {
       headers: getHeaders(options)
     });
-    console.log("fetch github user: ", data);
     authorInfo.login = data.items[0].login;
-  } catch (error) {
-    console.log("error: ", error);
-    console.log("error fetch github user");
+  } catch {
+  }
+  if (authorInfo.login) {
+    return authorInfo;
   }
-  if (info.login)
-    return info;
   if (info.commits.length) {
     try {
       const data = await $fetch(`https://api.github.com/repos/${options.github}/commits/${info.commits[0]}`, {
         headers: getHeaders(options)
       });
-      console.log("data: ", data);
       authorInfo.login = data.author.login;
-    } catch (e) {
-      console.log("e: ", e);
-      console.log("error fetch github commit");
+    } catch {
     }
   }
   return authorInfo;
@@ -123,8 +118,9 @@ async function resolveAuthors(commits, options) {
   const map = /* @__PURE__ */ new Map();
   commits.forEach((commit) => {
     commit.resolvedAuthors = commit.authors.map((a, idx) => {
-      if (!a.email || !a.name)
+      if (!a.email || !a.name) {
         return null;
+      }
       if (!map.has(a.email)) {
         map.set(a.email, {
           commits: [],
@@ -133,8 +129,9 @@ async function resolveAuthors(commits, options) {
         });
       }
       const info = map.get(a.email);
-      if (idx === 0)
+      if (idx === 0) {
         info.commits.push(commit.shortHash);
+      }
       return info;
     }).filter(notNullish);
   });
@@ -143,13 +140,15 @@ async function resolveAuthors(commits, options) {
   const loginSet = /* @__PURE__ */ new Set();
   const nameSet = /* @__PURE__ */ new Set();
   return resolved.sort((a, b) => (a.login || a.name).localeCompare(b.login || b.name)).filter((i) => {
-    if (i.login && loginSet.has(i.login))
+    if (i.login && loginSet.has(i.login)) {
       return false;
+    }
     if (i.login) {
       loginSet.add(i.login);
     } else {
-      if (nameSet.has(i.name))
+      if (nameSet.has(i.name)) {
         return false;
+      }
       nameSet.add(i.name);
     }
     return true;
@@ -169,8 +168,9 @@ async function hasTagOnGitHub(tag, options) {
 async function getGitHubRepo() {
   const url = await execCommand("git", ["config", "--get", "remote.origin.url"]);
   const match = url.match(/github\.com[\/:]([\w\d._-]+?)\/([\w\d._-]+?)(\.git)?$/i);
-  if (!match)
+  if (!match) {
     throw new Error(`Can not parse GitHub repo from url ${url}`);
+  }
   return `${match[1]}/${match[2]}`;
 }
 async function getCurrentGitBranch() {
@@ -229,19 +229,23 @@ async function getGitDiff(from, to = "HEAD") {
 const emojisRE = /([\u2700-\u27BF]|[\uE000-\uF8FF]|\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDFFF]|[\u2011-\u26FF]|\uD83E[\uDD10-\uDDFF])/g;
 function formatReferences(references, github, type) {
   const refs = references.filter((i) => {
-    if (type === "issues")
+    if (type === "issues") {
       return i.type === "issue" || i.type === "pull-request";
+    }
     return i.type === "hash";
   }).map((ref) => {
-    if (!github)
+    if (!github) {
       return ref.value;
-    if (ref.type === "pull-request" || ref.type === "issue")
+    }
+    if (ref.type === "pull-request" || ref.type === "issue") {
       return `https://github.com/${github}/issues/${ref.value.slice(1)}`;
+    }
     return `[<samp>(${ref.value.slice(0, 5)})</samp>](https://github.com/${github}/commit/${ref.value})`;
   });
   const referencesString = join(refs).trim();
-  if (type === "issues")
+  if (type === "issues") {
     return referencesString && `in ${referencesString}`;
+  }
   return referencesString;
 }
 function formatLine(commit, options) {
@@ -250,11 +254,13 @@ function formatLine(commit, options) {
   let authors = join([
     ...new Set(commit.resolvedAuthors?.map((i) => i.login ? `@${i.login}` : `**${i.name}**`))
   ])?.trim();
-  if (authors)
+  if (authors) {
     authors = `by ${authors}`;
+  }
   let refs = [authors, prRefs, hashRefs].filter((i) => i?.trim()).join(" ");
-  if (refs)
+  if (refs) {
     refs = `&nbsp;-&nbsp; ${refs}`;
+  }
   const description = options.capitalize ? capitalize(commit.description) : commit.description;
   return [description, refs].filter((i) => i?.trim()).join(" ");
 }
@@ -266,13 +272,15 @@ function formatTitle(name, options) {
   return `### &nbsp;&nbsp;&nbsp;${formatName}`;
 }
 function formatSection(commits, sectionName, options) {
-  if (!commits.length)
+  if (!commits.length) {
     return [];
+  }
   const lines = ["", formatTitle(sectionName, options), ""];
   const scopes = groupBy(commits, "scope");
   let useScopeGroup = options.group;
-  if (!Object.entries(scopes).some(([k, v]) => k && v.length > 1))
+  if (!Object.entries(scopes).some(([k, v]) => k && v.length > 1)) {
     useScopeGroup = false;
+  }
   Object.keys(scopes).sort().forEach((scope) => {
     let padding = "";
     let prefix = "";
@@ -344,7 +352,6 @@ async function resolveConfig(options) {
   if (config.to === config.from) {
     config.from = await getLastGitTag(-1) || await getFirstGitCommit();
   }
-  console.log("resolveConfig => config.token: ", config.token);
   return config;
 }
 
@@ -402,7 +409,8 @@ async function generate(options) {
   const rawCommits = await getGitDiff(resolved.from, resolved.to);
   const commits = parseCommits(rawCommits, resolved);
   if (resolved.contributors) {
-    await resolveAuthors(commits, resolved);
+    const authorInfo = await resolveAuthors(commits, resolved);
+    Object.assign(resolved, authorInfo);
   }
   const md = generateMarkdown(commits, resolved);
   return { config: resolved, md, commits };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "githublogen",
   "type": "module",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "sideEffects": false,
   "author": {
     "name": "SoybeanJS",