Correctly handle padding in JS2 (#660)

rust-diplomat · Aug 27, 2024 · f6cb561 · f6cb561
1 parent 0183677
commit f6cb561
Show file tree

Hide file tree

Showing 19 changed files with 528 additions and 85 deletions.
diff --git a/example/js/lib/api/FixedDecimalFormatterOptions.mjs b/example/js/lib/api/FixedDecimalFormatterOptions.mjs
diff --git a/example/js/lib/api/diplomat-runtime.mjs b/example/js/lib/api/diplomat-runtime.mjs
diff --git a/feature_tests/js/api/BigStructWithStuff.d.ts b/feature_tests/js/api/BigStructWithStuff.d.ts
diff --git a/feature_tests/js/api/BigStructWithStuff.mjs b/feature_tests/js/api/BigStructWithStuff.mjs
diff --git a/feature_tests/js/api/ImportedStruct.mjs b/feature_tests/js/api/ImportedStruct.mjs
diff --git a/feature_tests/js/api/MyStruct.mjs b/feature_tests/js/api/MyStruct.mjs
diff --git a/feature_tests/js/api/ScalarPairWithPadding.d.ts b/feature_tests/js/api/ScalarPairWithPadding.d.ts
diff --git a/feature_tests/js/api/ScalarPairWithPadding.mjs b/feature_tests/js/api/ScalarPairWithPadding.mjs
diff --git a/feature_tests/js/api/diplomat-runtime.mjs b/feature_tests/js/api/diplomat-runtime.mjs
diff --git a/feature_tests/js/api/index.d.ts b/feature_tests/js/api/index.d.ts
diff --git a/feature_tests/js/api/index.mjs b/feature_tests/js/api/index.mjs
diff --git a/feature_tests/js/test/struct.mjs b/feature_tests/js/test/struct.mjs
@@ -1,5 +1,5 @@
 import test from 'ava';
-import { MyEnum, MyStruct } from "diplomat-wasm-js-feature-tests";
+import { MyEnum, MyStruct, ScalarPairWithPadding, BigStructWithStuff } from "diplomat-wasm-js-feature-tests";
 
 test("Verify invariants of struct", t => {
     const s = MyStruct.new_("hello");
@@ -16,4 +16,16 @@ test("Verify invariants of struct", t => {
 test("Test struct creation", t => {
     const s = new MyStruct(17, true, 209, 1234n, 5991, '餐'.codePointAt(0), MyEnum.B);
     t.is(s.intoA(), 17);
-});
+});
+
+test("Test struct layout: scalar pair layout", t => {
+    const s = new ScalarPairWithPadding(122, 414);
+    s.assertValue();
+    t.is(true, true); // Ava doesn't like tests without assertions
+});
+
+test("Test struct layout: complex struct with multiple padding types and contained scalar pair", t => {
+    const s = new BigStructWithStuff(101, 505, 9345, new ScalarPairWithPadding(122, 414), 99);
+    s.assertValue(853);
+    t.is(true, true); // Ava doesn't like tests without assertions
+});