Merge branch 'develop' into milestone/custom-scalars

Author: jasonbahl

scripts/generate-changeset.js

@@ -110,7 +110,7 @@ function isBreakingChange(title, body) {
   }
 
   // Check for conventional commit breaking change indicator (!)
-  if (title.includes('!:')) {
+  if (title.includes('!')) {
     return true;
   }
 
@@ -156,12 +156,12 @@ async function generateChangeset() {
   const changeType = extractChangeType(title);
   const breaking = isBreakingChange(title, body);
 
-  // Use the createChangeset utility to create the changeset file
+  // Store the complete title in the changeset
   const changesetPath = await createChangeset({
-    title,
+    title: title.trim(),
     pr,
     author,
-    type: changeType,
+    type: title.split(':')[0].trim(),
     breaking,
     branch,
     description: body

scripts/generate-release-notes.js

@@ -150,102 +150,60 @@ async function readChangesets(options = {}) {
   return changesets.filter(changeset => changeset.branch === branch);
 }
 
-// Ensure consistent formatting for changeset entries
-function formatChangesetEntry(changeset) {
-  // Clean up the title (remove quotes, ensure proper format)
-  const title = changeset.title.replace(/^['"]|['"]$/g, '');
-  
-  return `* **${title}** (#${changeset.pr}) - @${changeset.author}`;
+/**
+ * Format a changeset entry for the release notes
+ * @param {Object} changeset The changeset object
+ * @returns {string} Formatted entry
+ */
+function formatChangesetEntry(changeset, repoUrl) {
+  return `- **${changeset.title}** ([#${changeset.pr}](${repoUrl}/pull/${changeset.pr})) - @${changeset.author}`;
 }
 
 // Generate release notes in markdown format
 async function generateMarkdownReleaseNotes(changesets, repoUrl, token) {
   // Categorize changesets
   const categories = categorizeChangesets(changesets);
 
-  // Determine the appropriate version bump type
-  const bumpType = determineBumpType(changesets);
-  
   // Start building the release notes
   let notes = ``;
 
   // Add breaking changes section if there are any
   if (categories.breaking.length > 0) {
     notes += `### Breaking Changes ⚠️\n\n`;
-    
     for (const changeset of categories.breaking) {
       const prLink = repoUrl ? `([#${changeset.pr}](${repoUrl}/pull/${changeset.pr}))` : `(#${changeset.pr})`;
-      const prefixRegex = /^(feat!?|fix!?|docs!?|style!?|refactor!?|perf!?|test!?|build!?|ci!?|chore!?|revert!?)(\([^)]+\))?:/;
-      const match = changeset.title.match(prefixRegex);
-      if (match) {
-        const prefix = changeset.title.substring(0, match[0].length);
-        const restOfTitle = changeset.title.substring(match[0].length).trim();
-        notes += `- **${prefix}** ${restOfTitle} ${prLink} - @${changeset.author}\n`;
-      } else {
-        notes += `- **${changeset.title}** ${prLink} - @${changeset.author}\n`;
-      }
+      notes += `- ${changeset.title} ${prLink} - @${changeset.author}\n`;
     }
-    
     notes += `\n`;
   }
 
   // Add features section if there are any
   if (categories.features.length > 0) {
     notes += `### Features ✨\n\n`;
-    
     for (const changeset of categories.features) {
       const prLink = repoUrl ? `([#${changeset.pr}](${repoUrl}/pull/${changeset.pr}))` : `(#${changeset.pr})`;
-      const prefixRegex = /^(feat!?|fix!?|docs!?|style!?|refactor!?|perf!?|test!?|build!?|ci!?|chore!?|revert!?)(\([^)]+\))?:/;
-      const match = changeset.title.match(prefixRegex);
-      if (match) {
-        const prefix = changeset.title.substring(0, match[0].length);
-        const restOfTitle = changeset.title.substring(match[0].length).trim();
-        notes += `- **${prefix}** ${restOfTitle} ${prLink} - @${changeset.author}\n`;
-      } else {
-        notes += `- **${changeset.title.replace(/^feat:\s*/i, '')}** ${prLink} - @${changeset.author}\n`;
-      }
+      notes += `- ${changeset.title} ${prLink} - @${changeset.author}\n`;
     }
-    
     notes += `\n`;
   }
 
   // Add fixes section if there are any
   if (categories.fixes.length > 0) {
     notes += `### Fixes 🐛\n\n`;
-    
     for (const changeset of categories.fixes) {
       const prLink = repoUrl ? `([#${changeset.pr}](${repoUrl}/pull/${changeset.pr}))` : `(#${changeset.pr})`;
-      const prefixRegex = /^(feat!?|fix!?|docs!?|style!?|refactor!?|perf!?|test!?|build!?|ci!?|chore!?|revert!?)(\([^)]+\))?:/;
-      const match = changeset.title.match(prefixRegex);
-      if (match) {
-        const prefix = changeset.title.substring(0, match[0].length);
-        const restOfTitle = changeset.title.substring(match[0].length).trim();
-        notes += `- **${prefix}** ${restOfTitle} ${prLink} - @${changeset.author}\n`;
-      } else {
-        notes += `- **${changeset.title.replace(/^fix:\s*/i, '')}** ${prLink} - @${changeset.author}\n`;
-      }
+      notes += `- ${changeset.title} ${prLink} - @${changeset.author}\n`;
     }
-    
     notes += `\n`;
   }
 
   // Add other changes section if there are any
   if (categories.other.length > 0) {
     notes += `### Other Changes 🔄\n\n`;
-    
     for (const changeset of categories.other) {
       const prLink = repoUrl ? `([#${changeset.pr}](${repoUrl}/pull/${changeset.pr}))` : `(#${changeset.pr})`;
-      const prefixRegex = /^(feat!?|fix!?|docs!?|style!?|refactor!?|perf!?|test!?|build!?|ci!?|chore!?|revert!?)(\([^)]+\))?:/;
-      const match = changeset.title.match(prefixRegex);
-      if (match) {
-        const prefix = changeset.title.substring(0, match[0].length);
-        const restOfTitle = changeset.title.substring(match[0].length).trim();
-        notes += `- **${prefix}** ${restOfTitle} ${prLink} - @${changeset.author}\n`;
-      } else {
-        notes += `- **${changeset.title.replace(/^[^:]+:\s*/i, '')}** ${prLink} - @${changeset.author}\n`;
-      }
+      notes += `- ${changeset.title} ${prLink} - @${changeset.author}\n`;
     }
-    
     notes += `\n`;
   }
 
@@ -273,7 +231,6 @@ async function generateMarkdownReleaseNotes(changesets, repoUrl, token) {
   if (contributors.size > 0) {
     notes += `## Contributors\n\n`;
     notes += `Thanks to all the contributors who made this release possible!\n\n`;
-    
     for (const contributor of contributors) {
       if (firstTimeContributors.has(contributor)) {
         notes += `- @${contributor} 🎉 (First-time contributor)\n`;
@@ -359,28 +316,22 @@ async function generateJsonReleaseNotes(changesets, repoUrl, token) {
 async function generateReleaseNotes() {
   // Get repository URL
   const repoUrl = await getRepoUrl();
-  
-  // Get GitHub token
   const token = getGitHubToken();
 
-  // Read all changesets, filtering by branch if specified
+  // Read changesets with branch filter if specified
   const changesets = await readChangesets({ branch: argv.branch });
 
-  // Log the number of changesets found
-  console.log(`Found ${changesets.length} changesets${argv.branch ? ` for branch ${argv.branch}` : ''}.`);
-  
-  // Generate release notes in the requested format
   if (argv.format === 'json') {
-    const jsonNotes = await generateJsonReleaseNotes(changesets, repoUrl, token);
-    console.log(jsonNotes);
-  } else {
-    const markdownNotes = await generateMarkdownReleaseNotes(changesets, repoUrl, token);
-    console.log(markdownNotes);
+    return generateJsonReleaseNotes(changesets, repoUrl, token);
   }
+  
+  return generateMarkdownReleaseNotes(changesets, repoUrl, token);
 }
 
-// Run the script
-generateReleaseNotes().catch(err => {
-  console.error('Error generating release notes:', err);
-  process.exit(1);
-}); 
+// Main execution
+generateReleaseNotes()
+  .then(notes => console.log(notes))
+  .catch(error => {
+    console.error('Error generating release notes:', error);
+    process.exit(1);
+  }); 

scripts/utils/changesets.js

@@ -120,45 +120,29 @@ async function readAllChangesets(options = {}) {
 }
 
 /**
- * Parse changeset content from a file
- * 
+ * Read and parse a changeset file
  * @param {string} content The content of the changeset file
- * @returns {Object} Parsed changeset object
+ * @returns {Object} Parsed changeset data
  */
 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: ''
-  };
+  const changeset = {};
 
-  // 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.replace(/^['"]|['"]$/g, '');
-    } 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();
+  let inFrontmatter = false;
+  for (const line of lines) {
+    if (line.trim() === '---') {
+      inFrontmatter = !inFrontmatter;
+      continue;
+    }
+    
+    if (inFrontmatter) {
+      const [key, ...valueParts] = line.split(':');
+      if (key && valueParts.length) {
+        // Join value parts back together and clean up quotes and whitespace
+        const value = valueParts.join(':').trim().replace(/^['"]|['"]$/g, '');
+        changeset[key.trim()] = value;
+      }
+    }
   }
 
   return changeset;
@@ -202,11 +186,12 @@ function categorizeChangesets(changesets = []) {
   };
 
   changesets.forEach(changeset => {
-    if (changeset.breaking) {
+    // Check for ! in the title for breaking changes
+    if (changeset.title.includes('!')) {
       categories.breaking.push(changeset);
-    } else if (changeset.type === 'feat') {
+    } else if (changeset.title.startsWith('feat:')) {
       categories.features.push(changeset);
-    } else if (changeset.type === 'fix') {
+    } else if (changeset.title.startsWith('fix:')) {
       categories.fixes.push(changeset);
     } else {
       categories.other.push(changeset);
@@ -229,7 +214,21 @@ function categorizeChangesets(changesets = []) {
  * @param {string} data.description PR description
  * @returns {Promise<string>} Path to the created changeset file
  */
-async function createChangeset({ title, pr, author, type, breaking, branch = 'develop', description = '' }) {
+async function createChangeset(data) {
+  const { title, pr, author, type, breaking, branch, description } = data;
+  
+  // Use the full title in the changeset content
+  const content = `---
+title: ${title}
+pr: ${pr}
+author: ${author}
+type: ${type}
+breaking: ${breaking}
+branch: ${branch}
+---
+
+${description}`;
+  
   // Ensure the .changesets directory exists
   const changesetDir = path.join(process.cwd(), '.changesets');
   await fs.ensureDir(changesetDir);
@@ -239,16 +238,6 @@ async function createChangeset({ title, pr, author, type, breaking, branch = 'de
   const filename = `${timestamp}-pr-${pr}.md`;
   const filepath = path.join(changesetDir, filename);
 
-  // Create the changeset content with frontmatter
-  const content = matter.stringify(description, {
-    title,
-    pr,
-    author,
-    type,
-    breaking,
-    branch
-  });
-  
   // Write the changeset file
   await fs.writeFile(filepath, content);
 
@@ -272,6 +261,32 @@ async function deleteAllChangesets() {
   return files.length;
 }
 
+/**
+ * Parse a PR title into its components
+ * @param {string} title The full PR title
+ * @returns {{prefix: string, description: string}} The parsed title components
+ */
+function parsePrTitle(title) {
+  const [prefix, ...rest] = title.split(':');
+  return {
+    prefix: prefix.trim(),
+    description: rest.join(':').trim() // Join back in case there were other colons
+  };
+}
+
+/**
+ * Format a changeset entry for the release notes
+ * @param {Object} changeset The changeset object
+ * @returns {string} Formatted entry
+ */
+function formatChangesetEntry(changeset) {
+  const { prefix, description } = parsePrTitle(changeset.title);
+  const breaking = changeset.breaking ? '!' : '';
+  
+  // Format as "**prefix**: description" or "**prefix!**: description" for breaking changes
+  return `- **${prefix}${breaking}**: ${description} ([#${changeset.pr}](${repoUrl}/pull/${changeset.pr})) - @${changeset.author}`;
+}
+
 module.exports = {
   getChangesetDir,
   ensureChangesetDir,