refactor: extract save accounts entry wrapper

Author: ndycode

lib/storage.ts

@@ -18,6 +18,7 @@ import {
 	importAccountsSnapshot,
 } from "./storage/account-port.js";
 import { saveAccountsToDisk } from "./storage/account-save.js";
+import { saveAccountsEntry } from "./storage/account-save-entry.js";
 import { buildBackupMetadata } from "./storage/backup-metadata-builder.js";
 import {
 	ACCOUNTS_BACKUP_SUFFIX,
@@ -1836,8 +1837,10 @@ export async function withAccountAndFlaggedStorageTransaction<T>(
  * @throws StorageError with platform-aware hints on failure
  */
 export async function saveAccounts(storage: AccountStorageV3): Promise<void> {
-	return withStorageLock(async () => {
-		await saveAccountsUnlocked(storage);
+	return saveAccountsEntry({
+		storage,
+		withStorageLock,
+		saveUnlocked: saveAccountsUnlocked,
 	});
 }
 

lib/storage/account-save-entry.ts

@@ -0,0 +1,11 @@
+import type { AccountStorageV3 } from "../storage.js";
+
+export async function saveAccountsEntry(params: {
+	storage: AccountStorageV3;
+	withStorageLock: <T>(fn: () => Promise<T>) => Promise<T>;
+	saveUnlocked: (storage: AccountStorageV3) => Promise<void>;
+}): Promise<void> {
+	return params.withStorageLock(async () => {
+		await params.saveUnlocked(params.storage);
+	});
+}

test/account-save-entry.test.ts

@@ -0,0 +1,25 @@
+import { describe, expect, it, vi } from "vitest";
+import { saveAccountsEntry } from "../lib/storage/account-save-entry.js";
+
+describe("account save entry", () => {
+	it("delegates save through the storage lock", async () => {
+		const saveUnlocked = vi.fn(async () => undefined);
+		await saveAccountsEntry({
+			storage: {
+				version: 3,
+				accounts: [],
+				activeIndex: 0,
+				activeIndexByFamily: {},
+			},
+			withStorageLock: async (fn) => fn(),
+			saveUnlocked,
+		});
+
+		expect(saveUnlocked).toHaveBeenCalledWith({
+			version: 3,
+			accounts: [],
+			activeIndex: 0,
+			activeIndexByFamily: {},
+		});
+	});
+});