Skip to content

Commit ae47665

Browse files
authored
Merge pull request #1356 from c410-f3r/ts-tests
Improve TS tests
2 parents b89fefd + dc50a5a commit ae47665

12 files changed

+63
-32
lines changed

crates/typescript-tests/index.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
use wasm_bindgen::prelude::*;
2+
3+
#[wasm_bindgen(typescript_custom_section)]
4+
const TS_INTERFACE_EXPORT: &'static str = r"
5+
interface Height { height: number; }
6+
";
7+
8+
#[wasm_bindgen]
9+
pub struct Person {
10+
pub height: u32,
11+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import * as wbg from '../pkg/typescript_tests';
2+
3+
const height: wbg.Height = new wbg.Person();

crates/typescript-tests/src/lib.rs

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
1-
use wasm_bindgen::prelude::*;
2-
3-
#[wasm_bindgen]
4-
pub fn greet(_: &str) {}
5-
6-
#[wasm_bindgen]
7-
struct A {
8-
}
9-
10-
#[wasm_bindgen]
11-
impl A {
12-
#[wasm_bindgen(constructor)]
13-
pub fn new() -> A {
14-
A {}
15-
}
16-
17-
pub fn other() {}
18-
19-
pub fn foo(&self) {}
20-
}
1+
mod custom_section;
2+
mod opt_args_and_ret;
3+
mod simple_fn;
4+
mod simple_struct;

crates/typescript-tests/src/memory.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import * as wasm from '../pkg/typescript_tests_bg';
2+
3+
const memory: WebAssembly.Memory = wasm.memory;
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
use wasm_bindgen::prelude::*;
2+
3+
#[wasm_bindgen]
4+
pub fn opt_fn(_a: Option<i32>) -> Option<i32> {
5+
None
6+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import * as wbg from '../pkg/typescript_tests';
2+
3+
const opt_fn: (a: number | undefined) => number | undefined = wbg.opt_fn;
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
use wasm_bindgen::prelude::*;
2+
3+
#[wasm_bindgen]
4+
pub fn greet(_: &str) {}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import * as wbg from '../pkg/typescript_tests';
2+
import * as wasm from '../pkg/typescript_tests_bg';
3+
4+
const wbg_greet: (a: string) => void = wbg.greet;
5+
const wasm_greet: (a: number, b: number) => void = wasm.greet;
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
use wasm_bindgen::prelude::*;
2+
3+
#[wasm_bindgen]
4+
pub struct A {
5+
}
6+
7+
#[wasm_bindgen]
8+
impl A {
9+
#[wasm_bindgen(constructor)]
10+
pub fn new() -> A {
11+
A {}
12+
}
13+
14+
pub fn other() {}
15+
16+
pub fn foo(&self) {}
17+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import * as wbg from '../pkg/typescript_tests';
2+
3+
const a = new wbg.A();
4+
wbg.A.other();
5+
a.foo();
6+
a.free();

crates/typescript-tests/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"baseUrl": "."
1010
},
1111
"include": [
12-
"index.ts"
12+
"src/*.ts"
1313
]
1414
}

0 commit comments

Comments
 (0)