fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-06-23 17:51:33 +00:00
Code Issues Projects Releases Wiki Activity

add wasm_bindgen(skip) attr to disable getters and setters exposure of pub fields

Browse Source
This commit is contained in:
alexlapa
2019-03-30 05:09:02 +02:00
parent c5f18b6099
commit 1dcf468c9d
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
crates/macro-support/src/parser.rs
View File

@ -50,6 +50,7 @@ macro_rules! attrgen {
(variadic, Variadic(Span)), (variadic, Variadic(Span)),
(typescript_custom_section, TypescriptCustomSection(Span)), (typescript_custom_section, TypescriptCustomSection(Span)),
(start, Start(Span)), (start, Start(Span)),
(skip, Skip(Span)),
} }
}; };
} }
@ -289,7 +290,7 @@ trait ConvertToAst<Ctx> {
impl<'a> ConvertToAst<BindgenAttrs> for &'a mut syn::ItemStruct { impl<'a> ConvertToAst<BindgenAttrs> for &'a mut syn::ItemStruct {
type Target = ast::Struct; type Target = ast::Struct;
fn convert(self, opts: BindgenAttrs) -> Result<Self::Target, Diagnostic> { fn convert(self, attrs: BindgenAttrs) -> Result<Self::Target, Diagnostic> {
if self.generics.params.len() > 0 { if self.generics.params.len() > 0 {
bail_span!( bail_span!(
self.generics, self.generics,
@ -298,7 +299,7 @@ impl<'a> ConvertToAst<BindgenAttrs> for &'a mut syn::ItemStruct {
); );
} }
let mut fields = Vec::new(); let mut fields = Vec::new();
let js_name = opts let js_name = attrs
.js_name() .js_name()
.map(|s| s.0.to_string()) .map(|s| s.0.to_string())
.unwrap_or(self.ident.to_string()); .unwrap_or(self.ident.to_string());
@ -312,26 +313,33 @@ impl<'a> ConvertToAst<BindgenAttrs> for &'a mut syn::ItemStruct {
Some(n) => n, Some(n) => n,
None => continue, None => continue,
}; };
let attrs = BindgenAttrs::find(&mut field.attrs)?;
assert_not_variadic(&attrs)?;
if attrs.skip().is_some() {
attrs.check_used()?;
continue
}
let comments = extract_doc_comments(&field.attrs);
let name_str = name.to_string(); let name_str = name.to_string();
let getter = shared::struct_field_get(&js_name, &name_str); let getter = shared::struct_field_get(&js_name, &name_str);
let setter = shared::struct_field_set(&js_name, &name_str); let setter = shared::struct_field_set(&js_name, &name_str);
let opts = BindgenAttrs::find(&mut field.attrs)?;
assert_not_variadic(&opts)?;
let comments = extract_doc_comments(&field.attrs);
fields.push(ast::StructField { fields.push(ast::StructField {
name: name.clone(), name: name.clone(),
struct_name: self.ident.clone(), struct_name: self.ident.clone(),
readonly: opts.readonly().is_some(), readonly: attrs.readonly().is_some(),
ty: field.ty.clone(), ty: field.ty.clone(),
getter: Ident::new(&getter, Span::call_site()), getter: Ident::new(&getter, Span::call_site()),
setter: Ident::new(&setter, Span::call_site()), setter: Ident::new(&setter, Span::call_site()),
comments, comments,
}); });
opts.check_used()?; attrs.check_used()?;
} }
} }
let comments: Vec<String> = extract_doc_comments(&self.attrs); let comments: Vec<String> = extract_doc_comments(&self.attrs);
opts.check_used()?; attrs.check_used()?;
Ok(ast::Struct { Ok(ast::Struct {
rust_name: self.ident.clone(), rust_name: self.ident.clone(),
js_name, js_name,

2
tests/wasm/classes.js
View File

@ -108,6 +108,8 @@ exports.js_public_fields = () => {
assert.strictEqual(a.d, 0); assert.strictEqual(a.d, 0);
a.d = 3.3; a.d = 3.3;
assert.strictEqual(a.d, 3); assert.strictEqual(a.d, 3);
assert.strictEqual(a.skipped, undefined);
}; };
exports.js_using_self = () => { exports.js_using_self = () => {

2
tests/wasm/classes.rs
View File

@ -274,6 +274,8 @@ pub struct PublicFields {
pub b: f32, pub b: f32,
pub c: f64, pub c: f64,
pub d: i32, pub d: i32,
#[wasm_bindgen(skip)]
pub skipped: u32
} }
#[wasm_bindgen] #[wasm_bindgen]