fix: changelong (#349)

Author: thejackshelton-kunaico

.github/workflows/create-release.yml

@@ -18,10 +18,26 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: 🟢 Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 24.9.0
+
+      - name: 📦 Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9.14.4
+
+      - name: ✨ Install dependencies
+        run: pnpm install --frozen-lockfile
+
       - name: 📝 Extract version from tag
         id: version
         run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
 
+      - name: 🔄 Regenerate changelog to include all commits
+        run: pnpm changelog
+
       - name: 📄 Extract changelog for this version
         id: changelog
         run: |

libs/tools/package.json

@@ -34,7 +34,7 @@
     "build": "pnpm run build.lib & pnpm run build.types && pnpm generate.icon.types",
     "build.lib": "rolldown -c rolldown.config.ts",
     "build.types": "tsc --emitDeclarationOnly --outDir ./lib-types",
-    "generate.icon.types": "node src/generate-icon-types.ts"
+    "generate.icon.types": "node src/generate/icon-types.ts"
   },
   "devDependencies": {
     "@iconify/types": "^2",

libs/tools/src/generate/changelog.unit.ts

@@ -0,0 +1,135 @@
+import { execSync } from "node:child_process";
+import { readFileSync } from "node:fs";
+import { describe, expect, it } from "vitest";
+
+function getLatestTag(): string | null {
+  try {
+    const tags = execSync("git tag --sort=-version:refname", { encoding: "utf-8" })
+      .trim()
+      .split("\n")
+      .filter(Boolean);
+    return tags.find(Boolean) || null;
+  } catch {
+    return null;
+  }
+}
+
+function getCommitsBetweenTags(fromTag: string | null, toRef = "HEAD"): string[] {
+  if (!fromTag) {
+    return [];
+  }
+  try {
+    const commits = execSync(`git log --oneline --no-merges ${fromTag}..${toRef}`, {
+      encoding: "utf-8"
+    })
+      .trim()
+      .split("\n")
+      .filter(Boolean);
+    return commits;
+  } catch {
+    return [];
+  }
+}
+
+function extractChangelogSection(changelogContent: string): string {
+  const lines = changelogContent.split("\n");
+  const firstSection: string[] = [];
+  let inSection = false;
+  let sectionCount = 0;
+
+  for (const line of lines) {
+    if (line.startsWith("## ")) {
+      sectionCount++;
+      if (sectionCount === 1) {
+        inSection = true;
+        continue;
+      } else if (sectionCount === 2) {
+        break;
+      }
+    }
+    if (inSection) {
+      firstSection.push(line);
+    }
+  }
+
+  return firstSection.join("\n");
+}
+
+function extractPRNumbers(changelogSection: string): string[] {
+  const prRegex = /\[#(\d+)\]/g;
+  const matches: string[] = [];
+  let match: RegExpExecArray | null;
+  while ((match = prRegex.exec(changelogSection)) !== null) {
+    if (match[1]) {
+      matches.push(match[1]);
+    }
+  }
+  return matches;
+}
+
+describe("changelog generation", () => {
+  it("should include all commits with PRs in the changelog", () => {
+    const latestTag = getLatestTag();
+
+    // Skip test if no tags exist
+    if (!latestTag) {
+      console.log("⚠️  No tags found. Skipping test.");
+      return;
+    }
+
+    const commits = getCommitsBetweenTags(latestTag);
+
+    // Skip test if no commits since last tag
+    if (commits.length === 0) {
+      console.log("✅ No commits since last tag. Test passed.");
+      return;
+    }
+
+    // Generate changelog
+    try {
+      execSync("pnpm changelog", { stdio: "inherit" });
+    } catch (error) {
+      throw new Error(`Failed to generate changelog: ${(error as Error).message}`, {
+        cause: error
+      });
+    }
+
+    // Read generated changelog
+    let changelogContent: string;
+    try {
+      changelogContent = readFileSync("CHANGELOG.md", "utf-8");
+    } catch (error) {
+      throw new Error(`Failed to read CHANGELOG.md: ${(error as Error).message}`, {
+        cause: error
+      });
+    }
+
+    const firstSection = extractChangelogSection(changelogContent);
+    const prNumbers = extractPRNumbers(firstSection);
+
+    // Check if commits with PR numbers are included
+    const commitsWithPRs = commits.filter((commit) => /\(#\d+\)/.test(commit));
+
+    if (commitsWithPRs.length > 0) {
+      const prsInCommits = commitsWithPRs
+        .map((commit) => {
+          const match = commit.match(/\(#(\d+)\)/);
+          return match && match[1] ? match[1] : null;
+        })
+        .filter((pr): pr is string => pr !== null);
+
+      const missingPRs = prsInCommits.filter((pr) => !prNumbers.includes(pr));
+
+      if (missingPRs.length > 0) {
+        throw new Error(
+          `Missing PRs in changelog: ${missingPRs.join(", ")}. ` +
+            `Expected PRs: ${prsInCommits.join(", ")}. ` +
+            `Found PRs: ${prNumbers.join(", ")}`
+        );
+      }
+    }
+
+    // Verify the changelog section exists and has content
+    expect(firstSection.trim()).not.toBe("");
+  });
+});

libs/tools/src/generate-icon-types.ts libs/tools/src/generate/icon-types.tslibs/tools/src/generate-icon-types.ts renamed to libs/tools/src/generate/icon-types.ts

@@ -8,7 +8,7 @@ import { fileURLToPath } from "node:url";
 export { sanitizeIconName, generateIconTypes, generateRuntimeProxies };
 
 // Import shared utilities
-import { discoverAllIconifyCollections, toPascalCase } from "../utils/icons/naming.ts";
+import { discoverAllIconifyCollections, toPascalCase } from "../../utils/icons/naming.ts";
 
 // Export shared utilities for convenience
 export { discoverAllIconifyCollections, toPascalCase };
@@ -112,9 +112,12 @@ async function generateIconTypes(packs?: Record<string, { iconifyPrefix: string
 
   const libTypesPath = join(
     scriptDir,
-    "../../components/lib-types/virtual-qds-icons.d.ts"
+    "../../../components/lib-types/virtual-qds-icons.d.ts"
+  );
+  const componentsRootPath = join(
+    scriptDir,
+    "../../../components/virtual-qds-icons.d.ts"
   );
-  const componentsRootPath = join(scriptDir, "../../components/virtual-qds-icons.d.ts");
 
   const libTypesDir = dirname(libTypesPath);
   if (!existsSync(libTypesDir)) {
@@ -151,7 +154,7 @@ async function generateRuntimeProxies(
 
   const packsToUse = packs || discoverAllIconifyCollections();
   const scriptDir = dirname(fileURLToPath(import.meta.url));
-  const defaultOutputPath = join(scriptDir, "../../components/src/icons-runtime.ts");
+  const defaultOutputPath = join(scriptDir, "../../../components/src/icons-runtime.ts");
   const finalOutputPath = outputPath || defaultOutputPath;
   const declarations: string[] = [];
 

…bs/tools/src/generate-icon-types.unit.ts …bs/tools/src/generate/icon-types.unit.tslibs/tools/src/generate-icon-types.unit.ts renamed to libs/tools/src/generate/icon-types.unit.ts libs/tools/src/generate-icon-types.unit.ts renamed to libs/tools/src/generate/icon-types.unit.ts

@@ -1,12 +1,12 @@
 import { describe, expect, it, vi } from "vitest";
-import { sanitizeIconName } from "./generate-icon-types";
+import { sanitizeIconName } from "./icon-types";
 
 // Mock fs module
 vi.mock("node:fs", () => ({
   writeFileSync: vi.fn()
 }));
 
-describe("generate-icon-types", () => {
+describe("icon-types", () => {
   describe("sanitizeIconName", () => {
     it("should convert kebab-case to PascalCase", () => {
       expect(sanitizeIconName("a-arrow-down")).toBe("AArrowDown");
@@ -35,22 +35,22 @@ describe("generate-icon-types", () => {
 
   describe("Icon Runtime Proxies Integration", () => {
     it("should be able to import Lucide namespace from runtime", async () => {
-      const { Lucide } = await import("../../components/src/icons-runtime");
+      const { Lucide } = await import("../../../components/src/icons-runtime");
       expect(Lucide).toBeDefined();
     });
 
     it("should be able to import Heroicons namespace from runtime", async () => {
-      const { Heroicons } = await import("../../components/src/icons-runtime");
+      const { Heroicons } = await import("../../../components/src/icons-runtime");
       expect(Heroicons).toBeDefined();
     });
 
     it("should be able to import Tabler namespace from runtime", async () => {
-      const { Tabler } = await import("../../components/src/icons-runtime");
+      const { Tabler } = await import("../../../components/src/icons-runtime");
       expect(Tabler).toBeDefined();
     });
 
     it("should have proxy objects for icon namespaces", async () => {
-      const { Lucide } = await import("../../components/src/icons-runtime");
+      const { Lucide } = await import("../../../components/src/icons-runtime");
       // The proxy object should be defined and be an object
       expect(typeof Lucide).toBe("object");
       expect(Lucide).not.toBeNull();

package.json

@@ -18,6 +18,7 @@
     "changelog": "changelogen --output CHANGELOG.md --no-commit --no-tag",
     "publish": "pnpm --filter '@qds.dev/*' publish --access public --no-git-checks",
     "release": "bumpp package.json libs/*/package.json --minor --execute \"pnpm changelog\" --all --commit \"chore: release v%s\" --tag \"v%s\" --push && pnpm run publish",
+    "test:changelog": "vitest run libs/tools/src/generate/changelog.unit.ts",
     "create-linear-issue": "node .github/scripts/update-linear.ts"
   },
   "devDependencies": {