@docupace/pipeline 1.0.39-matttest.39 → 1.0.39-matttest.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.39-matttest.39",
+  "version": "1.0.39-matttest.40",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/changeset/create.js

@@ -4,7 +4,7 @@ import { zodResponseFormat } from 'openai/helpers/zod';
 import fs from 'fs';
 import path from 'path';
 import inquirer from 'inquirer';
-import { getMainPackage, getPackage } from './util.js';
+import { getMainPackage, getPackage, findJiraTicketId } from './util.js';
 import { getPackageNames } from './package-util.js';
 import { execSync } from 'child_process';
 
@@ -40,11 +40,11 @@ async function getCurrentBranch() {
  * Extracts a Jira ticket ID from a branch name
  */
 function extractJiraTicketId(branchName) {
-  const jiraTicketMatch = branchName.match(/([A-Z]+-\d+)/);
-  if (!jiraTicketMatch) {
+  const jiraTicketId = findJiraTicketId(branchName);
+  if (!jiraTicketId) {
     throw new Error('No Jira ticket found in the branch name.');
   }
-  return jiraTicketMatch[0];
+  return jiraTicketId;
 }
 
 /**
@@ -66,7 +66,7 @@ async function fetchJiraTicketData(jiraTicketId) {
 
   if (!jiraResponse.ok) {
     throw new Error(
-      `Failed to fetch Jira ticket. Status: ${jiraResponse.status}`,
+      `Failed to fetch Jira ticket ${jiraTicketId}. Status: ${jiraResponse.status}, Ticket URL: ${jiraUrl}`,
     );
   }
 
@@ -121,7 +121,7 @@ ${packageEntries}
 ---
 
 ${summary} [${jiraTicketId}]
-  `;
+`;
   const changesetFile = `./.changeset/${jiraTicketId}.md`;
 
   await createChangesetDirectory();

package/src/changeset/util.js

@@ -25,3 +25,19 @@ export async function getPackage(mainModulePath) {
   }
   throw new Error('Main package.json not found');
 }
+
+/**
+ * Locates and extracts a JIRA Ticket ID from a given string.
+ * <p>
+ * The JIRA Ticket ID is expected to follow the pattern of uppercase letters (at least two) followed by a hyphen and digits (e.g., DC-1234, INFP-9).
+ * @param str the string to search for a JIRA ticket ID
+ * @returns {JIRA-TicketID|null}
+ */
+export function findJiraTicketId(str) {
+    if (!str) {
+        return null;
+    }
+    const regex = /([A-Z]{2,}-\d+)/;
+    const matches = str.match(regex);
+    return matches ? matches[0] : null;
+}

package/src/changeset/version.js

@@ -2,6 +2,7 @@ import { setGitInfo } from '../next/util.js';
 import { $ } from 'zx';
 import fs from 'fs';
 import { updateComponentVersion } from '../next/jira.js';
+import { findJiraTicketId } from "./util.js";
 
 const changeSetPackage = `{
   "name": "changeset-package",
@@ -65,8 +66,7 @@ export async function updateJiraWithVersion(releases) {
   const lastCommit = (await $`git log -1 --pretty=%B`).stdout.trim();
   console.log(`Last commit '${lastCommit}' being processed to get Jira ticket`);
 
-  const jiraTicketMatch = lastCommit.match(/([A-Z]+-\d+)/);
-  const jiraTicketId = jiraTicketMatch ? jiraTicketMatch[0] : null;
+  const jiraTicketId = findJiraTicketId(lastCommit);
 
   // If we have all the necessary data, update the component version in Jira
   if (jiraTicketId) {

package/src/next/jira.js

@@ -15,7 +15,7 @@ const jiraClient = axios.create({
 /**
  * Updates the component version custom field in Jira
  * @param {string} issueKey - The Jira issue key
- * @param {string} component - The component name
+ * @param {string} packageName - The package name
  * @param {string} version - The version to set
  */
 export async function updateComponentVersion(issueKey, packageName, version) {