@flighthq/render 0.3.0 → 0.3.1-next.1041.35b950c

package/src/renderer.test.ts

@@ -1,4 +1,12 @@
-import type { CanvasShapeCommand, Scene2DClipHooks, Renderer, RenderState } from '@flighthq/types/contract';
+import { createSlotTable, getRegistryTableEntry } from '@flighthq/registry/contract';
+import type {
+  ColorAdjustmentUnsupportedGuard,
+  RenderRootGuard,
+  Renderer,
+  RenderState,
+  Scene2DClipHooks,
+} from '@flighthq/types/contract';
+import { RegistryEntryState } from '@flighthq/types/contract';
 
 import {
   copyAllRenderersFromRenderState,
@@ -26,7 +34,7 @@ describe('copyAllRenderersFromRenderState', () => {
 
     copyAllRenderersFromRenderState(target, source);
 
-    expect(getRenderStateRuntime(target).rendererMap.get(kind)).toBe(renderer);
+    expect(getRegistryTableEntry(getRenderStateRuntime(target).registries.renderers, kind)).toBe(renderer);
     expect(target.displayObjectClipHooks).toBe(hooks);
   });
 
@@ -34,7 +42,7 @@ describe('copyAllRenderersFromRenderState', () => {
     const source = createRenderState();
     const target = createRenderState();
     copyAllRenderersFromRenderState(target, source);
-    expect(getRenderStateRuntime(target).rendererMap.size).toBe(0);
+    expect(getRenderStateRuntime(target).registries.renderers.entries.size).toBe(0);
     expect(target.displayObjectClipHooks).toBeNull();
   });
 });
@@ -47,14 +55,15 @@ describe('copyRenderersFromRenderState', () => {
     const renderer = { createData: vi.fn(), submit: vi.fn() } as unknown as Renderer;
     registerRenderer(source, kind, renderer);
     copyRenderersFromRenderState(target, source);
-    expect(getRenderStateRuntime(target).rendererMap.get(kind)).toBe(renderer);
+    expect(getRenderStateRuntime(target).registries.renderers).toBe(getRenderStateRuntime(source).registries.renderers);
+    expect(getRegistryTableEntry(getRenderStateRuntime(target).registries.renderers, kind)).toBe(renderer);
   });
 
   it('is a no-op when source has no renderer registrations', () => {
     const source = createRenderState();
     const target = createRenderState();
     copyRenderersFromRenderState(target, source);
-    expect(getRenderStateRuntime(target).rendererMap.size).toBe(0);
+    expect(getRenderStateRuntime(target).registries.renderers.entries.size).toBe(0);
   });
 
   it('does not affect source rendererMapId', () => {
@@ -67,38 +76,146 @@ describe('copyRenderersFromRenderState', () => {
     copyRenderersFromRenderState(target, source);
     expect(getRenderStateRuntime(source).rendererMapId).toBe(sourceIdBeforeCopy);
   });
+
+  it('preserves target-only registrations while source registrations win collisions', () => {
+    const source = createRenderState();
+    const target = createRenderState();
+    const sourceRenderer = { submit: vi.fn() } as unknown as Renderer;
+    const targetRenderer = { submit: vi.fn() } as unknown as Renderer;
+    const targetOnlyRenderer = { submit: vi.fn() } as unknown as Renderer;
+    registerRenderer(source, 'shared', sourceRenderer);
+    registerRenderer(target, 'shared', targetRenderer);
+    registerRenderer(target, 'target-only', targetOnlyRenderer);
+
+    copyRenderersFromRenderState(target, source);
+
+    const targetTable = getRenderStateRuntime(target).registries.renderers;
+    expect(getRegistryTableEntry(targetTable, 'shared')).toBe(sourceRenderer);
+    expect(getRegistryTableEntry(targetTable, 'target-only')).toBe(targetOnlyRenderer);
+  });
+
+  it('shares a fresh immutable snapshot and diverges on later registration', () => {
+    const source = createRenderState();
+    const target = createRenderState();
+    const renderer = { submit: vi.fn() } as unknown as Renderer;
+    const lateRenderer = { submit: vi.fn() } as unknown as Renderer;
+    registerRenderer(source, 'shared', renderer);
+
+    copyRenderersFromRenderState(target, source);
+
+    const sharedSnapshot = getRenderStateRuntime(target).registries.renderers;
+    expect(sharedSnapshot).toBe(getRenderStateRuntime(source).registries.renderers);
+    registerRenderer(source, 'late', lateRenderer);
+    expect(getRenderStateRuntime(target).registries.renderers).toBe(sharedSnapshot);
+    expect(getRenderStateRuntime(source).registries.renderers).not.toBe(sharedSnapshot);
+    expect(getRegistryTableEntry(sharedSnapshot, 'late')).toBeNull();
+  });
 });
 
 describe('copyRenderStateRegistrations', () => {
-  it('snapshot-copies effect-padding registrations without aliasing the maps', () => {
+  it('shares the effect-padding snapshot through distinct aggregates', () => {
     const source = createRenderState();
     const target = createRenderState();
     const resolver = vi.fn();
     const colorAdjustmentResolver = vi.fn();
-    getRenderStateRuntime(source).colorAdjustmentResolver = colorAdjustmentResolver;
-    getRenderStateRuntime(source).renderEffectPaddingResolverRegistry = new Map([['acme.Effect', resolver]]);
+    const colorAdjustmentUnsupportedGuard: ColorAdjustmentUnsupportedGuard = vi.fn();
+    const renderRootGuard: RenderRootGuard = vi.fn();
+    const strokeTessellator = vi.fn(() => null);
+    getRenderStateRuntime(source).registries.colorAdjustments = {
+      ...createSlotTable('ColorAdjustments', 'Disabled'),
+      entry: { state: RegistryEntryState.Bound, value: colorAdjustmentResolver },
+    };
+    getRenderStateRuntime(source).registries.colorAdjustmentUnsupportedGuard = {
+      ...createSlotTable('ColorAdjustmentUnsupportedGuard', 'Disabled'),
+      entry: { state: RegistryEntryState.Bound, value: colorAdjustmentUnsupportedGuard },
+    };
+    getRenderStateRuntime(source).registries.strokeTessellator = {
+      ...getRenderStateRuntime(source).registries.strokeTessellator,
+      entry: { state: RegistryEntryState.Bound, value: strokeTessellator },
+    };
+    getRenderStateRuntime(source).registries.renderRootGuard = {
+      ...createSlotTable('RenderRootGuard', 'Disabled'),
+      entry: { state: RegistryEntryState.Bound, value: renderRootGuard },
+    };
+    getRenderStateRuntime(source).registries.effectPaddingResolvers = {
+      entries: new Map([['acme.Effect', { state: RegistryEntryState.Bound, value: resolver }]]),
+      onMiss: 'Zero',
+      registry: 'RenderEffectPaddingResolver',
+      shape: 'keyed',
+    };
 
     copyRenderStateRegistrations(target, source);
 
-    expect(getRenderStateRuntime(target).colorAdjustmentResolver).toBe(colorAdjustmentResolver);
-    expect(getRenderStateRuntime(target).renderEffectPaddingResolverRegistry).not.toBe(
-      getRenderStateRuntime(source).renderEffectPaddingResolverRegistry,
+    const sourceRuntime = getRenderStateRuntime(source);
+    const targetRuntime = getRenderStateRuntime(target);
+    expect(targetRuntime.registries).not.toBe(sourceRuntime.registries);
+    expect(targetRuntime.registries.colorAdjustments).toBe(sourceRuntime.registries.colorAdjustments);
+    expect(targetRuntime.registries.colorAdjustments?.entry).toEqual({
+      state: RegistryEntryState.Bound,
+      value: colorAdjustmentResolver,
+    });
+    const sharedColorSnapshot = targetRuntime.registries.colorAdjustments;
+    sourceRuntime.registries.colorAdjustments = undefined;
+    expect(sourceRuntime.registries.colorAdjustments).not.toBe(sharedColorSnapshot);
+    expect(targetRuntime.registries.colorAdjustments).toBe(sharedColorSnapshot);
+    expect(targetRuntime.registries.colorAdjustments?.entry?.state).toBe(RegistryEntryState.Bound);
+    expect(targetRuntime.registries.colorAdjustmentUnsupportedGuard).toBe(
+      sourceRuntime.registries.colorAdjustmentUnsupportedGuard,
     );
-    expect(getRenderStateRuntime(target).renderEffectPaddingResolverRegistry?.get('acme.Effect')).toBe(resolver);
+    expect(targetRuntime.registries.colorAdjustmentUnsupportedGuard?.entry).toEqual({
+      state: RegistryEntryState.Bound,
+      value: colorAdjustmentUnsupportedGuard,
+    });
+    const sharedGuardSnapshot = targetRuntime.registries.colorAdjustmentUnsupportedGuard;
+    sourceRuntime.registries.colorAdjustmentUnsupportedGuard = undefined;
+    expect(sourceRuntime.registries.colorAdjustmentUnsupportedGuard).not.toBe(sharedGuardSnapshot);
+    expect(targetRuntime.registries.colorAdjustmentUnsupportedGuard).toBe(sharedGuardSnapshot);
+    expect(targetRuntime.registries.strokeTessellator).toBe(sourceRuntime.registries.strokeTessellator);
+    expect(targetRuntime.registries.strokeTessellator.entry).toEqual({
+      state: RegistryEntryState.Bound,
+      value: strokeTessellator,
+    });
+    const sharedStrokeSnapshot = targetRuntime.registries.strokeTessellator;
+    sourceRuntime.registries.strokeTessellator = { ...sourceRuntime.registries.strokeTessellator, entry: null };
+    expect(sourceRuntime.registries.strokeTessellator).not.toBe(sharedStrokeSnapshot);
+    expect(targetRuntime.registries.strokeTessellator).toBe(sharedStrokeSnapshot);
+    expect(targetRuntime.registries.strokeTessellator.entry?.state).toBe(RegistryEntryState.Bound);
+    expect(targetRuntime.registries.effectPaddingResolvers).toBe(sourceRuntime.registries.effectPaddingResolvers);
+    expect(targetRuntime.registries.effectPaddingResolvers?.entries.get('acme.Effect')).toEqual({
+      state: RegistryEntryState.Bound,
+      value: resolver,
+    });
+    expect(targetRuntime.registries.renderRootGuard).toBe(sourceRuntime.registries.renderRootGuard);
+    expect(targetRuntime.registries.renderRootGuard?.entry).toEqual({
+      state: RegistryEntryState.Bound,
+      value: renderRootGuard,
+    });
+    const sharedRootGuardSnapshot = targetRuntime.registries.renderRootGuard;
+    sourceRuntime.registries.renderRootGuard = undefined;
+    expect(sourceRuntime.registries.renderRootGuard).not.toBe(sharedRootGuardSnapshot);
+    expect(targetRuntime.registries.renderRootGuard).toBe(sharedRootGuardSnapshot);
   });
 
   it('snapshot-copies the shape-command registry without aliasing the map', () => {
     const source = createRenderState();
     const target = createRenderState();
-    const command = { key: 'beginFill', draw: vi.fn() } as unknown as CanvasShapeCommand;
-    getRenderStateRuntime(source).canvasShapeCommandRegistry = new Map([['beginFill', command]]);
+    const command = { key: 'beginFill', draw: vi.fn() } as never;
+    getRenderStateRuntime(source).registries.canvasShapeCommands = {
+      entries: new Map([['beginFill', { state: RegistryEntryState.Bound, value: command }]]),
+      onMiss: 'Unregistered',
+      registry: 'CanvasShapeCommand',
+      shape: 'keyed',
+    };
 
     copyRenderStateRegistrations(target, source);
 
-    expect(getRenderStateRuntime(target).canvasShapeCommandRegistry).not.toBe(
-      getRenderStateRuntime(source).canvasShapeCommandRegistry,
+    expect(getRenderStateRuntime(target).registries.canvasShapeCommands).toBe(
+      getRenderStateRuntime(source).registries.canvasShapeCommands,
     );
-    expect(getRenderStateRuntime(target).canvasShapeCommandRegistry?.get('beginFill')).toBe(command);
+    expect(getRenderStateRuntime(target).registries.canvasShapeCommands?.entries.get('beginFill')).toEqual({
+      state: RegistryEntryState.Bound,
+      value: command,
+    });
   });
 
   it('leaves the shape-command registry null when the source never registered one', () => {
@@ -107,7 +224,7 @@ describe('copyRenderStateRegistrations', () => {
 
     copyRenderStateRegistrations(target, source);
 
-    expect(getRenderStateRuntime(target).canvasShapeCommandRegistry).toBeNull();
+    expect(getRenderStateRuntime(target).registries.canvasShapeCommands).toBeUndefined();
   });
 });
 
@@ -134,9 +251,11 @@ describe('registerRenderer', () => {
   });
 
   it('should register a new renderer', () => {
-    expect(getRenderStateRuntime(state).rendererMap.has(kindA)).toBe(false);
+    const before = getRenderStateRuntime(state).registries.renderers;
+    expect(getRegistryTableEntry(before, kindA)).toBeNull();
     registerRenderer(state, kindA, renderer1);
-    expect(getRenderStateRuntime(state).rendererMap.get(kindA)).toBe(renderer1);
+    expect(getRenderStateRuntime(state).registries.renderers).not.toBe(before);
+    expect(getRegistryTableEntry(getRenderStateRuntime(state).registries.renderers, kindA)).toBe(renderer1);
     expect(getRenderStateRuntime(state).rendererMapId).toBe(1);
   });
 
@@ -144,7 +263,7 @@ describe('registerRenderer', () => {
     registerRenderer(state, kindA, renderer1);
     const idAfterFirst = getRenderStateRuntime(state).rendererMapId;
     registerRenderer(state, kindB, renderer2);
-    expect(getRenderStateRuntime(state).rendererMap.get(kindB)).toBe(renderer2);
+    expect(getRegistryTableEntry(getRenderStateRuntime(state).registries.renderers, kindB)).toBe(renderer2);
     expect(getRenderStateRuntime(state).rendererMapId).toBe(idAfterFirst + 1);
   });
 
@@ -152,7 +271,7 @@ describe('registerRenderer', () => {
     registerRenderer(state, kindA, renderer1);
     const idBefore = getRenderStateRuntime(state).rendererMapId;
     registerRenderer(state, kindA, renderer1);
-    expect(getRenderStateRuntime(state).rendererMap.get(kindA)).toBe(renderer1);
+    expect(getRegistryTableEntry(getRenderStateRuntime(state).registries.renderers, kindA)).toBe(renderer1);
     expect(getRenderStateRuntime(state).rendererMapId).toBe(idBefore);
   });
 
@@ -160,7 +279,7 @@ describe('registerRenderer', () => {
     registerRenderer(state, kindA, renderer1);
     const idBefore = getRenderStateRuntime(state).rendererMapId;
     registerRenderer(state, kindA, renderer2);
-    expect(getRenderStateRuntime(state).rendererMap.get(kindA)).toBe(renderer2);
+    expect(getRegistryTableEntry(getRenderStateRuntime(state).registries.renderers, kindA)).toBe(renderer2);
     expect(getRenderStateRuntime(state).rendererMapId).toBe(idBefore + 1);
   });
 
@@ -182,8 +301,8 @@ describe('registerRenderers', () => {
       [kindA, rendererA],
       [kindB, rendererB],
     ]);
-    expect(getRenderStateRuntime(state).rendererMap.get(kindA)).toBe(rendererA);
-    expect(getRenderStateRuntime(state).rendererMap.get(kindB)).toBe(rendererB);
+    expect(getRegistryTableEntry(getRenderStateRuntime(state).registries.renderers, kindA)).toBe(rendererA);
+    expect(getRegistryTableEntry(getRenderStateRuntime(state).registries.renderers, kindB)).toBe(rendererB);
   });
 
   it('should register nothing for an empty set', () => {