Loosen attribute helpers to allow any attribute names

Author: axelboc

packages/app/src/providers/models.ts

@@ -11,8 +11,6 @@ import {
   type OnProgress,
 } from '@h5web/shared/react-suspense-fetch';
 
-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>;
@@ -22,9 +20,6 @@ export interface ValuesStoreParams {
   selection?: string | undefined;
 }
 
-export type ImageAttribute = 'CLASS' | 'IMAGE_SUBCLASS';
-export type AttrName = NxAttribute | ImageAttribute | '_FillValue';
-
 export type ProgressCallback = (prog: number[]) => void;
 
 export type Fetcher = (

packages/app/src/utils.ts

@@ -14,22 +14,22 @@ import {
   type Value,
 } from '@h5web/shared/hdf5-models';
 
-import { type AttrName, type AttrValuesStore } from './providers/models';
+import { type AttrValuesStore } from './providers/models';
 
-export function hasAttribute(entity: Entity, attributeName: AttrName): boolean {
+export function hasAttribute(entity: Entity, attributeName: string): boolean {
   return entity.attributes.some((attr) => attr.name === attributeName);
 }
 
 export function findAttribute(
   entity: Entity,
-  attributeName: AttrName,
+  attributeName: string,
 ): Attribute | undefined {
   return entity.attributes.find((attr) => attr.name === attributeName);
 }
 
 export function findScalarNumAttr(
   entity: Entity,
-  attributeName: AttrName,
+  attributeName: string,
 ): Attribute<ScalarShape, NumericType> | undefined {
   const attr = findAttribute(entity, attributeName);
   return attr && hasScalarShape(attr) && hasNumericType(attr)
@@ -39,7 +39,7 @@ export function findScalarNumAttr(
 
 export function findScalarStrAttr(
   entity: Entity,
-  attributeName: AttrName,
+  attributeName: string,
 ): Attribute<ScalarShape, StringType> | undefined {
   const attr = findAttribute(entity, attributeName);
   return attr && hasScalarShape(attr) && hasStringType(attr) ? attr : undefined;

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

@@ -11,18 +11,6 @@ import {
 } from '@h5web/shared/hdf5-models';
 import { type AxisMapping } from '@h5web/shared/nexus-models';
 
-export type NxAttribute =
-  | 'NX_class'
-  | 'signal'
-  | 'interpretation'
-  | 'axes'
-  | 'default'
-  | 'default_slice'
-  | 'long_name'
-  | 'units'
-  | 'SILX_style'
-  | 'auxiliary_signals';
-
 export interface DatasetInfo {
   label: string;
   unit: string | undefined;