Remove obsolete AttrValuesStore#getSingle()

Author: axelboc

packages/app/src/providers/DataProvider.tsx

@@ -1,5 +1,4 @@
 import { isGroup } from '@h5web/shared/guards';
-import { type Entity } from '@h5web/shared/hdf5-models';
 import { getNameFromPath } from '@h5web/shared/hdf5-utils';
 import { createFetchStore } from '@h5web/shared/react-suspense-fetch';
 import {
@@ -9,10 +8,8 @@ import {
   useMemo,
 } from 'react';
 
-import { hasAttribute } from '../utils';
 import { type DataProviderApi } from './api';
 import {
-  type AttrName,
   type AttrValuesStore,
   type EntitiesStore,
   type ValuesStore,
@@ -70,18 +67,10 @@ function DataProvider(props: PropsWithChildren<Props>) {
   }, [api]);
 
   const attrValuesStore = useMemo(() => {
-    const store = createFetchStore(
+    return createFetchStore(
       api.getAttrValues.bind(api),
       (a, b) => a.path === b.path,
     );
-
-    return Object.assign(store, {
-      getSingle: (entity: Entity, attrName: AttrName) => {
-        return hasAttribute(entity, attrName)
-          ? attrValuesStore.get(entity)[attrName]
-          : undefined;
-      },
-    });
   }, [api]);
 
   return (

packages/app/src/providers/models.ts

@@ -15,16 +15,13 @@ import { type NxAttribute } from '../vis-packs/nexus/models';
 
 export type EntitiesStore = FetchStore<string, ProvidedEntity>;
 export type ValuesStore = FetchStore<ValuesStoreParams, unknown>;
+export type AttrValuesStore = FetchStore<Entity, AttributeValues>;
 
 export interface ValuesStoreParams {
   dataset: Dataset<ScalarShape | ArrayShape>;
   selection?: string | undefined;
 }
 
-export interface AttrValuesStore extends FetchStore<Entity, AttributeValues> {
-  getSingle: (entity: Entity, attrName: AttrName) => unknown;
-}
-
 export type ImageAttribute = 'CLASS' | 'IMAGE_SUBCLASS';
 export type AttrName = NxAttribute | ImageAttribute | '_FillValue';
 

packages/app/src/utils.ts

@@ -1,7 +1,9 @@
 import { assertValue } from '@h5web/shared/guards';
 import {
+  type ArrayShape,
   type Attribute,
   type Entity,
+  type ScalarShape,
   type Value,
 } from '@h5web/shared/hdf5-models';
 
@@ -18,11 +20,9 @@ export function findAttribute(
   return entity.attributes.find((attr) => attr.name === attributeName);
 }
 
-export function getAttributeValue<A extends Attribute>(
-  entity: Entity,
-  attribute: A,
-  attrValuesStore: AttrValuesStore,
-): Value<A> {
+export function getAttributeValue<
+  A extends Attribute<ScalarShape | ArrayShape>,
+>(entity: Entity, attribute: A, attrValuesStore: AttrValuesStore): Value<A> {
   const value = attrValuesStore.get(entity)[attribute.name];
   assertValue(value, attribute);
   return value;

packages/app/src/vis-packs/core/visualizations.test.ts

@@ -1,4 +1,4 @@
-import { type Entity } from '@h5web/shared/hdf5-models';
+import { type AttributeValues, type Entity } from '@h5web/shared/hdf5-models';
 import {
   arrayShape,
   boolType,
@@ -20,14 +20,13 @@ import { type AttrValuesStore } from '../../providers/models';
 import { CORE_VIS } from './visualizations';
 
 const mockStore = {
-  getSingle: (entity: Entity, attributeName: string): unknown => {
-    const attr = entity.attributes.find(({ name }) => name === attributeName);
-    if (!attr) {
-      return undefined;
-    }
-
-    assertMockAttribute(attr);
-    return attr.value;
+  get: (entity: Entity): AttributeValues => {
+    return Object.fromEntries(
+      entity.attributes.map((attr) => {
+        assertMockAttribute(attr);
+        return [attr.name, attr.value];
+      }),
+    );
   },
 };
 

packages/app/src/vis-packs/core/visualizations.ts

@@ -9,6 +9,7 @@ import {
   hasPrintableCompoundType,
   hasPrintableType,
   hasScalarShape,
+  hasStringType,
 } from '@h5web/shared/guards';
 import { type Dataset } from '@h5web/shared/hdf5-models';
 import {
@@ -148,9 +149,10 @@ export const CORE_VIS = {
     ConfigProvider: RgbConfigProvider,
     supportsDataset: (dataset, attrValuesStore) => {
       const classAttr = findAttribute(dataset, 'CLASS');
-      const classVal = classAttr
-        ? getAttributeValue(dataset, classAttr, attrValuesStore)
-        : undefined;
+      const classVal =
+        classAttr && hasScalarShape(classAttr) && hasStringType(classAttr)
+          ? getAttributeValue(dataset, classAttr, attrValuesStore)
+          : undefined;
 
       return (
         classVal === 'IMAGE' &&

packages/app/src/vis-packs/nexus/utils.ts

@@ -8,6 +8,7 @@ import {
   assertScalarShape,
   assertStringType,
   hasArrayShape,
+  hasNonNullShape,
   hasScalarShape,
   hasStringType,
   isAxisScaleType,
@@ -151,7 +152,7 @@ export function findAssociatedDatasets(
   attrValuesStore: AttrValuesStore,
 ): (Dataset<ArrayShape> | undefined)[] {
   const attr = findAttribute(group, type);
-  if (!attr || !hasStringType(attr)) {
+  if (!attr || !hasNonNullShape(attr) || !hasStringType(attr)) {
     return [];
   }
 

packages/app/src/vis-packs/nexus/visualizations.ts

@@ -3,6 +3,8 @@ import {
   hasMinDims,
   hasNumDims,
   hasNumericType,
+  hasScalarShape,
+  hasStringType,
 } from '@h5web/shared/guards';
 import {
   type ArrayShape,
@@ -93,9 +95,10 @@ export const NX_DATA_VIS = {
     ConfigProvider: RgbConfigProvider,
     supports: (_, signal, interpretation, attrValuesStore) => {
       const classAttr = findAttribute(signal, 'CLASS');
-      const classVal = classAttr
-        ? getAttributeValue(signal, classAttr, attrValuesStore)
-        : undefined;
+      const classVal =
+        classAttr && hasScalarShape(classAttr) && hasStringType(classAttr)
+          ? getAttributeValue(signal, classAttr, attrValuesStore)
+          : undefined;
 
       return (
         (interpretation === NxInterpretation.RGB || classVal === 'IMAGE') &&