@vitessce/vega 3.4.9 → 3.4.11

package/dist/index.js

@@ -47025,6 +47025,9 @@ const configSchema1_0_16 = configSchema1_0_13.extend({
     coordinationScopesBy: componentCoordinationScopesBy.optional()
   }))
 });
+const configSchema1_0_17 = configSchema1_0_16.extend({
+  version: z.literal("1.0.17")
+});
 configSchema1_0_0.shape.coordinationSpace.unwrap();
 configSchema1_0_0.shape.layout.element.shape.coordinationScopes.unwrap();
 function upgradeReplaceViewProp(prefix2, view, coordinationSpace) {
@@ -47496,7 +47499,43 @@ function upgradeFrom1_0_15(config) {
     version: "1.0.16"
   };
 }
-const latestConfigSchema = configSchema1_0_16;
+function upgradeFrom1_0_16(config) {
+  const newConfig = cloneDeep(config);
+  const { datasets } = newConfig;
+  const newDatasets = datasets.map((datasetDef) => {
+    const { files: files2 } = datasetDef;
+    const newFiles = files2.map((fileDef) => {
+      const { fileType, options } = fileDef;
+      if (fileType === "obsSets.anndata.zarr") {
+        return {
+          ...fileDef,
+          options: {
+            obsSets: options
+          }
+        };
+      }
+      if (fileType === "obsFeatureColumns.anndata.zarr") {
+        return {
+          ...fileDef,
+          options: {
+            obsFeatureColumns: options
+          }
+        };
+      }
+      return fileDef;
+    });
+    return {
+      ...datasetDef,
+      files: newFiles
+    };
+  });
+  return {
+    ...newConfig,
+    datasets: newDatasets,
+    version: "1.0.17"
+  };
+}
+const latestConfigSchema = configSchema1_0_17;
 const SCHEMA_HANDLERS = [
   [configSchema0_1_0, upgradeFrom0_1_0],
   [configSchema1_0_0, upgradeFrom1_0_0],
@@ -47514,7 +47553,8 @@ const SCHEMA_HANDLERS = [
   [configSchema1_0_12, upgradeFrom1_0_12],
   [configSchema1_0_13, upgradeFrom1_0_13],
   [configSchema1_0_14, upgradeFrom1_0_14],
-  [configSchema1_0_15, upgradeFrom1_0_15]
+  [configSchema1_0_15, upgradeFrom1_0_15],
+  [configSchema1_0_16, upgradeFrom1_0_16]
 ];
 var re$5 = { exports: {} };
 const SEMVER_SPEC_VERSION$1 = "2.0.0";
@@ -49660,6 +49700,7 @@ const FileType$1 = {
   // Joint file types
   ANNDATA_ZARR: "anndata.zarr",
   ANNDATA_ZARR_ZIP: "anndata.zarr.zip",
+  ANNDATA_H5AD: "anndata.h5ad",
   SPATIALDATA_ZARR: "spatialdata.zarr",
   // Atomic file types
   OBS_EMBEDDING_CSV: "obsEmbedding.csv",
@@ -49700,6 +49741,18 @@ const FileType$1 = {
   OBS_LABELS_ANNDATA_ZARR_ZIP: "obsLabels.anndata.zarr.zip",
   FEATURE_LABELS_ANNDATA_ZARR_ZIP: "featureLabels.anndata.zarr.zip",
   SAMPLE_EDGES_ANNDATA_ZARR_ZIP: "sampleEdges.anndata.zarr.zip",
+  // AnnData - h5ad via reference spec
+  OBS_FEATURE_MATRIX_ANNDATA_H5AD: "obsFeatureMatrix.anndata.h5ad",
+  OBS_FEATURE_COLUMNS_ANNDATA_H5AD: "obsFeatureColumns.anndata.h5ad",
+  OBS_SETS_ANNDATA_H5AD: "obsSets.anndata.h5ad",
+  OBS_EMBEDDING_ANNDATA_H5AD: "obsEmbedding.anndata.h5ad",
+  OBS_SPOTS_ANNDATA_H5AD: "obsSpots.anndata.h5ad",
+  OBS_POINTS_ANNDATA_H5AD: "obsPoints.anndata.h5ad",
+  OBS_LOCATIONS_ANNDATA_H5AD: "obsLocations.anndata.h5ad",
+  OBS_SEGMENTATIONS_ANNDATA_H5AD: "obsSegmentations.anndata.h5ad",
+  OBS_LABELS_ANNDATA_H5AD: "obsLabels.anndata.h5ad",
+  FEATURE_LABELS_ANNDATA_H5AD: "featureLabels.anndata.h5ad",
+  SAMPLE_EDGES_ANNDATA_H5AD: "sampleEdges.anndata.h5ad",
   // SpatialData
   IMAGE_SPATIALDATA_ZARR: "image.spatialdata.zarr",
   LABELS_SPATIALDATA_ZARR: "labels.spatialdata.zarr",
@@ -50048,10 +50101,11 @@ function makeConstantWithDeprecationMessage(currObj, oldObj) {
   const handler = {
     get(obj, prop) {
       const oldKeys = Object.keys(oldObj);
-      if (oldKeys.includes(prop)) {
-        console.warn(`Notice about the constant mapping ${prop}: '${oldObj[prop][0]}':
-${oldObj[prop][1]}`);
-        return oldObj[prop];
+      const propKey = String(prop);
+      if (oldKeys.includes(propKey)) {
+        console.warn(`Notice about the constant mapping ${propKey}: '${oldObj[propKey][0]}':
+${oldObj[propKey][1]}`);
+        return oldObj[propKey];
       }
       return obj[prop];
     }
@@ -50136,7 +50190,7 @@ const annDataObsFeatureMatrix = z.object({
   featureFilterPath: z.string().optional().describe("If the feature index should be filtered, put a boolean column here (analogous to the previous geneFilter option). e.g., var/in_obsm_X_small_matrix"),
   initialFeatureFilterPath: z.string().optional().describe("If only a subset of the matrix should be loaded initially, put a boolean column along the feature axis here (analogous to the previous matrixGeneFilter option). e.g., var/highly_variable")
 });
-const annDataObsSets = z.array(z.object({
+const annDataObsSetsArr = z.array(z.object({
   name: z.string().describe("The display name for the set, like 'Cell Type' or 'Louvain.'"),
   path: z.union([
     z.string().describe("The location in the AnnData store for the set, like 'obs/louvain' or 'obs/celltype.'"),
@@ -50144,9 +50198,15 @@ const annDataObsSets = z.array(z.object({
   ]),
   scorePath: z.string().optional().describe("The location in the AnnData store for the set confidence scores, like 'obs/celltype_prediction_score.'")
 }));
-z.array(z.object({
+const annDataObsSets = z.object({
+  obsSets: annDataObsSetsArr
+});
+const annDataObsFeatureColumnsArr = z.array(z.object({
   path: z.string()
 }));
+z.object({
+  obsFeatureColumns: annDataObsFeatureColumnsArr
+});
 const annDataObsSpots = annDataObsm;
 const annDataObsPoints = annDataObsm;
 const annDataObsLocations = annDataObsm;
@@ -50269,7 +50329,7 @@ z.object({
     scoreColumn: z.string().optional()
   }))
 });
-z.object({
+const anndataZarrSchema = z.object({
   obsLabels: z.union([
     annDataObsLabels,
     z.array(annDataConvenienceObsLabelsItem)
@@ -50279,7 +50339,7 @@ z.object({
     z.array(annDataConvenienceFeatureLabelsItem)
   ]),
   obsFeatureMatrix: annDataObsFeatureMatrix,
-  obsSets: annDataObsSets,
+  obsSets: annDataObsSetsArr,
   obsSpots: annDataObsSpots,
   obsPoints: annDataObsPoints,
   obsLocations: annDataObsLocations,
@@ -50290,6 +50350,9 @@ z.object({
   ]),
   sampleEdges: annDataSampleEdges
 }).partial();
+anndataZarrSchema.extend({
+  refSpecUrl: z.string()
+});
 z.object({
   // TODO: should `image` be a special schema
   // to allow specifying fileUid (like for embeddingType)?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/vega",
-  "version": "3.4.9",
+  "version": "3.4.11",
   "author": "Gehlenborg Lab",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -22,8 +22,8 @@
     "vega": "^5.21.0",
     "vega-lite": "^5.1.1",
     "vega-tooltip": "^0.27.0",
-    "@vitessce/tooltip": "3.4.9",
-    "@vitessce/legend": "3.4.9"
+    "@vitessce/tooltip": "3.4.11",
+    "@vitessce/legend": "3.4.11"
   },
   "devDependencies": {
     "react": "^18.0.0",