@docupace/pipeline 1.0.8-6.xray → 1.0.9

package/src/merge/merge-types.js

@@ -1,82 +0,0 @@
-import { mergeDriver } from '../lib/merge-driver.js';
-
-/**
- * Codegen-specific merge logic for handling balanced braces and removing duplicates
- * @param {string} headContent - Content from HEAD (current branch)
- * @param {string} branchContent - Content from the incoming branch
- * @returns {string} - Merged content
- * @throws {Error} - If conflicts cannot be automatically merged
- */
-function codegenMergeLogic(headContent, branchContent) {
-  // Check if braces are balanced in both head and branch content
-  const headOpenBraces = (headContent.match(/\{/g) || []).length;
-  const headCloseBraces = (headContent.match(/\}/g) || []).length;
-  const branchOpenBraces = (branchContent.match(/\{/g) || []).length;
-  const branchCloseBraces = (branchContent.match(/\}/g) || []).length;
-
-  // Check if head content has balanced braces
-  const headHasBraces = headOpenBraces > 0 || headCloseBraces > 0;
-  const headBalanced = headOpenBraces === headCloseBraces;
-
-  // Check if branch content has balanced braces
-  const branchHasBraces = branchOpenBraces > 0 || branchCloseBraces > 0;
-  const branchBalanced = branchOpenBraces === branchCloseBraces;
-
-  // If either has braces and they're not balanced, we can't merge
-  if (
-    (headHasBraces && !headBalanced) ||
-    (branchHasBraces && !branchBalanced)
-  ) {
-    throw new Error('Unbalanced braces detected - cannot merge automatically');
-  }
-
-  // If both have balanced braces, combine them as-is
-  if (headHasBraces && branchHasBraces && headBalanced && branchBalanced) {
-    return headContent + '\n' + branchContent;
-  }
-
-  // If neither has braces, combine and remove duplicates
-  if (!headHasBraces && !branchHasBraces) {
-    const headLines = headContent.split('\n').filter((line) => line);
-    const branchLines = branchContent.split('\n').filter((line) => line);
-
-    // Use Set to remove duplicates while preserving order
-    const uniqueLines = [...new Set([...headLines, ...branchLines])];
-
-    return uniqueLines.join('\n');
-  }
-
-  // Mixed case: one has braces, one doesn't - combine as-is
-  return headContent + '\n' + branchContent;
-}
-
-/**
- * Main function to merge codegen conflicts in a types file
- * @param {string} filePath - Path to the file with conflicts
- * @returns {Promise<Object>} - Result object with merge details
- */
-export async function mergeTypesFile(filePath) {
-  try {
-    console.log('Starting codegen merge for types file...');
-
-    // Use the merge driver with our custom codegen logic
-    const result = await mergeDriver(filePath, codegenMergeLogic);
-
-    if (result.success) {
-      console.log('✅ Codegen merge completed successfully');
-    } else {
-      console.log('⚠️ Codegen merge completed with unresolved conflicts');
-    }
-
-    return result;
-  } catch (error) {
-    console.error(`Codegen merge failed: ${error.message}`);
-    throw error;
-  }
-}
-
-// Export the merge logic function for direct use if needed
-export { codegenMergeLogic };
-
-// Default export
-export default mergeTypesFile;

package/src/merge/pr.js

@@ -1,231 +0,0 @@
-/**
- * Create a Bitbucket pull request
- * @param {string} sourceBranch - Source branch name
- * @param {string} targetBranch - Target branch name
- * @param {string} title - PR title
- * @param {string} description - PR description
- * @returns {Promise<Object>} - PR creation result
- */
-import { execSync } from 'child_process';
-
-/**
- * Check for existing pull requests with specific description pattern
- * @param {string} descriptionPattern - Pattern to match in PR descriptions
- * @returns {Promise<Object[]>} - Array of matching PRs
- */
-export async function getExistingPRsWithDescription(
-  descriptionPattern,
-  repositories,
-) {
-  // If no repositories provided, fall back to current repo behavior for backward compatibility
-  if (!repositories || !Array.isArray(repositories)) {
-    return getExistingPRsFromCurrentRepo(descriptionPattern);
-  }
-
-  try {
-    // Check for Bitbucket credentials
-    const username = process.env.BITBUCKET_USERNAME;
-    const password = process.env.BITBUCKET_APP_PASSWORD;
-
-    if (!username || !password) {
-      console.log(
-        `\n⚠️  Bitbucket credentials not found. Cannot check existing PRs.`,
-      );
-      return [];
-    }
-
-    const auth = Buffer.from(`${username}:${password}`).toString('base64');
-    const allMatchingPRs = [];
-
-    // Check each repository for matching PRs
-    for (const repo of repositories) {
-      try {
-        const match = repo.url.match(/bitbucket\.org[\/:]([^\/]+)\/([^\/\.]+)/);
-
-        if (!match) {
-          console.warn(`Could not parse repository URL: ${repo.url}`);
-          continue;
-        }
-
-        const [, workspace, repoSlug] = match;
-
-        const response = await fetch(
-          `https://api.bitbucket.org/2.0/repositories/${workspace}/${repoSlug}/pullrequests?state=OPEN`,
-          {
-            method: 'GET',
-            headers: {
-              Authorization: `Basic ${auth}`,
-              'Content-Type': 'application/json',
-            },
-          },
-        );
-
-        if (!response.ok) {
-          const error = await response.text();
-          console.warn(
-            `Bitbucket API error for ${repo.name}: ${response.status} - ${error}`,
-          );
-          continue;
-        }
-
-        const data = await response.json();
-        const matchingPRs = data.values.filter(
-          (pr) =>
-            pr.description && pr.description.startsWith(descriptionPattern),
-        );
-
-        // Add repository info to each PR for context
-        matchingPRs.forEach((pr) => {
-          pr.repositoryName = repo.name;
-          pr.repositoryUrl = repo.url;
-        });
-
-        allMatchingPRs.push(...matchingPRs);
-      } catch (error) {
-        console.warn(
-          `Failed to check PRs for repository ${repo.name}: ${error.message}`,
-        );
-      }
-    }
-
-    return allMatchingPRs;
-  } catch (error) {
-    console.error(`Failed to get existing PRs: ${error.message}`);
-    return [];
-  }
-}
-
-/**
- * Legacy function for backward compatibility - checks PRs in current repo only
- */
-export async function getExistingPRsFromCurrentRepo(descriptionPattern) {
-  try {
-    // Get Bitbucket workspace and repo from git remote
-    const remoteUrl = execSync('git config --get remote.origin.url', {
-      encoding: 'utf-8',
-    }).trim();
-    const match = remoteUrl.match(/bitbucket\.org[\/:]([^\/]+)\/([^\/\.]+)/);
-
-    if (!match) {
-      throw new Error(
-        'Could not parse Bitbucket workspace and repository from remote URL',
-      );
-    }
-
-    const [, workspace, repoSlug] = match;
-
-    // Check for Bitbucket credentials
-    const username = process.env.BITBUCKET_USERNAME;
-    const password = process.env.BITBUCKET_APP_PASSWORD;
-
-    if (!username || !password) {
-      console.log(
-        `\n⚠️  Bitbucket credentials not found. Cannot check existing PRs.`,
-      );
-      return [];
-    }
-
-    const auth = Buffer.from(`${username}:${password}`).toString('base64');
-    const response = await fetch(
-      `https://api.bitbucket.org/2.0/repositories/${workspace}/${repoSlug}/pullrequests?state=OPEN`,
-      {
-        method: 'GET',
-        headers: {
-          Authorization: `Basic ${auth}`,
-          'Content-Type': 'application/json',
-        },
-      },
-    );
-
-    if (!response.ok) {
-      const error = await response.text();
-      throw new Error(`Bitbucket API error: ${response.status} - ${error}`);
-    }
-
-    const data = await response.json();
-    const matchingPRs = data.values.filter(
-      (pr) => pr.description && pr.description.startsWith(descriptionPattern),
-    );
-
-    return matchingPRs;
-  } catch (error) {
-    console.error(`Failed to get existing PRs: ${error.message}`);
-    return [];
-  }
-}
-
-export async function createBitbucketPR(
-  sourceBranch,
-  targetBranch,
-  title,
-  description,
-) {
-  try {
-    // Get Bitbucket workspace and repo from git remote
-    const remoteUrl = execSync('git config --get remote.origin.url', {
-      encoding: 'utf-8',
-    }).trim();
-    const match = remoteUrl.match(/bitbucket\.org[\/:]([^\/]+)\/([^\/\.]+)/);
-
-    if (!match) {
-      throw new Error(
-        'Could not parse Bitbucket workspace and repository from remote URL',
-      );
-    }
-
-    const [, workspace, repoSlug] = match;
-
-    // Check for Bitbucket credentials
-    const username = process.env.BITBUCKET_USERNAME;
-    const password = process.env.BITBUCKET_APP_PASSWORD;
-
-    if (!username || !password) {
-      console.log(
-        `\n⚠️  Bitbucket credentials not found in environment variables.`,
-      );
-      console.log(
-        'Please set BITBUCKET_USERNAME and BITBUCKET_APP_PASSWORD to auto-create PR.',
-      );
-      console.log(
-        `Manual PR creation URL: https://bitbucket.org/${workspace}/${repoSlug}/pull-requests/new?source=${sourceBranch}&dest=${targetBranch}`,
-      );
-      return {
-        success: false,
-        manual: true,
-        url: `https://bitbucket.org/${workspace}/${repoSlug}/pull-requests/new?source=${sourceBranch}&dest=${targetBranch}`,
-      };
-    }
-
-    // Create PR via Bitbucket API
-    const prData = {
-      title,
-      description,
-      source: { branch: { name: sourceBranch } },
-      destination: { branch: { name: targetBranch } },
-    };
-
-    const auth = Buffer.from(`${username}:${password}`).toString('base64');
-    const response = await fetch(
-      `https://api.bitbucket.org/2.0/repositories/${workspace}/${repoSlug}/pullrequests`,
-      {
-        method: 'POST',
-        headers: {
-          Authorization: `Basic ${auth}`,
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(prData),
-      },
-    );
-
-    if (!response.ok) {
-      const error = await response.text();
-      throw new Error(`Bitbucket API error: ${response.status} - ${error}`);
-    }
-
-    const pr = await response.json();
-    return { success: true, pr, url: pr.links.html.href };
-  } catch (error) {
-    console.error(`Failed to create Bitbucket PR: ${error.message}`);
-    return { success: false, error: error.message };
-  }
-}

package/src/micro/cli.js

@@ -1,51 +0,0 @@
-#!/usr/bin/env node
-
-import { Command } from 'commander';
-//import { publishMicroservice } from './ms-publish.js';
-
-import dotenv from 'dotenv';
-import {
-  microserviceDeployTagVersion,
-  microserviceCopyImageToEnv,
-  microserviceBuildPushImage,
-} from './ms-deploy.js';
-
-dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
-
-const program = new Command();
-
-//const GIT_SHA = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
-
-program
-  .command('publish-microservice <serviceName>')
-  .description('Publish a microservice Docker image with version tags')
-  .option('-t, --tag <tag>', 'Version tag (defaults to BITBUCKET_TAG)')
-  .action(async (repoName, options) => {
-    await microserviceBuildPushImage(repoName, options);
-  });
-
-program
-  .command('deploy-microservice <repoName>')
-  .description('Deploy microservice end-to-end (build + publish + deploy)')
-  .option('-e, --env <environment>', 'Target environment', 'dev')
-  .option('-t, --tag <tag>', 'Version tag (defaults to BITBUCKET_TAG)')
-  .action(async (repoName, options) => {
-    await microserviceDeployTagVersion(repoName, options.env, options.tag);
-  });
-
-program
-  .command('promote-microservice <repoName>')
-  .description('Promote microservice image between environments')
-  .requiredOption('-f, --from <fromEnv>', 'Source environment')
-  .requiredOption('-t, --to <toEnv>', 'Target environment')
-  .requiredOption('-g, --tag <tag>', 'Image tag to promote')
-  .action(async (repoName, options) => {
-    await microserviceCopyImageToEnv(
-      repoName,
-      options.from,
-      options.to,
-      options.tag,
-    );
-  });
-
-program.parse(process.argv);