Fix parsing of committed datatypes metadata with h5wasm

silx-kit · Aug 29, 2024 · 1b3f8e1 · 1b3f8e1
1 parent ac0b148
commit 1b3f8e1
Show file tree

Hide file tree

Showing 4 changed files with 377 additions and 53 deletions.
diff --git a/packages/h5wasm/package.json b/packages/h5wasm/package.json
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "comlink": "4.4.1",
-    "h5wasm": "0.7.6",
+    "h5wasm": "0.7.7",
     "nanoid": "5.0.7"
   },
   "devDependencies": {

diff --git a/packages/h5wasm/src/worker-utils.ts b/packages/h5wasm/src/worker-utils.ts
@@ -147,7 +147,7 @@ export function parseEntity(
   }
 
   if (kind === h5wasm.H5G_TYPE) {
-    const metadata = h5wasm.get_dataset_metadata(fileId, path);
+    const metadata = h5wasm.get_datatype_metadata(fileId, path);
     const { chunks, maxshape, shape, ...rawType } = metadata; // keep `rawType` concise
 
     return {

diff --git a/packages/h5wasm/src/worker.ts b/packages/h5wasm/src/worker.ts
@@ -23,12 +23,7 @@ async function openFileBuffer(buffer: ArrayBuffer): Promise<bigint> {
 
   FS.writeFile(fileName, new Uint8Array(buffer), { flags: 'w+' });
 
-  return h5wasm.ccall(
-    'H5Fopen',
-    'bigint',
-    ['string', 'number', 'bigint'],
-    [fileName, h5wasm.H5F_ACC_RDONLY, 0n],
-  );
+  return h5wasm.open(fileName, h5wasm.H5F_ACC_RDONLY, false);
 }
 
 async function openLocalFile(file: File): Promise<bigint> {
@@ -41,11 +36,10 @@ async function openLocalFile(file: File): Promise<bigint> {
   const { WORKERFS } = FS.filesystems;
   WORKERFS.createNode(rootNode, fileName, WORKERFS.FILE_MODE, 0, file);
 
-  return h5wasm.ccall(
-    'H5Fopen',
-    'bigint',
-    ['string', 'number', 'bigint'],
-    [`${WORKERFS_FOLDER}/${fileName}`, h5wasm.H5F_ACC_RDONLY, 0n],
+  return h5wasm.open(
+    `${WORKERFS_FOLDER}/${fileName}`,
+    h5wasm.H5F_ACC_RDONLY,
+    false,
   );
 }