refactor: extract flagged load facade

Author: ndycode

lib/storage.ts

@@ -35,6 +35,7 @@ import {
 	clearFlaggedAccountsEntry,
 	saveFlaggedAccountsEntry,
 } from "./storage/flagged-entry.js";
+import { loadFlaggedAccountsEntry } from "./storage/flagged-load-entry.js";
 import { normalizeFlaggedStorage } from "./storage/flagged-storage.js";
 import {
 	clearFlaggedAccountsOnDisk,
@@ -1869,17 +1870,17 @@ export async function clearAccounts(): Promise<void> {
 }
 
 export async function loadFlaggedAccounts(): Promise<FlaggedAccountStorageV1> {
-	const path = getFlaggedAccountsPath();
-	return loadFlaggedAccountsState({
-		path,
-		legacyPath: getLegacyFlaggedAccountsPath(),
-		resetMarkerPath: getIntentionalResetMarkerPath(path),
+	return loadFlaggedAccountsEntry({
+		getFlaggedAccountsPath,
+		getLegacyFlaggedAccountsPath,
+		getIntentionalResetMarkerPath,
 		normalizeFlaggedStorage: (data) =>
 			normalizeFlaggedStorage(data, {
 				isRecord,
 				now: () => Date.now(),
 			}),
 		saveFlaggedAccounts,
+		loadFlaggedAccountsState,
 		logError: (message, details) => {
 			log.error(message, details);
 		},

lib/storage/flagged-load-entry.ts

@@ -0,0 +1,31 @@
+import type { FlaggedAccountStorageV1 } from "../storage.js";
+
+export async function loadFlaggedAccountsEntry(params: {
+	getFlaggedAccountsPath: () => string;
+	getLegacyFlaggedAccountsPath: () => string;
+	getIntentionalResetMarkerPath: (path: string) => string;
+	normalizeFlaggedStorage: (data: unknown) => FlaggedAccountStorageV1;
+	saveFlaggedAccounts: (storage: FlaggedAccountStorageV1) => Promise<void>;
+	loadFlaggedAccountsState: (args: {
+		path: string;
+		legacyPath: string;
+		resetMarkerPath: string;
+		normalizeFlaggedStorage: (data: unknown) => FlaggedAccountStorageV1;
+		saveFlaggedAccounts: (storage: FlaggedAccountStorageV1) => Promise<void>;
+		logError: (message: string, details: Record<string, unknown>) => void;
+		logInfo: (message: string, details: Record<string, unknown>) => void;
+	}) => Promise<FlaggedAccountStorageV1>;
+	logError: (message: string, details: Record<string, unknown>) => void;
+	logInfo: (message: string, details: Record<string, unknown>) => void;
+}): Promise<FlaggedAccountStorageV1> {
+	const path = params.getFlaggedAccountsPath();
+	return params.loadFlaggedAccountsState({
+		path,
+		legacyPath: params.getLegacyFlaggedAccountsPath(),
+		resetMarkerPath: params.getIntentionalResetMarkerPath(path),
+		normalizeFlaggedStorage: params.normalizeFlaggedStorage,
+		saveFlaggedAccounts: params.saveFlaggedAccounts,
+		logError: params.logError,
+		logInfo: params.logInfo,
+	});
+}

test/flagged-load-entry.test.ts

@@ -0,0 +1,34 @@
+import { describe, expect, it, vi } from "vitest";
+import { loadFlaggedAccountsEntry } from "../lib/storage/flagged-load-entry.js";
+
+describe("flagged load entry", () => {
+	it("passes paths and deps through to flagged load state helper", async () => {
+		const loadFlaggedAccountsState = vi.fn(async () => ({
+			version: 1,
+			accounts: [],
+		}));
+		const saveFlaggedAccounts = vi.fn(async () => undefined);
+
+		const result = await loadFlaggedAccountsEntry({
+			getFlaggedAccountsPath: () => "/tmp/flagged.json",
+			getLegacyFlaggedAccountsPath: () => "/tmp/legacy-flagged.json",
+			getIntentionalResetMarkerPath: (path) => `${path}.reset-intent`,
+			normalizeFlaggedStorage: vi.fn((data) => data as never),
+			saveFlaggedAccounts,
+			loadFlaggedAccountsState,
+			logError: vi.fn(),
+			logInfo: vi.fn(),
+		});
+
+		expect(loadFlaggedAccountsState).toHaveBeenCalledWith({
+			path: "/tmp/flagged.json",
+			legacyPath: "/tmp/legacy-flagged.json",
+			resetMarkerPath: "/tmp/flagged.json.reset-intent",
+			normalizeFlaggedStorage: expect.any(Function),
+			saveFlaggedAccounts,
+			logError: expect.any(Function),
+			logInfo: expect.any(Function),
+		});
+		expect(result).toEqual({ version: 1, accounts: [] });
+	});
+});