release-suite 1.0.0 → 1.0.1

package/.github/workflows/create-release-pr.yml

@@ -82,6 +82,10 @@ jobs:
             echo "exists=false" >> "$GITHUB_OUTPUT"
           fi
 
+      - name: Stage dist if exists
+        if: steps.dist.outputs.exists == 'true'
+        run: git add dist
+
       # Automatically create branches, commits, and PRs with peter-evans
       - name: Create Release PR
         if: steps.compute.outputs.status == '0' && steps.compute.outputs.version != ''
@@ -104,4 +108,3 @@ jobs:
           add-paths: |
             package.json
             CHANGELOG.md
-            ${{ steps.dist.outputs.exists == 'true' && 'dist/**' || '' }}

package/.github/workflows/publish-on-merge.yml

@@ -1,8 +1,7 @@
 name: Publish Release
 
 on:
-  pull_request:
-    types: [closed]
+  push:
     branches:
       - main
 
@@ -19,15 +18,9 @@ concurrency:
 jobs:
   publish:
     # Only runs when:
-    # - The PR has been merged
-    # - The PR has the "release" label
-    # - The PR title starts with ":bricks: chore(release):"
-    # - The PR was created by a bot
+    # - The commit message starts with ":bricks: chore(release):"
     if: >
-      github.event.pull_request.merged == true &&
-      startsWith(github.event.pull_request.title, ':bricks: chore(release):') &&
-      contains(join(github.event.pull_request.labels.*.name, ','), 'release') &&
-      github.event.pull_request.user.type == 'Bot'
+      startsWith(github.event.head_commit.message, ':bricks: chore(release):')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.0.1
+
+### 🐛 Fixes
+
+- Harden changelog generation for squash commits (#13)
+
+### 📚 Docs
+
+- Update ci/cd examples with trigger adjustment
+
+### 🔁 CI
+
+- Adjust trigger in workflow
+
 ## 1.0.0
 
 ### 💥 Breaking Changes

package/bin/generate-changelog.js

@@ -3,6 +3,9 @@ import { execSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { COMMIT_RE, COMMIT_EMOJI_RE } from "../lib/constants.js";
+import { normalizeCommits, parseCommit } from "../lib/git.js";
+import { normalizeSubject } from "../lib/versioning.js";
 import { computeVersion } from "./compute-version.js";
 
 function run(cmd, cwd = process.cwd()) {
@@ -37,26 +40,22 @@ function getAllTags(cwd = process.cwd()) {
 
 function getCommitsBetween(from, to, cwd = process.cwd()) {
   const range = from ? `${from}..${to}` : to;
+
   try {
-    return run(`git log ${range} --pretty=format:%H%x1f%s%x1f%b`, cwd)
-      .split("\n")
+    return run(
+      `git log ${range} --pretty=format:%H%x1f%s%x1f%B%x1e`,
+      cwd
+    )
+      .split("\x1e")
+      .map(c => c.trim())
       .filter(Boolean);
   } catch {
     return [];
   }
 }
 
-function parseCommit(line) {
-  const [hash, subject = "", body = ""] = line.split("\x1f");
-  return { hash, subject: subject.trim(), body: body.trim() };
-}
-
 function cleanSubject(subject) {
-  let s = subject.replace(/^(:\S+: )?/, "");
-  s = s.replace(
-    /^(feat|fix|refactor|docs|chore|style|test|build|perf|ci|raw|cleanup|remove)(\(.+\))?(!)?:\s*/i,
-    ""
-  );
+  const s = normalizeSubject(subject).replace(COMMIT_RE, "");
   return s ? s.charAt(0).toUpperCase() + s.slice(1) : s;
 }
 
@@ -78,9 +77,6 @@ function categorize(commits) {
     remove: [],
   };
 
-  const reType =
-    /^(:\S+: )?(feat|fix|refactor|docs|chore|style|test|build|perf|ci|raw|cleanup|remove)(\(.+\))?(!)?:/i;
-
   for (const c of commits) {
     const { subject, body } = c;
 
@@ -89,7 +85,7 @@ function categorize(commits) {
       continue;
     }
 
-    const match = subject.match(reType);
+    const match = subject.match(COMMIT_EMOJI_RE);
     const desc = cleanSubject(subject);
 
     if (!match) {
@@ -98,7 +94,14 @@ function categorize(commits) {
     }
 
     const type = match[2].toLowerCase();
-    (buckets[type] || buckets.chore).push({ desc, hash: c.hash });
+    const finalDesc = desc || cleanSubject(subject) || subject;
+
+    if (finalDesc && finalDesc.trim()) {
+      (buckets[type] || buckets.chore).push({
+        desc: finalDesc.trim(),
+        hash: c.hash
+      });
+    }
   }
 
   return buckets;
@@ -128,12 +131,18 @@ function buildSection(version, buckets) {
   let hasContent = false;
 
   for (const [key, title] of sections) {
-    if (buckets[key].length) {
-      hasContent = true;
-      out.push(`${title}\n`);
-      for (const c of buckets[key]) out.push(`- ${c.desc}`);
-      out.push("");
+    const items = buckets[key]
+      .map(c => c.desc && c.desc.trim())
+      .filter(Boolean);
+
+    if (!items.length) continue;
+
+    hasContent = true;
+    out.push(`${title}\n`);
+    for (const desc of items) {
+      out.push(`- ${desc}`);
     }
+    out.push("");
   }
 
   if (!hasContent) out.push("_No changes._\n");
@@ -165,7 +174,10 @@ export function generateChangelog({ isPreview = process.env.PREVIEW_MODE === "tr
 
   // Always generate the upcoming version (preview & release)
   if (!changelogHasVersion(CHANGELOG_FILE, nextVersion, cwd)) {
-    const commits = getCommitsBetween(lastTag, "HEAD", cwd).map(parseCommit);
+    const commits = normalizeCommits(
+      getCommitsBetween(lastTag, "HEAD", cwd).map(parseCommit)
+    );
+
 
     if (commits.length) {
       const buckets = categorize(commits);
@@ -180,7 +192,11 @@ export function generateChangelog({ isPreview = process.env.PREVIEW_MODE === "tr
 
     if (changelogHasVersion(CHANGELOG_FILE, tag, cwd)) continue;
 
-    const commits = getCommitsBetween(previous, tag, cwd).map(parseCommit);
+    const commits = normalizeCommits(
+      getCommitsBetween(previous, tag, cwd)
+        .map(parseCommit)
+    );
+
     if (!commits.length) continue;
 
     const buckets = categorize(commits);

package/docs/ci.md

@@ -87,6 +87,10 @@ jobs:
             echo "exists=false" >> "$GITHUB_OUTPUT"
           fi
 
+      - name: Stage dist if exists
+        if: steps.dist.outputs.exists == 'true'
+        run: git add dist          
+
       # Automatically create branches, commits, and PRs with peter-evans
       - name: Create Release PR
         if: steps.compute.outputs.status == '0' && steps.compute.outputs.version != ''
@@ -109,7 +113,6 @@ jobs:
           add-paths: |
             package.json
             CHANGELOG.md
-            ${{ steps.dist.outputs.exists == 'true' && 'dist/**' || '' }}
 
 ```
 
@@ -119,8 +122,7 @@ jobs:
 name: Publish Release
 
 on:
-  pull_request:
-    types: [closed]
+  push:
     branches:
       - main
 
@@ -137,15 +139,9 @@ concurrency:
 jobs:
   publish:
     # Only runs when:
-    # - The PR has been merged
-    # - The PR has the "release" label
-    # - The PR title starts with ":bricks: chore(release):"
-    # - The PR was created by a bot
+    # - The commit message starts with ":bricks: chore(release):"
     if: >
-      github.event.pull_request.merged == true &&
-      startsWith(github.event.pull_request.title, ':bricks: chore(release):') &&
-      contains(join(github.event.pull_request.labels.*.name, ','), 'release') &&
-      github.event.pull_request.user.type == 'Bot'
+      startsWith(github.event.head_commit.message, ':bricks: chore(release):')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

package/lib/constants.js

@@ -0,0 +1,28 @@
+// Constants used across the release-suite package
+
+// Commit types recognized in Conventional Commits
+export const COMMIT_TYPES = [
+  'feat',
+  'fix',
+  'refactor',
+  'docs',
+  'chore',
+  'style',
+  'test',
+  'build',
+  'perf',
+  'ci',
+  'raw',
+  'cleanup',
+  'remove',
+].join('|');
+
+export const COMMIT_RE = new RegExp(
+  `^(${COMMIT_TYPES})(\\(.+\\))?(!)?:\\s*`,
+  'i'
+);
+
+export const COMMIT_EMOJI_RE = new RegExp(
+  `^(:\\S+: )?(${COMMIT_TYPES})(\\(.+\\))?(!)?:`,
+  'i'
+);

package/lib/git.js

@@ -1,4 +1,6 @@
+import { COMMIT_RE } from "./constants.js";
 import { run } from "./utils.js";
+import { normalizeSubject } from "./versioning.js";
 
 /* ===========================
  * Git helpers
@@ -69,5 +71,59 @@ export function getCommits(range, cwd) {
  */
 export function parseCommit(line) {
   const [hash, subject = "", body = ""] = line.split("\x1f");
-  return { hash, subject, body };
-}
+  return {
+    hash: hash.trim(),
+    subject: subject.trim(),
+    body: body.trim()
+  };
+}
+
+function isSquashCommit(commit) {
+  return /\n\s*[*-]\s+/.test(commit.body);
+}
+
+function extractCommitsFromSquash(commit) {
+  const lines = commit.body
+    .split("\n")
+    .map(l => l.trim())
+    .filter(Boolean);
+
+  const firstBulletIndex = lines.findIndex(
+    l => l.startsWith("* ") || l.startsWith("- ")
+  );
+
+  if (firstBulletIndex === -1) {
+    return [];
+  }
+
+  return lines
+    .slice(firstBulletIndex)
+    .filter(l => l.startsWith("* ") || l.startsWith("- "))
+    .map(l => normalizeSubject(l))
+    .filter(subject => COMMIT_RE.test(subject))
+    .map(subject => ({
+      hash: commit.hash,
+      subject,
+      body: ""
+    }));
+
+}
+
+export function normalizeCommits(commits) {
+  const normalized = [];
+
+  for (const commit of commits) {
+    if (isSquashCommit(commit)) {
+      const extracted = extractCommitsFromSquash(commit);
+      if (extracted.length) {
+        normalized.push(...extracted);
+        continue;
+      }
+    }
+
+    // fallback: normal commit
+    normalized.push(commit);
+  }
+
+  return normalized;
+}

package/lib/versioning.js

@@ -1,10 +1,9 @@
+import { COMMIT_RE } from "./constants.js";
+
 /* ===========================
  * Semver detection
  * =========================== */
 
-const COMMIT_RE =
-  /^(feat|fix|refactor|docs|chore|style|test|build|perf|ci|cleanup|remove)(\(.+\))?(!)?:/i;
-
 /**
  * Normalize a subject string by removing leading emoji and trimming whitespace.
  *
@@ -25,12 +24,12 @@ const COMMIT_RE =
  * @example
  * normalizeSubject('  :a::b:Multiple emojis at start  ') // 'Multiple emojis at start'
  */
-function normalizeSubject(subject) {
+export function normalizeSubject(subject = "") {
   return subject
-    // remove emoji at start
-    .replace(/^:\S+:\s*/, "")
-    // remove unicode emoji at start
-    .replace(/^[\u{1F300}-\u{1FAFF}]+\s*/u, "")
+    .replace(/^[-*]\s*/, "") // leading list markers
+    .replace(/^:\w+:\s*/, "") // :emoji:
+    .replace(/^[^\w]+/, "")   // leading symbols
+    .replace(/^(?:[\u{1F300}-\u{1FAFF}]+\s*)+/u, "") // leading Unicode emoji
     .trim();
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-suite",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Semantic versioning tools for Git-based projects, providing automated version computation, changelog generation and release notes creation.",
   "type": "module",
   "publishConfig": {