refactor: extract restore backup facade

Author: ndycode

lib/storage.ts

@@ -75,6 +75,7 @@ import {
 	mergeStorageForMigration,
 } from "./storage/project-migration.js";
 import { buildRestoreAssessment } from "./storage/restore-assessment.js";
+import { restoreAccountsFromBackupEntry } from "./storage/restore-backup-entry.js";
 import {
 	loadAccountsFromPath,
 	parseAndNormalizeStorage,
@@ -810,9 +811,12 @@ export async function restoreAccountsFromBackup(
 	path: string,
 	options?: { persist?: boolean },
 ): Promise<AccountStorageV3> {
-	return restoreAccountsFromBackupPath(path, {
-		persist: options?.persist,
-		backupRoot: getNamedBackupRoot(getStoragePath()),
+	return restoreAccountsFromBackupEntry({
+		path,
+		options,
+		restoreAccountsFromBackupPath,
+		getNamedBackupRoot,
+		getStoragePath,
 		realpath: fs.realpath,
 		loadAccountsFromPath: (path) =>
 			loadAccountsFromPath(path, {

lib/storage/restore-backup-entry.ts

@@ -0,0 +1,33 @@
+import type { AccountStorageV3 } from "../storage.js";
+
+export async function restoreAccountsFromBackupEntry(params: {
+	path: string;
+	options?: { persist?: boolean };
+	restoreAccountsFromBackupPath: (
+		path: string,
+		options: {
+			persist?: boolean;
+			backupRoot: string;
+			realpath: (path: string) => Promise<string>;
+			loadAccountsFromPath: (path: string) => Promise<{
+				normalized: AccountStorageV3 | null;
+			}>;
+			saveAccounts: (storage: AccountStorageV3) => Promise<void>;
+		},
+	) => Promise<AccountStorageV3>;
+	getNamedBackupRoot: (storagePath: string) => string;
+	getStoragePath: () => string;
+	realpath: (path: string) => Promise<string>;
+	loadAccountsFromPath: (
+		path: string,
+	) => Promise<{ normalized: AccountStorageV3 | null }>;
+	saveAccounts: (storage: AccountStorageV3) => Promise<void>;
+}): Promise<AccountStorageV3> {
+	return params.restoreAccountsFromBackupPath(params.path, {
+		persist: params.options?.persist,
+		backupRoot: params.getNamedBackupRoot(params.getStoragePath()),
+		realpath: params.realpath,
+		loadAccountsFromPath: params.loadAccountsFromPath,
+		saveAccounts: params.saveAccounts,
+	});
+}

test/restore-backup-entry.test.ts

@@ -0,0 +1,42 @@
+import { describe, expect, it, vi } from "vitest";
+import { restoreAccountsFromBackupEntry } from "../lib/storage/restore-backup-entry.js";
+
+describe("restore backup entry", () => {
+	it("passes path, options, and injected deps through to the restore helper", async () => {
+		const restoreAccountsFromBackupPath = vi.fn(async () => ({
+			version: 3,
+			accounts: [],
+			activeIndex: 0,
+			activeIndexByFamily: {},
+		}));
+		const loadAccountsFromPath = vi.fn(async () => ({ normalized: null }));
+		const saveAccounts = vi.fn(async () => undefined);
+
+		const result = await restoreAccountsFromBackupEntry({
+			path: "/tmp/backup.json",
+			options: { persist: false },
+			restoreAccountsFromBackupPath,
+			getNamedBackupRoot: () => "/tmp/backups",
+			getStoragePath: () => "/tmp/accounts.json",
+			realpath: vi.fn(async (path) => path),
+			loadAccountsFromPath,
+			saveAccounts,
+		});
+
+		expect(restoreAccountsFromBackupPath).toHaveBeenCalledWith(
+			"/tmp/backup.json",
+			expect.objectContaining({
+				persist: false,
+				backupRoot: "/tmp/backups",
+				loadAccountsFromPath,
+				saveAccounts,
+			}),
+		);
+		expect(result).toEqual({
+			version: 3,
+			accounts: [],
+			activeIndex: 0,
+			activeIndexByFamily: {},
+		});
+	});
+});