@soybeanjs/changelog 0.3.15 → 0.3.17

package/dist/index.cjs

@@ -30,9 +30,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// node_modules/.pnpm/tsup@8.0.2_typescript@5.3.3/node_modules/tsup/assets/cjs_shims.js
+// node_modules/.pnpm/tsup@8.0.2_typescript@5.4.5/node_modules/tsup/assets/cjs_shims.js
 var init_cjs_shims = __esm({
-  "node_modules/.pnpm/tsup@8.0.2_typescript@5.3.3/node_modules/tsup/assets/cjs_shims.js"() {
+  "node_modules/.pnpm/tsup@8.0.2_typescript@5.4.5/node_modules/tsup/assets/cjs_shims.js"() {
     "use strict";
   }
 });
@@ -2004,7 +2004,7 @@ var 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"]);
   const tags = tagStr.split("\n");
-  return tags;
+  return tags.filter((tag) => VERSION_REG.test(tag));
 }
 async function getTagDateMap() {
   const tagDateStr = await execCommand("git", [
@@ -2030,16 +2030,23 @@ async function getTagDateMap() {
 }
 function getFromToTags(tags) {
   const result = [];
-  tags.forEach((tag, index) => {
-    if (index < tags.length - 1) {
-      result.push({ from: tag, to: tags[index + 1] });
+  if (tags.length < 2) {
+    return result;
+  }
+  const releaseTags = tags.filter((tag) => !isPrerelease(tag));
+  const reversedTags = [...tags].reverse();
+  reversedTags.forEach((tag, index) => {
+    if (index < reversedTags.length - 1) {
+      const to = tag;
+      let from = reversedTags[index + 1];
+      if (!isPrerelease(to)) {
+        const toIndex = releaseTags.indexOf(to);
+        from = releaseTags[toIndex - 1];
+      }
+      result.push({ from, to });
     }
   });
-  return result;
-}
-async function getLastGitTag(delta = 0) {
-  const tags = await getTotalGitTags();
-  return tags[tags.length + delta - 1];
+  return result.reverse();
 }
 async function getGitMainBranchName() {
   const main = await execCommand("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
@@ -2256,8 +2263,7 @@ function createDefaultOptions() {
       breakingChanges: "\u{1F6A8} Breaking Changes"
     },
     output: "CHANGELOG.md",
-    regenerate: false,
-    newVersion: ""
+    regenerate: false
   };
   return options;
 }
@@ -2279,21 +2285,20 @@ async function createOptions(options) {
   Object.assign(opts, options);
   const { newVersion } = await getVersionFromPkgJson(opts.cwd);
   (_a = opts.github).repo || (_a.repo = await getGitHubRepo());
-  opts.newVersion || (opts.newVersion = `v${newVersion}`);
-  opts.from || (opts.from = await getLastGitTag());
-  opts.to || (opts.to = await getCurrentGitBranch());
+  const tags = await getTotalGitTags();
+  opts.tags = tags;
+  opts.from || (opts.from = tags[tags.length - 1]);
+  opts.to || (opts.to = `v${newVersion}`);
   if (opts.to === opts.from) {
-    const lastTag = await getLastGitTag(-1);
+    const lastTag = tags[tags.length - 2];
     const firstCommit = await getFirstGitCommit();
     opts.from = lastTag || firstCommit;
   }
-  opts.tags = await getTotalGitTags();
   opts.tagDateMap = await getTagDateMap();
   opts.prerelease || (opts.prerelease = isPrerelease(opts.to));
   const isFromPrerelease = isPrerelease(opts.from);
   if (!isPrerelease(newVersion) && isFromPrerelease) {
-    const nVersion = opts.newVersion;
-    const allReleaseTags = opts.tags.filter((tag) => !isPrerelease(tag) && tag !== nVersion);
+    const allReleaseTags = opts.tags.filter((tag) => !isPrerelease(tag) && tag !== opts.to);
     opts.from = allReleaseTags[allReleaseTags.length - 1];
   }
   return opts;
@@ -2405,10 +2410,10 @@ function generateMarkdown(params) {
   const { options, showTitle, contributors } = params;
   const commits = params.commits.filter((commit) => commit.description.match(VERSION_WITH_RELEASE) === null);
   const lines = [];
-  const url = `https://github.com/${options.github.repo}/compare/${options.from}...${options.newVersion}`;
+  const url = `https://github.com/${options.github.repo}/compare/${options.from}...${options.to}`;
   if (showTitle) {
-    const date = options.tagDateMap.get(options.newVersion) || (0, import_dayjs2.default)().format("YY-MM-DD");
-    let title = `## [${options.newVersion}](${url})`;
+    const date = options.tagDateMap.get(options.to) || (0, import_dayjs2.default)().format("YYYY-MM-DD");
+    let title = `## [${options.to}](${url})`;
     if (date) {
       title += ` (${date})`;
     }
@@ -2484,7 +2489,9 @@ ${md}
 // src/index.ts
 async function getChangelogMarkdown(options, showTitle = true) {
   const opts = await createOptions(options);
-  const gitCommits = await getGitCommits(opts.from, opts.to);
+  const current = await getCurrentGitBranch();
+  const to = opts.tags.includes(opts.to) ? opts.to : current;
+  const gitCommits = await getGitCommits(opts.from, to);
   const resolvedLogins = /* @__PURE__ */ new Map();
   const { commits, contributors } = await getGitCommitsAndResolvedAuthors(gitCommits, opts.github, resolvedLogins);
   const markdown = generateMarkdown({ commits, options: opts, showTitle, contributors });
@@ -2526,7 +2533,7 @@ ${markdown}`;
 }
 async function generateChangelog(options) {
   const opts = await createOptions(options);
-  const existContent = await isVersionInMarkdown(opts.newVersion, opts.output);
+  const existContent = await isVersionInMarkdown(opts.to, opts.output);
   if (!opts.regenerate && existContent)
     return;
   const { markdown } = await getChangelogMarkdown(opts);

package/dist/index.d.cts

@@ -100,12 +100,6 @@ interface ChangelogOption {
      *   the changelog already exists the content of v0.0.1, but you want to regenerate it
      */
     regenerate: boolean;
-    /**
-     * Version from package.json, with prefix "v"
-     *
-     * If the options "to" is not specified, the version will be used
-     */
-    newVersion: string;
     /** Mark the release as prerelease */
     prerelease?: boolean;
 }

package/dist/index.d.ts

@@ -100,12 +100,6 @@ interface ChangelogOption {
      *   the changelog already exists the content of v0.0.1, but you want to regenerate it
      */
     regenerate: boolean;
-    /**
-     * Version from package.json, with prefix "v"
-     *
-     * If the options "to" is not specified, the version will be used
-     */
-    newVersion: string;
     /** Mark the release as prerelease */
     prerelease?: boolean;
 }

package/dist/index.js

@@ -68,7 +68,7 @@ var 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"]);
   const tags = tagStr.split("\n");
-  return tags;
+  return tags.filter((tag) => VERSION_REG.test(tag));
 }
 async function getTagDateMap() {
   const tagDateStr = await execCommand("git", [
@@ -94,16 +94,23 @@ async function getTagDateMap() {
 }
 function getFromToTags(tags) {
   const result = [];
-  tags.forEach((tag, index) => {
-    if (index < tags.length - 1) {
-      result.push({ from: tag, to: tags[index + 1] });
+  if (tags.length < 2) {
+    return result;
+  }
+  const releaseTags = tags.filter((tag) => !isPrerelease(tag));
+  const reversedTags = [...tags].reverse();
+  reversedTags.forEach((tag, index) => {
+    if (index < reversedTags.length - 1) {
+      const to = tag;
+      let from = reversedTags[index + 1];
+      if (!isPrerelease(to)) {
+        const toIndex = releaseTags.indexOf(to);
+        from = releaseTags[toIndex - 1];
+      }
+      result.push({ from, to });
     }
   });
-  return result;
-}
-async function getLastGitTag(delta = 0) {
-  const tags = await getTotalGitTags();
-  return tags[tags.length + delta - 1];
+  return result.reverse();
 }
 async function getGitMainBranchName() {
   const main = await execCommand("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
@@ -320,8 +327,7 @@ function createDefaultOptions() {
       breakingChanges: "\u{1F6A8} Breaking Changes"
     },
     output: "CHANGELOG.md",
-    regenerate: false,
-    newVersion: ""
+    regenerate: false
   };
   return options;
 }
@@ -343,21 +349,20 @@ async function createOptions(options) {
   Object.assign(opts, options);
   const { newVersion } = await getVersionFromPkgJson(opts.cwd);
   (_a = opts.github).repo || (_a.repo = await getGitHubRepo());
-  opts.newVersion || (opts.newVersion = `v${newVersion}`);
-  opts.from || (opts.from = await getLastGitTag());
-  opts.to || (opts.to = await getCurrentGitBranch());
+  const tags = await getTotalGitTags();
+  opts.tags = tags;
+  opts.from || (opts.from = tags[tags.length - 1]);
+  opts.to || (opts.to = `v${newVersion}`);
   if (opts.to === opts.from) {
-    const lastTag = await getLastGitTag(-1);
+    const lastTag = tags[tags.length - 2];
     const firstCommit = await getFirstGitCommit();
     opts.from = lastTag || firstCommit;
   }
-  opts.tags = await getTotalGitTags();
   opts.tagDateMap = await getTagDateMap();
   opts.prerelease || (opts.prerelease = isPrerelease(opts.to));
   const isFromPrerelease = isPrerelease(opts.from);
   if (!isPrerelease(newVersion) && isFromPrerelease) {
-    const nVersion = opts.newVersion;
-    const allReleaseTags = opts.tags.filter((tag) => !isPrerelease(tag) && tag !== nVersion);
+    const allReleaseTags = opts.tags.filter((tag) => !isPrerelease(tag) && tag !== opts.to);
     opts.from = allReleaseTags[allReleaseTags.length - 1];
   }
   return opts;
@@ -468,10 +473,10 @@ function generateMarkdown(params) {
   const { options, showTitle, contributors } = params;
   const commits = params.commits.filter((commit) => commit.description.match(VERSION_WITH_RELEASE) === null);
   const lines = [];
-  const url = `https://github.com/${options.github.repo}/compare/${options.from}...${options.newVersion}`;
+  const url = `https://github.com/${options.github.repo}/compare/${options.from}...${options.to}`;
   if (showTitle) {
-    const date = options.tagDateMap.get(options.newVersion) || dayjs2().format("YY-MM-DD");
-    let title = `## [${options.newVersion}](${url})`;
+    const date = options.tagDateMap.get(options.to) || dayjs2().format("YYYY-MM-DD");
+    let title = `## [${options.to}](${url})`;
     if (date) {
       title += ` (${date})`;
     }
@@ -547,7 +552,9 @@ ${md}
 // src/index.ts
 async function getChangelogMarkdown(options, showTitle = true) {
   const opts = await createOptions(options);
-  const gitCommits = await getGitCommits(opts.from, opts.to);
+  const current = await getCurrentGitBranch();
+  const to = opts.tags.includes(opts.to) ? opts.to : current;
+  const gitCommits = await getGitCommits(opts.from, to);
   const resolvedLogins = /* @__PURE__ */ new Map();
   const { commits, contributors } = await getGitCommitsAndResolvedAuthors(gitCommits, opts.github, resolvedLogins);
   const markdown = generateMarkdown({ commits, options: opts, showTitle, contributors });
@@ -589,7 +596,7 @@ ${markdown}`;
 }
 async function generateChangelog(options) {
   const opts = await createOptions(options);
-  const existContent = await isVersionInMarkdown(opts.newVersion, opts.output);
+  const existContent = await isVersionInMarkdown(opts.to, opts.output);
   if (!opts.regenerate && existContent)
     return;
   const { markdown } = await getChangelogMarkdown(opts);

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@soybeanjs/changelog",
   "type": "module",
-  "version": "0.3.15",
-  "packageManager": "pnpm@8.14.1",
+  "version": "0.3.17",
   "description": "generate changelog form git tags and commits for github",
   "author": {
     "name": "Soybean",
@@ -38,23 +37,23 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@soybeanjs/eslint-config": "^1.2.3",
+    "@soybeanjs/eslint-config": "^1.3.2",
     "cli-progress": "3.12.0",
     "convert-gitmoji": "0.1.5",
     "dayjs": "1.11.10",
     "execa": "8.0.1",
-    "ofetch": "1.3.3"
+    "ofetch": "1.3.4"
   },
   "devDependencies": {
-    "@soybeanjs/cli": "1.0.8",
+    "@soybeanjs/cli": "1.0.11",
     "@types/cli-progress": "3.11.5",
-    "@types/node": "20.11.24",
-    "eslint": "8.57.0",
+    "@types/node": "20.12.7",
+    "eslint": "9.1.1",
     "lint-staged": "15.2.2",
-    "simple-git-hooks": "2.9.0",
+    "simple-git-hooks": "2.11.1",
     "tsup": "^8.0.2",
-    "tsx": "4.7.1",
-    "typescript": "5.3.3"
+    "tsx": "4.7.2",
+    "typescript": "5.4.5"
   },
   "simple-git-hooks": {
     "commit-msg": "pnpm soy git-commit-verify",