@soybeanjs/changelog 0.0.3 → 0.0.5

package/dist/index.cjs

@@ -58,6 +58,7 @@ function join(array, glue = ", ", finalGlue = " and ") {
 
 const VERSION_REG = /v\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?/;
 const VERSION_REG_OF_MARKDOWN = /## \[v\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?]/g;
+const VERSION_WITH_RELEASE = /release\sv\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?/;
 
 async function getTotalGitTags() {
   const tagStr = await execCommand("git", ["--no-pager", "tag", "-l", "--sort=creatordate"]);
@@ -130,13 +131,13 @@ async function getGitDiff(from, to = "HEAD") {
   const gitCommits = rwaGitLines.map((line) => {
     const [firstLine, ...body] = line.split("\n");
     const [message, shortHash, authorName, authorEmail] = firstLine.split("|");
-    const gitCommmit = {
+    const gitCommit = {
       message,
       shortHash,
       author: { name: authorName, email: authorEmail },
       body: body.join("\n")
     };
-    return gitCommmit;
+    return gitCommit;
   });
   return gitCommits;
 }
@@ -165,8 +166,8 @@ function parseGitCommit(commit) {
   references.push({ value: commit.shortHash, type: "hash" });
   description = description.replace(PullRequestRE, "").trim();
   const authors = [commit.author];
-  const matchs = commit.body.matchAll(CoAuthoredByRegex);
-  for (const $match of matchs) {
+  const matches = commit.body.matchAll(CoAuthoredByRegex);
+  for (const $match of matches) {
     const { name = "", email = "" } = $match.groups || {};
     const author = {
       name: name.trim(),
@@ -201,7 +202,8 @@ async function getResolvedAuthorLogin(github, commitHashes, email) {
   try {
     const data = await ofetch.ofetch(`https://ungh.cc/users/find/${email}`);
     login = data?.user?.username || "";
-  } catch {
+  } catch (e) {
+    console.log("e: ", e);
   }
   if (login) {
     return login;
@@ -217,6 +219,7 @@ async function getResolvedAuthorLogin(github, commitHashes, email) {
       });
       login = data?.author?.login || "";
     } catch (e) {
+      console.log("e: ", e);
     }
   }
   if (login) {
@@ -228,6 +231,7 @@ async function getResolvedAuthorLogin(github, commitHashes, email) {
     });
     login = data.items[0].login;
   } catch (e) {
+    console.log("e: ", e);
   }
   return login;
 }
@@ -413,7 +417,7 @@ function getGitUserAvatar(userName) {
 }
 function createContributorLine(contributors) {
   let loginLine = "";
-  let unloginLine = "";
+  let unLoginLine = "";
   contributors.forEach((contributor, index) => {
     const { name, email, login } = contributor;
     if (!login) {
@@ -421,7 +425,7 @@ function createContributorLine(contributors) {
       if (index < contributors.length - 1) {
         line += ",&nbsp;";
       }
-      unloginLine += line;
+      unLoginLine += line;
     } else {
       const githubUrl = getUserGithub(login);
       const avatar = getGitUserAvatar(login);
@@ -429,10 +433,11 @@ function createContributorLine(contributors) {
     }
   });
   return `${loginLine}
-${unloginLine}`;
+${unLoginLine}`;
 }
 function generateMarkdown(params) {
-  const { commits, options, showTitle, contributors } = params;
+  const { options, showTitle, contributors } = params;
+  const commits = params.commits.filter((commit) => commit.description.match(VERSION_WITH_RELEASE) === null);
   const lines = [];
   const isNewVersion = !VERSION_REG.test(options.to);
   const version = isNewVersion ? options.newVersion : options.to;
@@ -556,6 +561,7 @@ async function generateTotalChangelog(options, showProgress = true) {
   const markdown = await getTotalChangelogMarkdown(opts, showProgress);
   await writeMarkdown(markdown, opts.output, true);
 }
+getChangelogMarkdown();
 
 exports.generateChangelog = generateChangelog;
 exports.generateTotalChangelog = generateTotalChangelog;

package/dist/index.d.ts

@@ -70,7 +70,7 @@ interface ChangelogOption {
      */
     regenerate: boolean;
     /**
-     * version from package.json, with preffix "v"
+     * version from package.json, with prefix "v"
      * @description if the options "to" is not specified, the version will be used
      */
     newVersion: string;

package/dist/index.mjs

@@ -51,6 +51,7 @@ function join(array, glue = ", ", finalGlue = " and ") {
 
 const VERSION_REG = /v\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?/;
 const VERSION_REG_OF_MARKDOWN = /## \[v\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?]/g;
+const VERSION_WITH_RELEASE = /release\sv\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?/;
 
 async function getTotalGitTags() {
   const tagStr = await execCommand("git", ["--no-pager", "tag", "-l", "--sort=creatordate"]);
@@ -123,13 +124,13 @@ async function getGitDiff(from, to = "HEAD") {
   const gitCommits = rwaGitLines.map((line) => {
     const [firstLine, ...body] = line.split("\n");
     const [message, shortHash, authorName, authorEmail] = firstLine.split("|");
-    const gitCommmit = {
+    const gitCommit = {
       message,
       shortHash,
       author: { name: authorName, email: authorEmail },
       body: body.join("\n")
     };
-    return gitCommmit;
+    return gitCommit;
   });
   return gitCommits;
 }
@@ -158,8 +159,8 @@ function parseGitCommit(commit) {
   references.push({ value: commit.shortHash, type: "hash" });
   description = description.replace(PullRequestRE, "").trim();
   const authors = [commit.author];
-  const matchs = commit.body.matchAll(CoAuthoredByRegex);
-  for (const $match of matchs) {
+  const matches = commit.body.matchAll(CoAuthoredByRegex);
+  for (const $match of matches) {
     const { name = "", email = "" } = $match.groups || {};
     const author = {
       name: name.trim(),
@@ -194,7 +195,8 @@ async function getResolvedAuthorLogin(github, commitHashes, email) {
   try {
     const data = await ofetch(`https://ungh.cc/users/find/${email}`);
     login = data?.user?.username || "";
-  } catch {
+  } catch (e) {
+    console.log("e: ", e);
   }
   if (login) {
     return login;
@@ -210,6 +212,7 @@ async function getResolvedAuthorLogin(github, commitHashes, email) {
       });
       login = data?.author?.login || "";
     } catch (e) {
+      console.log("e: ", e);
     }
   }
   if (login) {
@@ -221,6 +224,7 @@ async function getResolvedAuthorLogin(github, commitHashes, email) {
     });
     login = data.items[0].login;
   } catch (e) {
+    console.log("e: ", e);
   }
   return login;
 }
@@ -406,7 +410,7 @@ function getGitUserAvatar(userName) {
 }
 function createContributorLine(contributors) {
   let loginLine = "";
-  let unloginLine = "";
+  let unLoginLine = "";
   contributors.forEach((contributor, index) => {
     const { name, email, login } = contributor;
     if (!login) {
@@ -414,7 +418,7 @@ function createContributorLine(contributors) {
       if (index < contributors.length - 1) {
         line += ",&nbsp;";
       }
-      unloginLine += line;
+      unLoginLine += line;
     } else {
       const githubUrl = getUserGithub(login);
       const avatar = getGitUserAvatar(login);
@@ -422,10 +426,11 @@ function createContributorLine(contributors) {
     }
   });
   return `${loginLine}
-${unloginLine}`;
+${unLoginLine}`;
 }
 function generateMarkdown(params) {
-  const { commits, options, showTitle, contributors } = params;
+  const { options, showTitle, contributors } = params;
+  const commits = params.commits.filter((commit) => commit.description.match(VERSION_WITH_RELEASE) === null);
   const lines = [];
   const isNewVersion = !VERSION_REG.test(options.to);
   const version = isNewVersion ? options.newVersion : options.to;
@@ -549,5 +554,6 @@ async function generateTotalChangelog(options, showProgress = true) {
   const markdown = await getTotalChangelogMarkdown(opts, showProgress);
   await writeMarkdown(markdown, opts.output, true);
 }
+getChangelogMarkdown();
 
 export { generateChangelog, generateTotalChangelog, getChangelogMarkdown, getTotalChangelogMarkdown };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soybeanjs/changelog",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "generate changelog form git tags and commits for github",
   "author": {
     "name": "Soybean",
@@ -34,19 +34,19 @@
   "dependencies": {
     "cli-progress": "3.12.0",
     "convert-gitmoji": "0.1.3",
-    "dayjs": "1.11.8",
+    "dayjs": "1.11.9",
     "execa": "7.1.1",
-    "ofetch": "1.1.0"
+    "ofetch": "1.1.1"
   },
   "devDependencies": {
-    "@soybeanjs/cli": "0.6.0",
+    "@soybeanjs/cli": "0.6.2",
     "@types/cli-progress": "3.11.0",
-    "@types/node": "20.3.0",
-    "eslint": "8.42.0",
-    "eslint-config-soybeanjs": "0.4.9",
-    "simple-git-hooks": "2.8.1",
+    "@types/node": "20.4.5",
+    "eslint": "8.45.0",
+    "eslint-config-soybeanjs": "0.5.3",
+    "simple-git-hooks": "2.9.0",
     "tsx": "3.12.7",
-    "typescript": "5.1.3",
+    "typescript": "5.1.6",
     "unbuild": "1.2.1"
   },
   "simple-git-hooks": {