refactor(rsc): remove diff-added globalThis resolver state

Author: ScriptedAlchemy

packages/runtime/render/src/client/callServer.ts

@@ -8,29 +8,21 @@ type ReactServerValue = unknown;
 export type ActionIdResolver = (id: string) => string | Promise<string>;
 export type ActionRequestUrlResolver = (entryName?: string) => string;
 
-const ACTION_RESOLVER_KEY = '__MODERN_RSC_ACTION_RESOLVER__';
-const ACTION_URL_RESOLVER_KEY = '__MODERN_RSC_ACTION_URL_RESOLVER__';
+let actionIdResolver: ActionIdResolver | undefined;
+let actionRequestUrlResolver: ActionRequestUrlResolver | undefined;
 
 /**
  * Register a custom action ID resolver. Plugins (e.g. Module Federation)
  * use this to remap raw action IDs before they are sent to the server.
  */
-export const setResolveActionId = (resolver: ActionIdResolver): void => {
-  (
-    globalThis as typeof globalThis & {
-      [ACTION_RESOLVER_KEY]?: ActionIdResolver;
-    }
-  )[ACTION_RESOLVER_KEY] = resolver;
+export const setResolveActionId = (resolver?: ActionIdResolver): void => {
+  actionIdResolver = resolver;
 };
 
 export const setActionIdResolver = setResolveActionId;
 
 const resolveActionId = (id: string): string | Promise<string> => {
-  const resolver = (
-    globalThis as typeof globalThis & {
-      [ACTION_RESOLVER_KEY]?: ActionIdResolver;
-    }
-  )[ACTION_RESOLVER_KEY];
+  const resolver = actionIdResolver;
   if (typeof resolver === 'function') {
     return resolver(id);
   }
@@ -42,13 +34,9 @@ const resolveActionId = (id: string): string | Promise<string> => {
  * to align request URLs with customized route/base configurations.
  */
 export const setResolveActionRequestUrl = (
-  resolver: ActionRequestUrlResolver,
+  resolver?: ActionRequestUrlResolver,
 ): void => {
-  (
-    globalThis as typeof globalThis & {
-      [ACTION_URL_RESOLVER_KEY]?: ActionRequestUrlResolver;
-    }
-  )[ACTION_URL_RESOLVER_KEY] = resolver;
+  actionRequestUrlResolver = resolver;
 };
 
 export const setActionRequestUrlResolver = setResolveActionRequestUrl;
@@ -57,11 +45,7 @@ const resolveActionRequestUrl = (): string => {
   const entryName =
     typeof window !== 'undefined' ? window.__MODERN_JS_ENTRY_NAME : undefined;
 
-  const resolver = (
-    globalThis as typeof globalThis & {
-      [ACTION_URL_RESOLVER_KEY]?: ActionRequestUrlResolver;
-    }
-  )[ACTION_URL_RESOLVER_KEY];
+  const resolver = actionRequestUrlResolver;
   if (typeof resolver === 'function') {
     return resolver(entryName);
   }

packages/runtime/render/tests/callServer.test.ts

@@ -1,41 +1,43 @@
-const ACTION_RESOLVER_KEY = '__MODERN_RSC_ACTION_RESOLVER__';
-const ACTION_URL_RESOLVER_KEY = '__MODERN_RSC_ACTION_URL_RESOLVER__';
-
-type GlobalWithResolvers = typeof globalThis & {
-  [ACTION_RESOLVER_KEY]?: (id: string) => string | Promise<string>;
-  [ACTION_URL_RESOLVER_KEY]?: (entryName?: string) => string;
-};
-
 const WEBPACK_REQUIRE_SHIM = {
   u: (chunkId: string | number) => String(chunkId),
 };
 
 describe('requestCallServer pluggable action id resolver', () => {
-  const originalFetch = globalThis.fetch;
-  const originalWindow = (globalThis as { window?: unknown }).window;
+  const runtimeGlobal = global as typeof global & {
+    fetch?: typeof fetch;
+    window?: { __MODERN_JS_ENTRY_NAME: string };
+  };
+  const originalFetch = runtimeGlobal.fetch;
+  const originalWindow = runtimeGlobal.window;
   let requestCallServer: typeof import(
     '../src/client/callServer',
   ).requestCallServer;
   let setResolveActionId: typeof import(
     '../src/client/callServer',
   ).setResolveActionId;
+  let setActionIdResolver: typeof import(
+    '../src/client/callServer',
+  ).setActionIdResolver;
   let setResolveActionRequestUrl: typeof import(
     '../src/client/callServer',
   ).setResolveActionRequestUrl;
+  let setActionRequestUrlResolver: typeof import(
+    '../src/client/callServer',
+  ).setActionRequestUrlResolver;
   let fetchMock: ReturnType<typeof rstest.fn>;
 
   beforeAll(async () => {
     rstest.stubGlobal('__webpack_require__', WEBPACK_REQUIRE_SHIM);
     const mod = await import('../src/client/callServer');
     requestCallServer = mod.requestCallServer;
     setResolveActionId = mod.setResolveActionId;
+    setActionIdResolver = mod.setActionIdResolver;
     setResolveActionRequestUrl = mod.setResolveActionRequestUrl;
+    setActionRequestUrlResolver = mod.setActionRequestUrlResolver;
   });
 
   beforeEach(() => {
-    (
-      globalThis as unknown as { window?: { __MODERN_JS_ENTRY_NAME: string } }
-    ).window = {
+    runtimeGlobal.window = {
       __MODERN_JS_ENTRY_NAME: 'main',
     };
 
@@ -46,22 +48,20 @@ describe('requestCallServer pluggable action id resolver', () => {
         statusText: 'OK',
       } as Response;
     });
-    globalThis.fetch = fetchMock as typeof globalThis.fetch;
+    runtimeGlobal.fetch = fetchMock as typeof fetch;
   });
 
   afterEach(() => {
-    delete (globalThis as GlobalWithResolvers)[ACTION_RESOLVER_KEY];
-    delete (globalThis as GlobalWithResolvers)[ACTION_URL_RESOLVER_KEY];
-    (
-      globalThis as unknown as { window?: { __MODERN_JS_ENTRY_NAME: string } }
-    ).window = {
+    setResolveActionId(undefined);
+    setResolveActionRequestUrl(undefined);
+    runtimeGlobal.window = {
       __MODERN_JS_ENTRY_NAME: 'main',
     };
   });
 
   afterAll(() => {
-    globalThis.fetch = originalFetch;
-    (globalThis as { window?: unknown }).window = originalWindow;
+    runtimeGlobal.fetch = originalFetch;
+    runtimeGlobal.window = originalWindow;
     rstest.unstubAllGlobals();
   });
 
@@ -131,22 +131,19 @@ describe('requestCallServer pluggable action id resolver', () => {
     });
   });
 
-  test('resolver set via global key is picked up', async () => {
-    (globalThis as GlobalWithResolvers)[ACTION_RESOLVER_KEY] = id =>
-      `global:${id}`;
+  test('alias setter remaps action ids', async () => {
+    setActionIdResolver(id => `alias:${id}`);
 
     await requestCallServer('action123', []);
 
-    expectActionHeader('global:action123');
+    expectActionHeader('alias:action123');
   });
 
   test('uses custom request url resolver when registered', async () => {
     setResolveActionRequestUrl(entryName =>
       entryName ? `/custom/${entryName}` : '/custom',
     );
-    (
-      globalThis as unknown as { window?: { __MODERN_JS_ENTRY_NAME: string } }
-    ).window = {
+    runtimeGlobal.window = {
       __MODERN_JS_ENTRY_NAME: 'server-component-root',
     };
 
@@ -155,13 +152,12 @@ describe('requestCallServer pluggable action id resolver', () => {
     expectActionHeader('entry-action', '/custom/server-component-root');
   });
 
-  test('request url resolver set via global key is picked up', async () => {
-    (globalThis as GlobalWithResolvers)[ACTION_URL_RESOLVER_KEY] = () =>
-      '/global/custom';
+  test('alias request url resolver is used', async () => {
+    setActionRequestUrlResolver(() => '/alias/custom');
 
     await requestCallServer('action123', []);
 
-    expectActionHeader('action123', '/global/custom');
+    expectActionHeader('action123', '/alias/custom');
   });
 
   test('wraps request url resolver errors with CallServerError', async () => {
@@ -177,9 +173,7 @@ describe('requestCallServer pluggable action id resolver', () => {
   });
 
   test('uses entry specific action endpoint when entry name is not main/index', async () => {
-    (
-      globalThis as unknown as { window?: { __MODERN_JS_ENTRY_NAME: string } }
-    ).window = {
+    runtimeGlobal.window = {
       __MODERN_JS_ENTRY_NAME: 'server-component-root',
     };
 
@@ -189,9 +183,7 @@ describe('requestCallServer pluggable action id resolver', () => {
   });
 
   test('falls back to root endpoint when window is unavailable', async () => {
-    (
-      globalThis as unknown as { window?: { __MODERN_JS_ENTRY_NAME: string } }
-    ).window = undefined;
+    runtimeGlobal.window = undefined;
 
     await requestCallServer('no-window-action', []);