refactor: extract ui runtime bridge wrapper

Author: ndycode

index.ts

@@ -229,6 +229,7 @@ import {
 	applyUiRuntimeFromConfig,
 	getStatusMarker,
 } from "./lib/runtime/ui-runtime.js";
+import { resolveUiRuntimeEntry } from "./lib/runtime/ui-runtime-entry.js";
 import { SessionAffinityStore } from "./lib/session-affinity.js";
 import { registerCleanup } from "./lib/shutdown.js";
 import {
@@ -514,9 +515,12 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 	};
 
 	const resolveUiRuntime = (): UiRuntimeOptions => {
-		return resolveUiRuntimeFromConfig(loadPluginConfig, (pluginConfig) =>
-			applyUiRuntimeFromConfig(pluginConfig, setUiRuntimeOptions),
-		);
+		return resolveUiRuntimeEntry({
+			loadPluginConfig,
+			resolveUiRuntimeFromConfig,
+			applyUiRuntimeFromConfig: (pluginConfig) =>
+				applyUiRuntimeFromConfig(pluginConfig, setUiRuntimeOptions),
+		});
 	};
 
 	const invalidateAccountManagerCache = (): void => {

lib/runtime/ui-runtime-entry.ts

@@ -0,0 +1,23 @@
+import type { UiRuntimeOptions } from "../ui/runtime.js";
+
+export function resolveUiRuntimeEntry(params: {
+	loadPluginConfig: () => ReturnType<
+		typeof import("../config.js").loadPluginConfig
+	>;
+	resolveUiRuntimeFromConfig: (
+		loadPluginConfig: () => ReturnType<
+			typeof import("../config.js").loadPluginConfig
+		>,
+		applyUiRuntimeFromConfig: (
+			pluginConfig: ReturnType<typeof import("../config.js").loadPluginConfig>,
+		) => UiRuntimeOptions,
+	) => UiRuntimeOptions;
+	applyUiRuntimeFromConfig: (
+		pluginConfig: ReturnType<typeof import("../config.js").loadPluginConfig>,
+	) => UiRuntimeOptions;
+}): UiRuntimeOptions {
+	return params.resolveUiRuntimeFromConfig(
+		params.loadPluginConfig,
+		params.applyUiRuntimeFromConfig,
+	);
+}

test/ui-runtime-entry.test.ts

@@ -0,0 +1,22 @@
+import { describe, expect, it, vi } from "vitest";
+import { resolveUiRuntimeEntry } from "../lib/runtime/ui-runtime-entry.js";
+
+describe("ui runtime entry", () => {
+	it("passes loader and apply callback through to the ui runtime resolver", () => {
+		const loadPluginConfig = vi.fn(() => ({ a: 1 }));
+		const resolveUiRuntimeFromConfig = vi.fn(() => ({ theme: {} }));
+		const applyUiRuntimeFromConfig = vi.fn(() => ({ theme: {} }));
+
+		const result = resolveUiRuntimeEntry({
+			loadPluginConfig: loadPluginConfig as never,
+			resolveUiRuntimeFromConfig: resolveUiRuntimeFromConfig as never,
+			applyUiRuntimeFromConfig: applyUiRuntimeFromConfig as never,
+		});
+
+		expect(resolveUiRuntimeFromConfig).toHaveBeenCalledWith(
+			loadPluginConfig,
+			applyUiRuntimeFromConfig,
+		);
+		expect(result).toEqual({ theme: {} });
+	});
+});