fix js str decode (#727)

rust-diplomat · Nov 9, 2024 · 6ccac64 · 6ccac64
1 parent b1ae9e7
commit 6ccac64
Show file tree

Hide file tree

Showing 18 changed files with 88 additions and 21 deletions.
diff --git a/feature_tests/c/include/MyString.h b/feature_tests/c/include/MyString.h
diff --git a/feature_tests/cpp/include/MyString.d.hpp b/feature_tests/cpp/include/MyString.d.hpp
diff --git a/feature_tests/cpp/include/MyString.hpp b/feature_tests/cpp/include/MyString.hpp
diff --git a/feature_tests/dart/lib/src/MyString.g.dart b/feature_tests/dart/lib/src/MyString.g.dart
diff --git a/feature_tests/js/api/BorrowedFields.mjs b/feature_tests/js/api/BorrowedFields.mjs
diff --git a/feature_tests/js/api/BorrowedFieldsReturning.mjs b/feature_tests/js/api/BorrowedFieldsReturning.mjs
diff --git a/feature_tests/js/api/BorrowedFieldsWithBounds.mjs b/feature_tests/js/api/BorrowedFieldsWithBounds.mjs
diff --git a/feature_tests/js/api/MyString.d.ts b/feature_tests/js/api/MyString.d.ts
diff --git a/feature_tests/js/api/MyString.mjs b/feature_tests/js/api/MyString.mjs
diff --git a/feature_tests/js/api/OpaqueMutexedString.mjs b/feature_tests/js/api/OpaqueMutexedString.mjs
diff --git a/feature_tests/js/api/OptionString.mjs b/feature_tests/js/api/OptionString.mjs
diff --git a/feature_tests/js/api/Utf16Wrap.mjs b/feature_tests/js/api/Utf16Wrap.mjs
diff --git a/feature_tests/js/test/slices-ts.mjs b/feature_tests/js/test/slices-ts.mjs
@@ -8,6 +8,10 @@ test("String List", (t) => {
     let str = MyString.newFromFirst(["This", "is", "a", "test."]);
     t.is(str.str, "This");
 });
+test("MyString borrow", (t) => {
+    let str = MyString.new_("This is a test.");
+    t.is(str.borrow(), "This is a test.");
+});
 test("Float64Vec", (t) => {
     let input = [1, 2, 3, 4, 5];
     let data = Float64Vec.newIsize(input);

diff --git a/feature_tests/js/test/slices-ts.mts b/feature_tests/js/test/slices-ts.mts
@@ -12,6 +12,11 @@ test("String List", (t) => {
   t.is(str.str, "This");
 });
 
+test("MyString borrow", (t) => {
+  let str = MyString.new_("This is a test.");
+  t.is(str.borrow(), "This is a test.");
+});
+
 test("Float64Vec", (t) => {
   let input = [1, 2, 3, 4, 5];
   let data = Float64Vec.newIsize(input);

diff --git a/feature_tests/js/test/slices.mjs b/feature_tests/js/test/slices.mjs
@@ -1,18 +1,23 @@
-import test from 'ava';
-import { MyString, Float64Vec} from "diplomat-wasm-js-feature-tests";
+import test from "ava";
+import { MyString, Float64Vec } from "diplomat-wasm-js-feature-tests";
 
 test("MyString functionality", (t) => {
-    let str = MyString.new_("This is a test value.");
-    t.is(str.str, "This is a test value.");
+  let str = MyString.new_("This is a test value.");
+  t.is(str.str, "This is a test value.");
 });
 
 test("String List", (t) => {
-	let str = MyString.newFromFirst(["This", "is", "a", "test."]);
-	t.is(str.str, "This");
+  let str = MyString.newFromFirst(["This", "is", "a", "test."]);
+  t.is(str.str, "This");
+});
+
+test("MyString borrow", (t) => {
+  let str = MyString.new_("This is a test.");
+  t.is(str.borrow(), "This is a test.");
 });
 
 test("Float64Vec", (t) => {
-    let input = [1, 2, 3, 4, 5];
-    let data = Float64Vec.newIsize(input);
-    t.deepEqual(data.borrow(), input);
+  let input = [1, 2, 3, 4, 5];
+  let data = Float64Vec.newIsize(input);
+  t.deepEqual(data.borrow(), input);
 });
diff --git a/feature_tests/kotlin/somelib/src/main/kotlin/dev/diplomattest/somelib/MyString.kt b/feature_tests/kotlin/somelib/src/main/kotlin/dev/diplomattest/somelib/MyString.kt
diff --git a/feature_tests/src/slices.rs b/feature_tests/src/slices.rs
@@ -40,6 +40,10 @@ mod ffi {
             let _ = foo;
             let _ = write;
         }
+
+        pub fn borrow<'a>(&'a self) -> DiplomatStrSlice<'a> {
+            AsRef::<[u8]>::as_ref(&self.0).into()
+        }
     }
 
     #[diplomat::opaque]

diff --git a/tool/src/js/converter.rs b/tool/src/js/converter.rs
@@ -244,7 +244,7 @@ impl<'jsctx, 'tcx> TyGenContext<'jsctx, 'tcx> {
                     )
                     .into(),
                     hir::Slice::Str(_, encoding) => format!(
-                        r#"new diplomatRuntime.DiplomatSliceStr(wasm, {variable_name},  "string{}", {edges})"#,
+                        r#"new diplomatRuntime.DiplomatSliceStr(wasm, {variable_name},  "string{}", {edges}).getValue()"#,
                         match encoding {
                             hir::StringEncoding::Utf8 | hir::StringEncoding::UnvalidatedUtf8 => 8,
                             hir::StringEncoding::UnvalidatedUtf16 => 16,
@@ -257,7 +257,7 @@ impl<'jsctx, 'tcx> TyGenContext<'jsctx, 'tcx> {
                         // We basically iterate through and read each string into the array.
                         // TODO: Need a test for this.
                         format!(
-                            r#"new diplomatRuntime.DiplomatSliceStrings(wasm, {variable_name}, "string{}", {edges})"#,
+                            r#"new diplomatRuntime.DiplomatSliceStrings(wasm, {variable_name}, "string{}", {edges}).getValue()"#,
                             match encoding {
                                 hir::StringEncoding::Utf8
                                 | hir::StringEncoding::UnvalidatedUtf8 => 8,