@flighthq/image 0.5.1-edge.1471.4e82419 → 0.5.1-edge.1685.dc0e23a

package/README.md

@@ -13,5 +13,5 @@ Import the supported application-facing API from `@flighthq/image`. The `@flight
 This package is part of the locked-version Flight SDK graph. Applications may instead install and import `@flighthq/sdk` when package-level tree shaking is sufficient.
 
 - [Flight project](https://github.com/flighthq/flight)
-- [Source for @flighthq/image@0.5.1-edge.1471.4e82419](https://github.com/flighthq/flight/tree/4e82419a6322f8a673da169994c79fa561016515/packages/image)
-- [License](https://github.com/flighthq/flight/blob/4e82419a6322f8a673da169994c79fa561016515/LICENSE.md)
+- [Source for @flighthq/image@0.5.1-edge.1685.dc0e23a](https://github.com/flighthq/flight/tree/dc0e23a17453ec75c20ccbf07058a57b5ef10c4c/packages/image)
+- [License](https://github.com/flighthq/flight/blob/dc0e23a17453ec75c20ccbf07058a57b5ef10c4c/LICENSE.md)

package/dist/contract.d.ts

@@ -1,8 +1,6 @@
 export * from './imageResource';
 export * from './imageResourceFrom';
+export * from './imageResourceReference';
 export * from './imageSourceDimensions';
 export * from './imageTestHelper';
-export * from './imageResourceReference';
-export { initializeCompressedImageResource } from './imageResource';
-export { initializeEmbeddedImageResourceReference, initializeExternalImageResourceReference, } from './imageResourceReference';
 //# sourceMappingURL=contract.d.ts.map

package/dist/contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,OAAO,EAAE,iCAAiC,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EACL,wCAAwC,EACxC,wCAAwC,GACzC,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC"}

package/dist/contract.js

@@ -1,8 +1,6 @@
 export * from './imageResource';
 export * from './imageResourceFrom';
+export * from './imageResourceReference';
 export * from './imageSourceDimensions';
 export * from './imageTestHelper';
-export * from './imageResourceReference';
-export { initializeCompressedImageResource } from './imageResource';
-export { initializeEmbeddedImageResourceReference, initializeExternalImageResourceReference, } from './imageResourceReference';
 //# sourceMappingURL=contract.js.map

package/dist/contract.js.map

@@ -1 +1 @@
-{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,OAAO,EAAE,iCAAiC,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EACL,wCAAwC,EACxC,wCAAwC,GACzC,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC"}

package/dist/imageResourceReference.d.ts

@@ -1,4 +1,4 @@
-import type { AlphaType, EmbeddedImageResourceReference, ExternalImageResourceReference, ImageResourceFailure, ImageResourceFetch, ImageResourceReference, ImageBitmapCompositionResolver, ImageResourceReferenceResolutionExplanation, TextureSource, EntityConstruction } from '@flighthq/types/contract';
+import type { AlphaType, EmbeddedImageResourceReference, ExternalImageResourceReference, HostImageDecodeCapabilities, ImageDecodeFallback, ImageResourceFailure, ImageResourceFetch, ImageResourceReference, ImageBitmapCompositionResolver, ImageResourceReferenceResolutionExplanation, TextureSource, EntityConstruction } from '@flighthq/types/contract';
 export declare function createEmbeddedImageResourceReference(bytes: Uint8Array, mimeType?: string | null, alphaType?: AlphaType): EmbeddedImageResourceReference;
 export declare function createExternalImageResourceReference(uri: string, basePath?: string | null): ExternalImageResourceReference;
 export declare function createImageResourceFailure(cause: unknown): ImageResourceFailure;
@@ -7,5 +7,5 @@ export declare function initializeEmbeddedImageResourceReference(out: EntityCons
 export declare function initializeExternalImageResourceReference(out: EntityConstruction<ExternalImageResourceReference>, uri: string, basePath?: string | null): void;
 export declare function registerImageBitmapCompositionResolver(resolver: ImageBitmapCompositionResolver | null): void;
 export declare function resetFailedImageResourceReference(ref: ImageResourceReference): boolean;
-export declare function resolveImageResourceReference(ref: ImageResourceReference, fetch: ImageResourceFetch, signal: AbortSignal): Promise<TextureSource | null>;
+export declare function resolveImageResourceReference(imageDecode: Readonly<HostImageDecodeCapabilities>, ref: ImageResourceReference, fetch: ImageResourceFetch, signal: AbortSignal, fallbackDecode?: ImageDecodeFallback): Promise<TextureSource | null>;
 //# sourceMappingURL=imageResourceReference.d.ts.map

package/dist/imageResourceReference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imageResourceReference.d.ts","sourceRoot":"","sources":["../src/imageResourceReference.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,SAAS,EAET,8BAA8B,EAC9B,8BAA8B,EAC9B,oBAAoB,EACpB,kBAAkB,EAClB,sBAAsB,EACtB,8BAA8B,EAC9B,2CAA2C,EAC3C,aAAa,EACb,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAQlC,wBAAgB,oCAAoC,CAClD,KAAK,EAAE,UAAU,EACjB,QAAQ,GAAE,MAAM,GAAG,IAAW,EAC9B,SAAS,GAAE,SAAsB,GAChC,8BAA8B,CAIhC;AAED,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAM,GAAG,IAAW,GAC7B,8BAA8B,CAIhC;AAiCD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,CAa/E;AAID,wBAAgB,uCAAuC,CACrD,GAAG,EAAE,QAAQ,CAAC,sBAAsB,CAAC,GACpC,2CAA2C,CAO7C;AAOD,wBAAgB,wCAAwC,CACtD,GAAG,EAAE,kBAAkB,CAAC,8BAA8B,CAAC,EACvD,KAAK,EAAE,UAAU,EACjB,QAAQ,GAAE,MAAM,GAAG,IAAW,EAC9B,SAAS,GAAE,SAAsB,GAChC,IAAI,CAQN;AAED,wBAAgB,wCAAwC,CACtD,GAAG,EAAE,kBAAkB,CAAC,8BAA8B,CAAC,EACvD,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAM,GAAG,IAAW,GAC7B,IAAI,CAQN;AAMD,wBAAgB,sCAAsC,CAAC,QAAQ,EAAE,8BAA8B,GAAG,IAAI,GAAG,IAAI,CAE5G;AAID,wBAAgB,iCAAiC,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAKtF;AAUD,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,sBAAsB,EAC3B,KAAK,EAAE,kBAAkB,EACzB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAkC/B"}
+{"version":3,"file":"imageResourceReference.d.ts","sourceRoot":"","sources":["../src/imageResourceReference.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,SAAS,EAET,8BAA8B,EAC9B,8BAA8B,EAC9B,2BAA2B,EAC3B,mBAAmB,EACnB,oBAAoB,EACpB,kBAAkB,EAClB,sBAAsB,EACtB,8BAA8B,EAC9B,2CAA2C,EAC3C,aAAa,EACb,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAQlC,wBAAgB,oCAAoC,CAClD,KAAK,EAAE,UAAU,EACjB,QAAQ,GAAE,MAAM,GAAG,IAAW,EAC9B,SAAS,GAAE,SAAsB,GAChC,8BAA8B,CAIhC;AAED,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAM,GAAG,IAAW,GAC7B,8BAA8B,CAIhC;AAuCD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,CAa/E;AAID,wBAAgB,uCAAuC,CACrD,GAAG,EAAE,QAAQ,CAAC,sBAAsB,CAAC,GACpC,2CAA2C,CAO7C;AAOD,wBAAgB,wCAAwC,CACtD,GAAG,EAAE,kBAAkB,CAAC,8BAA8B,CAAC,EACvD,KAAK,EAAE,UAAU,EACjB,QAAQ,GAAE,MAAM,GAAG,IAAW,EAC9B,SAAS,GAAE,SAAsB,GAChC,IAAI,CAQN;AAED,wBAAgB,wCAAwC,CACtD,GAAG,EAAE,kBAAkB,CAAC,8BAA8B,CAAC,EACvD,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAM,GAAG,IAAW,GAC7B,IAAI,CAQN;AAMD,wBAAgB,sCAAsC,CAAC,QAAQ,EAAE,8BAA8B,GAAG,IAAI,GAAG,IAAI,CAE5G;AAID,wBAAgB,iCAAiC,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAKtF;AAUD,wBAAsB,6BAA6B,CACjD,WAAW,EAAE,QAAQ,CAAC,2BAA2B,CAAC,EAClD,GAAG,EAAE,sBAAsB,EAC3B,KAAK,EAAE,kBAAkB,EACzB,MAAM,EAAE,WAAW,EACnB,cAAc,CAAC,EAAE,mBAAmB,GACnC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CA4B/B"}

package/dist/imageResourceReference.js

@@ -1,5 +1,5 @@
 import { allocateEntity, finishEntity } from '@flighthq/entity/contract';
-import { decodeImage, decodeImagePremultiplied, explainImageDecodeFailure } from '@flighthq/image-codec/contract';
+import { decodeImage, decodeImagePremultiplied } from '@flighthq/image-codec/contract';
 import { BitmapTextureSourceKind, ImageResourceFailureKind, ImageResourceReferenceKind, ResourceResolutionState, } from '@flighthq/types/contract';
 export function createEmbeddedImageResourceReference(bytes, mimeType = null, alphaType = 'straight') {
     const out = allocateEntity();
@@ -15,14 +15,18 @@ export function createExternalImageResourceReference(uri, basePath = null) {
 // knowledge; this async resource layer turns its RGBA result into the live Bitmap entity renderers
 // dispatch by kind. The reference's alpha request is carried onto the source verbatim, so bytes that
 // are already premultiplied never get multiplied a second time at renderer upload.
-async function decodeEmbeddedImageResourceReference(ref, signal) {
+async function decodeEmbeddedImageResourceReference(imageDecode, ref, signal, fallbackDecode) {
     if (ref.bitmapComposition !== undefined && _resolveImageBitmapComposition !== null) {
-        return _resolveImageBitmapComposition(ref, signal);
+        return _resolveImageBitmapComposition(imageDecode, ref, signal);
     }
     signal.throwIfAborted();
-    const decoded = await (ref.alphaType === 'premultiplied'
-        ? decodeImagePremultiplied(ref.bytes, ref.mimeType ?? undefined)
-        : decodeImage(ref.bytes, ref.mimeType ?? undefined));
+    const premultiplied = ref.alphaType === 'premultiplied';
+    let decoded = await (premultiplied
+        ? decodeImagePremultiplied(imageDecode, ref.bytes, ref.mimeType ?? undefined)
+        : decodeImage(imageDecode, ref.bytes, ref.mimeType ?? undefined));
+    if (decoded === null && fallbackDecode !== undefined && ref.mimeType !== null) {
+        decoded = await fallbackDecode(ref.bytes, ref.mimeType, premultiplied ? { premultiplyAlpha: true } : undefined);
+    }
     signal.throwIfAborted();
     if (decoded === null)
         return null;
@@ -109,22 +113,17 @@ export function resetFailedImageResourceReference(ref) {
 //
 // This is the whole lifecycle for a document that resolves its images once. A caller needing concurrency
 // limits, priority, or retry drives those around this atom rather than inside it.
-export async function resolveImageResourceReference(ref, fetch, signal) {
+export async function resolveImageResourceReference(imageDecode, ref, fetch, signal, fallbackDecode) {
     ref.failure = null;
     ref.state = ResourceResolutionState.Loading;
     try {
-        const usesOrdinaryEmbeddedDecode = ref.kind === ImageResourceReferenceKind.Embedded &&
-            (ref.bitmapComposition === undefined || _resolveImageBitmapComposition === null);
         const source = ref.kind === ImageResourceReferenceKind.Embedded
-            ? await decodeEmbeddedImageResourceReference(ref, signal)
+            ? await decodeEmbeddedImageResourceReference(imageDecode, ref, signal, fallbackDecode)
             : await fetch(ref, signal);
         if (source === null) {
-            const decodeFailure = usesOrdinaryEmbeddedDecode
-                ? explainImageDecodeFailure(ref.bytes, ref.mimeType ?? undefined)
-                : null;
             const out = allocateEntity();
             out.kind = ImageResourceFailureKind.Unavailable;
-            out.message = decodeFailure?.reason ?? 'Image resource unavailable';
+            out.message = 'Image resource unavailable';
             out.name = null;
             ref.failure = finishEntity(out);
             ref.state = ResourceResolutionState.Failed;

package/dist/imageResourceReference.js.map

@@ -1 +1 @@
-{"version":3,"file":"imageResourceReference.js","sourceRoot":"","sources":["../src/imageResourceReference.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"imageResourceReference.js","sourceRoot":"","sources":["../src/imageResourceReference.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,2 +1,4 @@
-export { cloneImageResource, createCompressedImageResource, createEmbeddedImageResourceReference, createExternalImageResourceReference, createImageResource, createImageResourceFailure, createImageResourceFromBitmap, explainImageResourceReferenceResolution, isImageResourceEmpty, isImageUrlSameOrigin, loadImageResourceFromBase64, loadImageResourceFromBlob, loadImageResourceFromBytes, loadImageResourceFromUrl, resetFailedImageResourceReference, resolveImageResourceReference, } from './contract';
+export { cloneImageResource, createCompressedImageResource, createImageResource, invalidateImageResource, isImageResourceEmpty, } from './imageResource';
+export * from './imageResourceFrom';
+export { createEmbeddedImageResourceReference, createExternalImageResourceReference, createImageResourceFailure, explainImageResourceReferenceResolution, resetFailedImageResourceReference, resolveImageResourceReference, } from './imageResourceReference';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,6BAA6B,EAC7B,oCAAoC,EACpC,oCAAoC,EACpC,mBAAmB,EACnB,0BAA0B,EAC1B,6BAA6B,EAC7B,uCAAuC,EACvC,oBAAoB,EACpB,oBAAoB,EACpB,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,EAC1B,wBAAwB,EACxB,iCAAiC,EACjC,6BAA6B,GAC9B,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,6BAA6B,EAC7B,mBAAmB,EACnB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AACzB,cAAc,qBAAqB,CAAC;AACpC,OAAO,EACL,oCAAoC,EACpC,oCAAoC,EACpC,0BAA0B,EAC1B,uCAAuC,EACvC,iCAAiC,EACjC,6BAA6B,GAC9B,MAAM,0BAA0B,CAAC"}

package/dist/index.js

@@ -1,2 +1,4 @@
-export { cloneImageResource, createCompressedImageResource, createEmbeddedImageResourceReference, createExternalImageResourceReference, createImageResource, createImageResourceFailure, createImageResourceFromBitmap, explainImageResourceReferenceResolution, isImageResourceEmpty, isImageUrlSameOrigin, loadImageResourceFromBase64, loadImageResourceFromBlob, loadImageResourceFromBytes, loadImageResourceFromUrl, resetFailedImageResourceReference, resolveImageResourceReference, } from './contract';
+export { cloneImageResource, createCompressedImageResource, createImageResource, invalidateImageResource, isImageResourceEmpty, } from './imageResource';
+export * from './imageResourceFrom';
+export { createEmbeddedImageResourceReference, createExternalImageResourceReference, createImageResourceFailure, explainImageResourceReferenceResolution, resetFailedImageResourceReference, resolveImageResourceReference, } from './imageResourceReference';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,6BAA6B,EAC7B,oCAAoC,EACpC,oCAAoC,EACpC,mBAAmB,EACnB,0BAA0B,EAC1B,6BAA6B,EAC7B,uCAAuC,EACvC,oBAAoB,EACpB,oBAAoB,EACpB,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,EAC1B,wBAAwB,EACxB,iCAAiC,EACjC,6BAA6B,GAC9B,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,6BAA6B,EAC7B,mBAAmB,EACnB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AACzB,cAAc,qBAAqB,CAAC;AACpC,OAAO,EACL,oCAAoC,EACpC,oCAAoC,EACpC,0BAA0B,EAC1B,uCAAuC,EACvC,iCAAiC,EACjC,6BAA6B,GAC9B,MAAM,0BAA0B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/image",
-  "version": "0.5.1-edge.1471.4e82419",
+  "version": "0.5.1-edge.1685.dc0e23a",
   "author": "Joshua Granick and other contributors",
   "license": "MIT",
   "repository": {
@@ -38,9 +38,9 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/entity": "0.5.1-edge.1471.4e82419",
-    "@flighthq/image-codec": "0.5.1-edge.1471.4e82419",
-    "@flighthq/types": "0.5.1-edge.1471.4e82419"
+    "@flighthq/entity": "0.5.1-edge.1685.dc0e23a",
+    "@flighthq/image-codec": "0.5.1-edge.1685.dc0e23a",
+    "@flighthq/types": "0.5.1-edge.1685.dc0e23a"
   },
   "devDependencies": {
     "typescript": "^5.3.0"

package/src/imageResourceReference.test.ts

@@ -1,6 +1,10 @@
 import { allocateEntity, finishEntity } from '@flighthq/entity/contract';
-import { clearImageDecoders, registerImageDecoder } from '@flighthq/image-codec/contract';
-import type { Bitmap, ImageResource, ImageDecoder } from '@flighthq/types/contract';
+import type {
+  Bitmap,
+  HostImageDecodeCapabilities,
+  HostImageDecodeFormatCapability,
+  ImageResource,
+} from '@flighthq/types/contract';
 import {
   BitmapTextureSourceKind,
   EntityRuntimeKey,
@@ -20,20 +24,26 @@ import {
   resolveImageResourceReference,
 } from './imageResourceReference';
 
-let decoder: ReturnType<typeof vi.fn<ImageDecoder>>;
+const fakeSlot: HostImageDecodeFormatCapability = {
+  decode: vi.fn().mockResolvedValue({
+    data: new Uint8ClampedArray([0x11, 0x22, 0x33, 0x44]),
+    height: 1,
+    width: 1,
+  }),
+};
+
+const caps: HostImageDecodeCapabilities = { png: fakeSlot };
 
 beforeEach(() => {
-  decoder = vi.fn<ImageDecoder>().mockResolvedValue({
+  vi.mocked(fakeSlot.decode).mockResolvedValue({
     data: new Uint8ClampedArray([0x11, 0x22, 0x33, 0x44]),
     height: 1,
     width: 1,
   });
-  registerImageDecoder('image/png', decoder);
 });
 
 afterEach(() => {
   registerImageBitmapCompositionResolver(null);
-  clearImageDecoders();
 });
 
 const unusedFetch = () => Promise.resolve(null);
@@ -134,22 +144,20 @@ describe('registerImageBitmapCompositionResolver', () => {
     const ref = createEmbeddedImageResourceReference(new Uint8Array([1]), 'image/png');
     ref.bitmapComposition = { kind: 'acme/alpha-plane', payload: new Uint8Array([7]) };
 
-    expect(await resolveImageResourceReference(ref, unusedFetch, new AbortController().signal)).toBe(bitmap);
+    expect(await resolveImageResourceReference(caps, ref, unusedFetch, new AbortController().signal)).toBe(bitmap);
     expect(resolver).toHaveBeenCalledOnce();
-    expect(decoder).not.toHaveBeenCalled();
+    expect(fakeSlot.decode).not.toHaveBeenCalled();
   });
 
-  // Null is how the owner takes the join back out. The slot is the whole of image's knowledge about
-  // composition, so an emptied slot must leave the ordinary straight-decode path exactly as it was.
   it('restores the ordinary decode path when the resolver is taken back out', async () => {
     registerImageBitmapCompositionResolver(vi.fn().mockResolvedValue(createTestBitmap('straight')));
     registerImageBitmapCompositionResolver(null);
     const ref = createEmbeddedImageResourceReference(new Uint8Array([1]), 'image/png');
     ref.bitmapComposition = { kind: 'acme/alpha-plane', payload: new Uint8Array([7]) };
 
-    const source = await resolveImageResourceReference(ref, unusedFetch, new AbortController().signal);
+    const source = await resolveImageResourceReference(caps, ref, unusedFetch, new AbortController().signal);
 
-    expect(decoder).toHaveBeenCalledWith(ref.bytes);
+    expect(fakeSlot.decode).toHaveBeenCalledWith(ref.bytes);
     expect(source?.kind).toBe(BitmapTextureSourceKind);
   });
 });
@@ -180,7 +188,7 @@ describe('resetFailedImageResourceReference', () => {
 describe('resolveImageResourceReference', () => {
   it('decodes embedded bytes and marks the reference resolved', async () => {
     const ref = createEmbeddedImageResourceReference(new Uint8Array([0x89, 0x50, 0x4e, 0x47]), 'image/png');
-    const source = await resolveImageResourceReference(ref, unusedFetch, new AbortController().signal);
+    const source = await resolveImageResourceReference(caps, ref, unusedFetch, new AbortController().signal);
     expect(source).toMatchObject({
       alphaType: 'straight',
       data: new Uint8ClampedArray([0x11, 0x22, 0x33, 0x44]),
@@ -189,7 +197,7 @@ describe('resolveImageResourceReference', () => {
       width: 1,
     });
     expect(EntityRuntimeKey in source!).toBe(true);
-    expect(decoder).toHaveBeenCalledWith(ref.bytes);
+    expect(fakeSlot.decode).toHaveBeenCalledWith(ref.bytes);
     expect(ref.state).toBe(ResourceResolutionState.Resolved);
     expect(ref.failure).toBeNull();
   });
@@ -197,20 +205,19 @@ describe('resolveImageResourceReference', () => {
   it('requests and declares premultiplied output when the plain reference says its source retains it', async () => {
     const ref = createEmbeddedImageResourceReference(new Uint8Array([1]), 'image/png', 'premultiplied');
 
-    const source = await resolveImageResourceReference(ref, unusedFetch, new AbortController().signal);
+    const source = await resolveImageResourceReference(caps, ref, unusedFetch, new AbortController().signal);
 
-    expect(decoder).toHaveBeenCalledWith(ref.bytes, { premultiplyAlpha: true });
+    expect(fakeSlot.decode).toHaveBeenCalledWith(ref.bytes, { premultiplyAlpha: true });
     expect(source?.alphaType).toBe('premultiplied');
   });
 
   it('retains the missing-decoder cause when embedded bytes cannot be decoded', async () => {
-    clearImageDecoders();
     const ref = createEmbeddedImageResourceReference(new Uint8Array([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]));
 
-    expect(await resolveImageResourceReference(ref, unusedFetch, new AbortController().signal)).toBeNull();
+    expect(await resolveImageResourceReference({}, ref, unusedFetch, new AbortController().signal)).toBeNull();
     expect(ref.failure).toMatchObject({
       kind: ImageResourceFailureKind.Unavailable,
-      message: 'decoder-not-registered',
+      message: 'Image resource unavailable',
       name: null,
     });
   });
@@ -219,14 +226,14 @@ describe('resolveImageResourceReference', () => {
     const ref = createExternalImageResourceReference('atlas.png', '/assets');
     const fetched = { width: 2 } as ImageResource;
     const fetch = vi.fn().mockResolvedValue(fetched);
-    expect(await resolveImageResourceReference(ref, fetch, new AbortController().signal)).toBe(fetched);
+    expect(await resolveImageResourceReference(caps, ref, fetch, new AbortController().signal)).toBe(fetched);
     expect(fetch).toHaveBeenCalledOnce();
     expect(ref.state).toBe(ResourceResolutionState.Resolved);
   });
 
   it('records an unavailable failure when the fetch seam returns null', async () => {
     const ref = createExternalImageResourceReference('missing.png');
-    expect(await resolveImageResourceReference(ref, unusedFetch, new AbortController().signal)).toBeNull();
+    expect(await resolveImageResourceReference(caps, ref, unusedFetch, new AbortController().signal)).toBeNull();
     expect(ref.state).toBe(ResourceResolutionState.Failed);
     expect(ref.failure?.kind).toBe(ImageResourceFailureKind.Unavailable);
   });
@@ -234,7 +241,7 @@ describe('resolveImageResourceReference', () => {
   it('records a thrown cause as a failure rather than rethrowing', async () => {
     const ref = createExternalImageResourceReference('boom.png');
     const fetch = vi.fn().mockRejectedValue(new Error('network down'));
-    expect(await resolveImageResourceReference(ref, fetch, new AbortController().signal)).toBeNull();
+    expect(await resolveImageResourceReference(caps, ref, fetch, new AbortController().signal)).toBeNull();
     expect(ref.state).toBe(ResourceResolutionState.Failed);
     expect(ref.failure).toMatchObject({ kind: ImageResourceFailureKind.Error, message: 'network down', name: 'Error' });
   });
@@ -246,7 +253,7 @@ describe('resolveImageResourceReference', () => {
       controller.abort();
       return Promise.reject(new Error('aborted'));
     });
-    await expect(resolveImageResourceReference(ref, fetch, controller.signal)).rejects.toThrow('aborted');
+    await expect(resolveImageResourceReference(caps, ref, fetch, controller.signal)).rejects.toThrow('aborted');
     expect(ref.state).toBe(ResourceResolutionState.Unresolved);
     expect(ref.failure).toBeNull();
   });
@@ -256,7 +263,7 @@ describe('resolveImageResourceReference', () => {
     ref.failure = { [EntityRuntimeKey]: undefined, kind: ImageResourceFailureKind.Error, message: 'old', name: null };
     ref.state = ResourceResolutionState.Failed;
     const fetch = vi.fn().mockResolvedValue({ width: 1 } as ImageResource);
-    await resolveImageResourceReference(ref, fetch, new AbortController().signal);
+    await resolveImageResourceReference(caps, ref, fetch, new AbortController().signal);
     expect(ref.failure).toBeNull();
     expect(ref.state).toBe(ResourceResolutionState.Resolved);
   });