@docupace/pipeline 1.0.77 → 1.0.79

package/src/merge/cli.js

@@ -1,38 +1,38 @@
-#!/usr/bin/env node
-import dotenv from 'dotenv';
-dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
-
-import { Command } from 'commander';
-import { setupMerge } from './cli-merge.js';
-import { setupResolve } from './cli-resolve.js';
-import { setupMergeAll } from './cli-merge-all.js';
-
-const args = process.argv;
-const program = new Command();
-
-/**
- * Reusable auto-resolve function
- * @param {Object} options - Options object with config, dryRun, verbose properties
- * @returns {Object} - Result object with counts and success status
- */
-
-// Main program
-program
-  .name('merge-cli')
-  .description(
-    'Automatically resolve git merge conflicts based on file patterns',
-  )
-  .version('1.0.0');
-
-// Auto-resolve command (now uses the reusable function)
-
-setupResolve(program);
-setupMerge(program);
-setupMergeAll(program);
-// Parse command line arguments
-program.parse(args);
-
-// Show help if no arguments provided
-if (!args.slice(2).length) {
-  program.outputHelp();
-}
+#!/usr/bin/env node
+import dotenv from 'dotenv';
+dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
+
+import { Command } from 'commander';
+import { setupMerge } from './cli-merge.js';
+import { setupResolve } from './cli-resolve.js';
+import { setupMergeAll } from './cli-merge-all.js';
+
+const args = process.argv;
+const program = new Command();
+
+/**
+ * Reusable auto-resolve function
+ * @param {Object} options - Options object with config, dryRun, verbose properties
+ * @returns {Object} - Result object with counts and success status
+ */
+
+// Main program
+program
+  .name('merge-cli')
+  .description(
+    'Automatically resolve git merge conflicts based on file patterns',
+  )
+  .version('1.0.0');
+
+// Auto-resolve command (now uses the reusable function)
+
+setupResolve(program);
+setupMerge(program);
+setupMergeAll(program);
+// Parse command line arguments
+program.parse(args);
+
+// Show help if no arguments provided
+if (!args.slice(2).length) {
+  program.outputHelp();
+}

package/src/merge/merge-changelog.js

@@ -1,87 +1,87 @@
-import fs from 'fs';
-import { execSync } from 'child_process';
-
-/**
- * Simple changelog merger class
- */
-
-class ChangelogMerger {
-  constructor() {
-    this.content = '';
-  }
-
-  /**
-   * Parse a file with merge conflicts and clean up conflict markers
-   */
-  parseConflict(content) {
-    const lines = content.split('\n');
-    const cleanedLines = [];
-
-    for (const line of lines) {
-      if (line.startsWith('<<<<<<<')) {
-        // Remove conflict start marker
-        continue;
-      } else if (line.startsWith('=======')) {
-        // Replace separator with empty line
-        cleanedLines.push('');
-        continue;
-      } else if (line.startsWith('>>>>>>>')) {
-        // Remove conflict end marker
-        continue;
-      } else {
-        // Keep all other lines
-        cleanedLines.push(line);
-      }
-    }
-
-    this.content = cleanedLines.join('\n');
-  }
-
-  /**
-   * Generate the merged changelog content
-   */
-  generateMerged() {
-    return this.content;
-  }
-}
-
-/**
- * Changelog merge strategy - removes conflict markers and combines content
- * @param {string} conflictContent - Content with conflict markers
- * @returns {string} - Merged content
- */
-export function mergeChangelog(conflictContent) {
-  const merger = new ChangelogMerger();
-  merger.parseConflict(conflictContent);
-  return merger.generateMerged();
-}
-
-/**
- * Main function for processing a file with merge conflicts
- */
-export function mergeChangelogFile(filePath) {
-  try {
-    // Read the file (which contains the conflict markers)
-    const fileContent = fs.readFileSync(filePath, 'utf-8');
-    const result = mergeChangelog(fileContent);
-
-    // Write result back to the same file
-    fs.writeFileSync(filePath, result);
-
-    // Add file to git staging area to mark as resolved
-    try {
-      execSync(`git add ${filePath}`);
-      console.log('📝 File added to git staging area');
-    } catch (error) {
-      console.log(
-        '⚠️  Could not add file to git (may not be in a git repository)',
-      );
-    }
-
-    console.log('Changelog merge completed successfully');
-    return { success: true };
-  } catch (error) {
-    console.error(`Merge failed: ${error.message}`);
-    throw error;
-  }
-}
+import fs from 'fs';
+import { execSync } from 'child_process';
+
+/**
+ * Simple changelog merger class
+ */
+
+class ChangelogMerger {
+  constructor() {
+    this.content = '';
+  }
+
+  /**
+   * Parse a file with merge conflicts and clean up conflict markers
+   */
+  parseConflict(content) {
+    const lines = content.split('\n');
+    const cleanedLines = [];
+
+    for (const line of lines) {
+      if (line.startsWith('<<<<<<<')) {
+        // Remove conflict start marker
+        continue;
+      } else if (line.startsWith('=======')) {
+        // Replace separator with empty line
+        cleanedLines.push('');
+        continue;
+      } else if (line.startsWith('>>>>>>>')) {
+        // Remove conflict end marker
+        continue;
+      } else {
+        // Keep all other lines
+        cleanedLines.push(line);
+      }
+    }
+
+    this.content = cleanedLines.join('\n');
+  }
+
+  /**
+   * Generate the merged changelog content
+   */
+  generateMerged() {
+    return this.content;
+  }
+}
+
+/**
+ * Changelog merge strategy - removes conflict markers and combines content
+ * @param {string} conflictContent - Content with conflict markers
+ * @returns {string} - Merged content
+ */
+export function mergeChangelog(conflictContent) {
+  const merger = new ChangelogMerger();
+  merger.parseConflict(conflictContent);
+  return merger.generateMerged();
+}
+
+/**
+ * Main function for processing a file with merge conflicts
+ */
+export function mergeChangelogFile(filePath) {
+  try {
+    // Read the file (which contains the conflict markers)
+    const fileContent = fs.readFileSync(filePath, 'utf-8');
+    const result = mergeChangelog(fileContent);
+
+    // Write result back to the same file
+    fs.writeFileSync(filePath, result);
+
+    // Add file to git staging area to mark as resolved
+    try {
+      execSync(`git add ${filePath}`);
+      console.log('📝 File added to git staging area');
+    } catch (error) {
+      console.log(
+        '⚠️  Could not add file to git (may not be in a git repository)',
+      );
+    }
+
+    console.log('Changelog merge completed successfully');
+    return { success: true };
+  } catch (error) {
+    console.error(`Merge failed: ${error.message}`);
+    throw error;
+  }
+}

package/src/merge/merge-package.js

@@ -1,106 +1,106 @@
-import fs from 'fs';
-import { mergeDriver } from '../lib/merge-driver.js';
-
-/**
- * Custom merge logic for package.json files
- * Resolves version conflicts by taking HEAD version
- * @param {string} headContent - Content from HEAD (current branch)
- * @param {string} branchContent - Content from incoming branch
- * @returns {string} - Merged content
- * @throws {Error} - If conflicts are not version-only
- */
-function packageMergeLogic(headContent, branchContent) {
-  // Check if this is a version-only conflict
-  if (isVersionOnlyConflict(headContent, branchContent)) {
-    // Take the HEAD version
-    return headContent;
-  } else {
-    // Throw error to keep the conflict unresolved
-    throw new Error('Conflict contains more than just version differences');
-  }
-}
-
-/**
- * Check if conflict is version-only
- * @param {string} headContent - Content from HEAD
- * @param {string} branchContent - Content from branch
- * @returns {boolean} - True if only version differs
- */
-function isVersionOnlyConflict(headContent, branchContent) {
-  const headVersionMatch = headContent.match(/"version"\s*:\s*"([^"]+)"/);
-  const branchVersionMatch = branchContent.match(/"version"\s*:\s*"([^"]+)"/);
-
-  if (!headVersionMatch || !branchVersionMatch) {
-    return false;
-  }
-
-  // Remove version lines and check if there's any other content
-  const headWithoutVersion = headContent
-    .replace(/"version"\s*:\s*"[^"]+",?\s*/g, '')
-    .trim();
-  const branchWithoutVersion = branchContent
-    .replace(/"version"\s*:\s*"[^"]+",?\s*/g, '')
-    .trim();
-
-  // If both are empty after removing version, it's version-only
-  // Also handle case where there might be whitespace or comma differences
-  if (!headWithoutVersion && !branchWithoutVersion) {
-    return true;
-  }
-
-  // Additional check: if the only difference is trailing comma or whitespace
-  const normalizeContent = (content) => {
-    return content
-      .replace(/,\s*$/, '') // Remove trailing comma
-      .replace(/\s+/g, ' ') // Normalize whitespace
-      .trim();
-  };
-
-  return (
-    normalizeContent(headWithoutVersion) ===
-    normalizeContent(branchWithoutVersion)
-  );
-}
-
-/**
- * Main function to merge package.json conflicts using merge-driver
- * @param {string} filePath - Path to package.json file
- * @returns {Promise<boolean>} - True if successful
- */
-export async function mergePackageFile(filePath) {
-  try {
-    // Check if file exists
-    if (!fs.existsSync(filePath)) {
-      throw new Error(`File not found: ${filePath}`);
-    }
-
-    console.log(`🔄 Merging package.json conflicts in: ${filePath}`);
-
-    // Use merge driver with custom package.json merge logic
-    const result = await mergeDriver(filePath, packageMergeLogic);
-
-    // Log results
-    if (result.success) {
-      console.log('✅ Package merge completed successfully');
-      if (result.totalConflicts > 0) {
-        console.log(
-          `   Resolved ${result.resolvedConflicts} version-only conflicts`,
-        );
-      }
-    } else {
-      console.log('⚠️  Package merge partially completed');
-      console.log(
-        `   ${result.resolvedConflicts} of ${result.totalConflicts} conflicts resolved`,
-      );
-      console.log('   Non-version conflicts require manual resolution');
-    }
-
-    return result;
-  } catch (error) {
-    console.error(`❌ Merge failed: ${error.message}`);
-    throw error;
-  }
-}
-
-// Default export
-export default mergePackageFile;
+import fs from 'fs';
+import { mergeDriver } from '../lib/merge-driver.js';
+
+/**
+ * Custom merge logic for package.json files
+ * Resolves version conflicts by taking HEAD version
+ * @param {string} headContent - Content from HEAD (current branch)
+ * @param {string} branchContent - Content from incoming branch
+ * @returns {string} - Merged content
+ * @throws {Error} - If conflicts are not version-only
+ */
+function packageMergeLogic(headContent, branchContent) {
+  // Check if this is a version-only conflict
+  if (isVersionOnlyConflict(headContent, branchContent)) {
+    // Take the HEAD version
+    return headContent;
+  } else {
+    // Throw error to keep the conflict unresolved
+    throw new Error('Conflict contains more than just version differences');
+  }
+}
+
+/**
+ * Check if conflict is version-only
+ * @param {string} headContent - Content from HEAD
+ * @param {string} branchContent - Content from branch
+ * @returns {boolean} - True if only version differs
+ */
+function isVersionOnlyConflict(headContent, branchContent) {
+  const headVersionMatch = headContent.match(/"version"\s*:\s*"([^"]+)"/);
+  const branchVersionMatch = branchContent.match(/"version"\s*:\s*"([^"]+)"/);
+
+  if (!headVersionMatch || !branchVersionMatch) {
+    return false;
+  }
+
+  // Remove version lines and check if there's any other content
+  const headWithoutVersion = headContent
+    .replace(/"version"\s*:\s*"[^"]+",?\s*/g, '')
+    .trim();
+  const branchWithoutVersion = branchContent
+    .replace(/"version"\s*:\s*"[^"]+",?\s*/g, '')
+    .trim();
+
+  // If both are empty after removing version, it's version-only
+  // Also handle case where there might be whitespace or comma differences
+  if (!headWithoutVersion && !branchWithoutVersion) {
+    return true;
+  }
+
+  // Additional check: if the only difference is trailing comma or whitespace
+  const normalizeContent = (content) => {
+    return content
+      .replace(/,\s*$/, '') // Remove trailing comma
+      .replace(/\s+/g, ' ') // Normalize whitespace
+      .trim();
+  };
+
+  return (
+    normalizeContent(headWithoutVersion) ===
+    normalizeContent(branchWithoutVersion)
+  );
+}
+
+/**
+ * Main function to merge package.json conflicts using merge-driver
+ * @param {string} filePath - Path to package.json file
+ * @returns {Promise<boolean>} - True if successful
+ */
+export async function mergePackageFile(filePath) {
+  try {
+    // Check if file exists
+    if (!fs.existsSync(filePath)) {
+      throw new Error(`File not found: ${filePath}`);
+    }
+
+    console.log(`🔄 Merging package.json conflicts in: ${filePath}`);
+
+    // Use merge driver with custom package.json merge logic
+    const result = await mergeDriver(filePath, packageMergeLogic);
+
+    // Log results
+    if (result.success) {
+      console.log('✅ Package merge completed successfully');
+      if (result.totalConflicts > 0) {
+        console.log(
+          `   Resolved ${result.resolvedConflicts} version-only conflicts`,
+        );
+      }
+    } else {
+      console.log('⚠️  Package merge partially completed');
+      console.log(
+        `   ${result.resolvedConflicts} of ${result.totalConflicts} conflicts resolved`,
+      );
+      console.log('   Non-version conflicts require manual resolution');
+    }
+
+    return result;
+  } catch (error) {
+    console.error(`❌ Merge failed: ${error.message}`);
+    throw error;
+  }
+}
+
+// Default export
+export default mergePackageFile;

package/src/merge/merge-types.js

@@ -1,82 +1,82 @@
-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;
+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;