@vitessce/spatial-utils 4.0.0-test.0 → 4.0.0-test.2

package/dist/index.js

@@ -1,4 +1,4 @@
-import { D, e, a, b, c, d, H, G, Z, E, s, n, o, F, C, z, l, m, A, y, h, r, w, q, i, f, j, k, v, u, t, p, x } from "./index-eg9AfQpw.js";
+import { D, e, a, b, c, d, H, G, Z, E, s, n, o, F, C, z, l, m, A, y, h, r, w, q, i, f, j, k, v, u, t, p, x } from "./index-C5cy3J5q.js";
 export {
   D as DEFAULT_CELLS_LAYER,
   e as DEFAULT_LAYER_TYPE_ORDERING,

package/dist/{jpeg-8u_Neg38.js → jpeg-AJv2kZca.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-eg9AfQpw.js";
+import { B as BaseDecoder } from "./index-C5cy3J5q.js";
 const dctZigZag = new Int32Array([
   0,
   1,

package/dist/{lerc-bKaxnsyK.js → lerc-8rr5kVc2.js}

@@ -1,5 +1,5 @@
 import { i as inflate_1 } from "./pako.esm-SxljTded.js";
-import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-eg9AfQpw.js";
+import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-C5cy3J5q.js";
 const LercParameters = {
   AddCompression: 1
 };

package/dist/{lzw-CzAjji63.js → lzw-DLXXUpEz.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-eg9AfQpw.js";
+import { B as BaseDecoder } from "./index-C5cy3J5q.js";
 const MIN_BITS = 9;
 const CLEAR_CODE = 256;
 const EOI_CODE = 257;

package/dist/{packbits-DmKeDFs4.js → packbits-CN5Wf7cN.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-eg9AfQpw.js";
+import { B as BaseDecoder } from "./index-C5cy3J5q.js";
 class PackbitsDecoder extends BaseDecoder {
   decodeBlock(buffer) {
     const dataView = new DataView(buffer);

package/dist/{raw-av0MDkyf.js → raw-BW4rcScv.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-eg9AfQpw.js";
+import { B as BaseDecoder } from "./index-C5cy3J5q.js";
 class RawDecoder extends BaseDecoder {
   decodeBlock(buffer) {
     return buffer;

package/dist/{webimage-CmJDzlML.js → webimage-BJe_5cpU.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-eg9AfQpw.js";
+import { B as BaseDecoder } from "./index-C5cy3J5q.js";
 class WebImageDecoder extends BaseDecoder {
   constructor() {
     super();

package/dist-tsc/load-ome-zarr.d.ts

@@ -1,7 +1,7 @@
 export function guessTileSize(arr: any): number;
 export function loadOmeZarr(root: any): Promise<{
     data: ZarritaPixelSource[];
-    metadata: import("zarrita").Attributes;
+    metadata: any;
 }>;
 export class ZarritaPixelSource extends viv.ZarrPixelSource<any> {
     constructor(arr: any, labels: any, tileSize: any);

package/dist-tsc/load-ome-zarr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load-ome-zarr.d.ts","sourceRoot":"","sources":["../src/load-ome-zarr.js"],"names":[],"mappings":"AAmBA,gDAMC;AA6DD;;;GAaC;AA7BD;IACE,kDASC;IADC,qBAAwB;CAE3B;oBAjFmB,cAAc"}
+{"version":3,"file":"load-ome-zarr.d.ts","sourceRoot":"","sources":["../src/load-ome-zarr.js"],"names":[],"mappings":"AAmBA,gDAMC;AAkED;;;GAaC;AA7BD;IACE,kDASC;IADC,qBAAwB;CAE3B;oBAtFmB,cAAc"}

package/dist-tsc/load-ome-zarr.js

@@ -1,6 +1,6 @@
 import { viv } from '@vitessce/gl';
 import { open as zarrOpen } from 'zarrita';
-import { createZarrArrayAdapter } from '@vitessce/zarr-utils';
+import { createZarrArrayAdapter, flattenOmeAttrs } from '@vitessce/zarr-utils';
 import { ZarrNodeNotFoundError } from '@vitessce/error';
 function prevPowerOf2(x) {
     return 2 ** Math.floor(Math.log2(x));
@@ -36,11 +36,15 @@ async function loadMultiscales(root) {
         // Re-throw the error if it is not a NodeNotFoundError.
         throw e;
     }
+    // OME-NGFF v0.5 nests OME metadata under an `ome` key.
+    // Hoist it to the root so downstream consumers see the flat v0.4 shape.
+    rootAttrs = flattenOmeAttrs(rootAttrs);
     let paths = ['0'];
     // Default axes used for v0.1 and v0.2.
     let labels = ['t', 'c', 'z', 'y', 'x'];
     if ('multiscales' in rootAttrs) {
-        const { datasets, axes } = rootAttrs.multiscales[0];
+        const { multiscales } = rootAttrs;
+        const { datasets, axes } = multiscales[0];
         paths = datasets.map(d => d.path);
         if (axes) {
             if (isAxis(axes)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/spatial-utils",
-  "version": "4.0.0-test.0",
+  "version": "4.0.0-test.2",
   "author": "HIDIVE Lab at HMS",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -21,12 +21,12 @@
     "math.gl": "^3.5.6",
     "mathjs": "^9.2.0",
     "internmap": "^2.0.3",
-    "@vitessce/utils": "4.0.0-test.0",
-    "@vitessce/constants-internal": "4.0.0-test.0",
-    "@vitessce/globals": "4.0.0-test.0",
-    "@vitessce/zarr-utils": "4.0.0-test.0",
-    "@vitessce/gl": "4.0.0-test.0",
-    "@vitessce/error": "4.0.0-test.0"
+    "@vitessce/gl": "4.0.0-test.2",
+    "@vitessce/constants-internal": "4.0.0-test.2",
+    "@vitessce/utils": "4.0.0-test.2",
+    "@vitessce/zarr-utils": "4.0.0-test.2",
+    "@vitessce/globals": "4.0.0-test.2",
+    "@vitessce/error": "4.0.0-test.2"
   },
   "scripts": {
     "bundle": "pnpm exec vite build -c ../../../scripts/vite.config.mjs",

package/src/load-ome-zarr.js

@@ -1,6 +1,6 @@
 import { viv } from '@vitessce/gl';
 import { open as zarrOpen } from 'zarrita';
-import { createZarrArrayAdapter } from '@vitessce/zarr-utils';
+import { createZarrArrayAdapter, flattenOmeAttrs } from '@vitessce/zarr-utils';
 import { ZarrNodeNotFoundError } from '@vitessce/error';
 
 function prevPowerOf2(x) {
@@ -41,11 +41,16 @@ async function loadMultiscales(root) {
     throw e;
   }
 
+  // OME-NGFF v0.5 nests OME metadata under an `ome` key.
+  // Hoist it to the root so downstream consumers see the flat v0.4 shape.
+  rootAttrs = flattenOmeAttrs(rootAttrs);
+
   let paths = ['0'];
   // Default axes used for v0.1 and v0.2.
   let labels = ['t', 'c', 'z', 'y', 'x'];
   if ('multiscales' in rootAttrs) {
-    const { datasets, axes } = rootAttrs.multiscales[0];
+    const { multiscales } = rootAttrs;
+    const { datasets, axes } = multiscales[0];
     paths = datasets.map(d => d.path);
     if (axes) {
       if (isAxis(axes)) {