Fix attribute annotation

Changed files (2)

• modified src/init.rs
• modified src/lib.rs

Diff

diff --git a/src/init.rs b/src/init.rsindex 24d49a2..d9d7db2 100644--- a/src/init.rs+++ b/src/init.rs@@ -36,6 +36,7 @@ pub fn component_impl(attr: pm::TokenStream, item: pm::TokenStream) -> pm::Token     };      let struct_ident = &component_struct_item.ident;+    let emitted_struct_item = sanitize_component_struct(&component_struct_item);      let create_class_js = format!("createComponentClass{}", struct_ident);     let init_self_js = format!("initSelf{}", struct_ident);@@ -70,7 +71,7 @@ pub fn component_impl(attr: pm::TokenStream, item: pm::TokenStream) -> pm::Token      let expanded = quote! {         #[allow(dead_code, unreachable_code)]-        #component_struct_item+        #emitted_struct_item         #component_impl         #component_methods @@ -88,6 +89,21 @@ pub fn component_impl(attr: pm::TokenStream, item: pm::TokenStream) -> pm::Token     expanded.into() } +fn sanitize_component_struct(struct_item: &ItemStruct) -> ItemStruct {+    let mut sanitized = struct_item.clone();+    sanitized.attrs.push(syn::parse_quote!(#[derive(Default)]));++    if let Fields::Named(fields) = &mut sanitized.fields {+        for field in &mut fields.named {+            field+                .attrs+                .retain(|attr| !attr.path().is_ident("attribute"));+        }+    }++    sanitized+}+ fn attach_quote(atach_state_js_fn: &str, struct_name: &Ident) -> proc_macro2::TokenStream {     let js_callback_ident = Ident::new(atach_state_js_fn, Span::call_site());     let rs_name_str = from_pascal_to_snake(atach_state_js_fn);@@ -479,6 +495,7 @@ fn create_component(struct_item: &ItemStruct) -> proc_macro2::TokenStream {                 let _ = self.try_set_test_attribute(name, value);             } +            #[allow(unreachable_code)]             fn try_set_test_attribute(&mut self, name: &str, value: &str) -> ::kaja_web::Result<()> {                 match name {                     #setter_arms@@ -491,6 +508,7 @@ fn create_component(struct_item: &ItemStruct) -> proc_macro2::TokenStream {                 Ok(())             } +            #[allow(unreachable_code)]             fn validate_test_attribute(&self, name: &str, value: &str) -> ::kaja_web::Result<()> {                 match name {                     #validator_armsdiff --git a/src/lib.rs b/src/lib.rsindex 29e3461..3d2f38e 100644--- a/src/lib.rs+++ b/src/lib.rs@@ -1,35 +1,8 @@ mod init;  use proc_macro as pm;-use proc_macro2::TokenStream as TokenStream2;-use quote::quote;-use syn::{Fields, ItemStruct};  #[proc_macro_attribute] pub fn component(attr: pm::TokenStream, item: pm::TokenStream) -> pm::TokenStream {-    // Clone the attribute token stream so we can pass ownership into the helper-    // without risking accidental moves causing "use of moved value" errors when-    // the macro is expanded multiple times.-    let attr_clone = attr.clone();--    // Add `#[derive(Default)]` to the struct.-    let item_ts2 = TokenStream2::from(item.clone());-    let mut input = match syn::parse2::<ItemStruct>(item_ts2.clone()) {-        Ok(s) => s,-        Err(_) => return init::component_impl(attr_clone.clone(), item),-    };--    input.attrs.push(syn::parse_quote!(#[derive(Default)]));--    if let Fields::Named(fields) = &mut input.fields {-        for field in &mut fields.named {-            field-                .attrs-                .retain(|attr| !attr.path().is_ident("attribute"));-        }-    }--    // Add the functions needed for a complete web component using kaja-web-    let new_item_ts2 = quote!(#input);-    init::component_impl(attr_clone, pm::TokenStream::from(new_item_ts2))+    init::component_impl(attr, item) }