refactor(rsc-mf): model effective remote action map keys

Author: cursoragent

tests/integration/rsc-mf/host/src/server-component-root/App.tsx

@@ -96,18 +96,23 @@ const App = () => {
   const remoteActionIdToHostProxyActionId = Object.fromEntries(
     remoteActionIdToHostProxyActionEntries,
   );
+  const remoteActionIdMapKeyCount = Object.keys(
+    remoteActionIdToHostProxyActionId,
+  ).length;
   const remoteActionIdMapKey = JSON.stringify(
-    remoteActionIdToHostProxyActionEntries,
+    Object.entries(remoteActionIdToHostProxyActionId).sort(([left], [right]) =>
+      left.localeCompare(right),
+    ),
   );
   const remoteActionIdMapEntryCount =
     remoteActionIdToHostProxyActionEntries.length;
   const mappedHostProxyActionIds = Array.from(
-    new Set(remoteActionIdToHostProxyActionEntries.map(([, hostId]) => hostId)),
+    new Set(Object.values(remoteActionIdToHostProxyActionId)),
   ).sort();
   const doesMappingCoverAllHostProxyActions =
-    mappedHostProxyActionIds.length === uniqueHostProxyActionIds.length &&
-    mappedHostProxyActionIds.every(
-      (actionId, index) => actionId === uniqueHostProxyActionIds[index],
+    mappedHostProxyActionIds.length <= uniqueHostProxyActionIds.length &&
+    mappedHostProxyActionIds.every(actionId =>
+      uniqueHostProxyActionIds.includes(actionId),
     );
 
   const remoteServerOnlyInfo = getServerOnlyInfo();
@@ -141,6 +146,7 @@ const App = () => {
       <p className="host-proxy-map-entry-count">
         {remoteActionIdMapEntryCount}
       </p>
+      <p className="host-proxy-map-key-count">{remoteActionIdMapKeyCount}</p>
       <p className="host-mapped-proxy-action-ids">
         {mappedHostProxyActionIds.join(',')}
       </p>

tests/integration/rsc-mf/tests/index.test.ts

@@ -66,6 +66,7 @@ async function renderRemoteRscIntoHost({ hostPort, page }: TestContext) {
   expect(html).toContain('host-remote-bundled-meta-kind');
   expect(html).toContain('host-proxy-action-id-count');
   expect(html).toContain('host-proxy-map-entry-count');
+  expect(html).toContain('host-proxy-map-key-count');
   expect(html).toContain('host-mapped-proxy-action-ids');
   expect(html).toContain('host-proxy-map-covers-all');
   expect(html).toContain('host-proxy-action-ids');
@@ -125,17 +126,22 @@ async function renderRemoteRscIntoHost({ hostPort, page }: TestContext) {
     el => el.textContent?.trim(),
   );
   expect(hostProxyMapEntryCount).toBe('8');
+  const hostProxyMapKeyCount = await page.$eval(
+    '.host-proxy-map-key-count',
+    el => el.textContent?.trim(),
+  );
+  expect(Number(hostProxyMapKeyCount)).toBeGreaterThan(0);
+  expect(Number(hostProxyMapKeyCount)).toBeLessThanOrEqual(
+    Number(hostProxyMapEntryCount),
+  );
   const hostMappedProxyActionIds = await page.$eval(
     '.host-mapped-proxy-action-ids',
     el => el.textContent?.trim(),
   );
   const hostMappedProxyActionIdList = hostMappedProxyActionIds
     ?.split(',')
     .filter(Boolean) as string[];
-  expect(hostMappedProxyActionIdList.length).toBe(8);
-  expect(hostMappedProxyActionIdList.length).toBe(
-    Number(hostProxyMapEntryCount),
-  );
+  expect(hostMappedProxyActionIdList.length).toBe(Number(hostProxyMapKeyCount));
   const hostProxyMapCoversAll = await page.$eval(
     '.host-proxy-map-covers-all',
     el => el.textContent?.trim(),
@@ -156,8 +162,8 @@ async function renderRemoteRscIntoHost({ hostPort, page }: TestContext) {
   const sortedHostProxyActionIds = [...hostProxyActionIdList].sort();
   const sortedMappedProxyActionIds = [...hostMappedProxyActionIdList].sort();
   expect(
-    sortedHostProxyActionIds.every(
-      (id, index) => id === sortedMappedProxyActionIds[index],
+    sortedMappedProxyActionIds.every(mappedId =>
+      sortedHostProxyActionIds.includes(mappedId),
     ),
   ).toBe(true);
   const hostDirectProxyActionIds = await page.$eval(