Add CLI restore command to restore backup files

Author: mayank1513

.changeset/restore-command.md

@@ -0,0 +1,5 @@
+---
+"git-json-resolver": minor
+---
+
+Add CLI restore command to restore backup files

lib/src/cli.test.ts

@@ -9,6 +9,9 @@ vi.mock("node:child_process");
 vi.mock("./index", () => ({
   resolveConflicts: vi.fn(),
 }));
+vi.mock("./utils", () => ({
+  restoreBackups: vi.fn(),
+}));
 vi.mock("./normalizer", () => ({
   DEFAULT_CONFIG: { defaultStrategy: "merge" },
 }));
@@ -70,6 +73,16 @@ describe("cli helpers", () => {
       expect(result.init).toBe(true);
     });
 
+    it("sets restore with undefined", () => {
+      const result = (cli as any).parseArgs(["node", "cli", "--restore"]);
+      expect(result.restore).toBe(undefined);
+    });
+
+    it("sets restore with custom directory", () => {
+      const result = (cli as any).parseArgs(["node", "cli", "--restore", "custom-backup"]);
+      expect(result.restore).toBe("custom-backup");
+    });
+
     it("warns on unknown option", () => {
       const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
       (cli as any).parseArgs(["node", "cli", "--unknown"]);

lib/src/cli.ts

@@ -6,6 +6,7 @@ import { pathToFileURL } from "node:url";
 import { resolveConflicts } from "./index";
 import type { Config } from "./types";
 import { DEFAULT_CONFIG } from "./normalizer";
+import { restoreBackups } from "./utils";
 
 const CONFIG_FILENAME = "git-json-resolver.config.js";
 
@@ -63,9 +64,12 @@ module.exports = ${JSON.stringify(DEFAULT_CONFIG, null, 2)};
 /**
  * CLI argument parser (minimal, no external deps).
  */
-export const parseArgs = (argv: string[]): { overrides: Partial<Config>; init?: boolean } => {
+export const parseArgs = (
+  argv: string[],
+): { overrides: Partial<Config>; init?: boolean; restore?: string } => {
   const overrides: Partial<Config> = {};
   let init = false;
+  let restore: string | undefined;
 
   for (let i = 2; i < argv.length; i++) {
     const arg = argv[i];
@@ -93,18 +97,22 @@ export const parseArgs = (argv: string[]): { overrides: Partial<Config>; init?:
       case "--init":
         init = true;
         break;
+      case "--restore":
+        restore = next;
+        i++;
+        break;
       default:
         if (arg.startsWith("--")) {
           console.warn(`[git-json-resolver] Unknown option: ${arg}`);
         }
     }
   }
-  return { overrides, init };
+  return { overrides, init, restore };
 };
 
 (async () => {
   try {
-    const { overrides, init } = parseArgs(process.argv);
+    const { overrides, init, restore } = parseArgs(process.argv);
 
     if (init) {
       initConfig(process.cwd());
@@ -117,6 +125,12 @@ export const parseArgs = (argv: string[]): { overrides: Partial<Config>; init?:
       ...overrides,
     };
 
+    if (restore) {
+      await restoreBackups(restore || fileConfig.backupDir || ".merge-backups");
+      console.log(`[git-json-resolver] Restored backups from ${restore}`);
+      process.exit(0);
+    }
+
     await resolveConflicts(finalConfig);
   } catch (err) {
     console.error("[git-json-resolver] Failed:", err);