@docupace/pipeline 1.0.77 → 1.0.78

package/src/merge/cli-resolve.js

@@ -1,399 +1,399 @@
-import { mergeChangelogFile } from './merge-changelog.js';
-import mergeTypes, { mergeTypesFile } from './merge-types.js';
-import { existsSync, readFileSync, writeFileSync } from 'fs';
-import mergePackageFile from './merge-package.js';
-import { execSync } from 'child_process';
-
-// Default merge configuration
-const defaultMergeConfig = {
-  'CHANGELOG.md': 'changelog',
-  '*/CHANGELOG.md': 'changelog',
-  '**/CHANGELOG.md': 'changelog',
-  'src/types/graphql.ts': 'types',
-  'codegen.ts': 'ours',
-  'package.json': 'package',
-  '*/package.json': 'package',
-  '**/package.json': 'package',
-};
-
-// Available merge strategies
-const mergeStrategies = {
-  changelog: mergeChangelogFile,
-  package: mergePackageFile,
-  types: mergeTypesFile,
-  ours: (filePath) => {
-    // Keep our version by checking out the HEAD version (removes conflicts)
-    try {
-      execSync(`git checkout --ours ${filePath}`);
-      execSync(`git add ${filePath}`);
-      console.log(
-        `📝 Using 'ours' strategy for ${filePath} - reset to HEAD version and marked as resolved`,
-      );
-      return true;
-    } catch (error) {
-      throw new Error(`Failed to apply 'ours' strategy: ${error.message}`);
-    }
-  },
-  theirs: (filePath) => {
-    // Take their version
-    try {
-      execSync(`git checkout --theirs ${filePath}`);
-      execSync(`git add ${filePath}`);
-      console.log(
-        `📝 Using 'theirs' strategy for ${filePath} - marked as resolved`,
-      );
-      return true;
-    } catch (error) {
-      throw new Error(`Failed to apply 'theirs' strategy: ${error.message}`);
-    }
-  },
-};
-
-/**
- * Get list of conflicted files from git status
- */
-function getConflictedFiles() {
-  try {
-    const statusOutput = execSync('git status --porcelain', {
-      encoding: 'utf-8',
-    });
-    const conflictedFiles = statusOutput
-      .split('\n')
-      .filter(
-        (line) =>
-          line.startsWith('UU ') ||
-          line.startsWith('AA ') ||
-          line.startsWith('DD '),
-      )
-      .map((line) => line.substring(3).trim())
-      .filter((file) => file.length > 0);
-    return conflictedFiles;
-  } catch (error) {
-    throw new Error(`Failed to get git status: ${error.message}`);
-  }
-}
-
-/**
- * Load merge configuration from .mergerc file or use defaults
- */
-function loadMergeConfig() {
-  const configPath = '.mergerc';
-
-  if (existsSync(configPath)) {
-    try {
-      const configContent = readFileSync(configPath, 'utf-8');
-      const config = {};
-
-      configContent.split('\n').forEach((line) => {
-        line = line.trim();
-        if (line && !line.startsWith('#')) {
-          const [pattern, strategy] = line
-            .split(/\s+merge=/)
-            .map((s) => s.trim());
-          if (pattern && strategy) {
-            config[pattern] = strategy;
-          }
-        }
-      });
-
-      return config;
-    } catch (error) {
-      console.warn(
-        `Warning: Could not read ${configPath}, using defaults: ${error.message}`,
-      );
-    }
-  }
-
-  return defaultMergeConfig;
-}
-
-/**
- * Match file path against patterns (supports * and ** wildcards)
- */
-function matchPattern(filePath, pattern) {
-  // Handle ** at the beginning of pattern
-  if (pattern.startsWith('**/')) {
-    // Remove the **/ and check if the path ends with the remaining pattern
-    const remainingPattern = pattern.slice(3);
-    const regexPattern = remainingPattern
-      .replace(/\*/g, '[^/]*')
-      .replace(/\./g, '\\.')
-      .replace(/\//g, '\\/');
-
-    const regex = new RegExp(`(^|/)${regexPattern}$`);
-    return regex.test(filePath);
-  }
-
-  // For other cases, convert pattern to regex
-  const regexPattern = pattern
-    .replace(/\*\*/g, '___DOUBLESTAR___')
-    .replace(/\*/g, '[^/]*')
-    .replace(/___DOUBLESTAR___/g, '.*?')
-    .replace(/\./g, '\\.')
-    .replace(/\//g, '\\/');
-
-  const regex = new RegExp(`^${regexPattern}$`);
-  return regex.test(filePath);
-}
-
-/**
- * Find merge strategy for a given file
- */
-function findMergeStrategy(filePath, config) {
-  // Check exact match first
-  if (config[filePath]) {
-    return config[filePath];
-  }
-
-  // Check pattern matches
-  for (const [pattern, strategy] of Object.entries(config)) {
-    if (matchPattern(filePath, pattern)) {
-      return strategy;
-    }
-  }
-
-  return null;
-}
-
-/**
- * Create default .mergerc file
- */
-function createDefaultConfig() {
-  const configContent = `# Merge configuration file
-# Format: <file-pattern> merge=<strategy>
-# Strategies: changelog, package, types, ours, theirs
-
-CHANGELOG.md merge=changelog
-*/CHANGELOG.md merge=changelog
-**/CHANGELOG.md merge=changelog
-src/types/graphql.ts merge=types
-codegen.ts merge=ours
-package.json merge=package
-*/package.json merge=package
-**/package.json merge=package
-`;
-
-  writeFileSync('.mergerc', configContent);
-  console.log('✅ Created default .mergerc configuration file');
-}
-
-export async function autoResolveConflicts(options = {}) {
-  const { dryRun = false, verbose = false } = options;
-
-  // Get conflicted files
-  const conflictedFiles = getConflictedFiles();
-
-  if (conflictedFiles.length === 0) {
-    if (verbose) console.log('✅ No conflicted files found');
-    return { success: true, resolvedCount: 0, skippedCount: 0, totalCount: 0 };
-  }
-
-  if (verbose) {
-    console.log(`Found ${conflictedFiles.length} conflicted files:`);
-    conflictedFiles.forEach((file) => console.log(`  - ${file}`));
-    console.log('');
-  }
-
-  // Load configuration
-  const config = loadMergeConfig();
-
-  if (verbose) {
-    console.log('Merge configuration:');
-    Object.entries(config).forEach(([pattern, strategy]) => {
-      console.log(`  ${pattern} -> ${strategy}`);
-    });
-    console.log('');
-  }
-
-  let resolvedCount = 0;
-  let skippedCount = 0;
-
-  // Process each conflicted file
-  for (const filePath of conflictedFiles) {
-    const strategy = findMergeStrategy(filePath, config);
-
-    if (!strategy) {
-      if (verbose)
-        console.log(`⚠️  No strategy found for ${filePath} - skipping`);
-      skippedCount++;
-      continue;
-    }
-
-    const mergeFunction = mergeStrategies[strategy];
-    if (!mergeFunction) {
-      if (verbose)
-        console.log(
-          `⚠️  Unknown strategy '${strategy}' for ${filePath} - skipping`,
-        );
-      skippedCount++;
-      continue;
-    }
-
-    if (dryRun) {
-      if (verbose)
-        console.log(`Would apply '${strategy}' strategy to ${filePath}`);
-      continue;
-    }
-
-    try {
-      if (verbose)
-        console.log(`🔧 Applying '${strategy}' strategy to ${filePath}`);
-      const result = await mergeFunction(filePath);
-      if (result.success) {
-        resolvedCount++;
-      } else {
-        skippedCount++;
-      }
-    } catch (error) {
-      console.error(`❌ Failed to resolve ${filePath}: ${error.message}`);
-      skippedCount++;
-    }
-  }
-
-  const result = {
-    success: skippedCount === 0,
-    resolvedCount,
-    skippedCount,
-    totalCount: conflictedFiles.length,
-  };
-
-  // Summary
-  if (verbose) {
-    console.log(`\n📊 Summary:`);
-    console.log(`  Resolved: ${resolvedCount}`);
-    console.log(`  Skipped: ${skippedCount}`);
-    console.log(`  Total: ${conflictedFiles.length}`);
-
-    if (resolvedCount > 0 && !dryRun) {
-      console.log(`\n✅ Successfully resolved ${resolvedCount} conflicts`);
-      if (skippedCount === 0) {
-        console.log(
-          '🎉 All conflicts resolved! You can now commit the changes.',
-        );
-      }
-    }
-  }
-
-  return result;
-}
-
-export function setupResolve(program) {
-  program
-    .command('resolve-conflicts')
-    .description('Automatically resolve conflicts based on configuration')
-    .option(
-      '-c, --config <path>',
-      'Path to merge configuration file',
-      '.mergerc',
-    )
-    .option('-n, --dry-run', 'Show what would be done without making changes')
-    .option('-v, --verbose', 'Verbose output')
-    .action(async (options) => {
-      try {
-        const result = await autoResolveConflicts(options);
-
-        if (!result.success) {
-          console.error(
-            `❌ Auto-resolve failed: ${result.skippedCount} files could not be resolved`,
-          );
-          process.exit(1);
-        }
-      } catch (error) {
-        console.error(`❌ Auto-resolve failed: ${error.message}`);
-        process.exit(1);
-      }
-    });
-
-  // New merge command
-
-  // Individual strategy commands
-  program
-    .command('resolve-changelog-conflicts')
-    .description('Merge changelog files by removing conflict markers')
-    .argument('<file>', 'File with merge conflicts')
-    .action(async (file) => {
-      try {
-        mergeChangelogFile(file);
-        console.log('✅ Changelog merge completed successfully');
-      } catch (error) {
-        console.error(`❌ Changelog merge failed: ${error.message}`);
-        process.exit(1);
-      }
-    });
-
-  program
-    .command('resolve-package-conflicts')
-    .description('Merge package.json files by resolving version conflicts')
-    .argument('<file>', 'File with merge conflicts')
-    .action(async (file) => {
-      try {
-        await mergePackageFile(file);
-        console.log('✅ Package merge completed successfully');
-      } catch (error) {
-        console.error(`❌ Package merge failed: ${error.message}`);
-        process.exit(1);
-      }
-    });
-
-  program
-    .command('resolve-type-conflicts')
-    .description('Merge types files with balanced brace checking')
-    .argument('<file>', 'File with merge conflicts')
-    .action(async (file) => {
-      try {
-        await mergeTypes(file);
-        console.log('✅ Types merge completed successfully');
-      } catch (error) {
-        console.error(`❌ Types merge failed: ${error.message}`);
-        process.exit(1);
-      }
-    });
-
-  // Configuration commands
-  program
-    .command('init')
-    .description('Create default .mergerc configuration file')
-    .action(() => {
-      if (existsSync('.mergerc')) {
-        console.log('⚠️  .mergerc already exists. Use --force to overwrite.');
-        return;
-      }
-      createDefaultConfig();
-    });
-
-  program
-    .command('config')
-    .description('Show current merge configuration')
-    .action(() => {
-      const config = loadMergeConfig();
-      console.log('Current merge configuration:');
-      Object.entries(config).forEach(([pattern, strategy]) => {
-        console.log(`  ${pattern.padEnd(30)} -> ${strategy}`);
-      });
-    });
-
-  program
-    .command('status')
-    .description('Show conflicted files and their assigned strategies')
-    .action(() => {
-      try {
-        const conflictedFiles = getConflictedFiles();
-        const config = loadMergeConfig();
-
-        if (conflictedFiles.length === 0) {
-          console.log('✅ No conflicted files found');
-          return;
-        }
-
-        console.log('Conflicted files and their strategies:');
-        conflictedFiles.forEach((file) => {
-          const strategy = findMergeStrategy(file, config);
-          const status = strategy ? `-> ${strategy}` : '-> no strategy';
-          console.log(`  ${file.padEnd(40)} ${status}`);
-        });
-      } catch (error) {
-        console.error(`❌ Failed to get status: ${error.message}`);
-        process.exit(1);
-      }
-    });
-}
+import { mergeChangelogFile } from './merge-changelog.js';
+import mergeTypes, { mergeTypesFile } from './merge-types.js';
+import { existsSync, readFileSync, writeFileSync } from 'fs';
+import mergePackageFile from './merge-package.js';
+import { execSync } from 'child_process';
+
+// Default merge configuration
+const defaultMergeConfig = {
+  'CHANGELOG.md': 'changelog',
+  '*/CHANGELOG.md': 'changelog',
+  '**/CHANGELOG.md': 'changelog',
+  'src/types/graphql.ts': 'types',
+  'codegen.ts': 'ours',
+  'package.json': 'package',
+  '*/package.json': 'package',
+  '**/package.json': 'package',
+};
+
+// Available merge strategies
+const mergeStrategies = {
+  changelog: mergeChangelogFile,
+  package: mergePackageFile,
+  types: mergeTypesFile,
+  ours: (filePath) => {
+    // Keep our version by checking out the HEAD version (removes conflicts)
+    try {
+      execSync(`git checkout --ours ${filePath}`);
+      execSync(`git add ${filePath}`);
+      console.log(
+        `📝 Using 'ours' strategy for ${filePath} - reset to HEAD version and marked as resolved`,
+      );
+      return true;
+    } catch (error) {
+      throw new Error(`Failed to apply 'ours' strategy: ${error.message}`);
+    }
+  },
+  theirs: (filePath) => {
+    // Take their version
+    try {
+      execSync(`git checkout --theirs ${filePath}`);
+      execSync(`git add ${filePath}`);
+      console.log(
+        `📝 Using 'theirs' strategy for ${filePath} - marked as resolved`,
+      );
+      return true;
+    } catch (error) {
+      throw new Error(`Failed to apply 'theirs' strategy: ${error.message}`);
+    }
+  },
+};
+
+/**
+ * Get list of conflicted files from git status
+ */
+function getConflictedFiles() {
+  try {
+    const statusOutput = execSync('git status --porcelain', {
+      encoding: 'utf-8',
+    });
+    const conflictedFiles = statusOutput
+      .split('\n')
+      .filter(
+        (line) =>
+          line.startsWith('UU ') ||
+          line.startsWith('AA ') ||
+          line.startsWith('DD '),
+      )
+      .map((line) => line.substring(3).trim())
+      .filter((file) => file.length > 0);
+    return conflictedFiles;
+  } catch (error) {
+    throw new Error(`Failed to get git status: ${error.message}`);
+  }
+}
+
+/**
+ * Load merge configuration from .mergerc file or use defaults
+ */
+function loadMergeConfig() {
+  const configPath = '.mergerc';
+
+  if (existsSync(configPath)) {
+    try {
+      const configContent = readFileSync(configPath, 'utf-8');
+      const config = {};
+
+      configContent.split('\n').forEach((line) => {
+        line = line.trim();
+        if (line && !line.startsWith('#')) {
+          const [pattern, strategy] = line
+            .split(/\s+merge=/)
+            .map((s) => s.trim());
+          if (pattern && strategy) {
+            config[pattern] = strategy;
+          }
+        }
+      });
+
+      return config;
+    } catch (error) {
+      console.warn(
+        `Warning: Could not read ${configPath}, using defaults: ${error.message}`,
+      );
+    }
+  }
+
+  return defaultMergeConfig;
+}
+
+/**
+ * Match file path against patterns (supports * and ** wildcards)
+ */
+function matchPattern(filePath, pattern) {
+  // Handle ** at the beginning of pattern
+  if (pattern.startsWith('**/')) {
+    // Remove the **/ and check if the path ends with the remaining pattern
+    const remainingPattern = pattern.slice(3);
+    const regexPattern = remainingPattern
+      .replace(/\*/g, '[^/]*')
+      .replace(/\./g, '\\.')
+      .replace(/\//g, '\\/');
+
+    const regex = new RegExp(`(^|/)${regexPattern}$`);
+    return regex.test(filePath);
+  }
+
+  // For other cases, convert pattern to regex
+  const regexPattern = pattern
+    .replace(/\*\*/g, '___DOUBLESTAR___')
+    .replace(/\*/g, '[^/]*')
+    .replace(/___DOUBLESTAR___/g, '.*?')
+    .replace(/\./g, '\\.')
+    .replace(/\//g, '\\/');
+
+  const regex = new RegExp(`^${regexPattern}$`);
+  return regex.test(filePath);
+}
+
+/**
+ * Find merge strategy for a given file
+ */
+function findMergeStrategy(filePath, config) {
+  // Check exact match first
+  if (config[filePath]) {
+    return config[filePath];
+  }
+
+  // Check pattern matches
+  for (const [pattern, strategy] of Object.entries(config)) {
+    if (matchPattern(filePath, pattern)) {
+      return strategy;
+    }
+  }
+
+  return null;
+}
+
+/**
+ * Create default .mergerc file
+ */
+function createDefaultConfig() {
+  const configContent = `# Merge configuration file
+# Format: <file-pattern> merge=<strategy>
+# Strategies: changelog, package, types, ours, theirs
+
+CHANGELOG.md merge=changelog
+*/CHANGELOG.md merge=changelog
+**/CHANGELOG.md merge=changelog
+src/types/graphql.ts merge=types
+codegen.ts merge=ours
+package.json merge=package
+*/package.json merge=package
+**/package.json merge=package
+`;
+
+  writeFileSync('.mergerc', configContent);
+  console.log('✅ Created default .mergerc configuration file');
+}
+
+export async function autoResolveConflicts(options = {}) {
+  const { dryRun = false, verbose = false } = options;
+
+  // Get conflicted files
+  const conflictedFiles = getConflictedFiles();
+
+  if (conflictedFiles.length === 0) {
+    if (verbose) console.log('✅ No conflicted files found');
+    return { success: true, resolvedCount: 0, skippedCount: 0, totalCount: 0 };
+  }
+
+  if (verbose) {
+    console.log(`Found ${conflictedFiles.length} conflicted files:`);
+    conflictedFiles.forEach((file) => console.log(`  - ${file}`));
+    console.log('');
+  }
+
+  // Load configuration
+  const config = loadMergeConfig();
+
+  if (verbose) {
+    console.log('Merge configuration:');
+    Object.entries(config).forEach(([pattern, strategy]) => {
+      console.log(`  ${pattern} -> ${strategy}`);
+    });
+    console.log('');
+  }
+
+  let resolvedCount = 0;
+  let skippedCount = 0;
+
+  // Process each conflicted file
+  for (const filePath of conflictedFiles) {
+    const strategy = findMergeStrategy(filePath, config);
+
+    if (!strategy) {
+      if (verbose)
+        console.log(`⚠️  No strategy found for ${filePath} - skipping`);
+      skippedCount++;
+      continue;
+    }
+
+    const mergeFunction = mergeStrategies[strategy];
+    if (!mergeFunction) {
+      if (verbose)
+        console.log(
+          `⚠️  Unknown strategy '${strategy}' for ${filePath} - skipping`,
+        );
+      skippedCount++;
+      continue;
+    }
+
+    if (dryRun) {
+      if (verbose)
+        console.log(`Would apply '${strategy}' strategy to ${filePath}`);
+      continue;
+    }
+
+    try {
+      if (verbose)
+        console.log(`🔧 Applying '${strategy}' strategy to ${filePath}`);
+      const result = await mergeFunction(filePath);
+      if (result.success) {
+        resolvedCount++;
+      } else {
+        skippedCount++;
+      }
+    } catch (error) {
+      console.error(`❌ Failed to resolve ${filePath}: ${error.message}`);
+      skippedCount++;
+    }
+  }
+
+  const result = {
+    success: skippedCount === 0,
+    resolvedCount,
+    skippedCount,
+    totalCount: conflictedFiles.length,
+  };
+
+  // Summary
+  if (verbose) {
+    console.log(`\n📊 Summary:`);
+    console.log(`  Resolved: ${resolvedCount}`);
+    console.log(`  Skipped: ${skippedCount}`);
+    console.log(`  Total: ${conflictedFiles.length}`);
+
+    if (resolvedCount > 0 && !dryRun) {
+      console.log(`\n✅ Successfully resolved ${resolvedCount} conflicts`);
+      if (skippedCount === 0) {
+        console.log(
+          '🎉 All conflicts resolved! You can now commit the changes.',
+        );
+      }
+    }
+  }
+
+  return result;
+}
+
+export function setupResolve(program) {
+  program
+    .command('resolve-conflicts')
+    .description('Automatically resolve conflicts based on configuration')
+    .option(
+      '-c, --config <path>',
+      'Path to merge configuration file',
+      '.mergerc',
+    )
+    .option('-n, --dry-run', 'Show what would be done without making changes')
+    .option('-v, --verbose', 'Verbose output')
+    .action(async (options) => {
+      try {
+        const result = await autoResolveConflicts(options);
+
+        if (!result.success) {
+          console.error(
+            `❌ Auto-resolve failed: ${result.skippedCount} files could not be resolved`,
+          );
+          process.exit(1);
+        }
+      } catch (error) {
+        console.error(`❌ Auto-resolve failed: ${error.message}`);
+        process.exit(1);
+      }
+    });
+
+  // New merge command
+
+  // Individual strategy commands
+  program
+    .command('resolve-changelog-conflicts')
+    .description('Merge changelog files by removing conflict markers')
+    .argument('<file>', 'File with merge conflicts')
+    .action(async (file) => {
+      try {
+        mergeChangelogFile(file);
+        console.log('✅ Changelog merge completed successfully');
+      } catch (error) {
+        console.error(`❌ Changelog merge failed: ${error.message}`);
+        process.exit(1);
+      }
+    });
+
+  program
+    .command('resolve-package-conflicts')
+    .description('Merge package.json files by resolving version conflicts')
+    .argument('<file>', 'File with merge conflicts')
+    .action(async (file) => {
+      try {
+        await mergePackageFile(file);
+        console.log('✅ Package merge completed successfully');
+      } catch (error) {
+        console.error(`❌ Package merge failed: ${error.message}`);
+        process.exit(1);
+      }
+    });
+
+  program
+    .command('resolve-type-conflicts')
+    .description('Merge types files with balanced brace checking')
+    .argument('<file>', 'File with merge conflicts')
+    .action(async (file) => {
+      try {
+        await mergeTypes(file);
+        console.log('✅ Types merge completed successfully');
+      } catch (error) {
+        console.error(`❌ Types merge failed: ${error.message}`);
+        process.exit(1);
+      }
+    });
+
+  // Configuration commands
+  program
+    .command('init')
+    .description('Create default .mergerc configuration file')
+    .action(() => {
+      if (existsSync('.mergerc')) {
+        console.log('⚠️  .mergerc already exists. Use --force to overwrite.');
+        return;
+      }
+      createDefaultConfig();
+    });
+
+  program
+    .command('config')
+    .description('Show current merge configuration')
+    .action(() => {
+      const config = loadMergeConfig();
+      console.log('Current merge configuration:');
+      Object.entries(config).forEach(([pattern, strategy]) => {
+        console.log(`  ${pattern.padEnd(30)} -> ${strategy}`);
+      });
+    });
+
+  program
+    .command('status')
+    .description('Show conflicted files and their assigned strategies')
+    .action(() => {
+      try {
+        const conflictedFiles = getConflictedFiles();
+        const config = loadMergeConfig();
+
+        if (conflictedFiles.length === 0) {
+          console.log('✅ No conflicted files found');
+          return;
+        }
+
+        console.log('Conflicted files and their strategies:');
+        conflictedFiles.forEach((file) => {
+          const strategy = findMergeStrategy(file, config);
+          const status = strategy ? `-> ${strategy}` : '-> no strategy';
+          console.log(`  ${file.padEnd(40)} ${status}`);
+        });
+      } catch (error) {
+        console.error(`❌ Failed to get status: ${error.message}`);
+        process.exit(1);
+      }
+    });
+}