Merge pull request #1356 from c410-f3r/ts-tests

Improve TS tests

crates/typescript-tests/index.ts

@@ -1,11 +0,0 @@
-import * as wbg from './pkg/typescript_tests';
-import * as wasm from './pkg/typescript_tests_bg';
-
-const a1: (a: string) => void = wbg.greet;
-const a2: (a: number, b: number) => void = wasm.greet;
-const a3: WebAssembly.Memory = wasm.memory;
-
-const c = new wbg.A();
-wbg.A.other();
-c.foo();
-c.free();

crates/typescript-tests/src/custom_section.rs

@@ -0,0 +1,11 @@
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen(typescript_custom_section)]
+const TS_INTERFACE_EXPORT: &'static str = r"
+  interface Height { height: number; }
+";
+
+#[wasm_bindgen]
+pub struct Person {
+    pub height: u32,
+}

crates/typescript-tests/src/custom_section.ts

@@ -0,0 +1,3 @@
+import * as wbg from '../pkg/typescript_tests';
+
+const height: wbg.Height = new wbg.Person();

crates/typescript-tests/src/lib.rs

@@ -1,20 +1,4 @@
-use wasm_bindgen::prelude::*;
-
-#[wasm_bindgen]
-pub fn greet(_: &str) {}
-
-#[wasm_bindgen]
-struct A {
-}
-
-#[wasm_bindgen]
-impl A {
-    #[wasm_bindgen(constructor)]
-    pub fn new() -> A {
-        A {}
-    }
-
-    pub fn other() {}
-
-    pub fn foo(&self) {}
-}
+mod custom_section;
+mod opt_args_and_ret;
+mod simple_fn;
+mod simple_struct;

crates/typescript-tests/src/memory.ts

@@ -0,0 +1,3 @@
+import * as wasm from '../pkg/typescript_tests_bg';
+
+const memory: WebAssembly.Memory = wasm.memory;

crates/typescript-tests/src/opt_args_and_ret.rs

@@ -0,0 +1,6 @@
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen]
+pub fn opt_fn(_a: Option<i32>) -> Option<i32> {
+    None
+}

crates/typescript-tests/src/opt_args_and_ret.ts

@@ -0,0 +1,3 @@
+import * as wbg from '../pkg/typescript_tests';
+
+const opt_fn: (a: number | undefined) => number | undefined = wbg.opt_fn;

crates/typescript-tests/src/simple_fn.rs

@@ -0,0 +1,4 @@
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen]
+pub fn greet(_: &str) {}

crates/typescript-tests/src/simple_fn.ts

@@ -0,0 +1,5 @@
+import * as wbg from '../pkg/typescript_tests';
+import * as wasm from '../pkg/typescript_tests_bg';
+
+const wbg_greet: (a: string) => void = wbg.greet;
+const wasm_greet: (a: number, b: number) => void = wasm.greet;

crates/typescript-tests/src/simple_struct.rs

@@ -0,0 +1,17 @@
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen]
+pub struct A {
+}
+
+#[wasm_bindgen]
+impl A {
+    #[wasm_bindgen(constructor)]    
+    pub fn new() -> A {
+        A {}
+    }
+
+    pub fn other() {}
+
+    pub fn foo(&self) {}
+}

crates/typescript-tests/src/simple_struct.ts

@@ -0,0 +1,6 @@
+import * as wbg from '../pkg/typescript_tests';
+
+const a = new wbg.A();
+wbg.A.other();
+a.foo();
+a.free();

crates/typescript-tests/tsconfig.json

@@ -9,6 +9,6 @@
         "baseUrl": "."
     },
     "include": [
-        "index.ts"
+        "src/*.ts"
     ]
 }