@vitessce/config 3.8.4 → 3.8.6

package/dist-tsc/generate-config-anndata.js

@@ -60,7 +60,7 @@ export class AnnDataAutoConfig extends AbstractAutoConfig {
         });
     }
     // eslint-disable-next-line class-methods-use-this
-    addViews(vc, layoutOption) {
+    addViews(vc, dataset, layoutOption) {
         // TODO
     }
 }

package/dist-tsc/generate-config-helpers.d.ts

@@ -4,6 +4,6 @@ export class AbstractAutoConfig {
     fileType: any;
     zmetadata: any;
     addFiles(vc: any, dataset: any): void;
-    addViews(vc: any, layoutOption: any): void;
+    addViews(vc: any, dataset: any, layoutOption: any): void;
 }
 //# sourceMappingURL=generate-config-helpers.d.ts.map

package/dist-tsc/generate-config-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-config-helpers.d.ts","sourceRoot":"","sources":["../src/generate-config-helpers.js"],"names":[],"mappings":"AACA;IACE,8BAKC;IAHC,SAAc;IACd,cAAwB;IACxB,eAA0B;IAI5B,sCAEC;IAGD,2CAEC;CACF"}
+{"version":3,"file":"generate-config-helpers.d.ts","sourceRoot":"","sources":["../src/generate-config-helpers.js"],"names":[],"mappings":"AACA;IACE,8BAKC;IAHC,SAAc;IACd,cAAwB;IACxB,eAA0B;IAI5B,sCAEC;IAGD,yDAEC;CACF"}

package/dist-tsc/generate-config-helpers.js

@@ -11,7 +11,7 @@ export class AbstractAutoConfig {
         throw new Error('The addFiles() method has not been implemented.');
     }
     // eslint-disable-next-line class-methods-use-this
-    addViews(vc, layoutOption) {
+    addViews(vc, dataset, layoutOption) {
         throw new Error('The addViews() method has not been implemented.');
     }
 }

package/dist-tsc/generate-config-ome.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-config-ome.d.ts","sourceRoot":"","sources":["../src/generate-config-ome.js"],"names":[],"mappings":"AAKA;CAeC;mCAnBkC,8BAA8B"}
+{"version":3,"file":"generate-config-ome.d.ts","sourceRoot":"","sources":["../src/generate-config-ome.js"],"names":[],"mappings":"AAMA;CAoBC;mCAxBkC,8BAA8B"}

package/dist-tsc/generate-config-ome.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-unused-vars */
+import { hconcat, vconcat } from './VitessceConfig.js';
 import { AbstractAutoConfig } from './generate-config-helpers.js';
 // TODO: split into separate classes for OME-TIFF and OME-Zarr?
 // TODO: split into separate classes for image and obsSegmentations?
@@ -13,7 +14,11 @@ export class OmeAutoConfig extends AbstractAutoConfig {
         });
     }
     // eslint-disable-next-line class-methods-use-this
-    addViews(vc, layoutOption) {
-        // TODO
+    addViews(vc, dataset, layoutOption) {
+        // Add spatialBeta/layerControllerBeta views.
+        const spatialView = vc.addView(dataset, 'spatialBeta');
+        const lcView = vc.addView(dataset, 'layerControllerBeta');
+        // Layout.
+        vc.layout(hconcat(spatialView, lcView));
     }
 }

package/dist-tsc/generate-config-spatialdata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-config-spatialdata.d.ts","sourceRoot":"","sources":["../src/generate-config-spatialdata.js"],"names":[],"mappings":"AAGA;IACE,iBA0FC;CAgBF;mCA7GkC,8BAA8B"}
+{"version":3,"file":"generate-config-spatialdata.d.ts","sourceRoot":"","sources":["../src/generate-config-spatialdata.js"],"names":[],"mappings":"AAIA;IACE,iBA6FC;CAqCF;mCArIkC,8BAA8B"}

package/dist-tsc/generate-config-spatialdata.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-unused-vars */
+import { hconcat, vconcat } from './VitessceConfig.js';
 import { AbstractAutoConfig } from './generate-config-helpers.js';
 export class SpatialDataAutoConfig extends AbstractAutoConfig {
     getOptions() {
@@ -70,6 +71,9 @@ export class SpatialDataAutoConfig extends AbstractAutoConfig {
                         // region: null,
                         tablePath: relPath,
                         obsSets: columnOrder.map(c => ({
+                            // TODO: determine whether this column is string/categorical.
+                            // TODO: determine whether this column contains too many
+                            // categories to make sense to consider a cell set.
                             path: `${hasObs.path.substring(1)}/${c}`,
                             name: c,
                         })),
@@ -89,7 +93,24 @@ export class SpatialDataAutoConfig extends AbstractAutoConfig {
         });
     }
     // eslint-disable-next-line class-methods-use-this
-    addViews(vc, layoutOption) {
-        // TODO
+    addViews(vc, dataset, layoutOption) {
+        const options = this.getOptions();
+        // Add spatialBeta/layerControllerBeta views.
+        const spatialView = vc.addView(dataset, 'spatialBeta');
+        const lcView = vc.addView(dataset, 'layerControllerBeta');
+        const controlViews = [lcView];
+        // If obsSets are present, add obsSets view.
+        if (options.obsSets) {
+            const obsSets = vc.addView(dataset, 'obsSets');
+            controlViews.push(obsSets);
+        }
+        // If obsFeatureMatrix is present, add featureList view.
+        if (options.obsFeatureMatrix) {
+            const featureList = vc.addView(dataset, 'featureList');
+            controlViews.push(featureList);
+        }
+        // TODO: set up coordination stuff here?
+        // Layout.
+        vc.layout(hconcat(spatialView, vconcat(...controlViews)));
     }
 }

package/dist-tsc/generate-config.d.ts

@@ -1,3 +1,12 @@
+/**
+ *
+ * @param {string[]} arr
+ * @returns {{ url: string, fileType: string }[]} The URLs with file types.
+ */
+export function parseUrls(arr: string[]): {
+    url: string;
+    fileType: string;
+}[];
 /**
  *
  * @param {string} s A single string, like this
@@ -5,7 +14,7 @@
  * http://example.com/my_tiff.ome.tif`
  * @returns {{ url: string, fileType: string}[]} The URLs with file types.
  */
-export function parseUrls(s: string): {
+export function parseUrlsFromString(s: string): {
     url: string;
     fileType: string;
 }[];

package/dist-tsc/generate-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-config.d.ts","sourceRoot":"","sources":["../src/generate-config.js"],"names":[],"mappings":"AAmGA;;;;;;GAMG;AACH,6BALW,MAAM,GAGJ;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAC,EAAE,CAqB9C;AAGD;;;;YAsEC;AAED;;;;GAIG;AACH,sDAHW;IAAE,GAAG,MAAC;IAAC,QAAQ,MAAC;IAAC,KAAK,MAAA;CAAE,EAAE,GACzB,MAAM,EAAE,CAOnB;AAED;;;;GAIG;AACH,2CAHW;IAAE,GAAG,MAAC;IAAC,QAAQ,MAAC;IAAC,KAAK,MAAA;CAAE,EAAE,iBAC1B,MAAM,GAAC,IAAI;;;GAoDrB;+BAvQ8B,qBAAqB"}
+{"version":3,"file":"generate-config.d.ts","sourceRoot":"","sources":["../src/generate-config.js"],"names":[],"mappings":"AA4GA;;;;GAIG;AACH,+BAHW,MAAM,EAAE,GACN;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,CAoB/C;AAED;;;;;;GAMG;AACH,uCALW,MAAM,GAGJ;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAC,EAAE,CAK9C;AAGD;;;;YAsEC;AAED;;;;GAIG;AACH,sDAHW;IAAE,GAAG,MAAC;IAAC,QAAQ,MAAC;IAAC,KAAK,MAAA;CAAE,EAAE,GACzB,MAAM,EAAE,CAOnB;AAED;;;;GAIG;AACH,2CAHW;IAAE,GAAG,MAAC;IAAC,QAAQ,MAAC;IAAC,KAAK,MAAA;CAAE,EAAE,iBAC1B,MAAM,GAAC,IAAI;;;GAoDrB;+BAtR8B,qBAAqB"}

package/dist-tsc/generate-config.js

@@ -1,12 +1,16 @@
 // TODO: ts-check
 import { FileType } from '@vitessce/constants-internal';
-import { withConsolidated, FetchStore, ZipFileStore, open as zarrOpen, root as zarrRoot } from 'zarrita';
+import { withConsolidated, FetchStore, open as zarrOpen, root as zarrRoot } from 'zarrita';
+// eslint-disable-next-line import/no-unresolved
+import ZipFileStore from '@zarrita/storage/zip';
 import { transformEntriesForZipFileStore } from '@vitessce/zarr-utils';
 import { VitessceConfig } from './VitessceConfig.js';
 // Classes for different types of objects
 import { AnnDataAutoConfig } from './generate-config-anndata.js';
 import { SpatialDataAutoConfig } from './generate-config-spatialdata.js';
 import { OmeAutoConfig } from './generate-config-ome.js';
+// TODO: make this a function parameter?
+const FILE_TYPE_DELIM = '$';
 const fileTypeToExtensions = {
     [FileType.IMAGE_OME_TIFF]: ['.ome.tif', '.ome.tiff', '.ome.tf2', '.ome.tf8'],
     [FileType.IMAGE_OME_ZARR]: ['.ome.zarr'],
@@ -47,6 +51,8 @@ const ZARR_FILETYPES = [
     FileType.OBS_SEGMENTATIONS_OME_ZARR_ZIP,
 ];
 function urlToFileType(url) {
+    // TODO: for plain .zarr, we could open the root .attrs and try to guess a fileType
+    // (we can probably infer at least whether OME-Zarr vs. AnnData vs. SpatialData).
     const match = Object.entries(fileTypeToExtensions).find(
     // eslint-disable-next-line no-unused-vars
     ([fileType, extensions]) => extensions.some(ext => url.endsWith(ext)));
@@ -91,15 +97,12 @@ function ensureStores(parsedUrls) {
 }
 /**
  *
- * @param {string} s A single string, like this
- * `http://example.com/my_zarr.zarr#anndata.zarr;
- * http://example.com/my_tiff.ome.tif`
- * @returns {{ url: string, fileType: string}[]} The URLs with file types.
+ * @param {string[]} arr
+ * @returns {{ url: string, fileType: string }[]} The URLs with file types.
  */
-export function parseUrls(s) {
-    const urlsWithHashes = s.split(';');
-    return urlsWithHashes.map((urlWithHash) => {
-        const parts = urlWithHash.split('#');
+export function parseUrls(arr) {
+    return arr.map((urlWithHash) => {
+        const parts = urlWithHash.split(FILE_TYPE_DELIM);
         if (parts.length === 1) {
             const [url] = parts;
             return {
@@ -114,9 +117,20 @@ export function parseUrls(s) {
                 fileType,
             };
         }
-        throw new Error('Only expected zero or one # character per URL, but received more.');
+        throw new Error(`Only expected zero or one ${FILE_TYPE_DELIM} character per URL, but received more.`);
     });
 }
+/**
+ *
+ * @param {string} s A single string, like this
+ * `http://example.com/my_zarr.zarr#anndata.zarr;
+ * http://example.com/my_tiff.ome.tif`
+ * @returns {{ url: string, fileType: string}[]} The URLs with file types.
+ */
+export function parseUrlsFromString(s) {
+    const urlsWithHashes = s.split(';');
+    return parseUrls(urlsWithHashes);
+}
 export async function parsedUrlToZmetadata(parsedUrl) {
     const { store: initialStore } = parsedUrl;
     if (!initialStore) {
@@ -226,7 +240,7 @@ export async function generateConfig(parsedUrls, layoutOption = null) {
         const autoConfig = new AutoConfigClass(parsedStore);
         autoConfig.addFiles(vc, dataset);
         // TODO: add all files, then add all views (in two separate loops)?
-        autoConfig.addViews(vc, layoutOption);
+        autoConfig.addViews(vc, dataset, layoutOption);
     });
     const stores = Object.fromEntries(
     // Here, we use `parsedUrls` rather than `parsedStores`

package/dist-tsc/generate-config.test.js

@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest';
 import { createStoreFromMapContents } from '@vitessce/zarr-utils';
 import { withConsolidated } from 'zarrita';
-import { parseUrls, parsedUrlToZmetadata, generateConfig } from './generate-config.js';
+import { parseUrlsFromString, parsedUrlToZmetadata, generateConfig } from './generate-config.js';
 import spatialdataMouseLiverFixture from './json-fixtures/mouse_liver.spatialdata.json';
 import anndataMouseLiverFixture from './json-fixtures/mouse_liver.anndata.json';
 import imageOmeZarrMouseLiverFixture from './json-fixtures/mouse_liver.ome.json';
@@ -9,21 +9,21 @@ import obsSegmentationsOmeZarrMouseLiverFixture from './json-fixtures/mouse_live
 describe('generateConfig', () => {
     it('parses URLs', () => {
         const s1 = 'https://example.com/my_image.ome.tif';
-        expect(parseUrls(s1)).toEqual([
+        expect(parseUrlsFromString(s1)).toEqual([
             {
                 url: 'https://example.com/my_image.ome.tif',
                 fileType: 'image.ome-tiff',
             },
         ]);
-        const s2 = 'https://example.com/my_image.ome.tif#obsSegmentations.ome-tiff';
-        expect(parseUrls(s2)).toEqual([
+        const s2 = 'https://example.com/my_image.ome.tif$obsSegmentations.ome-tiff';
+        expect(parseUrlsFromString(s2)).toEqual([
             {
                 url: 'https://example.com/my_image.ome.tif',
                 fileType: 'obsSegmentations.ome-tiff',
             },
         ]);
-        const s3 = 'https://example.com/my_image.ome.tif#obsSegmentations.ome-tiff;http://another.com/obj.zarr#anndata.zarr';
-        expect(parseUrls(s3)).toEqual([
+        const s3 = 'https://example.com/my_image.ome.tif$obsSegmentations.ome-tiff;http://another.com/obj.zarr$anndata.zarr';
+        expect(parseUrlsFromString(s3)).toEqual([
             {
                 url: 'https://example.com/my_image.ome.tif',
                 fileType: 'obsSegmentations.ome-tiff',

package/dist-tsc/index.d.ts

@@ -1,4 +1,5 @@
 export { VitessceConfig, vconcat, hconcat, CL as CoordinationLevel, getCoordinationSpaceAndScopes } from "./VitessceConfig.js";
 export { generateConfig, getHintOptions } from "./VitessceAutoConfig.js";
 export { HINTS_CONFIG, HINT_TYPE_TO_FILE_TYPE_MAP } from "./constants.js";
+export { generateConfig as generateConfigAlt, parseUrls, parseUrlsFromString } from "./generate-config.js";
 //# sourceMappingURL=index.d.ts.map

package/dist-tsc/index.js

@@ -2,3 +2,4 @@ export { VitessceConfig, vconcat, hconcat, CL as CoordinationLevel, getCoordinat
 export { generateConfig, getHintOptions } from './VitessceAutoConfig.js';
 export { HINTS_CONFIG, HINT_TYPE_TO_FILE_TYPE_MAP } from './constants.js';
 export { getInitialCoordinationScopePrefix, getInitialCoordinationScopeName, } from '@vitessce/utils';
+export { generateConfig as generateConfigAlt, parseUrls, parseUrlsFromString } from './generate-config.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/config",
-  "version": "3.8.4",
+  "version": "3.8.6",
   "author": "HIDIVE Lab at HMS",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -17,10 +17,11 @@
   ],
   "dependencies": {
     "zarrita": "0.5.4",
-    "@vitessce/constants-internal": "3.8.4",
-    "@vitessce/utils": "3.8.4",
-    "@vitessce/globals": "3.8.4",
-    "@vitessce/zarr-utils": "3.8.4"
+    "@zarrita/storage": "0.1.3",
+    "@vitessce/constants-internal": "3.8.6",
+    "@vitessce/utils": "3.8.6",
+    "@vitessce/globals": "3.8.6",
+    "@vitessce/zarr-utils": "3.8.6"
   },
   "scripts": {
     "bundle": "pnpm exec vite build -c ../../scripts/vite.config.mjs",

package/src/generate-config-anndata.js

@@ -69,7 +69,7 @@ export class AnnDataAutoConfig extends AbstractAutoConfig {
   }
 
   // eslint-disable-next-line class-methods-use-this
-  addViews(vc, layoutOption) {
+  addViews(vc, dataset, layoutOption) {
     // TODO
   }
 }

package/src/generate-config-helpers.js

@@ -13,7 +13,7 @@ export class AbstractAutoConfig {
   }
 
   // eslint-disable-next-line class-methods-use-this
-  addViews(vc, layoutOption) {
+  addViews(vc, dataset, layoutOption) {
     throw new Error('The addViews() method has not been implemented.');
   }
 }

package/src/generate-config-ome.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-unused-vars */
+import { hconcat, vconcat } from './VitessceConfig.js';
 import { AbstractAutoConfig } from './generate-config-helpers.js';
 
 // TODO: split into separate classes for OME-TIFF and OME-Zarr?
@@ -15,7 +16,12 @@ export class OmeAutoConfig extends AbstractAutoConfig {
   }
 
   // eslint-disable-next-line class-methods-use-this
-  addViews(vc, layoutOption) {
-    // TODO
+  addViews(vc, dataset, layoutOption) {
+    // Add spatialBeta/layerControllerBeta views.
+    const spatialView = vc.addView(dataset, 'spatialBeta');
+    const lcView = vc.addView(dataset, 'layerControllerBeta');
+
+    // Layout.
+    vc.layout(hconcat(spatialView, lcView));
   }
 }

package/src/generate-config-spatialdata.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-unused-vars */
+import { hconcat, vconcat } from './VitessceConfig.js';
 import { AbstractAutoConfig } from './generate-config-helpers.js';
 
 export class SpatialDataAutoConfig extends AbstractAutoConfig {
@@ -83,6 +84,9 @@ export class SpatialDataAutoConfig extends AbstractAutoConfig {
             // region: null,
             tablePath: relPath,
             obsSets: columnOrder.map(c => ({
+              // TODO: determine whether this column is string/categorical.
+              // TODO: determine whether this column contains too many
+              // categories to make sense to consider a cell set.
               path: `${hasObs.path.substring(1)}/${c}`,
               name: c,
             })),
@@ -105,7 +109,28 @@ export class SpatialDataAutoConfig extends AbstractAutoConfig {
   }
 
   // eslint-disable-next-line class-methods-use-this
-  addViews(vc, layoutOption) {
-    // TODO
+  addViews(vc, dataset, layoutOption) {
+    const options = this.getOptions();
+
+    // Add spatialBeta/layerControllerBeta views.
+    const spatialView = vc.addView(dataset, 'spatialBeta');
+    const lcView = vc.addView(dataset, 'layerControllerBeta');
+
+    const controlViews = [lcView];
+    // If obsSets are present, add obsSets view.
+    if (options.obsSets) {
+      const obsSets = vc.addView(dataset, 'obsSets');
+      controlViews.push(obsSets);
+    }
+    // If obsFeatureMatrix is present, add featureList view.
+    if (options.obsFeatureMatrix) {
+      const featureList = vc.addView(dataset, 'featureList');
+      controlViews.push(featureList);
+    }
+
+    // TODO: set up coordination stuff here?
+
+    // Layout.
+    vc.layout(hconcat(spatialView, vconcat(...controlViews)));
   }
 }

package/src/generate-config.js

@@ -1,6 +1,9 @@
 // TODO: ts-check
+
 import { FileType } from '@vitessce/constants-internal';
-import { withConsolidated, FetchStore, ZipFileStore, open as zarrOpen, root as zarrRoot } from 'zarrita';
+import { withConsolidated, FetchStore, open as zarrOpen, root as zarrRoot } from 'zarrita';
+// eslint-disable-next-line import/no-unresolved
+import ZipFileStore from '@zarrita/storage/zip';
 import { transformEntriesForZipFileStore } from '@vitessce/zarr-utils';
 import { VitessceConfig } from './VitessceConfig.js';
 // Classes for different types of objects
@@ -8,6 +11,9 @@ import { AnnDataAutoConfig } from './generate-config-anndata.js';
 import { SpatialDataAutoConfig } from './generate-config-spatialdata.js';
 import { OmeAutoConfig } from './generate-config-ome.js';
 
+// TODO: make this a function parameter?
+const FILE_TYPE_DELIM = '$';
+
 const fileTypeToExtensions = {
   [FileType.IMAGE_OME_TIFF]: ['.ome.tif', '.ome.tiff', '.ome.tf2', '.ome.tf8'],
   [FileType.IMAGE_OME_ZARR]: ['.ome.zarr'],
@@ -51,6 +57,9 @@ const ZARR_FILETYPES = [
 ];
 
 function urlToFileType(url) {
+  // TODO: for plain .zarr, we could open the root .attrs and try to guess a fileType
+  // (we can probably infer at least whether OME-Zarr vs. AnnData vs. SpatialData).
+
   const match = Object.entries(fileTypeToExtensions).find(
     // eslint-disable-next-line no-unused-vars
     ([fileType, extensions]) => extensions.some(ext => url.endsWith(ext)),
@@ -99,15 +108,12 @@ function ensureStores(parsedUrls) {
 
 /**
  *
- * @param {string} s A single string, like this
- * `http://example.com/my_zarr.zarr#anndata.zarr;
- * http://example.com/my_tiff.ome.tif`
- * @returns {{ url: string, fileType: string}[]} The URLs with file types.
+ * @param {string[]} arr
+ * @returns {{ url: string, fileType: string }[]} The URLs with file types.
  */
-export function parseUrls(s) {
-  const urlsWithHashes = s.split(';');
-  return urlsWithHashes.map((urlWithHash) => {
-    const parts = urlWithHash.split('#');
+export function parseUrls(arr) {
+  return arr.map((urlWithHash) => {
+    const parts = urlWithHash.split(FILE_TYPE_DELIM);
     if (parts.length === 1) {
       const [url] = parts;
       return {
@@ -121,10 +127,22 @@ export function parseUrls(s) {
         fileType,
       };
     }
-    throw new Error('Only expected zero or one # character per URL, but received more.');
+    throw new Error(`Only expected zero or one ${FILE_TYPE_DELIM} character per URL, but received more.`);
   });
 }
 
+/**
+ *
+ * @param {string} s A single string, like this
+ * `http://example.com/my_zarr.zarr#anndata.zarr;
+ * http://example.com/my_tiff.ome.tif`
+ * @returns {{ url: string, fileType: string}[]} The URLs with file types.
+ */
+export function parseUrlsFromString(s) {
+  const urlsWithHashes = s.split(';');
+  return parseUrls(urlsWithHashes);
+}
+
 
 export async function parsedUrlToZmetadata(parsedUrl) {
   const { store: initialStore } = parsedUrl;
@@ -247,7 +265,7 @@ export async function generateConfig(parsedUrls, layoutOption = null) {
 
     autoConfig.addFiles(vc, dataset);
     // TODO: add all files, then add all views (in two separate loops)?
-    autoConfig.addViews(vc, layoutOption);
+    autoConfig.addViews(vc, dataset, layoutOption);
   });
 
   const stores = Object.fromEntries(

package/src/generate-config.test.js

@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest';
 import { createStoreFromMapContents } from '@vitessce/zarr-utils';
 import { withConsolidated } from 'zarrita';
-import { parseUrls, parsedUrlToZmetadata, generateConfig } from './generate-config.js';
+import { parseUrlsFromString, parsedUrlToZmetadata, generateConfig } from './generate-config.js';
 import spatialdataMouseLiverFixture from './json-fixtures/mouse_liver.spatialdata.json';
 import anndataMouseLiverFixture from './json-fixtures/mouse_liver.anndata.json';
 import imageOmeZarrMouseLiverFixture from './json-fixtures/mouse_liver.ome.json';
@@ -10,23 +10,23 @@ import obsSegmentationsOmeZarrMouseLiverFixture from './json-fixtures/mouse_live
 describe('generateConfig', () => {
   it('parses URLs', () => {
     const s1 = 'https://example.com/my_image.ome.tif';
-    expect(parseUrls(s1)).toEqual([
+    expect(parseUrlsFromString(s1)).toEqual([
       {
         url: 'https://example.com/my_image.ome.tif',
         fileType: 'image.ome-tiff',
       },
     ]);
 
-    const s2 = 'https://example.com/my_image.ome.tif#obsSegmentations.ome-tiff';
-    expect(parseUrls(s2)).toEqual([
+    const s2 = 'https://example.com/my_image.ome.tif$obsSegmentations.ome-tiff';
+    expect(parseUrlsFromString(s2)).toEqual([
       {
         url: 'https://example.com/my_image.ome.tif',
         fileType: 'obsSegmentations.ome-tiff',
       },
     ]);
 
-    const s3 = 'https://example.com/my_image.ome.tif#obsSegmentations.ome-tiff;http://another.com/obj.zarr#anndata.zarr';
-    expect(parseUrls(s3)).toEqual([
+    const s3 = 'https://example.com/my_image.ome.tif$obsSegmentations.ome-tiff;http://another.com/obj.zarr$anndata.zarr';
+    expect(parseUrlsFromString(s3)).toEqual([
       {
         url: 'https://example.com/my_image.ome.tif',
         fileType: 'obsSegmentations.ome-tiff',

package/src/index.js

@@ -5,3 +5,5 @@ export {
   getInitialCoordinationScopePrefix,
   getInitialCoordinationScopeName,
 } from '@vitessce/utils';
+
+export { generateConfig as generateConfigAlt, parseUrls, parseUrlsFromString } from './generate-config.js';