Fix nested types (#18)

Author: kylebarron

.gitignore

@@ -1,4 +1,5 @@
 lib/
+.yarn
 
 # Logs
 logs

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

src/vector.ts

@@ -35,7 +35,7 @@ function parseData<T extends DataType>(
   }
 
   const ptrToChildrenPtrs = dataView.getUint32(ptr + 44, true);
-  const children = new Array(Number(nChildren));
+  const children: arrow.Vector[] = new Array(Number(nChildren));
   for (let i = 0; i < nChildren; i++) {
     children[i] = parseVector(
       buffer,
@@ -273,41 +273,55 @@ function parseData<T extends DataType>(
           copyBuffer(dataView.buffer, offsetsPtr, (length + 1) * 4)
         )
       : new Int32Array(dataView.buffer, offsetsPtr, length + 1);
+
+    assert(children[0].data.length === 1);
+    let childData = children[0].data[0];
+
     return arrow.makeData({
       type: dataType,
       offset,
       length,
       nullCount,
       nullBitmap,
       valueOffsets,
-      child: children[0],
+      child: childData,
     });
   }
 
   if (DataType.isFixedSizeList(dataType)) {
     assert(nChildren === 1);
     const [validityPtr] = bufferPtrs;
     const nullBitmap = parseNullBitmap(dataView.buffer, validityPtr, copy);
+
+    assert(children[0].data.length === 1);
+    let childData = children[0].data[0];
+
     return arrow.makeData({
       type: dataType,
       offset,
       length,
       nullCount,
       nullBitmap,
-      child: children[0],
+      child: childData,
     });
   }
 
   if (DataType.isStruct(dataType)) {
     const [validityPtr] = bufferPtrs;
     const nullBitmap = parseNullBitmap(dataView.buffer, validityPtr, copy);
+
+    let childData = children.map(child => {
+        assert(child.data.length === 1);
+        return child.data[0];
+    })
+
     return arrow.makeData({
       type: dataType,
       offset,
       length,
       nullCount,
       nullBitmap,
-      children,
+      children: childData,
     });
   }
 

tests/ffi.ts

@@ -7,7 +7,7 @@ import { parseField, parseVector } from "../src";
 wasm.setPanicHook();
 
 // @ts-expect-error
-const WASM_MEMORY = wasm.__wasm.memory;
+const WASM_MEMORY: WebAssembly.Memory = wasm.__wasm.memory;
 
 interface FixtureType {
   data: any;
@@ -121,7 +121,7 @@ test("primitive types non-null with copy", (t) => {
   t.end();
 });
 
-test.skip("fixed size list", (t) => {
+test("fixed size list", (t) => {
   const table = loadIPCTableFromDisk("tests/fixed_size_list.arrow");
   const originalField = table.schema.fields[0];
   const originalVector = table.getChildAt(0);
@@ -130,11 +130,18 @@ test.skip("fixed size list", (t) => {
   const fieldPtr = ffiTable.schemaAddr(0);
   const field = parseField(WASM_MEMORY.buffer, fieldPtr);
 
-  t.equals(field.name, originalField.name);
-  t.equals(field.typeId, originalField.typeId);
-  // t.equals(field.nullable, originalField.nullable);
+  t.equals(field.name, originalField.name, "Field name should be equal.");
+  t.equals(field.typeId, originalField.typeId, "Type id should be equal.");
 
-  console.log("field", field);
+  const arrayPtr = ffiTable.arrayAddr(0, 0);
+  const wasmVector = parseVector(WASM_MEMORY.buffer, arrayPtr, field.type);
+
+  t.equals(wasmVector.get(0).get(0), 1);
+  t.equals(wasmVector.get(0).get(1), 2);
+  t.equals(wasmVector.get(1).get(0), 3);
+  t.equals(wasmVector.get(1).get(1), 4);
+  t.equals(wasmVector.get(2).get(0), 5);
+  t.equals(wasmVector.get(2).get(1), 6);
 
   t.end();
 });

tests/rust-arrow-ffi/.gitignore

@@ -3,3 +3,4 @@
 bin/
 pkg/
 wasm-pack.log
+.yarn

tests/rust-arrow-ffi/yarn.lock

@@ -0,0 +1,11 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 6
+
+"root-workspace-0b6124@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "root-workspace-0b6124@workspace:."
+  languageName: unknown
+  linkType: soft