Improve error handling

Author: mayank1513

lib/src/cli.ts

@@ -46,7 +46,7 @@ export const loadConfigFile = async (): Promise<Partial<Config>> => {
 export const initConfig = (targetDir: string) => {
   const targetPath = path.join(targetDir, CONFIG_FILENAME);
   if (fs.existsSync(targetPath)) {
-    console.error(`[git-json-resolver] Config file already exists: ${targetPath}`);
+    console.error(`Config file already exists: ${targetPath}`);
     process.exit(1);
   }
 
@@ -58,7 +58,7 @@ module.exports = ${JSON.stringify(DEFAULT_CONFIG, null, 2)};
 `;
 
   fs.writeFileSync(targetPath, starter, "utf8");
-  console.log(`[git-json-resolver] Created starter config at ${targetPath}`);
+  console.log(`Created starter config at ${targetPath}`);
 };
 
 /**
@@ -103,7 +103,7 @@ export const parseArgs = (
         break;
       default:
         if (arg.startsWith("--")) {
-          console.warn(`[git-json-resolver] Unknown option: ${arg}`);
+          console.warn(`Unknown option: ${arg}`);
         }
     }
   }
@@ -127,13 +127,13 @@ export const parseArgs = (
 
     if (restore) {
       await restoreBackups(restore || fileConfig.backupDir || ".merge-backups");
-      console.log(`[git-json-resolver] Restored backups from ${restore}`);
+      console.log(`Restored backups from ${restore}`);
       process.exit(0);
     }
 
     await resolveConflicts(finalConfig);
   } catch (err) {
-    console.error("[git-json-resolver] Failed:", err);
+    console.error("Failed:", err);
     process.exit(1);
   }
 })();

lib/src/utils.ts

@@ -160,21 +160,29 @@ export const backupFile = async (filePath: string, backupDir = ".merge-backups")
 
 export const restoreBackups = async (backupDir = ".merge-backups") => {
   const walk = async (dir: string, relativeDir = "") => {
-    const entries = await fs.readdir(dir, { withFileTypes: true });
-    
-    for (const entry of entries) {
-      const srcPath = path.join(dir, entry.name);
-      const relativePath = path.join(relativeDir, entry.name);
-      const destPath = path.join(process.cwd(), relativePath);
-      
-      if (entry.isDirectory()) {
-        await walk(srcPath, relativePath);
-      } else {
-        await fs.mkdir(path.dirname(destPath), { recursive: true });
-        await fs.copyFile(srcPath, destPath);
+    try {
+      const entries = await fs.readdir(dir, { withFileTypes: true });
+
+      for (const entry of entries) {
+        const srcPath = path.join(dir, entry.name);
+        const relativePath = path.join(relativeDir, entry.name);
+        const destPath = path.join(process.cwd(), relativePath);
+
+        if (entry.isDirectory()) {
+          await walk(srcPath, relativePath);
+        } else {
+          try {
+            await fs.mkdir(path.dirname(destPath), { recursive: true });
+            await fs.copyFile(srcPath, destPath);
+          } catch (error) {
+            console.warn(`Failed to restore ${srcPath.replace(/[\r\n\t]/g, "")}: ${error}`);
+          }
+        }
       }
+    } catch (error) {
+      console.warn(`Failed to read backup directory ${dir}: ${error}`);
     }
   };
-  
+
   await walk(backupDir);
 };