Release v1.0.0

Major Changes

• 7e959e6: # 🚨 Breaking Change: Array Merge Strategy

  Arrays are no longer merged element-by-element under the default merge strategy.

  What Changed

  • Only plain objects are merged by default
  • Arrays now require explicit strategies: concat, unique, or custom resolvers

  Why This Change

  Previous array merging was unpredictable when arrays had:

  • Different lengths
  • Different semantic meanings
  • Mixed data types

  Migration Guide

  // Before (automatic array merging)
  rules: [{ pattern: "*", strategy: "merge" }];
  
  // After (explicit array handling)
  rules: [
    { pattern: "dependencies", strategy: "concat" },
    { pattern: "scripts", strategy: "ours" },
    { pattern: "*", strategy: "merge" }, // objects only
  ];

  This ensures predictable and safe conflict resolution.

Minor Changes

• Add concat and unique array merge strategies

  • concat: Concatenate arrays from both sides (applies only if both are arrays)
  • unique: Merge arrays and remove duplicates (applies only if both are arrays)

  These strategies provide explicit control over array merging behavior for better conflict resolution.

• 50f0ee1: # 📁 Configurable Backup Path

  New Feature

  Backup file location is now fully configurable for enhanced flexibility.

  Usage

  import { resolveConflicts } from "git-json-resolver";
  
  resolveConflicts({
    filePath: "package.json",
    backupPath: "./backups/package.json.backup", // Custom backup location
    rules: [
      /* your rules */
    ],
  });

  Benefits

  • Custom backup directories for better organization
  • Integration with existing backup strategies
  • Compliance with project structure requirements

• e3f85e9: # 🔄 CLI Restore Command

  New CLI Feature

  Restore backup files with a dedicated command for quick recovery.

  Usage

  # Restore specific backup
  npx git-json-resolver restore package.json.backup
  
  # Restore all backups in directory
  npx git-json-resolver restore --all
  
  # Restore with confirmation prompt
  npx git-json-resolver restore --interactive

  Benefits

  • Quick recovery from failed merges
  • Batch restore operations for multiple files
  • Interactive mode for safer restoration
  • Seamless CI/CD integration for rollback scenarios

• 58df9b2: # ⚡ Pattern Negation Support

  New Matcher Feature

  Pattern negation with ! prefix for the default basicMatcher.

  Usage

  import { resolveConflicts } from "git-json-resolver";
  
  resolveConflicts({
    filePath: "package.json",
    rules: [
      { pattern: "dependencies.*", strategy: "ours" },
      { pattern: "!dependencies.react", strategy: "theirs" }, // Negation
      { pattern: "scripts.*", strategy: "merge" },
      { pattern: "!scripts.test", strategy: "manual" }, // Exception
    ],
  });

  Benefits

  • Fine-grained control over merge strategies
  • Exception handling within broader patterns
  • Intuitive syntax familiar from gitignore patterns
  • Enhanced rule flexibility for complex scenarios

Patch Changes

• 973fc14: # 🔧 Code Refactoring

  Normalizer Simplification

  • Streamlined normalizer logic for better maintainability
  • Moved file handling utilities to dedicated utils module
  • Improved separation of concerns between components

  Benefits

  • Cleaner, more focused code structure
  • Enhanced testability and debugging
  • Better code reusability across modules

• f9d3ea8: # 🚀 Quality & Performance Improvements

  Enhanced Error Handling

  • More descriptive error messages with context
  • Graceful fallbacks for edge cases
  • Better error recovery mechanisms

  Expanded Test Coverage

  • Additional unit tests for critical paths
  • Edge case validation scenarios
  • Performance regression tests

  Performance Enhancements

  • Optimized pattern matching algorithms
  • Reduced memory footprint for large files
  • Faster conflict resolution processing

  Benefits

  • More reliable conflict resolution
  • Better debugging experience
  • Improved performance for large repositories

Full Changelog: 0.1.8...1.0.0

Release v0.1.8

Patch Changes

• 420d6df: Fix: handle POSIX

Full Changelog: 0.1.7...0.1.8

Release v0.1.7

Patch Changes

• 5eb95b3: Wire loggerConfig and isolate logger per instance.

Full Changelog: 0.1.6...0.1.7

Release v0.1.6

Patch Changes

• 4313ee4: fix file walker. Do not walk .git and cleanly process only relative path to ensure proper pattern match.

Full Changelog: 0.1.5...0.1.6

Release v0.1.5

Patch Changes

• 10b5462: Fix logger

Full Changelog: 0.1.4...0.1.5

Release v0.1.4

Patch Changes

• 4bb154f: Do not walk through node_modules

Full Changelog: 0.1.3...0.1.4

Release v0.1.3

Patch Changes

• 27f6a2e: Timestampt log files

Full Changelog: 0.1.2...0.1.3

Release v0.1.2

Patch Changes

• 562e0ea: Enhance logging

Full Changelog: 0.1.1...0.1.2

Release v0.1.1

Patch Changes

• 2464e00: Add logs

Full Changelog: 0.1.0...0.1.1

Release v0.1.0

Minor Changes

• f3ec835: Ensure node_modules is always excluded to avoid common pitfall or missing it while providing custom exclude list.

Full Changelog: 0.0.2...0.1.0