Merge pull request #1249 from silx-kit/fix-value-type

Fix `Value<D>` and export `getExportURL` function type
silx-kit · Nov 2, 2022 · ff35ff7 · ff35ff7
2 parents d582960 + 36df934
commit ff35ff7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/packages/app/src/index.ts b/packages/app/src/index.ts
@@ -1,3 +1,5 @@
+import type { DataProviderApi } from './providers/api';
+
 export { default as App } from './App';
 
 export { default as MockProvider } from './providers/mock/MockProvider';
@@ -7,6 +9,7 @@ export { default as H5GroveProvider } from './providers/h5grove/H5GroveProvider'
 export { getFeedbackMailto } from './breadcrumbs/utils';
 export type { FeedbackContext } from './breadcrumbs/models';
 export type { ExportFormat, ExportURL } from './providers/models';
+export type GetExportURL = NonNullable<DataProviderApi['getExportURL']>;
 
 // Context
 export { useDataContext } from './providers/DataProvider';

diff --git a/packages/app/src/providers/hsds/hsds-api.ts b/packages/app/src/providers/hsds/hsds-api.ts
@@ -8,7 +8,6 @@ import type {
   ChildEntity,
   ProvidedEntity,
   ArrayShape,
-  DType,
   Value,
 } from '@h5web/shared';
 import { assertGroup } from '@h5web/shared';
@@ -152,7 +151,7 @@ export class HsdsApi extends DataProviderApi {
     );
   }
 
-  public getExportURL<D extends Dataset<ArrayShape, DType>>(
+  public getExportURL<D extends Dataset<ArrayShape>>(
     format: ExportFormat,
     dataset: D,
     selection: string | undefined,

diff --git a/packages/h5wasm/src/h5wasm-api.ts b/packages/h5wasm/src/h5wasm-api.ts
@@ -12,7 +12,6 @@ import type {
   Attribute,
   ChildEntity,
   Dataset,
-  DType,
   Entity,
   Group,
   ProvidedEntity,
@@ -95,7 +94,7 @@ export class H5WasmApi extends ProviderApi {
     );
   }
 
-  public getExportURL<D extends Dataset<ArrayShape, DType>>(
+  public getExportURL<D extends Dataset<ArrayShape>>(
     format: ExportFormat,
     dataset: D,
     selection: string | undefined,

diff --git a/packages/shared/src/models-hdf5.ts b/packages/shared/src/models-hdf5.ts
@@ -175,10 +175,12 @@ export type ArrayValue<T extends DType> =
   | Primitive<T>[]
   | (T extends NumericType ? TypedArray : never);
 
-export type Value<D extends Dataset> = D['shape'] extends ScalarShape
-  ? Primitive<D['type']>
-  : D['shape'] extends ArrayShape
-  ? ArrayValue<D['type']>
+export type Value<D extends Dataset> = D extends Dataset<infer S, infer T>
+  ? S extends ScalarShape
+    ? Primitive<T>
+    : S extends ArrayShape
+    ? ArrayValue<T>
+    : never
   : never;
 
 export type AttributeValues = Record<string, unknown>;