@docupace/pipeline 1.0.7-beta.2 → 1.0.8-6.xray

package/src/changeset/cli.js

@@ -1,123 +1,111 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
 import { $ } from 'zx';
-import path from 'path';
 import { validateChangesets } from './validate.js';
-import fs from 'fs';
-import OpenAI from 'openai';
-import { zodResponseFormat } from 'openai/helpers/zod';
-import z from 'zod';
 import dotenv from 'dotenv';
+import { isMonoRepo, setGitInfo } from '../next/util.js';
+import {
+  toShortVersion,
+  updateJiraWithVersion,
+  versionCommand,
+} from './version.js';
+import { createChangeset } from './create.js';
+import {
+  updateWikiWithVersion,
+  upsertReleaseNotesFromFile,
+} from './changelog-wiki.js';
+
 dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
-import { exec } from 'child_process';
 
 const program = new Command();
 
 const args = process.argv;
 
-async function createChangesetDirectory() {
-  try {
-    // Use path.join to build a safe path to `.changeset`
-    const targetDir = path.join(process.cwd(), '.changeset');
+async function commitTagCommand(releases) {
+  console.log('📌 Checking for updates to commit...');
 
-    // Create the directory recursively if it doesn't exist
-    await fs.promises.mkdir(targetDir, { recursive: true });
-  } catch (error) {
-    console.error('Error creating .changeset directory:', error);
+  // Check if there are changes to commit
+  const status = (await $`git status --porcelain`).stdout.trim();
+  if (!status) {
+    console.log('✅ No changes to commit. Exiting.');
+    return;
   }
-}
-
 
-function run(command) {
-  return new Promise((resolve, reject) => {
-    exec(command, { shell: true }, (error, stdout, stderr) => {
-      if (error) {
-        reject(error);
-      } else {
-        resolve({ stdout, stderr });
-      }
-    });
-  });
-}
+  console.log('📌 Committing and tagging the new version...');
+  await setGitInfo();
+  await $`git add .`;
 
-async function fileExists(filePath) {
-  try {
-    await fs.promises.access(filePath);
-    return true;
-  } catch {
-    return false;
+  if (isMonoRepo()) {
+    await commitTagMono(releases);
+  } else {
+    await commitTag();
   }
 }
 
-async function getMainPackage() {
-  const mainModulePath = process.cwd();
-  if (mainModulePath) {
-    const packageJsonPath = path.join(mainModulePath, 'package.json');
-    if (await fileExists(packageJsonPath)) {
-      const fileContent = await fs.promises.readFile(packageJsonPath, 'utf-8');
-      const packageJson = JSON.parse(fileContent);
-      return packageJson;
-    }
-  }
-  throw new Error('Main package.json not found');
+export function getAppReleases(releases) {
+  const appReleases = releases.filter(
+    (release) =>
+      release.name.endsWith('-app') || release.name.endsWith('-template'),
+  );
+  return appReleases;
 }
 
-// Helper function to set Git info
-async function setGitInfo() {
-  await $`git config --global user.email "gitops@docupace.com"`;
-  await $`git config --global user.name "Gitops"`;
-  await $`git remote set-url origin https://${process.env.THIS_REP_TOKEN}@bitbucket.org/${process.env.BITBUCKET_REPO_FULL_NAME}.git`;
+function getAppNameFromPackageName(packageName) {
+  const appName = packageName.includes('/')
+    ? packageName.split('/')[1]
+    : packageName;
+
+  return appName;
 }
 
-const changeSetPackage = `{
-  "name": "changeset-package",
-  "version": "1.0.0",
-  "description": "",
-  "scripts": {
-  },
-  "type": "module",
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {},
-  "devDependencies": {
-    "@changesets/cli": "^2.27.10"
+async function commitTagMono(releases) {
+  let versions = [];
+  for (const release of getAppReleases(releases)) {
+    const newVersion = release.newVersion;
+    const appName = getAppNameFromPackageName(release.name);
+    versions.push(`${appName}@${newVersion}`);
   }
-}
-`;
 
-async function versionCommand() {
-  console.log('📦 Running Changeset versioning...');
-  await setGitInfo();
-  await $`mv package.json package.json.bak`;
-  await $`mv pnpm-lock.yaml pnpm-lock.yaml.bak`;
-  await fs.promises.writeFile('package.json', changeSetPackage);
-  await $`pnpm install`;
-  await $`rm package.json pnpm-lock.yaml`;
-  await $`mv package.json.bak package.json`;
-  await $`mv pnpm-lock.yaml.bak pnpm-lock.yaml`;
-  await $`pnpm changeset version`;
-  console.log('✅ Changeset versioning complete.');
-}
+  const defaultBranch = process.env.BITBUCKET_BRANCH;
 
-async function commitTagCommand() {
-  console.log('📌 Checking for updates to commit...');
+  if (!process.env.IS_DEV) {
+    await $`git commit -m "Version bump to ${versions.join(',')} and changelog"`;
+    await $`git push origin ${defaultBranch}`;
+  } else {
+    console.log(`Simulate Version bump to ${versions.join(',')} and changelog`);
+  }
 
-  // Check if there are changes to commit
-  const status = (await $`git status --porcelain`).stdout.trim();
-  if (!status) {
-    console.log('✅ No changes to commit. Exiting.');
-    return;
+  for (const newVersion of versions) {
+    if (!process.env.IS_DEV) {
+      await $`git tag ${newVersion}`;
+      console.log(`✅ Version ${newVersion} tagged.`);
+    } else {
+      console.log(`✅ Simulate Version ${newVersion} tagged.`);
+    }
   }
 
-  console.log('📌 Committing and tagging the new version...');
-  await setGitInfo();
-  await $`git add .`;
+  if (!process.env.IS_DEV) {
+    await $`git push origin --tags`;
+    console.log(`✅ Version pushed.`);
+  } else {
+    console.log(`✅ Simulate Version pushed.`);
+  }
+}
+
+async function commitTag() {
   const newVersion = (
     await $`node -p "require('./package.json').version"`
   ).stdout.trim();
+
+  if (process.env.IS_DEV) {
+    console.log(`Simulate commit of version ${newVersion}`);
+    return;
+  }
+
+  const defaultBranch = process.env.BITBUCKET_BRANCH;
+
   await $`git commit -m "Version bump to ${newVersion} and changelog"`;
-  await $`git push origin`;
+  await $`git push origin ${defaultBranch}`;
   await $`git tag v${newVersion}`;
   await $`git push origin --tags`;
   console.log(`✅ Version ${newVersion} tagged and pushed.`);
@@ -125,22 +113,13 @@ async function commitTagCommand() {
 
 // Command: validate
 program
-  .command('validate <path>')
+  .command('validate')
   .description('Validate changesets for the provided PR')
-  .action(async (path) => {
+  .action(async () => {
     if (!process.env.BITBUCKET_PR_ID) {
       return;
     }
-    console.log('🔍 Validating changesets...');
-    try {
-      await validateChangesets(path);
-      console.log('✅ Changeset validation passed.');
-    } catch (error) {
-      console.error(
-        '❌ No changeset found. Please add a changeset to this PR. Please see more information at https://docupacellc.atlassian.net/wiki/spaces/PM/pages/1350893571/Creating+changesets+for+Docupace+Next',
-      );
-      process.exit(1);
-    }
+    await validateChangesets();
   });
 // Command: version
 program
@@ -164,8 +143,49 @@ program
   .description('Run versioning and commit-and-tag in sequence')
   .action(async () => {
     console.log('📦 Running all steps...');
-    await versionCommand();
-    await commitTagCommand();
+    const releases = await versionCommand();
+    await updateJiraWithVersion(releases);
+    await updateWikiWithVersion(releases);
+    await commitTagCommand(releases);
+  });
+
+program
+  .command('close-version')
+  .description('Closes a version')
+  .action(async () => {
+    console.log('📦 Running all steps...');
+    const releases = await versionCommand(true);
+    await commitTagCommand(releases);
+
+    const { stdout: currentBranch } = await $`git rev-parse --abbrev-ref HEAD`;
+
+    if (isMonoRepo()) {
+      for (const release of getAppReleases(releases)) {
+        const appName = getAppNameFromPackageName(release.name);
+        const newVersion = toShortVersion(release.newVersion);
+        if (!newVersion) {
+          throw new Error('Error calculating branch name');
+        }
+        await $`git checkout -b release/${appName}/${newVersion}`;
+        await $`git push origin release/${appName}/${newVersion}`;
+      }
+    } else {
+      const newVersion = toShortVersion(releases[0].newVersion);
+      if (!newVersion) {
+        throw new Error('Error calculating branch name');
+      }
+      await $`git checkout -b release/${newVersion}`;
+      await $`git push origin release/${newVersion}`;
+    }
+
+    // Return to original branch
+    await $`git checkout ${currentBranch.trim()}`;
+
+    // Open next alpha version
+    await $`pnpm changeset pre enter alpha`;
+    await $`git add .`;
+    await $`git commit -m "Open next alpha version"`;
+    await $`git push origin`;
   });
 
 program
@@ -174,105 +194,41 @@ program
     'Creates a changeset based on the current branch and Jira ticket information',
   )
   .action(async () => {
-    const mainPackage = await getMainPackage();
-    const componentName = mainPackage.name;
+    await createChangeset();
+  });
 
+program
+  .command('upload-wiki')
+  .description('Upload release notes from markdown file to Confluence')
+  .requiredOption(
+    '-v, --version <version>',
+    'Version title (e.g., "Version 1.0")',
+  )
+  .requiredOption(
+    '-c, --component <component>',
+    'Component title (e.g., "Component A")',
+  )
+  .requiredOption('-f, --file <file>', 'Path to markdown file')
+  .requiredOption('-g, --group <group>', 'Group of release notes')
+
+  .action(async (options) => {
     try {
-      // Step 1: Get the current branch name
-      const { stdout: branchStdout } = await run(`git branch --show-current`);
-      const branchName = branchStdout.trim();
-      console.log(`Current branch: ${branchName}`);
-
-      // Step 2: Extract Jira ticket number (e.g., matching JIRA-1234 pattern)
-      const jiraTicketMatch = branchName.match(/([A-Z]+-\d+)/);
-      if (!jiraTicketMatch) {
-        throw new Error('No Jira ticket found in the branch name.');
-      }
-      const jiraTicketId = jiraTicketMatch[0];
-
-      // Step 3: Fetch Jira ticket information
-      const jiraBaseUrl = 'https://docupacellc.atlassian.net';
-      const jiraEmail = process.env.JIRA_API_EMAIL;
-      const jiraApiKey = process.env.JIRA_API_KEY;
-      const jiraFullApiKey = `${jiraEmail}:${jiraApiKey}`;
-      const jiraUrl = `${jiraBaseUrl}/rest/api/2/issue/${jiraTicketId}`;
-      const jiraResponse = await fetch(jiraUrl, {
-        headers: {
-          Authorization: `Basic ${Buffer.from(jiraFullApiKey).toString('base64')}`,
-          'Content-Type': 'application/json',
-        },
+      console.log('📤 Uploading release notes to Confluence...');
+      const { versionPage, componentPage } = await upsertReleaseNotesFromFile({
+        version: options.version,
+        component: options.component,
+        markdownFile: options.file,
+        group: options.group,
       });
 
-      if (!jiraResponse.ok) {
-        throw new Error(
-          `Failed to fetch Jira ticket. Status: ${jiraResponse.status}`,
-        );
-      }
-      const jiraTicketData = await jiraResponse.json();
-
-      if (jiraTicketData.fields.customfield_10107?.value !== 'Product') {
-        throw new Error('Issue Type of Work must be Product');
-      }
-
-      const jiraSummary = jiraTicketData.fields.summary;
-
+      console.log('✅ Successfully uploaded to Confluence');
+      console.log('Version page:', versionPage._links?.webui || versionPage.id);
       console.log(
-        `Generating release notes for ${jiraTicketId} - ${jiraSummary}`,
+        'Component page:',
+        componentPage._links?.webui || componentPage.id,
       );
-
-      // Step 4: Use OpenAI to generate release notes
-      const openaiClient = new OpenAI({
-        apiKey: process.env['OPENAI_API_KEY'],
-      });
-
-      const ChangeRequestSchema = z.object({
-        change_type: z.enum(['patch', 'minor']),
-        summary: z.string(),
-        jira_ticket_id: z.string(),
-      });
-
-      const openAiResponse = await openaiClient.chat.completions.create({
-        model: 'gpt-4o-mini',
-        messages: [
-          {
-            role: 'system',
-            content: `Process JSON from a Jira ticket to generate simple maximum 2 sentence release note for the ticket and determine the change type for bug it should be a patch for new feature it should be a minor change`,
-          },
-          {
-            role: 'user',
-            content: JSON.stringify(jiraTicketData),
-          },
-        ],
-        response_format: zodResponseFormat(
-          ChangeRequestSchema,
-          'changeset_schema',
-        ),
-        temperature: 0,
-      });
-
-      const assistantResponse = openAiResponse.choices[0].message.content;
-      const parsedResponse = JSON.parse(assistantResponse);
-
-      const { change_type, summary } = parsedResponse;
-      console.log(`Change type: ${change_type}`);
-      console.log(`Release note: ${summary}`);
-
-      // Step 5: Create a changeset .md file
-      const changesetContent = `---
-"${componentName}": ${change_type}
----
-
-${summary} [${jiraTicketId}]
-`;
-      const changesetFile = `./.changeset/${jiraTicketId}.md`;
-
-      await createChangesetDirectory();
-      await fs.promises.writeFile(changesetFile, changesetContent);
-      console.log(`Created changeset file at ${changesetFile}`);
-
-      console.log('Done!');
-    } catch (err) {
-      console.error(`Error: ${err.message}`);
+    } catch (error) {
+      console.error('❌ Error uploading to Confluence:', error.message);
       process.exit(1);
     }
   });

package/src/changeset/create.js

@@ -0,0 +1,215 @@
+import OpenAI from 'openai';
+import z from 'zod';
+import { zodResponseFormat } from 'openai/helpers/zod';
+import fs from 'fs';
+import path from 'path';
+import inquirer from 'inquirer';
+import { getMainPackage, getPackage, findJiraTicketId } from './util.js';
+import { getPackageNames } from './package-util.js';
+import { execSync } from 'child_process';
+
+async function createChangesetDirectory() {
+  try {
+    // Use path.join to build a safe path to `.changeset`
+    const targetDir = path.join(process.cwd(), '.changeset');
+
+    // Create the directory recursively if it doesn't exist
+    await fs.promises.mkdir(targetDir, { recursive: true });
+  } catch (error) {
+    console.error('Error creating .changeset directory:', error);
+  }
+}
+
+/**
+ * Gets the current git branch name
+ */
+async function getCurrentBranch() {
+  try {
+    const branchName = execSync('git branch --show-current', {
+      encoding: 'utf8',
+      shell: true,
+    }).trim();
+    console.log(`Current branch: ${branchName}`);
+    return branchName;
+  } catch (error) {
+    console.error('Error getting current branch:', error.message);
+    throw error;
+  }
+}
+/**
+ * Extracts a Jira ticket ID from a branch name
+ */
+function extractJiraTicketId(branchName) {
+  const jiraTicketId = findJiraTicketId(branchName);
+  if (!jiraTicketId) {
+    throw new Error('No Jira ticket found in the branch name.');
+  }
+  return jiraTicketId;
+}
+
+/**
+ * Fetches Jira ticket data from Jira API
+ */
+async function fetchJiraTicketData(jiraTicketId) {
+  const jiraBaseUrl = 'https://docupacellc.atlassian.net';
+  const jiraEmail = process.env.JIRA_API_EMAIL;
+  const jiraApiKey = process.env.JIRA_API_KEY;
+  const jiraFullApiKey = `${jiraEmail}:${jiraApiKey}`;
+  const jiraUrl = `${jiraBaseUrl}/rest/api/2/issue/${jiraTicketId}`;
+
+  const jiraResponse = await fetch(jiraUrl, {
+    headers: {
+      Authorization: `Basic ${Buffer.from(jiraFullApiKey).toString('base64')}`,
+      'Content-Type': 'application/json',
+    },
+  });
+
+  if (!jiraResponse.ok) {
+    throw new Error(
+      `Failed to fetch Jira ticket ${jiraTicketId}. Status: ${jiraResponse.status}, Ticket URL: ${jiraUrl}`,
+    );
+  }
+
+  return await jiraResponse.json();
+}
+
+/**
+ * Generates release notes using OpenAI
+ */
+async function generateReleaseNotes(jiraTicketData) {
+  const openaiClient = new OpenAI({
+    apiKey: process.env['OPENAI_API_KEY'],
+  });
+
+  const ChangeRequestSchema = z.object({
+    change_type: z.enum(['patch', 'minor']),
+    summary: z.string(),
+    jira_ticket_id: z.string(),
+  });
+
+  const openAiResponse = await openaiClient.chat.completions.create({
+    model: 'gpt-4o-mini',
+    messages: [
+      {
+        role: 'system',
+        content: `Process JSON from a Jira ticket to generate simple maximum 2 sentence release note for the ticket and determine the change type for bug it should be a patch for new feature it should be a minor change`,
+      },
+      {
+        role: 'user',
+        content: JSON.stringify(jiraTicketData),
+      },
+    ],
+    response_format: zodResponseFormat(ChangeRequestSchema, 'changeset_schema'),
+    temperature: 0,
+  });
+
+  const assistantResponse = openAiResponse.choices[0].message.content;
+  return JSON.parse(assistantResponse);
+}
+
+/**
+ * Writes the changeset file
+ */
+async function writeJiraChangesetFile(
+  packages,
+  jiraTicketId,
+  changeType,
+  summary,
+) {
+  const text = `${summary} [${jiraTicketId}]`;
+  await writeChangesetFile(packages, jiraTicketId, changeType, text);
+}
+
+export async function writeChangesetFile(packages, filename, changeType, text) {
+  const packageEntries = packages
+    .map((pkg) => `'${pkg.name}': ${changeType}`)
+    .join('\n');
+
+  const changesetContent = `---
+${packageEntries}
+---
+
+${text}
+`;
+
+  const changesetFile = `./.changeset/${filename}.md`;
+
+  await createChangesetDirectory();
+  await fs.promises.writeFile(changesetFile, changesetContent);
+  console.log(`Created changeset file at ${changesetFile}`);
+}
+
+/**
+ * Main function to create a changeset
+ */
+
+export async function createChangeset() {
+  const packages = getPackageNames();
+
+  if (packages.length > 1) {
+    const allPackages = packages;
+    const response = await inquirer.prompt([
+      {
+        type: 'checkbox',
+        name: 'packages',
+        message: 'Which packages do you want to generate changesets for?',
+        choices: allPackages.map((appPackage) => ({
+          name: appPackage.name,
+          value: appPackage.name,
+        })),
+        validate: (input) => {
+          if (input.length === 0) {
+            return 'Please select at least one package.';
+          }
+          return true;
+        },
+      },
+    ]);
+
+    const selectedPackages = allPackages.filter((appPackage) =>
+      response.packages.includes(appPackage.name),
+    );
+
+    // Get package contents for all selected packages
+    const selectedPackageContents = await Promise.all(
+      selectedPackages.map(async (selectedPackage) => {
+        return await getPackage(selectedPackage.path);
+      }),
+    );
+
+    await createChangesetForPackage(selectedPackageContents);
+  } else {
+    const mainPackage = await getMainPackage();
+    await createChangesetForPackage([mainPackage]);
+  }
+}
+
+export async function createChangesetForPackage(packages) {
+  try {
+    // Step 1: Get the current branch name
+    const branchName = await getCurrentBranch();
+
+    // Step 2: Extract Jira ticket number
+    const jiraTicketId = extractJiraTicketId(branchName);
+
+    // Step 3: Fetch Jira ticket data
+    const jiraTicketData = await fetchJiraTicketData(jiraTicketId);
+    const jiraSummary = jiraTicketData.fields.summary;
+    console.log(
+      `Generating release notes for ${jiraTicketId} - ${jiraSummary}`,
+    );
+
+    // Step 4: Generate release notes using OpenAI
+    const { change_type, summary } = await generateReleaseNotes(jiraTicketData);
+    console.log(`Change type: ${change_type}`);
+    console.log(`Release note: ${summary}`);
+
+    // Step 5: Create a changeset .md file for all packages
+    await writeJiraChangesetFile(packages, jiraTicketId, change_type, summary);
+
+    console.log('Changeset created successfully!');
+  } catch (err) {
+    console.error(`Error: ${err.message}`);
+    process.exit(1);
+  }
+}