Assert array and vlen type values

Author: axelboc

packages/app/src/index.ts

@@ -148,6 +148,7 @@ export {
   isComplexType,
   isPrintableType,
   isCompoundType,
+  isArrayOrVlenType,
   hasType,
   hasStringType,
   hasIntegerType,

packages/shared/src/guards.test.ts

@@ -3,6 +3,7 @@ import { describe, expect, it } from 'vitest';
 import { assertScalarValue, assertValue } from './guards';
 import {
   arrayShape,
+  arrayType,
   boolType,
   compoundType,
   cplxType,
@@ -11,6 +12,7 @@ import {
   intType,
   scalarShape,
   strType,
+  vlenType,
 } from './hdf5-utils';
 import { dataset } from './mock-utils';
 
@@ -38,12 +40,21 @@ describe('assertScalarValue', () => {
       assertScalarValue([0, 0], cplxType(intType())),
     ).not.toThrowError();
 
+    expect(() =>
+      assertScalarValue([0, 0], arrayType(intType(), [2])),
+    ).not.toThrowError();
+
+    expect(() =>
+      assertScalarValue([0], vlenType(floatType())),
+    ).not.toThrowError();
+
     expect(() =>
       assertScalarValue(
-        [0, ''],
+        [0, '', [[]]],
         compoundType([
           ['int', intType()],
           ['str', strType()],
+          ['nested', compoundType([['vlen', vlenType(floatType())]])],
         ]),
       ),
     ).not.toThrowError();

packages/shared/src/guards.ts

@@ -2,6 +2,7 @@ import { type Data, type NdArray, type TypedArray } from 'ndarray';
 
 import {
   type ArrayShape,
+  type ArrayType,
   type BooleanType,
   type ComplexArray,
   type ComplexType,
@@ -31,6 +32,7 @@ import {
   type ShapeClassMap,
   type StringType,
   type Value,
+  type VLenType,
 } from './hdf5-models';
 import {
   type AnyNumArray,
@@ -637,6 +639,10 @@ export function assertPrintableCompoundType<O extends HasType<CompoundType>>(
   }
 }
 
+export function isArrayOrVlenType(type: DType): type is ArrayType | VLenType {
+  return type.class === DTypeClass.Array || type.class === DTypeClass.VLen;
+}
+
 export function isComplexValue(
   type: DType,
   value: unknown,
@@ -665,6 +671,11 @@ export function assertScalarValue<T extends DType>(
     type.fields.values().forEach((fieldType, index) => {
       assertScalarValue(value[index], fieldType);
     });
+  } else if (isArrayOrVlenType(type)) {
+    assertArrayOrTypedArray(value);
+    if (value.length > 0) {
+      assertScalarValue(value[0], type.base);
+    }
   }
 }