Merge branch 'develop'

# Conflicts:
#	scripts/utils/changesets.js

Author: jasonbahl

.changesets/20250314T194426-pr-62.md

@@ -0,0 +1,9 @@
+---
+title: 'feat: datetime-scalar'
+pr: 62
+author: jasonbahl
+type: feat
+breaking: false
+branch: milestone/custom-scalars
+---
+null

.changesets/20250314T203923-pr-65.md

@@ -0,0 +1,9 @@
+---
+title: 'feat: date scalar'
+pr: 65
+author: jasonbahl
+type: feat
+breaking: false
+branch: milestone/custom-scalars
+---
+null

.github/workflows/generate-changeset.yml

@@ -179,14 +179,12 @@ jobs:
           # Create a temporary directory for release notes
           mkdir -p /tmp/release-notes
           
-          # Generate release notes from all changesets to a temporary file
-          # For develop branch, include all changesets (including those from milestone branches)
+          # For develop branch, don't filter by branch to include all changesets
           if [[ "${{ steps.target_branch.outputs.name }}" == "develop" ]]; then
             echo "Generating release notes for develop branch (including milestone branch changesets)"
             npm run release:notes > /tmp/release-notes/temp_notes_raw.md
           else
-            # For other branches, filter by branch
-            echo "Generating release notes for ${{ steps.target_branch.outputs.name }} branch"
+            # For other branches, filter by branch as before
             npm run release:notes -- --branch="${{ steps.target_branch.outputs.name }}" > /tmp/release-notes/temp_notes_raw.md
           fi
           
@@ -317,7 +315,7 @@ jobs:
         if: steps.target_branch.outputs.is_milestone == 'true' && steps.check_milestone_pr.outputs.exists == 'false'
         run: |
           # Create a new PR from milestone branch to develop
-          PR_TITLE="feat: ${{ steps.target_branch.outputs.milestone_name }} 🚀"
+          PR_TITLE="milestone: ${{ steps.target_branch.outputs.milestone_name }} 🚀"
           
           # Create the PR body with proper formatting
           PR_BODY="## Milestone: ${{ steps.target_branch.outputs.milestone_name }}"

automation-tests.php

@@ -20,6 +20,8 @@
 // SCALARS:
 // - Email
 // - Phone
+// - DateTime
+// - Date
 
 // BREAKING CHANGE
-// We're simulating a breaking change with this comment.
+// We're simulating a breaking change with this comment.

scripts/generate-release-notes.js

@@ -159,7 +159,7 @@ async function generateMarkdownReleaseNotes(changesets, repoUrl, token) {
   const bumpType = determineBumpType(changesets);
 
   // Start building the release notes
-  let notes = `## Release Notes\n\n`;
+  let notes = ``;
 
   // Add breaking changes section if there are any
   if (categories.breaking.length > 0) {

scripts/utils/changesets.js

@@ -75,7 +75,7 @@ async function readChangeset(filePath) {
  * @returns {Promise<Array>} Array of changeset objects
  */
 async function readAllChangesets(options = {}) {
-  const { branch } = options;
+  const { branch } = options || {};
 
   // Get all changeset files
   const changesetDir = path.join(process.cwd(), '.changesets');
@@ -103,22 +103,66 @@ async function readAllChangesets(options = {}) {
     // Special case for develop branch - include milestone branch changesets
     if (branch === 'develop') {
       return changesets.filter(changeset => 
+        !changeset.branch || // Include changesets without branch info
         changeset.branch === branch || 
-        changeset.branch === undefined || // Include changesets without branch info
         changeset.branch.startsWith('milestone/')
       );
     }
 
-    // Otherwise, filter by the specified branch
+    // Otherwise, use the original filtering logic
     return changesets.filter(changeset => 
-      changeset.branch === branch || 
-      changeset.branch === undefined // Include changesets without branch info
+      !changeset.branch || // Include changesets without branch info
+      changeset.branch === branch
     );
   }
 
   return changesets;
 }
 
+/**
+ * Parse changeset content from a file
+ * 
+ * @param {string} content The content of the changeset file
+ * @returns {Object} Parsed changeset object
+ */
+function parseChangesetContent(content) {
+  // Use your existing parsing logic here
+  // This should extract title, PR number, author, type, breaking flag, branch, etc.
+  // from the changeset content
+  
+  // Example implementation (adjust based on your actual changeset format):
+  const lines = content.split('\n');
+  const changeset = {
+    title: '',
+    pr: null,
+    author: '',
+    type: 'other',
+    breaking: false,
+    branch: undefined,
+    description: ''
+  };
+  
+  // Parse metadata lines (key: value format)
+  const metadataLines = lines.filter(line => line.includes(':'));
+  for (const line of metadataLines) {
+    const [key, value] = line.split(':', 2).map(part => part.trim());
+    if (key === 'title') changeset.title = value;
+    else if (key === 'pr') changeset.pr = parseInt(value, 10) || null;
+    else if (key === 'author') changeset.author = value;
+    else if (key === 'type') changeset.type = value;
+    else if (key === 'breaking') changeset.breaking = value === 'true';
+    else if (key === 'branch') changeset.branch = value;
+  }
+  
+  // Extract description (everything after metadata)
+  const descriptionStartIndex = metadataLines.length;
+  if (descriptionStartIndex < lines.length) {
+    changeset.description = lines.slice(descriptionStartIndex).join('\n').trim();
+  }
+  
+  return changeset;
+}
+
 /**
  * Determine the version bump type based on changesets
  * 
@@ -236,5 +280,6 @@ module.exports = {
   determineBumpType,
   categorizeChangesets,
   createChangeset,
-  deleteAllChangesets
+  deleteAllChangesets,
+  parseChangesetContent
 };