mirror of
https://github.com/rustwasm/wasm-bindgen.git
synced 2024-12-15 21:02:10 +03:00
3cc30843e3
This commit is the second, and hopefully last massive, refactor for using WebIDL bindings internally in `wasm-bindgen`. This commit actually fully executes on the task at hand, moving `wasm-bindgen` to internally using WebIDL bindings throughout its code generation, anyref passes, etc. This actually fixes a number of issues that have existed in the anyref pass for some time now! The main changes here are to basically remove the usage of `Descriptor` from generating JS bindings. Instead two new types are introduced: `NonstandardIncoming` and `NonstandardOutgoing` which are bindings lists used for incoming/outgoing bindings. These mirror the standard terminology and literally have variants which are the standard values. All `Descriptor` types are now mapped into lists of incoming/outgoing bindings and used for process in wasm-bindgen. All JS generation has been refactored and updated to now process these lists of bindings instead of the previous `Descriptor`. In other words this commit takes `js2rust.rs` and `rust2js.rs` and first splits them in two. Interpretation of `Descriptor` and what to do for conversions is in the binding selection modules. The actual generation of JS from the binding selection is now performed by `incoming.rs` and `outgoing.rs`. To boot this also deduplicates all the code between the argument handling of `js2rust.rs` and return value handling of `rust2js.rs`. This means that to implement a new binding you only need to implement it one place and it's implemented for free in the other! This commit is not the end of the story though. I would like to add a mdoe to `wasm-bindgen` that literally emits a WebIDL bindings section. That's left for a third (and hopefully final) refactoring which is also intended to optimize generated JS for bindings. This commit currently loses the optimization where an imported is hooked up by value directly whenever a shim isn't needed. It's planned that the next refactoring to emit a webidl binding section that can be added back in. It shouldn't be too too hard hopefully since all the scaffolding is in place now. cc #1524
108 lines
2.5 KiB
JavaScript
108 lines
2.5 KiB
JavaScript
const assert = require('assert');
|
|
const wasm = require('wasm-bindgen-test');
|
|
const fs = require('fs');
|
|
|
|
let ARG = null;
|
|
let ANOTHER_ARG = null;
|
|
let SYM = Symbol('a');
|
|
|
|
exports.simple_foo = function(s) {
|
|
assert.strictEqual(ARG, null);
|
|
assert.strictEqual(s, "foo");
|
|
ARG = s;
|
|
};
|
|
|
|
exports.simple_another = function(s) {
|
|
assert.strictEqual(ANOTHER_ARG, null);
|
|
assert.strictEqual(s, 21);
|
|
ANOTHER_ARG = s;
|
|
return 35;
|
|
};
|
|
|
|
exports.simple_take_and_return_bool = function(s) {
|
|
return s;
|
|
};
|
|
exports.simple_return_object = function() {
|
|
return SYM;
|
|
};
|
|
exports.test_simple = function() {
|
|
assert.strictEqual(ARG, null);
|
|
wasm.simple_take_str("foo");
|
|
assert.strictEqual(ARG, "foo");
|
|
|
|
assert.strictEqual(ANOTHER_ARG, null);
|
|
assert.strictEqual(wasm.simple_another_thunk(21), 35);
|
|
assert.strictEqual(ANOTHER_ARG, 21);
|
|
|
|
assert.strictEqual(wasm.simple_bool_thunk(true), true);
|
|
assert.strictEqual(wasm.simple_bool_thunk(false), false);
|
|
|
|
assert.strictEqual(wasm.simple_get_the_object(), SYM);
|
|
};
|
|
|
|
exports.return_string = function() {
|
|
return 'bar';
|
|
};
|
|
|
|
exports.take_and_ret_string = function(a) {
|
|
return a + 'b';
|
|
};
|
|
|
|
exports.exceptions_throw = function() {
|
|
throw new Error('error!');
|
|
};
|
|
exports.exceptions_throw2 = function() {
|
|
throw new Error('error2');
|
|
};
|
|
exports.test_exception_propagates = function() {
|
|
assert.throws(wasm.exceptions_propagate, /error!/);
|
|
};
|
|
|
|
exports.assert_valid_error = function(obj) {
|
|
assert.strictEqual(obj instanceof Error, true);
|
|
assert.strictEqual(obj.message, 'error2');
|
|
};
|
|
|
|
exports.IMPORT = 1.0;
|
|
|
|
exports.return_three = function() { return 3; };
|
|
|
|
exports.underscore = function(x) {};
|
|
|
|
exports.self = function() { return 2; };
|
|
|
|
exports.bar = { foo: 3 };
|
|
|
|
let CUSTOM_TYPE = null;
|
|
|
|
exports.take_custom_type = function(f) {
|
|
CUSTOM_TYPE = f;
|
|
return f;
|
|
};
|
|
|
|
exports.custom_type_return_2 = function() {
|
|
return 2;
|
|
};
|
|
|
|
exports.touch_custom_type = function() {
|
|
assert.throws(() => CUSTOM_TYPE.touch(),
|
|
/Attempt to use a moved value|null pointer passed to rust/);
|
|
};
|
|
|
|
exports.interpret_2_as_custom_type = function() {
|
|
assert.throws(wasm.interpret_2_as_custom_type, /expected instance of CustomType/);
|
|
};
|
|
|
|
exports.baz$ = function() {};
|
|
exports.$foo = 1.0;
|
|
|
|
exports.assert_dead_import_not_generated = function() {
|
|
const filename = require.resolve("wasm-bindgen-test");
|
|
const bindings = fs.readFileSync(filename);
|
|
assert.ok(!bindings.includes("unused_import"));
|
|
};
|
|
|
|
exports.import_inside_function_works = function() {};
|
|
exports.import_inside_private_module = function() {};
|
|
exports.should_call_undefined_functions = () => false;
|