@docupace/pipeline 1.0.77 → 1.0.79

package/src/lib/merge-driver.js

@@ -1,204 +1,204 @@
-#!/usr/bin/env node
-
-import fs from 'fs';
-import { execSync } from 'child_process';
-import path from 'path';
-import { fileURLToPath } from 'url';
-
-// Get __dirname equivalent in ESM
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-/**
- * Default merge logic function - can be overridden
- * @param {string} headContent - The content from HEAD (current branch)
- * @param {string} branchContent - The content from the incoming branch
- * @returns {string} - The merged content
- * @throws {Error} - If the conflict cannot be automatically merged
- */
-export function defaultMergeLogic(headContent, branchContent) {
-  // Default implementation - throws error
-  // Users should provide their own implementation
-  throw new Error(
-    'No merge logic provided - please pass a custom merge function',
-  );
-}
-
-/**
- * Main merge driver function
- * @param {string} filePath - Path to the file with conflicts
- * @param {Function} customMergeLogic - Custom merge function (optional)
- * @returns {Promise<{success: boolean, totalConflicts: number, resolvedConflicts: number, hasUnresolvedConflicts: boolean}>}
- */
-export async function mergeDriver(filePath, customMergeLogic = null) {
-  // Use provided merge logic or fall back to default
-  const mergeLogic = customMergeLogic || defaultMergeLogic;
-
-  if (!filePath) {
-    throw new Error('File path is required');
-  }
-
-  // Check if file exists
-  if (!fs.existsSync(filePath)) {
-    throw new Error(`File not found: ${filePath}`);
-  }
-
-  console.log(`Processing conflicts in: ${filePath}`);
-
-  // Read the file content
-  let fileContent;
-  try {
-    fileContent = fs.readFileSync(filePath, 'utf8');
-  } catch (error) {
-    throw new Error(`Error reading file: ${error.message}`);
-  }
-
-  // Split content into lines for processing
-  const lines = fileContent.split('\n');
-  const resultLines = [];
-
-  // Track merge state
-  let hasUnresolvedConflicts = false;
-  let totalConflicts = 0;
-  let resolvedConflicts = 0;
-
-  // State variables for parsing
-  let inConflict = false;
-  let headLines = [];
-  let branchLines = [];
-  let currentSection = null; // 'head' or 'branch'
-
-  // Process each line
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-
-    if (line.startsWith('<<<<<<<')) {
-      // Start of conflict marker
-      inConflict = true;
-      currentSection = 'head';
-      headLines = [];
-      branchLines = [];
-      totalConflicts++;
-    } else if (inConflict && line.startsWith('=======')) {
-      // Middle of conflict - switch from HEAD to branch
-      currentSection = 'branch';
-    } else if (inConflict && line.startsWith('>>>>>>>')) {
-      // End of conflict marker - attempt to merge
-      const headContent = headLines.join('\n');
-      const branchContent = branchLines.join('\n');
-
-      try {
-        // Call custom merge logic
-        const mergedContent = mergeLogic(headContent, branchContent);
-
-        // Add merged content to result
-        if (mergedContent !== null && mergedContent !== undefined) {
-          resultLines.push(mergedContent);
-          resolvedConflicts++;
-          console.log(`✓ Resolved conflict #${totalConflicts}`);
-        }
-      } catch (error) {
-        // Cannot merge this conflict - keep original conflict markers
-        hasUnresolvedConflicts = true;
-
-        console.log(
-          `✗ Could not resolve conflict #${totalConflicts}: ${error.message}`,
-        );
-
-        // Preserve the original conflict
-        resultLines.push(`<<<<<<< HEAD`);
-        resultLines.push(headContent);
-        resultLines.push('=======');
-        resultLines.push(branchContent);
-        resultLines.push(`>>>>>>> branch`);
-      }
-
-      // Reset conflict state
-      inConflict = false;
-      currentSection = null;
-      headLines = [];
-      branchLines = [];
-    } else if (inConflict) {
-      // Inside conflict - collect lines
-      if (currentSection === 'head') {
-        headLines.push(line);
-      } else if (currentSection === 'branch') {
-        branchLines.push(line);
-      }
-    } else {
-      // Normal line outside of conflict
-      resultLines.push(line);
-    }
-  }
-
-  // Write the result back to the file
-  const resultContent = resultLines.join('\n');
-  try {
-    fs.writeFileSync(filePath, resultContent, 'utf8');
-    console.log(`\nFile updated: ${filePath}`);
-  } catch (error) {
-    throw new Error(`Error writing file: ${error.message}`);
-  }
-
-  // Summary
-  console.log('\n--- Merge Summary ---');
-  console.log(`Total conflicts found: ${totalConflicts}`);
-  console.log(`Conflicts resolved: ${resolvedConflicts}`);
-  console.log(`Conflicts remaining: ${totalConflicts - resolvedConflicts}`);
-
-  // If all conflicts were resolved, stage the file
-  if (!hasUnresolvedConflicts && totalConflicts > 0) {
-    try {
-      execSync(`git add "${filePath}"`, { stdio: 'inherit' });
-      console.log(
-        `\n✓ All conflicts resolved! File has been staged with 'git add'.`,
-      );
-    } catch (error) {
-      console.error(`\nWarning: Could not stage file: ${error.message}`);
-      console.log('You may need to run "git add" manually.');
-    }
-  } else if (hasUnresolvedConflicts) {
-    console.log(`\n⚠ Some conflicts could not be resolved automatically.`);
-    console.log('Please review and resolve the remaining conflicts manually.');
-  } else if (totalConflicts === 0) {
-    console.log('\nNo conflicts found in the file.');
-  }
-
-  // Return result object for programmatic use
-  return {
-    success: !hasUnresolvedConflicts,
-    totalConflicts,
-    resolvedConflicts,
-    hasUnresolvedConflicts,
-    filePath,
-  };
-}
-
-/**
- * Process multiple files with the same merge logic
- * @param {string[]} filePaths - Array of file paths to process
- * @param {Function} customMergeLogic - Custom merge function
- * @returns {Promise<Array>} - Array of results for each file
- */
-export async function mergeMultipleFiles(filePaths, customMergeLogic) {
-  const results = [];
-
-  for (const filePath of filePaths) {
-    try {
-      const result = await mergeDriver(filePath, customMergeLogic);
-      results.push(result);
-    } catch (error) {
-      console.error(`Error processing ${filePath}: ${error.message}`);
-      results.push({
-        success: false,
-        error: error.message,
-        filePath,
-      });
-    }
-  }
-
-  return results;
-}
-
-// Default export for convenience
-export default mergeDriver;
+#!/usr/bin/env node
+
+import fs from 'fs';
+import { execSync } from 'child_process';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+// Get __dirname equivalent in ESM
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+/**
+ * Default merge logic function - can be overridden
+ * @param {string} headContent - The content from HEAD (current branch)
+ * @param {string} branchContent - The content from the incoming branch
+ * @returns {string} - The merged content
+ * @throws {Error} - If the conflict cannot be automatically merged
+ */
+export function defaultMergeLogic(headContent, branchContent) {
+  // Default implementation - throws error
+  // Users should provide their own implementation
+  throw new Error(
+    'No merge logic provided - please pass a custom merge function',
+  );
+}
+
+/**
+ * Main merge driver function
+ * @param {string} filePath - Path to the file with conflicts
+ * @param {Function} customMergeLogic - Custom merge function (optional)
+ * @returns {Promise<{success: boolean, totalConflicts: number, resolvedConflicts: number, hasUnresolvedConflicts: boolean}>}
+ */
+export async function mergeDriver(filePath, customMergeLogic = null) {
+  // Use provided merge logic or fall back to default
+  const mergeLogic = customMergeLogic || defaultMergeLogic;
+
+  if (!filePath) {
+    throw new Error('File path is required');
+  }
+
+  // Check if file exists
+  if (!fs.existsSync(filePath)) {
+    throw new Error(`File not found: ${filePath}`);
+  }
+
+  console.log(`Processing conflicts in: ${filePath}`);
+
+  // Read the file content
+  let fileContent;
+  try {
+    fileContent = fs.readFileSync(filePath, 'utf8');
+  } catch (error) {
+    throw new Error(`Error reading file: ${error.message}`);
+  }
+
+  // Split content into lines for processing
+  const lines = fileContent.split('\n');
+  const resultLines = [];
+
+  // Track merge state
+  let hasUnresolvedConflicts = false;
+  let totalConflicts = 0;
+  let resolvedConflicts = 0;
+
+  // State variables for parsing
+  let inConflict = false;
+  let headLines = [];
+  let branchLines = [];
+  let currentSection = null; // 'head' or 'branch'
+
+  // Process each line
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+
+    if (line.startsWith('<<<<<<<')) {
+      // Start of conflict marker
+      inConflict = true;
+      currentSection = 'head';
+      headLines = [];
+      branchLines = [];
+      totalConflicts++;
+    } else if (inConflict && line.startsWith('=======')) {
+      // Middle of conflict - switch from HEAD to branch
+      currentSection = 'branch';
+    } else if (inConflict && line.startsWith('>>>>>>>')) {
+      // End of conflict marker - attempt to merge
+      const headContent = headLines.join('\n');
+      const branchContent = branchLines.join('\n');
+
+      try {
+        // Call custom merge logic
+        const mergedContent = mergeLogic(headContent, branchContent);
+
+        // Add merged content to result
+        if (mergedContent !== null && mergedContent !== undefined) {
+          resultLines.push(mergedContent);
+          resolvedConflicts++;
+          console.log(`✓ Resolved conflict #${totalConflicts}`);
+        }
+      } catch (error) {
+        // Cannot merge this conflict - keep original conflict markers
+        hasUnresolvedConflicts = true;
+
+        console.log(
+          `✗ Could not resolve conflict #${totalConflicts}: ${error.message}`,
+        );
+
+        // Preserve the original conflict
+        resultLines.push(`<<<<<<< HEAD`);
+        resultLines.push(headContent);
+        resultLines.push('=======');
+        resultLines.push(branchContent);
+        resultLines.push(`>>>>>>> branch`);
+      }
+
+      // Reset conflict state
+      inConflict = false;
+      currentSection = null;
+      headLines = [];
+      branchLines = [];
+    } else if (inConflict) {
+      // Inside conflict - collect lines
+      if (currentSection === 'head') {
+        headLines.push(line);
+      } else if (currentSection === 'branch') {
+        branchLines.push(line);
+      }
+    } else {
+      // Normal line outside of conflict
+      resultLines.push(line);
+    }
+  }
+
+  // Write the result back to the file
+  const resultContent = resultLines.join('\n');
+  try {
+    fs.writeFileSync(filePath, resultContent, 'utf8');
+    console.log(`\nFile updated: ${filePath}`);
+  } catch (error) {
+    throw new Error(`Error writing file: ${error.message}`);
+  }
+
+  // Summary
+  console.log('\n--- Merge Summary ---');
+  console.log(`Total conflicts found: ${totalConflicts}`);
+  console.log(`Conflicts resolved: ${resolvedConflicts}`);
+  console.log(`Conflicts remaining: ${totalConflicts - resolvedConflicts}`);
+
+  // If all conflicts were resolved, stage the file
+  if (!hasUnresolvedConflicts && totalConflicts > 0) {
+    try {
+      execSync(`git add "${filePath}"`, { stdio: 'inherit' });
+      console.log(
+        `\n✓ All conflicts resolved! File has been staged with 'git add'.`,
+      );
+    } catch (error) {
+      console.error(`\nWarning: Could not stage file: ${error.message}`);
+      console.log('You may need to run "git add" manually.');
+    }
+  } else if (hasUnresolvedConflicts) {
+    console.log(`\n⚠ Some conflicts could not be resolved automatically.`);
+    console.log('Please review and resolve the remaining conflicts manually.');
+  } else if (totalConflicts === 0) {
+    console.log('\nNo conflicts found in the file.');
+  }
+
+  // Return result object for programmatic use
+  return {
+    success: !hasUnresolvedConflicts,
+    totalConflicts,
+    resolvedConflicts,
+    hasUnresolvedConflicts,
+    filePath,
+  };
+}
+
+/**
+ * Process multiple files with the same merge logic
+ * @param {string[]} filePaths - Array of file paths to process
+ * @param {Function} customMergeLogic - Custom merge function
+ * @returns {Promise<Array>} - Array of results for each file
+ */
+export async function mergeMultipleFiles(filePaths, customMergeLogic) {
+  const results = [];
+
+  for (const filePath of filePaths) {
+    try {
+      const result = await mergeDriver(filePath, customMergeLogic);
+      results.push(result);
+    } catch (error) {
+      console.error(`Error processing ${filePath}: ${error.message}`);
+      results.push({
+        success: false,
+        error: error.message,
+        filePath,
+      });
+    }
+  }
+
+  return results;
+}
+
+// Default export for convenience
+export default mergeDriver;