@soybeanjs/changelog 0.3.17 → 0.3.19

package/dist/index.cjs

@@ -1997,14 +1997,37 @@ function join(array, glue = ", ", finalGlue = " and ") {
 // src/constant.ts
 init_cjs_shims();
 var VERSION_REG = /v\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?/;
+var RELEASE_VERSION_REG = /v\d+\.\d+\.\d+/;
 var VERSION_REG_OF_MARKDOWN = /## \[v\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?]/g;
 var VERSION_WITH_RELEASE = /release\sv\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?/;
 
 // src/git.ts
 async function getTotalGitTags() {
-  const tagStr = await execCommand("git", ["--no-pager", "tag", "-l", "--sort=creatordate"]);
+  const tagStr = await execCommand("git", ["--no-pager", "tag", "-l", "--sort=v:refname"]);
   const tags = tagStr.split("\n");
-  return tags.filter((tag) => VERSION_REG.test(tag));
+  const filtered = tags.filter((tag) => VERSION_REG.test(tag));
+  return sortTags(filtered);
+}
+function sortTags(tags) {
+  tags.sort((a, b2) => {
+    var _a, _b;
+    const versionA = ((_a = a.match(RELEASE_VERSION_REG)) == null ? void 0 : _a[0]) || "";
+    const versionB = ((_b = b2.match(RELEASE_VERSION_REG)) == null ? void 0 : _b[0]) || "";
+    if (versionA < versionB) {
+      return -1;
+    } else if (versionA > versionB) {
+      return 1;
+    }
+    const isBetaA = isPrerelease(a);
+    const isBetaB = isPrerelease(b2);
+    if (isBetaA && !isBetaB) {
+      return -1;
+    } else if (!isBetaA && isBetaB) {
+      return 1;
+    }
+    return 0;
+  });
+  return tags;
 }
 async function getTagDateMap() {
   const tagDateStr = await execCommand("git", [
@@ -2544,6 +2567,7 @@ async function generateTotalChangelog(options, showProgress = true) {
   const markdown = await getTotalChangelogMarkdown(opts, showProgress);
   await writeMarkdown(markdown, opts.output, true);
 }
+generateTotalChangelog();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   generateChangelog,

package/dist/index.js

@@ -61,14 +61,37 @@ function join(array, glue = ", ", finalGlue = " and ") {
 
 // src/constant.ts
 var VERSION_REG = /v\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?/;
+var RELEASE_VERSION_REG = /v\d+\.\d+\.\d+/;
 var VERSION_REG_OF_MARKDOWN = /## \[v\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?]/g;
 var VERSION_WITH_RELEASE = /release\sv\d+\.\d+\.\d+(-(beta|alpha)\.\d+)?/;
 
 // src/git.ts
 async function getTotalGitTags() {
-  const tagStr = await execCommand("git", ["--no-pager", "tag", "-l", "--sort=creatordate"]);
+  const tagStr = await execCommand("git", ["--no-pager", "tag", "-l", "--sort=v:refname"]);
   const tags = tagStr.split("\n");
-  return tags.filter((tag) => VERSION_REG.test(tag));
+  const filtered = tags.filter((tag) => VERSION_REG.test(tag));
+  return sortTags(filtered);
+}
+function sortTags(tags) {
+  tags.sort((a, b) => {
+    var _a, _b;
+    const versionA = ((_a = a.match(RELEASE_VERSION_REG)) == null ? void 0 : _a[0]) || "";
+    const versionB = ((_b = b.match(RELEASE_VERSION_REG)) == null ? void 0 : _b[0]) || "";
+    if (versionA < versionB) {
+      return -1;
+    } else if (versionA > versionB) {
+      return 1;
+    }
+    const isBetaA = isPrerelease(a);
+    const isBetaB = isPrerelease(b);
+    if (isBetaA && !isBetaB) {
+      return -1;
+    } else if (!isBetaA && isBetaB) {
+      return 1;
+    }
+    return 0;
+  });
+  return tags;
 }
 async function getTagDateMap() {
   const tagDateStr = await execCommand("git", [
@@ -607,6 +630,7 @@ async function generateTotalChangelog(options, showProgress = true) {
   const markdown = await getTotalChangelogMarkdown(opts, showProgress);
   await writeMarkdown(markdown, opts.output, true);
 }
+generateTotalChangelog();
 export {
   generateChangelog,
   generateTotalChangelog,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@soybeanjs/changelog",
   "type": "module",
-  "version": "0.3.17",
+  "version": "0.3.19",
   "description": "generate changelog form git tags and commits for github",
   "author": {
     "name": "Soybean",