@flighthq/image 0.2.1-next.841.373388f → 0.3.0-edge.1458.0c01b63

package/dist/contract.d.ts

@@ -0,0 +1,3 @@
+export * from './imageResource';
+export * from './imageResourceFrom';
+//# sourceMappingURL=contract.d.ts.map

package/dist/contract.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC"}

package/dist/contract.js

@@ -0,0 +1,3 @@
+export * from './imageResource';
+export * from './imageResourceFrom';
+//# sourceMappingURL=contract.js.map

package/dist/contract.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC"}

package/dist/imageResource.d.ts

@@ -1,13 +1,7 @@
-import type { ImageResource, ImageResourceCompressed } from '@flighthq/types';
-export declare function cloneImageResource(resource: Readonly<ImageResource>): ImageResource;
-export declare function createCompressedImageResource(compressed: Readonly<ImageResourceCompressed>): ImageResource;
-export declare function createImageResource(image?: CanvasImageSource): ImageResource;
-export declare function disposeImageResource(resource: ImageResource): void;
-export declare function getImageResourceByteSize(resource: Readonly<ImageResource>): number;
-export declare function hasImageResourceData(resource: Readonly<ImageResource>): boolean;
-export declare function hasImageResourcePixels(resource: Readonly<ImageResource>): boolean;
-export declare function hasImageResourceSource(resource: Readonly<ImageResource>): boolean;
-export declare function invalidateImageResource(resource: ImageResource): void;
-export declare function isImageResourceEmpty(resource: Readonly<ImageResource>): boolean;
-export declare function setImageResourceSource(resource: ImageResource, element: CanvasImageSource | null): void;
+import type { CompressedImage, CompressedImageData, Image } from '@flighthq/types/contract';
+export declare function cloneImageResource(resource: Readonly<Image>): Image;
+export declare function createCompressedImage(compressed: Readonly<CompressedImageData>): CompressedImage;
+export declare function createImageResource(image: CanvasImageSource): Image;
+export declare function invalidateImageResource(resource: Image): void;
+export declare function isImageResourceEmpty(resource: Readonly<Image>): boolean;
 //# sourceMappingURL=imageResource.d.ts.map

package/dist/imageResource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imageResource.d.ts","sourceRoot":"","sources":["../src/imageResource.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAM9E,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,aAAa,CAWnF;AAMD,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,QAAQ,CAAC,uBAAuB,CAAC,GAAG,aAAa,CAW1G;AAED,wBAAgB,mBAAmB,CAAC,KAAK,CAAC,EAAE,iBAAiB,GAAG,aAAa,CAa5E;AAMD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,CAKlE;AAMD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,MAAM,CAElF;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,OAAO,CAE/E;AAQD,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,OAAO,CAEjF;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,OAAO,CAEjF;AAKD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,CAErE;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,OAAO,CAE/E;AAID,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI,GAAG,IAAI,CAIvG"}
+{"version":3,"file":"imageResource.d.ts","sourceRoot":"","sources":["../src/imageResource.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAK5F,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,CAQnE;AAID,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,GAAG,eAAe,CAQhG;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,GAAG,KAAK,CAUnE;AAGD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,KAAK,GAAG,IAAI,CAG7D;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,OAAO,CAEvE"}

package/dist/imageResource.js

@@ -1,104 +1,52 @@
-import { createEntity } from '@flighthq/entity';
-// Allocates a new resource identity over the SAME underlying pixels. The element, the `data` array, and
-// the `compressed` payload are shared by reference, not duplicated — clone gives you an independent
-// version counter and entity identity over the same pixels, e.g. to upload one image into two render
-// states with separate invalidation. Use a Surface copy when you need the pixels themselves duplicated.
+import { createEntity } from '@flighthq/entity/contract';
+import { CompressedImageTextureSourceKind, ImageTextureSourceKind } from '@flighthq/types/contract';
+// Allocates a new resource identity over the same borrowed host image. The host handle is shared by
+// reference; the clone owns an independent version counter for renderer cache invalidation.
 export function cloneImageResource(resource) {
     return createEntity({
-        alphaType: resource.alphaType,
-        compressed: resource.compressed,
-        data: resource.data,
-        format: resource.format,
         height: resource.height,
+        kind: resource.kind,
         source: resource.source,
         version: resource.version,
         width: resource.width,
     });
 }
-// Wraps a parsed block-compressed (KTX2/DDS/Basis) payload as an ImageResource. `width`/`height` mirror
-// the container's base-mip dimensions so the same 2D draw path sizes the quad; `source`/`data` stay null
-// (a GPU backend uploads the `compressed` payload instead, and a Canvas/DOM backend ignores it). The
-// caller owns the payload bytes the container's level ranges index into.
-export function createCompressedImageResource(compressed) {
+// Wraps a parsed block-compressed payload as its own GPU-only source. The caller owns the payload
+// bytes indexed by the container's level ranges.
+export function createCompressedImage(compressed) {
     return createEntity({
-        alphaType: 'straight',
         compressed,
-        data: null,
-        format: 'rgba8unorm',
         height: compressed.container.height,
-        source: null,
+        kind: CompressedImageTextureSourceKind,
         version: 0,
         width: compressed.container.width,
     });
 }
 export function createImageResource(image) {
     const resource = createEntity({
-        alphaType: 'straight',
-        compressed: null,
-        data: null,
-        format: 'rgba8unorm',
         height: 0,
-        source: image ?? null,
+        kind: ImageTextureSourceKind,
+        source: image,
         version: 0,
         width: 0,
     });
-    if (resource.source !== null)
-        updateImageResourceSize(resource);
+    updateImageResourceSize(resource);
     return resource;
 }
-// Releases the element and raw-data references so they become eligible for GC, and marks the resource
-// changed. This does NOT free the backend GPU texture (that is owned per render state — call the
-// backend's destroy*Texture) and does NOT close an owned ImageBitmap (ownership is ambiguous; close it
-// explicitly if you own it). Dimensions are left intact; setImageResourceSource repopulates the resource.
-export function disposeImageResource(resource) {
-    resource.compressed = null;
-    resource.data = null;
-    resource.source = null;
-    invalidateImageResource(resource);
-}
-// Returns the byte footprint of the CPU-side pixel data (`data` array). Returns 0 when `data` is
-// null (element-only resource — the GPU texture footprint is tracked by the render state, not here).
-// For `rgba8unorm` (the default) the result equals width × height × 4; other formats are not yet
-// exercised but the formula still applies (byteLength of the actual buffer is authoritative).
-export function getImageResourceByteSize(resource) {
-    return resource.data !== null ? resource.data.byteLength : 0;
-}
-export function hasImageResourceData(resource) {
-    return resource.data !== null;
-}
-// True when the resource carries pixels in any representation — a decoded `source` element, raw CPU
-// `data`, or a block-`compressed` payload. The upload-readiness predicate for backends that can consume
-// any of them: an element-only load, a data-only generated Surface, a compressed-only parsed container,
-// or a resource holding several are all uploadable. Prefer this over hasImageResourceSource at any gate
-// that feeds a source-or-data uploader (bindGlTexture, bindWgpuTexture), so a memory-generated Surface
-// or a compressed container is not rejected for lacking an element.
-export function hasImageResourcePixels(resource) {
-    return resource.source !== null || resource.data !== null || resource.compressed !== null;
-}
-export function hasImageResourceSource(resource) {
-    return resource.source !== null;
-}
-// Bumps the resource content revision so consumers (renderer texture caches) know the pixels behind
-// this image changed even though the object identity is the same. Call after mutating the backing
-// pixels in place; the Surface API calls it for you. Resource-tier analog of invalidateNodeLocalContent.
+// Marks changed pixels behind the same borrowed host handle. The handle itself remains immutable.
 export function invalidateImageResource(resource) {
+    updateImageResourceSize(resource);
     resource.version = (resource.version + 1) >>> 0;
 }
 export function isImageResourceEmpty(resource) {
     return resource.width <= 0 || resource.height <= 0;
 }
-// Swaps the element representation, re-reads its dimensions, and marks the resource changed. Pass
-// null to clear the element (dimensions are left intact; use disposeImageResource to release for GC).
-export function setImageResourceSource(resource, element) {
-    resource.source = element;
-    if (element !== null)
-        updateImageResourceSize(resource);
-    invalidateImageResource(resource);
-}
-// Reads pixel dimensions from the current (non-null) element. Video sources carry their size on
+// Reads pixel dimensions from the current host element. Video sources carry their size on
 // videoWidth/videoHeight; every other CanvasImageSource exposes width/height directly.
 function updateImageResourceSize(resource) {
     const element = resource.source;
+    if (element === null)
+        return;
     if (element instanceof HTMLVideoElement) {
         resource.width = element.videoWidth;
         resource.height = element.videoHeight;

package/dist/imageResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"imageResource.js","sourceRoot":"","sources":["../src/imageResource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"imageResource.js","sourceRoot":"","sources":["../src/imageResource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,gCAAgC,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAEpG,oGAAoG;AACpG,4FAA4F;AAC5F,MAAM,UAAU,kBAAkB,CAAC,QAAyB;IAC1D,OAAO,YAAY,CAAC;QAClB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,KAAK,EAAE,QAAQ,CAAC,KAAK;KACtB,CAAC,CAAC;AACL,CAAC;AAED,kGAAkG;AAClG,iDAAiD;AACjD,MAAM,UAAU,qBAAqB,CAAC,UAAyC;IAC7E,OAAO,YAAY,CAAC;QAClB,UAAU;QACV,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,MAAM;QACnC,IAAI,EAAE,gCAAgC;QACtC,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,UAAU,CAAC,SAAS,CAAC,KAAK;KAClC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAwB;IAC1D,MAAM,QAAQ,GAAU,YAAY,CAAC;QACnC,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,sBAAsB;QAC5B,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,CAAC;KACT,CAAC,CAAC;IACH,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAClC,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,kGAAkG;AAClG,MAAM,UAAU,uBAAuB,CAAC,QAAe;IACrD,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAClC,QAAQ,CAAC,OAAO,GAAG,CAAC,QAAQ,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAyB;IAC5D,OAAO,QAAQ,CAAC,KAAK,IAAI,CAAC,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC;AACrD,CAAC;AAED,0FAA0F;AAC1F,uFAAuF;AACvF,SAAS,uBAAuB,CAAC,QAAe;IAC9C,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC;IAChC,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO;IAC7B,IAAI,OAAO,YAAY,gBAAgB,EAAE,CAAC;QACxC,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC;QACpC,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IACxC,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,GAAG,OAA6D,CAAC;QAC5E,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QAC7B,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IACjC,CAAC;AACH,CAAC"}

package/dist/imageResourceFrom.d.ts

@@ -1,11 +1,11 @@
-import type { ImageResource } from '@flighthq/types';
-export declare function createCanvasFromImageResource(image: Readonly<ImageResource>): HTMLCanvasElement | null;
-export declare function createImageResourceFromCanvas(canvas: HTMLCanvasElement): ImageResource;
-export declare function createImageResourceFromImageBitmap(bitmap: ImageBitmap): ImageResource;
-export declare function createImageResourceFromImageElement(img: HTMLImageElement): ImageResource;
-export declare function isImageResourceSameOrigin(url: string): boolean;
-export declare function loadImageResourceFromBase64(base64: string, mimeType: string, signal?: AbortSignal): Promise<ImageResource>;
-export declare function loadImageResourceFromBlob(blob: Blob, signal?: AbortSignal): Promise<ImageResource>;
-export declare function loadImageResourceFromBytes(bytes: Uint8Array, mimeType?: string, signal?: AbortSignal): Promise<ImageResource>;
-export declare function loadImageResourceFromUrl(url: string, crossOrigin?: string, signal?: AbortSignal): Promise<ImageResource>;
+import type { Bitmap, Image } from '@flighthq/types/contract';
+export declare function createImageResourceFromBitmap(bitmap: Readonly<Bitmap>): Image;
+export declare function createImageResourceFromCanvas(canvas: HTMLCanvasElement): Image;
+export declare function createImageResourceFromImageBitmap(bitmap: ImageBitmap): Image;
+export declare function createImageResourceFromImageElement(img: HTMLImageElement): Image;
+export declare function isImageUrlSameOrigin(url: string): boolean;
+export declare function loadImageResourceFromBase64(base64: string, mimeType: string, signal?: AbortSignal): Promise<Image>;
+export declare function loadImageResourceFromBlob(blob: Blob, signal?: AbortSignal): Promise<Image>;
+export declare function loadImageResourceFromBytes(bytes: Uint8Array, mimeType?: string, signal?: AbortSignal): Promise<Image>;
+export declare function loadImageResourceFromUrl(url: string, crossOrigin?: 'anonymous' | 'use-credentials', signal?: AbortSignal): Promise<Image>;
 //# sourceMappingURL=imageResourceFrom.d.ts.map

package/dist/imageResourceFrom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imageResourceFrom.d.ts","sourceRoot":"","sources":["../src/imageResourceFrom.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAQrD,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,iBAAiB,GAAG,IAAI,CAStG;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,iBAAiB,GAAG,aAAa,CAWtF;AAED,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,WAAW,GAAG,aAAa,CAWrF;AAED,wBAAgB,mCAAmC,CAAC,GAAG,EAAE,gBAAgB,GAAG,aAAa,CAWxF;AAED,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAO9D;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,aAAa,CAAC,CAExB;AAED,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAOxG;AAED,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,UAAU,EACjB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,aAAa,CAAC,CAOxB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,MAAM,EACX,WAAW,CAAC,EAAE,MAAM,EACpB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,aAAa,CAAC,CAexB"}
+{"version":3,"file":"imageResourceFrom.d.ts","sourceRoot":"","sources":["../src/imageResourceFrom.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAO9D,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,KAAK,CAQ7E;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,iBAAiB,GAAG,KAAK,CAQ9E;AAED,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,WAAW,GAAG,KAAK,CAQ7E;AAED,wBAAgB,mCAAmC,CAAC,GAAG,EAAE,gBAAgB,GAAG,KAAK,CAQhF;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAOzD;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,KAAK,CAAC,CAEhB;AAED,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,CAOhG;AAED,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,UAAU,EACjB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,KAAK,CAAC,CAOhB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,MAAM,EACX,WAAW,CAAC,EAAE,WAAW,GAAG,iBAAiB,EAC7C,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,KAAK,CAAC,CA0BhB"}

package/dist/imageResourceFrom.js

@@ -1,29 +1,23 @@
-import { createEntity } from '@flighthq/entity';
-import { detectImageMimeType } from '@flighthq/image-codec';
-// Materializes a data-backed ImageResource's raw pixels into a detached, drawable HTMLCanvasElement
-// via putImageData. The inverse of createImageResourceFromCanvas: it turns the portable `data`
-// representation of a generated Surface into the host element that Canvas/DOM `drawImage` needs.
-// Returns null for an element-only resource (no `data` to transcode). Straight-alpha in, straight-alpha
-// out — the drawn canvas matches the source's `alphaType`. Callers that draw data-only resources cache
-// the result keyed on `version`; this primitive allocates a fresh canvas on every call.
-export function createCanvasFromImageResource(image) {
-    if (image.data === null)
-        return null;
+import { createEntity } from '@flighthq/entity/contract';
+import { detectImageMimeType } from '@flighthq/image-codec/contract';
+import { ImageTextureSourceKind } from '@flighthq/types/contract';
+// Transcodes a Bitmap's raw pixels into an element-backed Image, via a detached canvas.
+// The inverse of captureBitmapFromImageResource. Lives here rather than in @flighthq/bitmap because a
+// conversion belongs with the type it PRODUCES: you look for it under what you want to end up with.
+// Allocates a fresh canvas on every call; callers that draw repeatedly should hold the result.
+export function createImageResourceFromBitmap(bitmap) {
     const canvas = document.createElement('canvas');
-    canvas.width = image.width;
-    canvas.height = image.height;
-    const imageData = new globalThis.ImageData(image.width, image.height);
-    imageData.data.set(image.data);
-    canvas.getContext('2d').putImageData(imageData, 0, 0);
-    return canvas;
+    canvas.width = bitmap.width;
+    canvas.height = bitmap.height;
+    const domImageData = new globalThis.ImageData(bitmap.width, bitmap.height);
+    domImageData.data.set(bitmap.data);
+    canvas.getContext('2d').putImageData(domImageData, 0, 0);
+    return createImageResourceFromCanvas(canvas);
 }
 export function createImageResourceFromCanvas(canvas) {
     return createEntity({
-        alphaType: 'straight',
-        compressed: null,
-        data: null,
-        format: 'rgba8unorm',
         height: canvas.height,
+        kind: ImageTextureSourceKind,
         source: canvas,
         version: 0,
         width: canvas.width,
@@ -31,11 +25,8 @@ export function createImageResourceFromCanvas(canvas) {
 }
 export function createImageResourceFromImageBitmap(bitmap) {
     return createEntity({
-        alphaType: 'straight',
-        compressed: null,
-        data: null,
-        format: 'rgba8unorm',
         height: bitmap.height,
+        kind: ImageTextureSourceKind,
         source: bitmap,
         version: 0,
         width: bitmap.width,
@@ -43,17 +34,14 @@ export function createImageResourceFromImageBitmap(bitmap) {
 }
 export function createImageResourceFromImageElement(img) {
     return createEntity({
-        alphaType: 'straight',
-        compressed: null,
-        data: null,
-        format: 'rgba8unorm',
         height: img.height,
+        kind: ImageTextureSourceKind,
         source: img,
         version: 0,
         width: img.width,
     });
 }
-export function isImageResourceSameOrigin(url) {
+export function isImageUrlSameOrigin(url) {
     if (url.startsWith('data:') || url.startsWith('blob:'))
         return true;
     try {
@@ -89,12 +77,24 @@ export async function loadImageResourceFromUrl(url, crossOrigin, signal) {
     if (crossOrigin !== undefined)
         img.crossOrigin = crossOrigin;
     img.src = url;
-    // Wire abort to cancel the pending decode by rejecting the promise.
+    // Wire abort to cancel the pending decode and reject with the signal's reason. Always remove the
+    // listener when the race settles so a long-lived signal does not retain the image and closure.
     if (signal !== undefined) {
-        await Promise.race([
-            img.decode(),
-            new Promise((_, reject) => signal.addEventListener('abort', () => reject(signal.reason), { once: true })),
-        ]);
+        let rejectAbort = () => { };
+        const abortPromise = new Promise((_, reject) => {
+            rejectAbort = reject;
+        });
+        const onAbort = () => {
+            img.src = '';
+            rejectAbort(signal.reason);
+        };
+        signal.addEventListener('abort', onAbort, { once: true });
+        try {
+            await Promise.race([img.decode(), abortPromise]);
+        }
+        finally {
+            signal.removeEventListener('abort', onAbort);
+        }
     }
     else {
         await img.decode();

package/dist/imageResourceFrom.js.map

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

package/dist/index.d.ts

@@ -1,3 +1,2 @@
-export * from './imageResource';
-export * from './imageResourceFrom';
+export { cloneImageResource, createCompressedImage, createImageResource, createImageResourceFromBitmap, createImageResourceFromCanvas, createImageResourceFromImageBitmap, createImageResourceFromImageElement, isImageResourceEmpty, isImageUrlSameOrigin, loadImageResourceFromBase64, loadImageResourceFromBlob, loadImageResourceFromBytes, loadImageResourceFromUrl, } from './contract';
 //# 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,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,EACnB,6BAA6B,EAC7B,6BAA6B,EAC7B,kCAAkC,EAClC,mCAAmC,EACnC,oBAAoB,EACpB,oBAAoB,EACpB,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -1,3 +1,2 @@
-export * from './imageResource';
-export * from './imageResourceFrom';
+export { cloneImageResource, createCompressedImage, createImageResource, createImageResourceFromBitmap, createImageResourceFromCanvas, createImageResourceFromImageBitmap, createImageResourceFromImageElement, isImageResourceEmpty, isImageUrlSameOrigin, loadImageResourceFromBase64, loadImageResourceFromBlob, loadImageResourceFromBytes, loadImageResourceFromUrl, } from './contract';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,EACnB,6BAA6B,EAC7B,6BAA6B,EAC7B,kCAAkC,EAClC,mCAAmC,EACnC,oBAAoB,EACpB,oBAAoB,EACpB,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,YAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/image",
-  "version": "0.2.1-next.841.373388f",
+  "version": "0.3.0-edge.1458.0c01b63",
   "repository": {
     "type": "git",
     "url": "https://github.com/flighthq/flight.git",
@@ -13,6 +13,10 @@
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
+    },
+    "./contract": {
+      "types": "./dist/contract.d.ts",
+      "default": "./dist/contract.js"
     }
   },
   "files": [
@@ -32,9 +36,9 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/entity": "0.2.1-next.841.373388f",
-    "@flighthq/image-codec": "0.2.1-next.841.373388f",
-    "@flighthq/types": "0.2.1-next.841.373388f"
+    "@flighthq/entity": "0.3.0-edge.1458.0c01b63",
+    "@flighthq/image-codec": "0.3.0-edge.1458.0c01b63",
+    "@flighthq/types": "0.3.0-edge.1458.0c01b63"
   },
   "devDependencies": {
     "typescript": "^5.3.0"

package/src/imageResource.test.ts

@@ -1,234 +1,86 @@
-import type { ImageResourceCompressed } from '@flighthq/types';
+import type { CompressedImageData } from '@flighthq/types/contract';
+import { CompressedImageTextureSourceKind, ImageTextureSourceKind } from '@flighthq/types/contract';
 
 import {
   cloneImageResource,
-  createCompressedImageResource,
+  createCompressedImage,
   createImageResource,
-  disposeImageResource,
-  getImageResourceByteSize,
-  hasImageResourceData,
-  hasImageResourcePixels,
-  hasImageResourceSource,
   invalidateImageResource,
   isImageResourceEmpty,
-  setImageResourceSource,
 } from './imageResource';
 
-// A minimal single-mip bc3 4x4 compressed payload stand-in for the resource wrapper tests.
-function makeCompressed(): ImageResourceCompressed {
+function makeCompressed(): CompressedImageData {
   return {
     container: {
+      depth: 1,
+      faces: 1,
       format: 'bc3',
-      width: 4,
       height: 4,
-      depth: 1,
-      mipLevels: 1,
       layers: 1,
-      faces: 1,
+      levels: [{ byteLength: 16, byteOffset: 0, height: 4, width: 4 }],
+      mipLevels: 1,
       supercompression: 'None',
-      levels: [{ byteOffset: 0, byteLength: 16, width: 4, height: 4 }],
+      width: 4,
     },
     payload: new Uint8Array(16),
   };
 }
 
 describe('cloneImageResource', () => {
-  it('copies fields, shares the element, and gives an independent identity', () => {
-    const element = { width: 4, height: 5 } as HTMLImageElement;
-    const resource = createImageResource(element);
+  it('shares the host source under an independent identity and version', () => {
+    const source = document.createElement('canvas');
+    source.width = 4;
+    source.height = 5;
+    const resource = createImageResource(source);
     resource.version = 3;
-
     const copy = cloneImageResource(resource);
-
     expect(copy).not.toBe(resource);
-    expect(copy.source).toBe(element);
-    expect(copy.width).toStrictEqual(4);
-    expect(copy.height).toStrictEqual(5);
-    expect(copy.version).toStrictEqual(3);
-
+    expect(copy.source).toBe(source);
+    expect(copy.version).toBe(3);
     copy.version++;
-    expect(resource.version).toStrictEqual(3);
-  });
-
-  it('shares the data buffer by reference and copies the format and alphaType', () => {
-    const resource = createImageResource();
-    resource.data = new Uint8ClampedArray([1, 2, 3, 4]);
-    resource.format = 'bgra8unorm';
-    resource.alphaType = 'premultiplied';
-
-    const copy = cloneImageResource(resource);
-
-    expect(copy.data).toBe(resource.data);
-    expect(copy.format).toStrictEqual('bgra8unorm');
-    expect(copy.alphaType).toStrictEqual('premultiplied');
-  });
-
-  it('shares the compressed payload by reference', () => {
-    const resource = createCompressedImageResource(makeCompressed());
-    const copy = cloneImageResource(resource);
-    expect(copy.compressed).toBe(resource.compressed);
+    expect(resource.version).toBe(3);
   });
 });
 
-describe('createCompressedImageResource', () => {
-  it('wraps the container, mirrors its base dimensions, and leaves source/data null', () => {
+describe('createCompressedImage', () => {
+  it('wraps the compressed payload as a distinct source', () => {
     const compressed = makeCompressed();
-    const resource = createCompressedImageResource(compressed);
-    expect(resource.compressed).toBe(compressed);
-    expect(resource.width).toStrictEqual(4);
-    expect(resource.height).toStrictEqual(4);
-    expect(resource.source).toBeNull();
-    expect(resource.data).toBeNull();
-    expect(resource.version).toStrictEqual(0);
+    const image = createCompressedImage(compressed);
+    expect(image.kind).toBe(CompressedImageTextureSourceKind);
+    expect(image.compressed).toBe(compressed);
+    expect(image.width).toBe(4);
+    expect(image.height).toBe(4);
   });
 });
 
 describe('createImageResource', () => {
-  it('returns an object', () => {
-    const resource = createImageResource();
-    expect(resource).not.toBeNull();
-  });
-
-  it('sets source, width and height if you pass in a source element', () => {
-    const element = { width: 100, height: 100 } as HTMLImageElement;
-    const resource = createImageResource(element);
-    expect(resource.source).toStrictEqual(element);
-    expect(resource.width).toStrictEqual(element.width);
-    expect(resource.height).toStrictEqual(element.height);
-  });
-
-  it('starts at version 0', () => {
-    expect(createImageResource().version).toBe(0);
-  });
-
-  it('defaults to null data, rgba8unorm format, and straight alphaType', () => {
-    const resource = createImageResource();
-    expect(resource.data).toBeNull();
-    expect(resource.format).toStrictEqual('rgba8unorm');
-    expect(resource.alphaType).toStrictEqual('straight');
-  });
-});
-
-describe('disposeImageResource', () => {
-  it('releases the element, data, and compressed payload and marks the resource changed', () => {
-    const resource = createImageResource({ width: 4, height: 5 } as HTMLImageElement);
-    resource.data = new Uint8ClampedArray(4 * 5 * 4);
-    resource.compressed = makeCompressed();
-    const before = resource.version;
-
-    disposeImageResource(resource);
-
-    expect(resource.source).toBeNull();
-    expect(resource.data).toBeNull();
-    expect(resource.compressed).toBeNull();
-    expect(resource.version).toStrictEqual(before + 1);
-  });
-});
-
-describe('getImageResourceByteSize', () => {
-  it('returns 0 when data is null (element-only resource)', () => {
-    const resource = createImageResource();
-    expect(getImageResourceByteSize(resource)).toBe(0);
-  });
-
-  it('returns the byteLength of the data array when present', () => {
-    const resource = createImageResource();
-    resource.data = new Uint8ClampedArray(100);
-    expect(getImageResourceByteSize(resource)).toBe(100);
-  });
-
-  it('reflects width × height × 4 for a typical rgba8unorm resource', () => {
-    const resource = createImageResource();
-    resource.width = 4;
-    resource.height = 4;
-    resource.data = new Uint8ClampedArray(4 * 4 * 4);
-    expect(getImageResourceByteSize(resource)).toBe(64);
-  });
-});
-
-describe('hasImageResourceData', () => {
-  it('is false without data and true with it', () => {
-    const resource = createImageResource();
-    expect(hasImageResourceData(resource)).toStrictEqual(false);
-    resource.data = new Uint8ClampedArray(4);
-    expect(hasImageResourceData(resource)).toStrictEqual(true);
-  });
-});
-
-describe('hasImageResourcePixels', () => {
-  it('is false when neither representation is present', () => {
-    expect(hasImageResourcePixels(createImageResource())).toStrictEqual(false);
-  });
-
-  it('is true for a data-only resource (a generated Surface)', () => {
-    const resource = createImageResource();
-    resource.data = new Uint8ClampedArray(4);
-    expect(hasImageResourcePixels(resource)).toStrictEqual(true);
-  });
-
-  it('is true for an element-only resource', () => {
-    expect(hasImageResourcePixels(createImageResource({ width: 1, height: 1 } as HTMLImageElement))).toStrictEqual(
-      true,
-    );
-  });
-
-  it('is true for a compressed-only resource (a parsed container)', () => {
-    expect(hasImageResourcePixels(createCompressedImageResource(makeCompressed()))).toStrictEqual(true);
-  });
-});
-
-describe('hasImageResourceSource', () => {
-  it('is false without an element and true with one', () => {
-    expect(hasImageResourceSource(createImageResource())).toStrictEqual(false);
-    expect(hasImageResourceSource(createImageResource({ width: 1, height: 1 } as HTMLImageElement))).toStrictEqual(
-      true,
-    );
+  it('wraps one host source with its dimensions and declared kind', () => {
+    const source = document.createElement('canvas');
+    source.width = 8;
+    source.height = 6;
+    const resource = createImageResource(source);
+    expect(resource.kind).toBe(ImageTextureSourceKind);
+    expect(resource.source).toBe(source);
+    expect(resource.width).toBe(8);
+    expect(resource.height).toBe(6);
   });
 });
 
 describe('invalidateImageResource', () => {
-  it('increments the version', () => {
-    const resource = createImageResource();
+  it('refreshes host dimensions and advances the version', () => {
+    const source = document.createElement('canvas');
+    const resource = createImageResource(source);
+    source.width = 12;
+    source.height = 9;
     invalidateImageResource(resource);
+    expect(resource.width).toBe(12);
+    expect(resource.height).toBe(9);
     expect(resource.version).toBe(1);
-    invalidateImageResource(resource);
-    expect(resource.version).toBe(2);
-  });
-
-  it('wraps around with >>> 0', () => {
-    const resource = createImageResource();
-    resource.version = 0xffffffff;
-    invalidateImageResource(resource);
-    expect(resource.version).toBe(0);
   });
 });
 
 describe('isImageResourceEmpty', () => {
-  it('is true with no dimensions and false once sized', () => {
-    expect(isImageResourceEmpty(createImageResource())).toStrictEqual(true);
-    expect(isImageResourceEmpty(createImageResource({ width: 2, height: 2 } as HTMLImageElement))).toStrictEqual(false);
-  });
-});
-
-describe('setImageResourceSource', () => {
-  it('swaps the element, re-reads dimensions, and marks the resource changed', () => {
-    const resource = createImageResource();
-    const before = resource.version;
-    const element = { width: 8, height: 6 } as HTMLImageElement;
-
-    setImageResourceSource(resource, element);
-
-    expect(resource.source).toBe(element);
-    expect(resource.width).toStrictEqual(8);
-    expect(resource.height).toStrictEqual(6);
-    expect(resource.version).toStrictEqual(before + 1);
-  });
-
-  it('clears the element when passed null', () => {
-    const resource = createImageResource({ width: 8, height: 6 } as HTMLImageElement);
-
-    setImageResourceSource(resource, null);
-
-    expect(resource.source).toBeNull();
+  it('reports a zero-sized host image', () => {
+    expect(isImageResourceEmpty(createImageResource(globalThis.document.createElement('img')))).toBe(true);
   });
 });

package/src/imageResourceFrom.test.ts

@@ -1,10 +1,14 @@
+import { createEntity } from '@flighthq/entity/contract';
+import type { Bitmap } from '@flighthq/types/contract';
+import { BitmapTextureSourceKind } from '@flighthq/types/contract';
+
 import { createImageResource } from './imageResource';
 import {
-  createCanvasFromImageResource,
+  createImageResourceFromBitmap,
   createImageResourceFromCanvas,
   createImageResourceFromImageBitmap,
   createImageResourceFromImageElement,
-  isImageResourceSameOrigin,
+  isImageUrlSameOrigin,
   loadImageResourceFromBase64,
   loadImageResourceFromBlob,
   loadImageResourceFromBytes,
@@ -21,29 +25,24 @@ afterEach(() => {
   delete (HTMLImageElement.prototype as Partial<HTMLImageElement>).decode;
 });
 
-describe('createCanvasFromImageResource', () => {
-  function makeDataResource(width: number, height: number) {
-    const resource = createImageResource();
-    resource.width = width;
-    resource.height = height;
-    resource.data = new Uint8ClampedArray(width * height * 4).fill(255);
-    return resource;
-  }
-
-  it('materializes a canvas sized to the resource', () => {
-    const canvas = createCanvasFromImageResource(makeDataResource(6, 5));
-    expect(canvas).toBeInstanceOf(HTMLCanvasElement);
-    expect(canvas!.width).toBe(6);
-    expect(canvas!.height).toBe(5);
-  });
-
-  it('returns a new canvas each call', () => {
-    const resource = makeDataResource(4, 4);
-    expect(createCanvasFromImageResource(resource)).not.toBe(createCanvasFromImageResource(resource));
-  });
-
-  it('returns null for an element-only resource with no data', () => {
-    expect(createCanvasFromImageResource(createImageResource(document.createElement('img')))).toBeNull();
+describe('createImageResourceFromBitmap', () => {
+  it('returns an Image with matching dimensions', () => {
+    // Built with createEntity rather than @flighthq/bitmap's createBitmap: bitmap depends on image,
+    // so importing it here would force a circular tsconfig project reference.
+    const bitmap: Bitmap = createEntity({
+      alphaType: 'straight',
+      colorSpace: 'srgb',
+      data: new Uint8ClampedArray(4 * 4 * 4),
+      format: 'rgba8unorm',
+      height: 4,
+      kind: BitmapTextureSourceKind,
+      version: 0,
+      width: 4,
+    });
+    const resource = createImageResourceFromBitmap(bitmap);
+    expect(resource.width).toBe(4);
+    expect(resource.height).toBe(4);
+    expect(resource.source).not.toBeNull();
   });
 });
 
@@ -115,26 +114,26 @@ describe('createImageResourceFromImageElement', () => {
   });
 });
 
-describe('isImageResourceSameOrigin', () => {
+describe('isImageUrlSameOrigin', () => {
   it('returns true for data: URLs', () => {
-    expect(isImageResourceSameOrigin('data:image/png;base64,abc')).toBe(true);
+    expect(isImageUrlSameOrigin('data:image/png;base64,abc')).toBe(true);
   });
 
   it('returns true for blob: URLs', () => {
-    expect(isImageResourceSameOrigin('blob:http://localhost/some-id')).toBe(true);
+    expect(isImageUrlSameOrigin('blob:http://localhost/some-id')).toBe(true);
   });
 
   it('returns true for relative URLs (same origin)', () => {
-    expect(isImageResourceSameOrigin('/images/logo.png')).toBe(true);
+    expect(isImageUrlSameOrigin('/images/logo.png')).toBe(true);
   });
 
   it('returns false for a different-origin absolute URL', () => {
-    expect(isImageResourceSameOrigin('https://cdn.other-domain.com/image.png')).toBe(false);
+    expect(isImageUrlSameOrigin('https://cdn.other-domain.com/image.png')).toBe(false);
   });
 });
 
 describe('loadImageResourceFromBase64', () => {
-  it('resolves to an ImageResource', async () => {
+  it('resolves to an Image', async () => {
     const resource = await loadImageResourceFromBase64('abc123', 'image/png');
     expect(resource).not.toBeNull();
     expect(resource.source).toBeInstanceOf(HTMLImageElement);
@@ -147,7 +146,7 @@ describe('loadImageResourceFromBase64', () => {
 });
 
 describe('loadImageResourceFromBlob', () => {
-  it('resolves to an ImageResource', async () => {
+  it('resolves to an Image', async () => {
     const blob = new Blob([], { type: 'image/png' });
     const resource = await loadImageResourceFromBlob(blob);
     expect(resource).not.toBeNull();
@@ -221,12 +220,47 @@ describe('loadImageResourceFromUrl', () => {
     );
   });
 
-  it('resolves to an ImageResource whose source is an HTMLImageElement', async () => {
+  it('clears the image source when aborted during decode', async () => {
+    let capturedImg: HTMLImageElement | undefined;
+    const origImage = globalThis.Image;
+    globalThis.Image = new Proxy(origImage, {
+      construct(Target, args) {
+        const img = new Target(...(args as []));
+        capturedImg = img;
+        return img;
+      },
+    }) as typeof Image;
+    HTMLImageElement.prototype.decode = vi.fn().mockReturnValue(new Promise(() => {}));
+    const controller = new AbortController();
+
+    try {
+      const promise = loadImageResourceFromUrl('/images/slow.png', undefined, controller.signal);
+      controller.abort(new Error('cancelled'));
+      await expect(promise).rejects.toThrow('cancelled');
+      expect(capturedImg?.getAttribute('src')).toBe('');
+    } finally {
+      globalThis.Image = origImage;
+    }
+  });
+
+  it('removes its abort listener after decode succeeds', async () => {
+    const controller = new AbortController();
+    const add = vi.spyOn(controller.signal, 'addEventListener');
+    const remove = vi.spyOn(controller.signal, 'removeEventListener');
+
+    await loadImageResourceFromUrl('/images/logo.png', undefined, controller.signal);
+
+    expect(add).toHaveBeenCalledOnce();
+    expect(remove).toHaveBeenCalledOnce();
+    expect(remove.mock.calls[0][1]).toBe(add.mock.calls[0][1]);
+  });
+
+  it('resolves to an Image whose source is an HTMLImageElement', async () => {
     const resource = await loadImageResourceFromUrl('data:image/png;base64,abc');
     expect(resource.source).toBeInstanceOf(HTMLImageElement);
   });
 
-  it('sets crossOrigin when the crossOrigin parameter is provided', async () => {
+  it.each(['anonymous', 'use-credentials'] as const)('sets crossOrigin to %s when provided', async (crossOrigin) => {
     let capturedImg: HTMLImageElement | undefined;
     const origImage = globalThis.Image;
     globalThis.Image = new Proxy(origImage, {
@@ -237,8 +271,8 @@ describe('loadImageResourceFromUrl', () => {
       },
     }) as typeof Image;
 
-    await loadImageResourceFromUrl('https://cdn.other-domain.com/image.png', 'anonymous');
-    expect(capturedImg?.crossOrigin).toBe('anonymous');
+    await loadImageResourceFromUrl('https://cdn.other-domain.com/image.png', crossOrigin);
+    expect(capturedImg?.crossOrigin).toBe(crossOrigin);
 
     globalThis.Image = origImage;
   });