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

package/dist/renderer.js

@@ -1,3 +1,5 @@
+import { getRegistryTableEntry, withRegistryTableEntry } from '@flighthq/registry/contract';
+import { RegistryEntryState } from '@flighthq/types/contract';
 import { getRenderStateRuntime } from './renderState';
 // Mask renderers were retired (a mask is now a path ClipRegion realized by the backend clip hooks), so
 // there is no mask-renderer registry to copy — only the kind→renderer map and the clip hooks.
@@ -7,35 +9,55 @@ export function copyAllRenderersFromRenderState(target, source) {
         target.displayObjectClipHooks = source.displayObjectClipHooks;
 }
 export function copyRenderersFromRenderState(target, source) {
-    getRenderStateRuntime(source).rendererMap.forEach((renderer, kind) => {
-        registerRenderer(target, kind, renderer);
-    });
+    const targetRuntime = getRenderStateRuntime(target);
+    const sourceTable = getRenderStateRuntime(source).registries.renderers;
+    const targetTable = targetRuntime.registries.renderers;
+    // A fresh derived pipeline can share the immutable source snapshot directly. A target that already
+    // has policy keeps its target-only registrations, matching the additive copy contract, while source
+    // bindings remain last-write-wins through registerRenderer.
+    if (targetTable.entries.size === 0) {
+        let registrationCount = 0;
+        for (const entry of sourceTable.entries.values()) {
+            if (entry.state === RegistryEntryState.Bound)
+                registrationCount++;
+        }
+        if (registrationCount === 0)
+            return;
+        targetRuntime.registries.renderers = sourceTable;
+        targetRuntime.rendererMapId = (targetRuntime.rendererMapId + registrationCount) >>> 0;
+        return;
+    }
+    for (const [kind, entry] of sourceTable.entries) {
+        if (entry.state === RegistryEntryState.Bound)
+            registerRenderer(target, kind, entry.value);
+    }
 }
-// Copies the backend-agnostic policy registries that participate in pipeline derivation. Maps are
-// cloned, never aliased: derived states start with a snapshot and diverge until an explicit re-copy.
+// Copies the backend-agnostic policy registries that participate in pipeline derivation. Persistent
+// tables share an immutable snapshot through distinct aggregates, so later replacements diverge until
+// an explicit re-copy.
 export function copyRenderStateRegistrations(target, source) {
     const targetRuntime = getRenderStateRuntime(target);
     const sourceRuntime = getRenderStateRuntime(source);
-    targetRuntime.colorAdjustmentResolver = sourceRuntime.colorAdjustmentResolver;
-    const sourcePaddingRegistry = sourceRuntime.renderEffectPaddingResolverRegistry;
-    targetRuntime.renderEffectPaddingResolverRegistry =
-        sourcePaddingRegistry === null || sourcePaddingRegistry === undefined ? null : new Map(sourcePaddingRegistry);
-    // The shape-command set is a base-runtime registry every backend replays through, so a pipeline
-    // that inherits the renderers must inherit the commands too. Without it an offscreen state resolves
-    // no handler for any command in a shape's stream and bakes an empty target.
-    const sourceShapeCommands = sourceRuntime.canvasShapeCommandRegistry;
-    targetRuntime.canvasShapeCommandRegistry =
-        sourceShapeCommands === null || sourceShapeCommands === undefined ? null : new Map(sourceShapeCommands);
+    targetRuntime.registries.colorAdjustments = sourceRuntime.registries.colorAdjustments;
+    targetRuntime.registries.colorAdjustmentUnsupportedGuard = sourceRuntime.registries.colorAdjustmentUnsupportedGuard;
+    targetRuntime.registries.effectPaddingResolvers = sourceRuntime.registries.effectPaddingResolvers;
+    targetRuntime.registries.renderRootGuard = sourceRuntime.registries.renderRootGuard;
+    // The shape-command set is base policy every backend replays through, so a pipeline that inherits
+    // the renderers must inherit the commands too. Without it an offscreen state resolves no handler for
+    // any command in a shape's stream and bakes an empty target.
+    targetRuntime.registries.canvasShapeCommands = sourceRuntime.registries.canvasShapeCommands;
+    targetRuntime.registries.strokeTessellator = sourceRuntime.registries.strokeTessellator;
 }
 export function noopRendererData(_state, _source) {
     return null;
 }
 export function registerRenderer(state, kind, renderer) {
     const runtime = getRenderStateRuntime(state);
-    if (runtime.rendererMap.get(kind) === renderer)
+    const table = runtime.registries.renderers;
+    if (getRegistryTableEntry(table, kind) === renderer)
         return;
+    runtime.registries.renderers = withRegistryTableEntry(table, kind, renderer);
     runtime.rendererMapId = (runtime.rendererMapId + 1) >>> 0;
-    runtime.rendererMap.set(kind, renderer);
 }
 // Batch form of registerRenderer over a caller-supplied set of [kind, renderer] pairs. The registry
 // stays open and tree-shakable: only the renderers the caller references are pulled in — there is no

package/dist/renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../src/renderer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,uGAAuG;AACvG,8FAA8F;AAC9F,MAAM,UAAU,+BAA+B,CAAC,MAAmB,EAAE,MAAmB;IACtF,4BAA4B,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,IAAI,MAAM,CAAC,sBAAsB,KAAK,IAAI;QAAE,MAAM,CAAC,sBAAsB,GAAG,MAAM,CAAC,sBAAsB,CAAC;AAC5G,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,MAAmB,EAAE,MAAmB;IACnF,qBAAqB,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE;QACnE,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC;AAED,kGAAkG;AAClG,qGAAqG;AACrG,MAAM,UAAU,4BAA4B,CAAC,MAAmB,EAAE,MAAmB;IACnF,MAAM,aAAa,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IACpD,aAAa,CAAC,uBAAuB,GAAG,aAAa,CAAC,uBAAuB,CAAC;IAC9E,MAAM,qBAAqB,GAAG,aAAa,CAAC,mCAAmC,CAAC;IAChF,aAAa,CAAC,mCAAmC;QAC/C,qBAAqB,KAAK,IAAI,IAAI,qBAAqB,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAChH,gGAAgG;IAChG,oGAAoG;IACpG,4EAA4E;IAC5E,MAAM,mBAAmB,GAAG,aAAa,CAAC,0BAA0B,CAAC;IACrE,aAAa,CAAC,0BAA0B;QACtC,mBAAmB,KAAK,IAAI,IAAI,mBAAmB,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,mBAAmB,CAAC,CAAC;AAC5G,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAmB,EAAE,OAAmB;IACvE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAkB,EAAE,IAAU,EAAE,QAAkB;IACjF,MAAM,OAAO,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAC7C,IAAI,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,QAAQ;QAAE,OAAO;IACvD,OAAO,CAAC,aAAa,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IAC1D,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC1C,CAAC;AAED,oGAAoG;AACpG,qGAAqG;AACrG,kFAAkF;AAClF,MAAM,UAAU,iBAAiB,CAAC,KAAkB,EAAE,OAAiD;IACrG,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,OAAO;QAAE,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AAClF,CAAC"}
+{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../src/renderer.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/render",
-  "version": "0.3.0",
+  "version": "0.3.1-next.1041.35b950c",
   "author": "Joshua Granick and other contributors",
   "license": "MIT",
   "repository": {
@@ -38,16 +38,17 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/adjustments": "0.3.0",
-    "@flighthq/color": "0.3.0",
-    "@flighthq/entity": "0.3.0",
-    "@flighthq/geometry": "0.3.0",
-    "@flighthq/log": "0.3.0",
-    "@flighthq/materials": "0.3.0",
-    "@flighthq/mesh": "0.3.0",
-    "@flighthq/node": "0.3.0",
-    "@flighthq/signals": "0.3.0",
-    "@flighthq/types": "0.3.0"
+    "@flighthq/adjustments": "0.3.1-next.1041.35b950c",
+    "@flighthq/color": "0.3.1-next.1041.35b950c",
+    "@flighthq/entity": "0.3.1-next.1041.35b950c",
+    "@flighthq/geometry": "0.3.1-next.1041.35b950c",
+    "@flighthq/log": "0.3.1-next.1041.35b950c",
+    "@flighthq/materials": "0.3.1-next.1041.35b950c",
+    "@flighthq/mesh": "0.3.1-next.1041.35b950c",
+    "@flighthq/node": "0.3.1-next.1041.35b950c",
+    "@flighthq/registry": "0.3.1-next.1041.35b950c",
+    "@flighthq/signals": "0.3.1-next.1041.35b950c",
+    "@flighthq/types": "0.3.1-next.1041.35b950c"
   },
   "devDependencies": {
     "@flighthq/camera": "*",

package/src/enableColorAdjustmentGuards.test.ts

@@ -2,7 +2,8 @@ import { createTintAdjustment } from '@flighthq/adjustments/contract';
 import { addLogSink, createMemoryLogSink, getMemoryLogSinkEntries, removeLogSink } from '@flighthq/log/contract';
 import { setNodeColorAdjustments } from '@flighthq/node/contract';
 import { createDisplayObject } from '@flighthq/scene2d/contract';
-import type { Adjustment, Renderable } from '@flighthq/types/contract';
+import type { Adjustment, Renderable, RenderProxy, RenderState } from '@flighthq/types/contract';
+import { RegistryEntryState } from '@flighthq/types/contract';
 
 import { areColorAdjustmentGuardsEnabled, enableColorAdjustmentGuards } from './enableColorAdjustmentGuards';
 import { enableColorAdjustments } from './enableColorAdjustments';
@@ -15,6 +16,15 @@ describe('areColorAdjustmentGuardsEnabled', () => {
     expect(areColorAdjustmentGuardsEnabled(state)).toBe(false);
     enableColorAdjustmentGuards(state);
     expect(areColorAdjustmentGuardsEnabled(state)).toBe(true);
+    const table = getRenderStateRuntime(state).registries.colorAdjustmentUnsupportedGuard;
+    expect(table).toMatchObject({
+      entry: { state: RegistryEntryState.Bound },
+      onMiss: 'Disabled',
+      registry: 'ColorAdjustmentUnsupportedGuard',
+      shape: 'slot',
+    });
+    enableColorAdjustmentGuards(state);
+    expect(getRenderStateRuntime(state).registries.colorAdjustmentUnsupportedGuard).toBe(table);
   });
 });
 
@@ -30,7 +40,7 @@ describe('enableColorAdjustmentGuards', () => {
     const sink = createMemoryLogSink(8);
     addLogSink(sink.sink);
     try {
-      getRenderStateRuntime(state).colorAdjustmentResolver!(state, data);
+      resolveColorAdjustments(state, data);
       const entries = getMemoryLogSinkEntries(sink);
       expect(entries.length).toBe(1);
       expect(String((entries[0].data as Record<string, unknown>).message)).toContain('not inline-able');
@@ -49,10 +59,16 @@ describe('enableColorAdjustmentGuards', () => {
     const sink = createMemoryLogSink(8);
     addLogSink(sink.sink);
     try {
-      getRenderStateRuntime(state).colorAdjustmentResolver!(state, data);
+      resolveColorAdjustments(state, data);
       expect(getMemoryLogSinkEntries(sink).length).toBe(0);
     } finally {
       removeLogSink(sink.sink);
     }
   });
 });
+
+function resolveColorAdjustments(state: RenderState, data: RenderProxy): void {
+  const entry = getRenderStateRuntime(state).registries.colorAdjustments?.entry;
+  if (entry?.state !== RegistryEntryState.Bound) throw new Error('Color-adjustment resolver is not enabled');
+  entry.value(state, data);
+}

package/src/enableColorAdjustments.test.ts

@@ -7,6 +7,7 @@ import {
 import { addNodeChild, setNodeColorAdjustments } from '@flighthq/node/contract';
 import { createDisplayObject, getNode2DRuntime } from '@flighthq/scene2d/contract';
 import type { Renderable, RenderProxy, RenderState } from '@flighthq/types/contract';
+import { RegistryEntryState } from '@flighthq/types/contract';
 
 import { areColorAdjustmentsEnabled, enableColorAdjustments } from './enableColorAdjustments';
 import { createRenderProxy, getRenderProxy2D, prepareScene2DRender } from './renderProxy';
@@ -22,6 +23,20 @@ describe('areColorAdjustmentsEnabled', () => {
 });
 
 describe('enableColorAdjustments', () => {
+  it('replaces the persistent resolver slot once and remains idempotent', () => {
+    const state = createRenderState();
+    const runtime = getRenderStateRuntime(state);
+    const empty = runtime.registries.colorAdjustments;
+
+    enableColorAdjustments(state);
+
+    const bound = runtime.registries.colorAdjustments!;
+    expect(bound).not.toBe(empty);
+    expect(bound.entry?.state).toBe(RegistryEntryState.Bound);
+    enableColorAdjustments(state);
+    expect(runtime.registries.colorAdjustments).toBe(bound);
+  });
+
   it('leaves color adjustments unresolved until the state opts in', () => {
     const state = createRenderState();
     const node = createDisplayObject();
@@ -229,5 +244,7 @@ function createEnabledRenderState(): RenderState {
 }
 
 function resolveColorAdjustments(state: RenderState, data: RenderProxy, parentData?: RenderProxy): void {
-  getRenderStateRuntime(state).colorAdjustmentResolver!(state, data, parentData);
+  const entry = getRenderStateRuntime(state).registries.colorAdjustments?.entry;
+  if (entry?.state !== RegistryEntryState.Bound) throw new Error('Color-adjustment resolver is not enabled');
+  entry.value(state, data, parentData);
 }

package/src/explainScene2DCoverage.test.ts

@@ -1,5 +1,5 @@
-import type { Renderer, Scene2DKindUsage, SceneCoverageEntry } from '@flighthq/types/contract';
-import { RenderRegistry, SceneCoverage } from '@flighthq/types/contract';
+import type { Renderer, Scene2DKindUsage, SceneCoverageCatalog, SceneCoverageEntry } from '@flighthq/types/contract';
+import { RegistryEntryState, RenderRegistry, RequirementFacet, SceneCoverage } from '@flighthq/types/contract';
 import { describe, expect, it } from 'vitest';
 
 import { explainScene2DCoverage, hasScene2DCoverage } from './explainScene2DCoverage';
@@ -8,28 +8,75 @@ import { createRenderState } from './renderState';
 import { getRenderStateRuntime } from './renderState';
 
 const renderer: Renderer = { createData: () => null, submit: () => {} } as unknown as Renderer;
+const coverageCatalog: SceneCoverageCatalog = [
+  {
+    kind: 'Shape',
+    registrations: [
+      { module: '@flighthq/scene2d', registrar: 'registerShapeRenderer' },
+      { module: '@flighthq/scene2d-canvas', registrar: 'registerCanvasShapeCommands' },
+    ],
+    registry: RenderRegistry.NodeRenderer,
+  },
+  {
+    kind: 'Sprite',
+    registrations: [{ module: '@flighthq/scene2d', registrar: 'registerSpriteRenderer' }],
+    registry: RenderRegistry.NodeRenderer,
+  },
+  {
+    kind: 'beginFill',
+    registrations: [{ module: '@flighthq/scene2d-canvas', registrar: 'registerCanvasShapeCommands' }],
+    registry: RenderRegistry.ShapeCommandHandler,
+  },
+];
 
 function usage(overrides: Partial<Scene2DKindUsage> = {}): Scene2DKindUsage {
   return { blendModes: [], materialKinds: [], nodeKinds: [], shapeCommandKeys: [], ...overrides };
 }
 
-function entries(state: ReturnType<typeof createRenderState>, u: Scene2DKindUsage): SceneCoverageEntry[] {
+function entries(
+  state: ReturnType<typeof createRenderState>,
+  u: Scene2DKindUsage,
+  catalog: SceneCoverageCatalog = coverageCatalog,
+): SceneCoverageEntry[] {
   const out: SceneCoverageEntry[] = [];
-  explainScene2DCoverage(out, state, u);
+  explainScene2DCoverage(out, state, u, catalog);
   return out;
 }
 
-// The registry is a plain Map on the base runtime; registering a real command means reaching through
+// The registry lives on the base runtime; registering a real command means reaching through
 // scene2d-canvas, which render cannot depend on, so the test installs the binding directly.
 function wireShapeCommand(state: ReturnType<typeof createRenderState>, key: string): void {
   const runtime = getRenderStateRuntime(state);
-  (runtime.canvasShapeCommandRegistry ??= new Map()).set(key, { key, draw: () => {} } as never);
+  runtime.registries.canvasShapeCommands = {
+    entries: new Map([[key, { state: RegistryEntryState.Bound, value: { key, draw: () => {} } as never }]]),
+    onMiss: 'Unregistered',
+    registry: 'CanvasShapeCommand',
+    shape: 'keyed',
+  };
 }
 
 describe('explainScene2DCoverage', () => {
-  it('reports an unregistered node kind as Missing, since the node and its subtree never draw', () => {
+  it('reports an unregistered node kind with the primary catalog remedy', () => {
     expect(entries(createRenderState(), usage({ nodeKinds: ['Shape'] }))).toEqual([
-      { coverage: SceneCoverage.Missing, kind: 'Shape', registry: RenderRegistry.NodeRenderer },
+      {
+        coverage: SceneCoverage.Unregistered,
+        facet: RequirementFacet.SceneNodeKind,
+        kind: 'Shape',
+        module: '@flighthq/scene2d',
+        registrar: 'registerShapeRenderer',
+        registry: RenderRegistry.NodeRenderer,
+      },
+    ]);
+  });
+
+  it('reports an uncatalogued node kind as Unavailable, with no remedy fields', () => {
+    expect(entries(createRenderState(), usage({ nodeKinds: ['Shape'] }), [])).toEqual([
+      {
+        coverage: SceneCoverage.Unavailable,
+        facet: RequirementFacet.SceneNodeKind,
+        kind: 'Shape',
+        registry: RenderRegistry.NodeRenderer,
+      },
     ]);
   });
 
@@ -37,14 +84,22 @@ describe('explainScene2DCoverage', () => {
     const state = createRenderState();
     registerRenderer(state, 'Shape', renderer);
     expect(entries(state, usage({ nodeKinds: ['Shape'] }))).toEqual([
-      { coverage: SceneCoverage.Satisfied, kind: 'Shape', registry: RenderRegistry.NodeRenderer },
+      {
+        coverage: SceneCoverage.Satisfied,
+        facet: RequirementFacet.SceneNodeKind,
+        kind: 'Shape',
+        registry: RenderRegistry.NodeRenderer,
+      },
     ]);
   });
 
   it('reports an unhandled shape command key against the state that would replay it', () => {
     expect(entries(createRenderState(), usage({ shapeCommandKeys: ['beginFill'] }))).toContainEqual({
-      coverage: SceneCoverage.Missing,
+      coverage: SceneCoverage.Unregistered,
+      facet: RequirementFacet.SceneShapeCommand,
       kind: 'beginFill',
+      module: '@flighthq/scene2d-canvas',
+      registrar: 'registerCanvasShapeCommands',
       registry: RenderRegistry.ShapeCommandHandler,
     });
   });
@@ -54,6 +109,7 @@ describe('explainScene2DCoverage', () => {
     wireShapeCommand(state, 'beginFill');
     expect(entries(state, usage({ shapeCommandKeys: ['beginFill'] }))).toContainEqual({
       coverage: SceneCoverage.Satisfied,
+      facet: RequirementFacet.SceneShapeCommand,
       kind: 'beginFill',
       registry: RenderRegistry.ShapeCommandHandler,
     });
@@ -64,7 +120,7 @@ describe('explainScene2DCoverage', () => {
     registerRenderer(state, 'Shape', renderer);
     const found = entries(state, usage({ nodeKinds: ['Shape', 'Sprite'], shapeCommandKeys: ['beginFill'] }));
     expect(found).toHaveLength(3);
-    expect(found.filter((e) => e.coverage === SceneCoverage.Missing).map((e) => e.kind)).toEqual([
+    expect(found.filter((e) => e.coverage !== SceneCoverage.Satisfied).map((e) => e.kind)).toEqual([
       'Sprite',
       'beginFill',
     ]);
@@ -74,9 +130,9 @@ describe('explainScene2DCoverage', () => {
     const state = createRenderState();
     const u = usage({ nodeKinds: ['Shape'] });
     const out: SceneCoverageEntry[] = [];
-    explainScene2DCoverage(out, state, u);
+    explainScene2DCoverage(out, state, u, coverageCatalog);
     const first = out.length;
-    explainScene2DCoverage(out, state, u);
+    explainScene2DCoverage(out, state, u, coverageCatalog);
     expect(out).toHaveLength(first);
   });
 });
@@ -92,7 +148,7 @@ describe('hasScene2DCoverage', () => {
     wireShapeCommand(state, 'beginFill');
     const u = usage({ nodeKinds: ['Shape'], shapeCommandKeys: ['beginFill'] });
     const out: SceneCoverageEntry[] = [];
-    explainScene2DCoverage(out, state, u);
+    explainScene2DCoverage(out, state, u, coverageCatalog);
     expect(out.every((e) => e.coverage === SceneCoverage.Satisfied)).toBe(true);
     expect(hasScene2DCoverage(state, u)).toBe(true);
   });
@@ -102,7 +158,7 @@ describe('hasScene2DCoverage', () => {
     registerRenderer(state, 'Shape', renderer);
     const u = usage({ nodeKinds: ['Shape', 'Sprite'] });
     const out: SceneCoverageEntry[] = [];
-    explainScene2DCoverage(out, state, u);
+    explainScene2DCoverage(out, state, u, coverageCatalog);
     const gaps = out.filter((e) => e.coverage !== SceneCoverage.Satisfied);
     expect(hasScene2DCoverage(state, u)).toBe(gaps.length === 0);
   });

package/src/renderCache.test.ts

@@ -117,7 +117,7 @@ describe('registerRenderCacheRenderer', () => {
     const state = createRenderState();
     const renderer = { createData: () => null, submit: vi.fn() };
     registerRenderCacheRenderer(state, renderer as any);
-    expect(getRenderStateRuntime(state).rendererMap.get(RenderCacheKind)).toBe(renderer);
+    expect(getRegistryTableEntry(getRenderStateRuntime(state).registries.renderers, RenderCacheKind)).toBe(renderer);
   });
 });
 
@@ -149,3 +149,4 @@ describe('useRenderCache', () => {
     expect(getRenderProxyAdapter(stateB, obj as any)).toBeNull();
   });
 });
+import { getRegistryTableEntry } from '@flighthq/registry/contract';

package/src/renderProxy.test.ts

@@ -14,6 +14,7 @@ import {
 import { createDisplayObject, setNode2DClip } from '@flighthq/scene2d/contract';
 import { createSprite } from '@flighthq/scene2d/contract';
 import type { ClipRegion, Node, RenderProxy, RenderProxy2D, RenderState } from '@flighthq/types/contract';
+import { RegistryEntryState } from '@flighthq/types/contract';
 
 import { registerRenderer } from './renderer';
 import {
@@ -224,17 +225,23 @@ describe('getOrCreateRenderProxy2D', () => {
     expect(a).toBe(b);
   });
 
-  it('syncs renderer when rendererMapId has changed', () => {
+  it('invalidates and syncs an existing proxy when the renderer table is replaced', () => {
     const state = createRenderState();
     const source = createSprite();
     const node = getOrCreateRenderProxy2D(state, source);
     expect(node.renderer).toBeNull();
 
     const renderer = makeRenderer();
+    const runtime = getRenderStateRuntime(state);
+    const tableBeforeRegistration = runtime.registries.renderers;
+    const idBeforeRegistration = runtime.rendererMapId;
     registerRenderer(state, source.kind, renderer as any);
+    expect(runtime.registries.renderers).not.toBe(tableBeforeRegistration);
+    expect(runtime.rendererMapId).toBe(idBeforeRegistration + 1);
     getOrCreateRenderProxy2D(state, source);
 
     expect(node.renderer).toBe(renderer);
+    expect(node.rendererMapId).toBe(runtime.rendererMapId);
   });
 });
 
@@ -583,7 +590,13 @@ describe('updateRenderProxy2D', () => {
       expect((resolvedData as RenderProxy2D).clipDepth).toBe(0);
       expect(resolvedData.lastChildrenId).toBe(-1);
     });
-    getRenderStateRuntime(state).colorAdjustmentResolver = resolver;
+    const runtime = getRenderStateRuntime(state);
+    runtime.registries.colorAdjustments = {
+      entry: { state: RegistryEntryState.Bound, value: resolver },
+      onMiss: 'Disabled',
+      registry: 'ColorAdjustments',
+      shape: 'slot',
+    };
 
     updateRenderProxy2D(state, root, data, undefined);
 

package/src/renderState.test.ts

@@ -1,8 +1,15 @@
 import { createMatrix } from '@flighthq/geometry/contract';
-import type { RenderState } from '@flighthq/types/contract';
-import { BlendMode, EntityRuntimeKey } from '@flighthq/types/contract';
+import { createKeyedTable, createSlotTable } from '@flighthq/registry/contract';
+import type { ColorAdjustmentUnsupportedGuard, RenderState } from '@flighthq/types/contract';
+import { BlendMode, EntityRuntimeKey, RegistryEntryState } from '@flighthq/types/contract';
 
-import { createRenderState, createRenderStateRuntime, destroyRenderState, getRenderStateRuntime } from './renderState';
+import {
+  createRenderState,
+  createRenderStateRuntime,
+  destroyRenderState,
+  getColorAdjustmentUnsupportedGuard,
+  getRenderStateRuntime,
+} from './renderState';
 
 describe('createRenderState', () => {
   let state: RenderState;
@@ -30,7 +37,10 @@ describe('createRenderState', () => {
     expect(runtime.currentFrameId).toStrictEqual(0);
     expect(runtime.renderProxyMap).toStrictEqual(new WeakMap());
     expect(runtime.renderProxyAdapterMap).toStrictEqual(new WeakMap());
-    expect(runtime.rendererMap).toStrictEqual(new Map());
+    expect(runtime.registries).toStrictEqual({
+      renderers: createKeyedTable('NodeRenderer', 'Unregistered'),
+      strokeTessellator: createSlotTable('StrokeTessellator', 'Rasterize'),
+    });
     expect(runtime.rendererMapId).toStrictEqual(0);
     expect(runtime.tempStack).toStrictEqual([]);
   });
@@ -69,11 +79,12 @@ describe('createRenderState', () => {
 describe('createRenderStateRuntime', () => {
   it('initializes the machinery fields', () => {
     const runtime = createRenderStateRuntime();
-    expect(runtime.colorAdjustmentResolver).toBeNull();
     expect(runtime.currentFrameId).toStrictEqual(0);
     expect(runtime.renderProxyMap).toStrictEqual(new WeakMap());
     expect(runtime.renderProxyAdapterMap).toStrictEqual(new WeakMap());
-    expect(runtime.rendererMap).toStrictEqual(new Map());
+    expect(runtime.registries.colorAdjustments).toBeUndefined();
+    expect(runtime.registries.renderers).toStrictEqual(createKeyedTable('NodeRenderer', 'Unregistered'));
+    expect(runtime.registries.strokeTessellator).toStrictEqual(createSlotTable('StrokeTessellator', 'Rasterize'));
     expect(runtime.rendererMapId).toStrictEqual(0);
     expect(runtime.tempStack).toStrictEqual([]);
   });
@@ -82,7 +93,8 @@ describe('createRenderStateRuntime', () => {
     const a = createRenderStateRuntime();
     const b = createRenderStateRuntime();
     expect(a).not.toBe(b);
-    expect(a.rendererMap).not.toBe(b.rendererMap);
+    expect(a.registries.renderers).not.toBe(b.registries.renderers);
+    expect(a.registries.strokeTessellator).not.toBe(b.registries.strokeTessellator);
   });
 });
 
@@ -91,12 +103,39 @@ describe('destroyRenderState', () => {
     const state = createRenderState();
     const runtime = getRenderStateRuntime(state);
     runtime.tempStack.push({} as never);
-    runtime.renderEffectPaddingResolverRegistry = new Map();
+    runtime.registries.effectPaddingResolvers = {
+      entries: new Map(),
+      onMiss: 'Zero',
+      registry: 'RenderEffectPaddingResolver',
+      shape: 'keyed',
+    };
 
     destroyRenderState(state);
 
     expect(runtime.tempStack).toHaveLength(0);
-    expect(runtime.renderEffectPaddingResolverRegistry).toBeNull();
+    expect(runtime.registries.effectPaddingResolvers).toBeUndefined();
+  });
+});
+
+describe('getColorAdjustmentUnsupportedGuard', () => {
+  it('resolves only a bound guard entry', () => {
+    const state = createRenderState();
+    const guard: ColorAdjustmentUnsupportedGuard = vi.fn();
+    const runtime = getRenderStateRuntime(state);
+
+    expect(getColorAdjustmentUnsupportedGuard(state)).toBeNull();
+    runtime.registries.colorAdjustmentUnsupportedGuard = {
+      entry: { state: RegistryEntryState.Bound, value: guard },
+      onMiss: 'Disabled',
+      registry: 'ColorAdjustmentUnsupportedGuard',
+      shape: 'slot',
+    };
+    expect(getColorAdjustmentUnsupportedGuard(state)).toBe(guard);
+    runtime.registries.colorAdjustmentUnsupportedGuard = {
+      ...runtime.registries.colorAdjustmentUnsupportedGuard,
+      entry: { state: RegistryEntryState.Tombstoned },
+    };
+    expect(getColorAdjustmentUnsupportedGuard(state)).toBeNull();
   });
 });