Fix JS slices (#372)

rust-diplomat · Nov 28, 2023 · 5e392d5 · 5e392d5
1 parent e2e9442
commit 5e392d5
Show file tree

Hide file tree

Showing 9 changed files with 190 additions and 175 deletions.
diff --git a/example/js/lib/api/diplomat-runtime.js b/example/js/lib/api/diplomat-runtime.js
diff --git a/feature_tests/js/api/Float64Vec.js b/feature_tests/js/api/Float64Vec.js
diff --git a/feature_tests/js/api/Foo.js b/feature_tests/js/api/Foo.js
diff --git a/feature_tests/js/api/diplomat-runtime.js b/feature_tests/js/api/diplomat-runtime.js
diff --git a/feature_tests/js/docs/source/slices_ffi.rst b/feature_tests/js/docs/source/slices_ffi.rst
diff --git a/tool/src/js/conversions.rs b/tool/src/js/conversions.rs
@@ -121,20 +121,20 @@ pub fn gen_value_js_to_rust<'env>(
             // clean this up.
             if let ast::TypeName::PrimitiveSlice(.., prim) = typ {
                 pre_logic.push(format!(
-                    "const {param_name_buf} = diplomatRuntime.DiplomatBuf.slice(wasm, {param_name}, {align});",
-                    align = layout::primitive_size_alignment(*prim).align()
+                    "const {param_name_buf} = diplomatRuntime.DiplomatBuf.slice(wasm, {param_name}, {rust_type:?});",
+                    rust_type = prim.to_string(),
                 ));
-            } else if matches!(
-                typ,
-                ast::TypeName::StrReference(_, ast::StringEncoding::UnvalidatedUtf16)
-            ) {
+            } else if let ast::TypeName::StrReference(_, encoding) = typ {
                 pre_logic.push(format!(
-                    "const {param_name_buf} = diplomatRuntime.DiplomatBuf.str16(wasm, {param_name}, 2);",
+                    "const {param_name_buf} = diplomatRuntime.DiplomatBuf.{}(wasm, {param_name});",
+                    match encoding {
+                        ast::StringEncoding::UnvalidatedUtf8 => "str8",
+                        ast::StringEncoding::UnvalidatedUtf16 => "str16",
+                        _ => unreachable!("unknown AST/HIR variant"),
+                    }
                 ));
             } else {
-                pre_logic.push(format!(
-                    "const {param_name_buf} = diplomatRuntime.DiplomatBuf.str8(wasm, {param_name});"
-                ));
+                unreachable!("unknown AST/HIR variant");
             }
 
             invocation_params.push(format!("{param_name_buf}.ptr"));
@@ -144,6 +144,7 @@ pub fn gen_value_js_to_rust<'env>(
                 .as_named()
                 .and_then(|current| borrowed_current_to_root.get(current))
             {
+                post_logic.push(format!("{param_name_buf}.garbageCollect();"));
                 entries.entry(named).or_default().push(param_name_buf);
             } else if lifetime == &ast::Lifetime::Static {
                 post_logic.push(format!("{param_name_buf}.leak();"));

diff --git a/tool/src/js/docs.rs b/tool/src/js/docs.rs
@@ -142,19 +142,6 @@ pub fn gen_method_docs<W: fmt::Write>(
         writeln!(method_indented)?;
     }
 
-    for p in method
-        .params
-        .iter()
-        .filter(|p| matches!(p.ty, ast::TypeName::PrimitiveSlice(..)))
-    {
-        writeln!(
-            method_indented,
-            "- Note: ``{}`` should be an ArrayBuffer or TypedArray corresponding to the slice type expected by Rust.",
-            p.name
-        )?;
-        writeln!(method_indented)?;
-    }
-
     let static_borrows = method.borrowed_params();
     let static_borrows = static_borrows.static_names().collect::<Vec<_>>();
     if !static_borrows.is_empty() {