fix(wasm-api): fix TS code gen array mem mapping

- use correct type size for array mem mapping - update test fixtures
thi-ng · Nov 1, 2022 · a0e7132 · a0e7132
1 parent dae2279
commit a0e7132
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/packages/wasm-api/src/codegen/typescript.ts b/packages/wasm-api/src/codegen/typescript.ts
@@ -15,6 +15,7 @@ import {
 	ICodeGen,
 	PKG_NAME,
 	Struct,
+	TypeColl,
 	Union,
 	WasmPrim,
 	WasmTarget,
@@ -201,7 +202,11 @@ import { MemorySlice, Pointer, ${__stringImpl(
 						);
 					} else {
 						const fn = f.len
-							? [`(addr) => {`, ...__mapArray(f, f.len), `}`]
+							? [
+									`(addr) => {`,
+									...__mapArray(f, types, f.len),
+									`}`,
+							  ]
 							: [`(addr) => new $${f.type}.instance(addr)`];
 						lines.push(
 							`return $${f.name} || ($${
@@ -238,7 +243,7 @@ import { MemorySlice, Pointer, ${__stringImpl(
 					} else {
 						lines.push(
 							`const addr = ${__ptr(opts.target, offset)};`,
-							...__mapArray(f)
+							...__mapArray(f, types)
 						);
 					}
 				} else if (f.tag === "array" || f.tag === "vec") {
@@ -262,7 +267,7 @@ import { MemorySlice, Pointer, ${__stringImpl(
 					} else {
 						lines.push(
 							`const addr = ${__addr(offset)};`,
-							...__mapArray(f, f.len)
+							...__mapArray(f, types, f.len)
 						);
 					}
 				} else {
@@ -375,10 +380,12 @@ const __mem = (type: string, offset: number) =>
 	`mem.${type}[${__addrShift(offset!, type)}]`;
 
 /** @internal */
-const __mapArray = (f: Field, len: NumOrString = "len") => [
+const __mapArray = (f: Field, types: TypeColl, len: NumOrString = "len") => [
 	`const inst = $${f.type}(mem);`,
 	`const slice: ${f.type}[] = [];`,
-	`for(let i = 0; i < ${len}; i++) slice.push(inst.instance(addr + i * ${f.__size}));`,
+	`for(let i = 0; i < ${len}; i++) slice.push(inst.instance(addr + i * ${
+		types[f.type].__size
+	}));`,
 	`return slice;`,
 ];
 

diff --git a/packages/wasm-api/test/fixtures/union.ts b/packages/wasm-api/test/fixtures/union.ts
@@ -52,10 +52,10 @@ export const $A: WasmTypeConstructor<A> = (mem) => ({
 				return $c || ($c = new Pointer<Uint16Array>(mem, (base + 8), (base) => mem.u16.subarray(base >>> 1, (base >>> 1) + 3)));
 			},
 			get d(): number {
-				return mem.f64[(base + 16) >>> 2];
+				return mem.f64[(base + 16) >>> 3];
 			},
 			set d(x: number) {
-				mem.f64[(base + 16) >>> 2] = x;
+				mem.f64[(base + 16) >>> 3] = x;
 			},
 		};
 	}
@@ -88,7 +88,7 @@ export const $B: WasmTypeConstructor<B> = (mem) => ({
 				const addr = base;
 				const inst = $A(mem);
 				const slice: A[] = [];
-				for(let i = 0; i < 3; i++) slice.push(inst.instance(addr + i * 72));
+				for(let i = 0; i < 3; i++) slice.push(inst.instance(addr + i * 24));
 				return slice;
 			},
 			get b(): bigint {