@soybeanjs/changelog 0.3.20 → 0.3.22

package/dist/index.cjs

@@ -1947,6 +1947,9 @@ var import_node_tty2 = require("tty");
 var import_node_util3 = require("util");
 var import_node_path3 = require("path");
 
+// src/git.ts
+var import_semver = __toESM(require("semver"), 1);
+
 // src/shared.ts
 init_cjs_shims();
 async function execCommand(cmd, args, options) {
@@ -1996,8 +1999,7 @@ 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 = /^v\d+\.\d+\.\d+(-(beta|alpha)\.\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+)?/;
 
@@ -2006,29 +2008,9 @@ async function getTotalGitTags() {
   const tagStr = await execCommand("git", ["--no-pager", "tag", "-l", "--sort=v:refname"]);
   const tags = tagStr.split("\n");
   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;
+  return import_semver.default.sort(filtered);
 }
+getTotalGitTags();
 async function getTagDateMap() {
   const tagDateStr = await execCommand("git", [
     "--no-pager",
@@ -2051,6 +2033,7 @@ async function getTagDateMap() {
   });
   return map;
 }
+getTagDateMap();
 function getFromToTags(tags) {
   const result = [];
   if (tags.length < 2) {

package/dist/index.js

@@ -12,6 +12,7 @@ import { readFile } from "fs/promises";
 // src/git.ts
 import { ofetch } from "ofetch";
 import dayjs from "dayjs";
+import semver from "semver";
 
 // src/shared.ts
 async function execCommand(cmd, args, options) {
@@ -60,8 +61,7 @@ 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 = /^v\d+\.\d+\.\d+(-(beta|alpha)\.\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+)?/;
 
@@ -70,29 +70,9 @@ async function getTotalGitTags() {
   const tagStr = await execCommand("git", ["--no-pager", "tag", "-l", "--sort=v:refname"]);
   const tags = tagStr.split("\n");
   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;
+  return semver.sort(filtered);
 }
+getTotalGitTags();
 async function getTagDateMap() {
   const tagDateStr = await execCommand("git", [
     "--no-pager",
@@ -115,6 +95,7 @@ async function getTagDateMap() {
   });
   return map;
 }
+getTagDateMap();
 function getFromToTags(tags) {
   const result = [];
   if (tags.length < 2) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@soybeanjs/changelog",
   "type": "module",
-  "version": "0.3.20",
+  "version": "0.3.22",
   "description": "generate changelog form git tags and commits for github",
   "author": {
     "name": "Soybean",
@@ -42,7 +42,8 @@
     "convert-gitmoji": "0.1.5",
     "dayjs": "1.11.10",
     "execa": "8.0.1",
-    "ofetch": "1.3.4"
+    "ofetch": "1.3.4",
+    "semver": "7.6.0"
   },
   "devDependencies": {
     "@soybeanjs/cli": "1.0.11",