@flighthq/scene3d-resources 0.3.0 → 0.3.1-next.320.fe56fc2

package/dist/resolveScene3DResources.d.ts

@@ -1,5 +1,5 @@
-import type { Image, Scene3D, ImageResourceReference, ResolveScene3DResourcesOptions, Scene3DResources, Scene3DResourceResolver, UpdateScene3DResourceStreamingOptions } from '@flighthq/types/contract';
-export declare function resolveOneScene3DResourceTexture(resolver: Readonly<Scene3DResourceResolver>, ref: Readonly<ImageResourceReference>, signal: AbortSignal): Promise<Image | null>;
+import type { ImageResourceReference, ResolveScene3DResourcesOptions, Scene3D, Scene3DResources, Scene3DResourceResolver, TextureSource, UpdateScene3DResourceStreamingOptions } from '@flighthq/types/contract';
+export declare function resolveOneScene3DResourceTexture(resolver: Readonly<Scene3DResourceResolver>, ref: ImageResourceReference, signal: AbortSignal): Promise<TextureSource | null>;
 export declare function resolveScene3DResources(scene: Readonly<Scene3D>, resolver: Scene3DResourceResolver, options?: Readonly<ResolveScene3DResourcesOptions>): Scene3DResources;
 export declare function updateScene3DResourceStreaming(scene: Readonly<Scene3D>, resolver: Scene3DResourceResolver, options?: Readonly<UpdateScene3DResourceStreamingOptions>): Scene3DResources;
 //# sourceMappingURL=resolveScene3DResources.d.ts.map

package/dist/resolveScene3DResources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveScene3DResources.d.ts","sourceRoot":"","sources":["../src/resolveScene3DResources.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,KAAK,EACL,OAAO,EACP,sBAAsB,EACtB,8BAA8B,EAC9B,gBAAgB,EAChB,uBAAuB,EAGvB,qCAAqC,EACtC,MAAM,0BAA0B,CAAC;AAelC,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,QAAQ,CAAC,uBAAuB,CAAC,EAC3C,GAAG,EAAE,QAAQ,CAAC,sBAAsB,CAAC,EACrC,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAKvB;AAMD,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EACxB,QAAQ,EAAE,uBAAuB,EACjC,OAAO,CAAC,EAAE,QAAQ,CAAC,8BAA8B,CAAC,GACjD,gBAAgB,CA0ClB;AAID,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EACxB,QAAQ,EAAE,uBAAuB,EACjC,OAAO,CAAC,EAAE,QAAQ,CAAC,qCAAqC,CAAC,GACxD,gBAAgB,CAQlB"}
+{"version":3,"file":"resolveScene3DResources.d.ts","sourceRoot":"","sources":["../src/resolveScene3DResources.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,sBAAsB,EACtB,8BAA8B,EAC9B,OAAO,EACP,gBAAgB,EAChB,uBAAuB,EAGvB,aAAa,EACb,qCAAqC,EACtC,MAAM,0BAA0B,CAAC;AAUlC,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,QAAQ,CAAC,uBAAuB,CAAC,EAC3C,GAAG,EAAE,sBAAsB,EAC3B,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAE/B;AAMD,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EACxB,QAAQ,EAAE,uBAAuB,EACjC,OAAO,CAAC,EAAE,QAAQ,CAAC,8BAA8B,CAAC,GACjD,gBAAgB,CA0ClB;AAID,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EACxB,QAAQ,EAAE,uBAAuB,EACjC,OAAO,CAAC,EAAE,QAAQ,CAAC,qCAAqC,CAAC,GACxD,gBAAgB,CAQlB"}

package/dist/resolveScene3DResources.js

@@ -1,20 +1,17 @@
-import { createImageResourceFailure, loadImageResourceFromBytes } from '@flighthq/image/contract';
+import { createImageResourceFailure, resolveImageResourceReference } from '@flighthq/image/contract';
 import { queueResourceLoad } from '@flighthq/loader/contract';
 import { emitSignal } from '@flighthq/signals/contract';
-import { ImageResourceFailureKind, ImageTextureSourceKind, ResourceResolutionState, ImageResourceReferenceKind, } from '@flighthq/types/contract';
+import { ImageResourceFailureKind, ResourceResolutionState } from '@flighthq/types/contract';
 import { Scene3DResourceResolverRuntimeKey } from '@flighthq/types/contract';
 import { getScene3DResourceTextures, getScene3DTextureResourceReference } from './getScene3DResourceTextures';
-// Resolves one texture's ref to an Image (or null for an expected failure): Embedded bytes
+// Resolves one texture's ref to a TextureSource (or null for an expected failure): Embedded bytes
 // decode through @flighthq/image; External URIs go through the resolver's fetch seam. Cancellation is
 // carried by `signal` (both paths reject on abort). Exported for direct testing of the two ref kinds.
 export function resolveOneScene3DResourceTexture(resolver, ref, signal) {
-    if (ref.kind === ImageResourceReferenceKind.Embedded) {
-        return loadImageResourceFromBytes(ref.bytes, ref.mimeType ?? undefined, signal);
-    }
-    return resolver.fetch(ref, signal);
+    return resolveImageResourceReference(ref, resolver.fetch, signal);
 }
 // Reconciles the selected working set entirely synchronously. It groups shared references, recognizes
-// content already present on a texture, and binds resolver-cached images to every selected subscriber.
+// content already present on a texture, and binds resolver-cached sources to every selected subscriber.
 // Acquisition, cancellation, Promise scheduling, and priority policy belong to the explicit update/load
 // operations.
 export function resolveScene3DResources(scene, resolver, options) {
@@ -27,9 +24,9 @@ export function resolveScene3DResources(scene, resolver, options) {
         const ref = getScene3DTextureResourceReference(scene, texture);
         if (ref == null)
             continue;
-        const image = texture.dimension === '2d' ? texture.source : null;
-        if (image?.kind === ImageTextureSourceKind) {
-            runtime.resolved.set(ref, image);
+        const source = texture.dimension === '2d' ? texture.source : null;
+        if (source !== null) {
+            runtime.resolved.set(ref, source);
             ref.failure = null;
             ref.state = ResourceResolutionState.Resolved;
         }
@@ -45,8 +42,8 @@ export function resolveScene3DResources(scene, resolver, options) {
     const resolved = [];
     const unresolved = [];
     for (const [ref, subscribers] of working) {
-        const image = runtime.resolved.get(ref);
-        if (image === undefined) {
+        const source = runtime.resolved.get(ref);
+        if (source === undefined) {
             if (ref.state === ResourceResolutionState.Resolved)
                 ref.state = ResourceResolutionState.Unresolved;
             unresolved.push({ ref, textures: subscribers });
@@ -55,9 +52,9 @@ export function resolveScene3DResources(scene, resolver, options) {
         ref.failure = null;
         ref.state = ResourceResolutionState.Resolved;
         for (let i = 0; i < subscribers.length; i++) {
-            bindResolvedScene3DResource(resolver, subscribers[i], ref, image);
+            bindResolvedScene3DResource(resolver, subscribers[i], ref, source);
         }
-        resolved.push({ image, ref, textures: subscribers });
+        resolved.push({ ref, source, textures: subscribers });
     }
     return { resolved, scene, unresolved };
 }
@@ -95,16 +92,16 @@ function cancelDroppedResolutions(resolver, working) {
         }
     }
 }
-function finishScene3DResourceResolution(resolver, ref, entry, image) {
+function finishScene3DResourceResolution(resolver, ref, entry, source) {
     const runtime = resolver[Scene3DResourceResolverRuntimeKey];
     // Ignore a late settle whose entry was already cancelled or replaced by a newer request.
     if (runtime.inFlight.get(ref) !== entry)
         return;
     runtime.inFlight.delete(ref);
-    if (image === null) {
-        ref.failure = {
+    if (source === null) {
+        ref.failure ??= {
             kind: ImageResourceFailureKind.Unavailable,
-            message: 'Image resource resolution returned no image',
+            message: 'Image resource resolution returned no source',
             name: null,
         };
         ref.state = ResourceResolutionState.Failed;
@@ -112,11 +109,11 @@ function finishScene3DResourceResolution(resolver, ref, entry, image) {
             emitScene3DResourceEvent(resolver, texture, ref, false);
         return;
     }
-    runtime.resolved.set(ref, image);
+    runtime.resolved.set(ref, source);
     ref.failure = null;
     ref.state = ResourceResolutionState.Resolved;
     for (const texture of entry.subscribers)
-        bindResolvedScene3DResource(resolver, texture, ref, image);
+        bindResolvedScene3DResource(resolver, texture, ref, source);
 }
 function failScene3DResourceResolution(resolver, ref, entry, cause) {
     const runtime = resolver[Scene3DResourceResolverRuntimeKey];
@@ -131,12 +128,12 @@ function failScene3DResourceResolution(resolver, ref, entry, cause) {
     for (const texture of entry.subscribers)
         emitScene3DResourceEvent(resolver, texture, ref, false);
 }
-function bindResolvedScene3DResource(resolver, texture, ref, image) {
+function bindResolvedScene3DResource(resolver, texture, ref, source) {
     if (texture.dimension !== '2d')
         return;
-    if (texture.source === image)
+    if (texture.source === source)
         return;
-    texture.source = image;
+    texture.source = source;
     texture.version = (texture.version + 1) >>> 0;
     emitScene3DResourceEvent(resolver, texture, ref, true);
 }
@@ -191,7 +188,7 @@ function requestWorkingResolutions(resolver, working, options) {
             promise: _resolvedVoid,
             subscribers: new Set(subscribers),
         };
-        entry.promise = handle.promise.then((image) => finishScene3DResourceResolution(resolver, ref, entry, image), (cause) => failScene3DResourceResolution(resolver, ref, entry, cause));
+        entry.promise = handle.promise.then((source) => finishScene3DResourceResolution(resolver, ref, entry, source), (cause) => failScene3DResourceResolution(resolver, ref, entry, cause));
         runtime.inFlight.set(ref, entry);
     }
 }

package/dist/resolveScene3DResources.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/scene3d-resources",
-  "version": "0.3.0",
+  "version": "0.3.1-next.320.fe56fc2",
   "author": "Joshua Granick and other contributors",
   "license": "MIT",
   "repository": {
@@ -38,18 +38,18 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/entity": "0.3.0",
-    "@flighthq/image": "0.3.0",
-    "@flighthq/loader": "0.3.0",
-    "@flighthq/log": "0.3.0",
-    "@flighthq/net": "0.3.0",
-    "@flighthq/node": "0.3.0",
-    "@flighthq/scene3d": "0.3.0",
-    "@flighthq/scene3d-formats": "0.3.0",
-    "@flighthq/signals": "0.3.0",
-    "@flighthq/texture": "0.3.0",
-    "@flighthq/tween": "0.3.0",
-    "@flighthq/types": "0.3.0"
+    "@flighthq/entity": "0.3.1-next.320.fe56fc2",
+    "@flighthq/image": "0.3.1-next.320.fe56fc2",
+    "@flighthq/loader": "0.3.1-next.320.fe56fc2",
+    "@flighthq/log": "0.3.1-next.320.fe56fc2",
+    "@flighthq/net": "0.3.1-next.320.fe56fc2",
+    "@flighthq/node": "0.3.1-next.320.fe56fc2",
+    "@flighthq/scene3d": "0.3.1-next.320.fe56fc2",
+    "@flighthq/scene3d-formats": "0.3.1-next.320.fe56fc2",
+    "@flighthq/signals": "0.3.1-next.320.fe56fc2",
+    "@flighthq/texture": "0.3.1-next.320.fe56fc2",
+    "@flighthq/tween": "0.3.1-next.320.fe56fc2",
+    "@flighthq/types": "0.3.1-next.320.fe56fc2"
   },
   "devDependencies": {
     "@flighthq/materials": "*",

package/src/getScene3DResourceTextures.test.ts

@@ -11,6 +11,7 @@ import { getScene3DResourceTextures, getScene3DTextureResourceReference } from '
 
 function embeddedRef(state: ResourceResolutionState = ResourceResolutionState.Unresolved): ImageResourceReference {
   return {
+    alphaType: 'straight',
     bytes: new Uint8Array([1, 2, 3]),
     failure: null,
     kind: ImageResourceReferenceKind.Embedded,

package/src/resolveScene3DResources.test.ts

@@ -21,12 +21,12 @@ import type * as Scene3DResourceResolverModule from './sceneResourceResolver';
 import type * as Scene3DResourceSignalsModule from './sceneResourceSignals';
 
 const fakeImage = { height: 2, kind: ImageTextureSourceKind, width: 2 } as unknown as Image;
-type LoadImageResourceFromBytes = typeof ImageModule.loadImageResourceFromBytes;
+type ResolveImageResourceReference = typeof ImageModule.resolveImageResourceReference;
 
 let createBuiltInScene3DResourceResolver: typeof Scene3DResourceResolverModule.createBuiltInScene3DResourceResolver;
 let disposeScene3DResourceResolver: typeof Scene3DResourceResolverModule.disposeScene3DResourceResolver;
 let enableScene3DResourceSignals: typeof Scene3DResourceSignalsModule.enableScene3DResourceSignals;
-let loadFromBytes: Mock<LoadImageResourceFromBytes>;
+let resolveReference: Mock<ResolveImageResourceReference>;
 let resolveOneScene3DResourceTexture: typeof ResolveScene3DResourcesModule.resolveOneScene3DResourceTexture;
 let resolveScene3DResources: typeof ResolveScene3DResourcesModule.resolveScene3DResources;
 let updateScene3DResourceStreaming: typeof ResolveScene3DResourcesModule.updateScene3DResourceStreaming;
@@ -37,6 +37,7 @@ let sceneResources: ImageResourceReference[] = [];
 function embeddedRef(mimeType: string | null = 'image/png'): ImageResourceReference {
   const ref: ImageResourceReference = {
     bytes: new Uint8Array([9, 9]),
+    alphaType: 'straight',
     failure: null,
     kind: ImageResourceReferenceKind.Embedded,
     mimeType,
@@ -86,13 +87,12 @@ async function settle(resolver: Scene3DResourceResolver): Promise<void> {
 
 beforeAll(async () => {
   vi.resetModules();
-  loadFromBytes = vi.fn<LoadImageResourceFromBytes>();
-  // Override only the two loaders; the rest of the module stays real, so growing @flighthq/image cannot
+  resolveReference = vi.fn<ResolveImageResourceReference>();
+  // Override only the resource atom; the rest of the module stays real, so growing @flighthq/image cannot
   // silently blank out a code path under test.
   vi.doMock('@flighthq/image/contract', async (importOriginal) => ({
     ...(await importOriginal<typeof ImageModule>()),
-    loadImageResourceFromBytes: loadFromBytes,
-    loadImageResourceFromUrl: vi.fn(),
+    resolveImageResourceReference: resolveReference,
   }));
   ({ resolveOneScene3DResourceTexture, resolveScene3DResources, updateScene3DResourceStreaming } =
     await import('./resolveScene3DResources'));
@@ -107,31 +107,36 @@ afterAll(() => {
 });
 
 afterEach(() => {
-  loadFromBytes.mockReset();
+  resolveReference.mockReset();
 });
 
 describe('resolveOneScene3DResourceTexture', () => {
   it('decodes embedded bytes through @flighthq/image', async () => {
-    loadFromBytes.mockResolvedValue(fakeImage);
+    resolveReference.mockResolvedValue(fakeImage);
     const resolver = createBuiltInScene3DResourceResolver();
     const ref = embeddedRef('image/jpeg');
     const signal = new AbortController().signal;
     const result = await resolveOneScene3DResourceTexture(resolver, ref, signal);
-    expect(loadFromBytes).toHaveBeenCalledWith((ref as { bytes: Uint8Array }).bytes, 'image/jpeg', signal);
+    expect(resolveReference).toHaveBeenCalledWith(ref, resolver.fetch, signal);
     expect(result).toBe(fakeImage);
     disposeScene3DResourceResolver(resolver);
   });
 
-  it('passes undefined for a null embedded mimeType', async () => {
-    loadFromBytes.mockResolvedValue(fakeImage);
+  it('passes the complete plain embedded reference to the shared resource atom', async () => {
+    resolveReference.mockResolvedValue(fakeImage);
     const resolver = createBuiltInScene3DResourceResolver();
-    await resolveOneScene3DResourceTexture(resolver, embeddedRef(null), new AbortController().signal);
-    expect(loadFromBytes).toHaveBeenCalledWith(expect.anything(), undefined, expect.anything());
+    const ref = embeddedRef(null);
+    const signal = new AbortController().signal;
+    await resolveOneScene3DResourceTexture(resolver, ref, signal);
+    expect(resolveReference).toHaveBeenCalledWith(ref, resolver.fetch, signal);
     disposeScene3DResourceResolver(resolver);
   });
 
   it('routes external refs through the resolver fetch seam', async () => {
     const fetch = vi.fn(async () => fakeImage);
+    resolveReference.mockImplementation((ref, resolveFetch, signal) =>
+      ref.kind === ImageResourceReferenceKind.External ? resolveFetch(ref, signal) : Promise.resolve(null),
+    );
     const resolver = createBuiltInScene3DResourceResolver({ fetch });
     const ref = externalRef();
     const signal = new AbortController().signal;
@@ -145,8 +150,8 @@ describe('resolveOneScene3DResourceTexture', () => {
 describe('resolveScene3DResources', () => {
   it('does not cancel acquisition owned by a streaming update', async () => {
     let loadSignal: AbortSignal | undefined;
-    loadFromBytes.mockImplementation(
-      (_bytes, _mime, signal) =>
+    resolveReference.mockImplementation(
+      (_ref, _fetch, signal) =>
         new Promise<Image>((_resolve, reject) => {
           loadSignal = signal;
           signal?.addEventListener('abort', () => reject(signal.reason));
@@ -168,7 +173,7 @@ describe('resolveScene3DResources', () => {
   });
 
   it('returns the selected unresolved working set without starting acquisition', () => {
-    loadFromBytes.mockResolvedValue(fakeImage);
+    resolveReference.mockResolvedValue(fakeImage);
     const ref = embeddedRef();
     const a = createTexture({ resource: ref });
     const b = createTexture({ resource: ref });
@@ -181,7 +186,7 @@ describe('resolveScene3DResources', () => {
     expect(resources.resolved).toEqual([]);
     expect(resources.unresolved).toEqual([{ ref, textures: [a, b] }]);
     expect(ref.state).toBe(ResourceResolutionState.Unresolved);
-    expect(loadFromBytes).not.toHaveBeenCalled();
+    expect(resolveReference).not.toHaveBeenCalled();
     disposeScene3DResourceResolver(resolver);
   });
 
@@ -197,7 +202,7 @@ describe('resolveScene3DResources', () => {
     const resources = resolveScene3DResources(scene, resolver);
 
     expect(resources.unresolved).toEqual([]);
-    expect(resources.resolved).toEqual([{ image: fakeImage, ref, textures: [a, b] }]);
+    expect(resources.resolved).toEqual([{ ref, source: fakeImage, textures: [a, b] }]);
     expect(getTextureSource(b)).toBe(fakeImage);
     expect(ref.state).toBe(ResourceResolutionState.Resolved);
     disposeScene3DResourceResolver(resolver);
@@ -206,7 +211,7 @@ describe('resolveScene3DResources', () => {
 
 describe('updateScene3DResourceStreaming', () => {
   it('resolves every pending texture, binding the image and advancing state', async () => {
-    loadFromBytes.mockResolvedValue(fakeImage);
+    resolveReference.mockResolvedValue(fakeImage);
     const a = pendingTexture();
     const b = pendingTexture();
     const scene = meshScene3D(a, b);
@@ -224,7 +229,7 @@ describe('updateScene3DResourceStreaming', () => {
   });
 
   it('fetches and decodes one shared resource once, then binds every subscribed texture', async () => {
-    loadFromBytes.mockResolvedValue(fakeImage);
+    resolveReference.mockResolvedValue(fakeImage);
     const ref = embeddedRef();
     const a = createTexture({ resource: ref });
     const b = createTexture({ resource: ref });
@@ -234,7 +239,7 @@ describe('updateScene3DResourceStreaming', () => {
     updateScene3DResourceStreaming(scene, resolver);
     await settle(resolver);
 
-    expect(loadFromBytes).toHaveBeenCalledTimes(1);
+    expect(resolveReference).toHaveBeenCalledTimes(1);
     expect(getTextureSource(a)).toBe(fakeImage);
     expect(getTextureSource(b)).toBe(fakeImage);
     expect(ref.state).toBe(ResourceResolutionState.Resolved);
@@ -243,8 +248,8 @@ describe('updateScene3DResourceStreaming', () => {
 
   it('keeps a shared load alive until its final subscriber leaves the working set', async () => {
     let loadSignal: AbortSignal | undefined;
-    loadFromBytes.mockImplementation(
-      (_bytes, _mime, signal) =>
+    resolveReference.mockImplementation(
+      (_ref, _fetch, signal) =>
         new Promise<Image>((_resolve, reject) => {
           loadSignal = signal;
           signal?.addEventListener('abort', () => reject(signal.reason));
@@ -269,7 +274,7 @@ describe('updateScene3DResourceStreaming', () => {
   });
 
   it('binds a later subscriber from the resolved resource cache without decoding again', async () => {
-    loadFromBytes.mockResolvedValue(fakeImage);
+    resolveReference.mockResolvedValue(fakeImage);
     const ref = embeddedRef();
     const a = createTexture({ resource: ref });
     const b = createTexture({ resource: ref });
@@ -283,12 +288,12 @@ describe('updateScene3DResourceStreaming', () => {
 
     updateScene3DResourceStreaming(scene, resolver, { select: (texture) => texture === b });
     expect(getTextureSource(b)).toBe(fakeImage);
-    expect(loadFromBytes).toHaveBeenCalledTimes(1);
+    expect(resolveReference).toHaveBeenCalledTimes(1);
     disposeScene3DResourceResolver(resolver);
   });
 
   it('limits the working set to textures the select predicate accepts', async () => {
-    loadFromBytes.mockResolvedValue(fakeImage);
+    resolveReference.mockResolvedValue(fakeImage);
     const wanted = pendingTexture();
     const skipped = pendingTexture();
     const scene = meshScene3D(wanted, skipped);
@@ -304,6 +309,19 @@ describe('updateScene3DResourceStreaming', () => {
   });
 
   it('fails a texture whose external fetch returns null', async () => {
+    resolveReference.mockImplementation(async (ref, fetch, signal) => {
+      if (ref.kind !== ImageResourceReferenceKind.External) return null;
+      const source = await fetch(ref, signal);
+      if (source === null) {
+        ref.failure = {
+          kind: ImageResourceFailureKind.Unavailable,
+          message: 'Image resource unavailable',
+          name: null,
+        };
+        ref.state = ResourceResolutionState.Failed;
+      }
+      return source;
+    });
     const texture = createTexture({ resource: externalRef() });
     const scene = meshScene3D(texture);
     const resolver = createBuiltInScene3DResourceResolver({ fetch: async () => null });
@@ -315,14 +333,14 @@ describe('updateScene3DResourceStreaming', () => {
     expect(resourceOf(texture)?.state).toBe(ResourceResolutionState.Failed);
     expect(resourceOf(texture)?.failure).toEqual({
       kind: ImageResourceFailureKind.Unavailable,
-      message: 'Image resource resolution returned no image',
+      message: 'Image resource unavailable',
       name: null,
     });
     disposeScene3DResourceResolver(resolver);
   });
 
   it('fails a texture whose decode throws', async () => {
-    loadFromBytes.mockRejectedValue(new Error('bad image'));
+    resolveReference.mockRejectedValue(new Error('bad image'));
     const texture = pendingTexture();
     const scene = meshScene3D(texture);
     const resolver = createBuiltInScene3DResourceResolver();
@@ -342,8 +360,8 @@ describe('updateScene3DResourceStreaming', () => {
   it('cancels and reverts a load dropped from the working set, then re-requests on re-entry', async () => {
     const loadSignals: AbortSignal[] = [];
     // A load that hangs until its signal aborts, so we can drop it mid-flight.
-    loadFromBytes.mockImplementation(
-      (_bytes, _mime, signal) =>
+    resolveReference.mockImplementation(
+      (_ref, _fetch, signal) =>
         new Promise<Image>((_resolve, reject) => {
           if (signal !== undefined) loadSignals.push(signal);
           signal?.addEventListener('abort', () => reject(signal.reason));
@@ -372,21 +390,21 @@ describe('updateScene3DResourceStreaming', () => {
   });
 
   it('does not re-request a texture already in flight', async () => {
-    loadFromBytes.mockImplementation(() => new Promise<Image>(() => {}));
+    resolveReference.mockImplementation(() => new Promise<Image>(() => {}));
     const texture = pendingTexture();
     const scene = meshScene3D(texture);
     const resolver = createBuiltInScene3DResourceResolver();
 
     updateScene3DResourceStreaming(scene, resolver);
-    await vi.waitFor(() => expect(loadFromBytes).toHaveBeenCalledTimes(1));
+    await vi.waitFor(() => expect(resolveReference).toHaveBeenCalledTimes(1));
     updateScene3DResourceStreaming(scene, resolver);
-    expect(loadFromBytes).toHaveBeenCalledTimes(1);
+    expect(resolveReference).toHaveBeenCalledTimes(1);
 
     disposeScene3DResourceResolver(resolver);
   });
 
   it('emits onResourceResolved when signals are enabled', async () => {
-    loadFromBytes.mockResolvedValue(fakeImage);
+    resolveReference.mockResolvedValue(fakeImage);
     const texture = pendingTexture();
     const scene = meshScene3D(texture);
     const resolver = createBuiltInScene3DResourceResolver();
@@ -405,7 +423,7 @@ describe('updateScene3DResourceStreaming', () => {
   });
 
   it('emits onResourceFailed when a decode throws', async () => {
-    loadFromBytes.mockRejectedValue(new Error('bad image'));
+    resolveReference.mockRejectedValue(new Error('bad image'));
     const texture = pendingTexture();
     const scene = meshScene3D(texture);
     const resolver = createBuiltInScene3DResourceResolver();

package/src/revealScene3DResourcesOnResolve.test.ts

@@ -23,6 +23,7 @@ const testResources: EmbeddedImageResourceReference[] = [];
 
 function pendingRef(): EmbeddedImageResourceReference {
   const ref: EmbeddedImageResourceReference = {
+    alphaType: 'straight',
     bytes: new Uint8Array([0x89, 0x50, 0x4e, 0x47]),
     failure: null,
     kind: 'Embedded',

package/src/sceneResourceResolver.test.ts

@@ -61,6 +61,7 @@ describe('disposeScene3DResourceResolver', () => {
     const resolver = createScene3DResourceResolver();
     const controller = new AbortController();
     const ref = {
+      alphaType: 'straight',
       bytes: new Uint8Array(0),
       failure: null,
       kind: ImageResourceReferenceKind.Embedded,

package/src/sceneResourceSignals.test.ts

@@ -11,6 +11,7 @@ import {
 } from './sceneResourceSignals';
 
 const ref: ImageResourceReference = {
+  alphaType: 'straight',
   bytes: new Uint8Array(),
   failure: null,
   kind: ImageResourceReferenceKind.Embedded,