Use darling to parse value of macros attribute

near · Oct 2, 2023 · e4ae6fd · e4ae6fd
1 parent d11a7f3
commit e4ae6fd
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 55 deletions.
diff --git a/examples/lockable-fungible-token/Cargo.lock b/examples/lockable-fungible-token/Cargo.lock
diff --git a/examples/status-message/Cargo.lock b/examples/status-message/Cargo.lock
diff --git a/near-sdk-macros/Cargo.toml b/near-sdk-macros/Cargo.toml
@@ -21,6 +21,7 @@ strum = "0.24"
 strum_macros = "0.24"
 quote = "1.0"
 Inflector = { version = "0.11.4", default-features = false, features = [] }
+darling = { version = "0.20.3" }
 
 [features]
 abi = []

diff --git a/near-sdk-macros/src/core_impl/abi/abi_generator.rs b/near-sdk-macros/src/core_impl/abi/abi_generator.rs
@@ -279,7 +279,6 @@ pub fn parse_rustdoc(attrs: &[Attribute]) -> Option<String> {
                     }
                 }
             }
-
             None
         })
         .collect::<Vec<_>>()

diff --git a/near-sdk-macros/src/core_impl/event/mod.rs b/near-sdk-macros/src/core_impl/event/mod.rs
@@ -3,18 +3,41 @@ use proc_macro2::Span;
 
 use quote::quote;
 
-use syn::parse_macro_input;
+use darling::ast::NestedMeta;
+use darling::Error;
+use darling::FromMeta;
+use syn::{parse_quote, ItemEnum, LitStr};
+
+#[derive(Default, FromMeta, Clone, Debug)]
+pub struct MacroConfig {
+    pub event_json: Option<EventsConfig>,
+}
+#[derive(Default, FromMeta, Clone, Debug)]
+pub struct EventsConfig {
+    standard: Option<String>,
+}
 
-use syn::Meta;
-use syn::{parse_quote, ItemEnum, LitStr, MetaNameValue};
 /// this function is used to inject serialization macros and the `near_sdk::EventMetadata` macro.
 /// In addition, this function extracts the event's `standard` value and injects it as a constant to be used by
 /// the `near_sdk::EventMetadata` derive macro
 pub(crate) fn near_events(attr: TokenStream, item: TokenStream) -> TokenStream {
     // get standard from attr args
-    let args = parse_macro_input!(attr as syn::Meta);
-    let standard = get_standard_arg(args);
-    if standard.is_none() {
+
+    let attr_args = match NestedMeta::parse_meta_list(attr.into()) {
+        Ok(v) => v,
+        Err(e) => {
+            return TokenStream::from(Error::from(e).write_errors());
+        }
+    };
+
+    let args = match MacroConfig::from_list(&attr_args) {
+        Ok(v) => v,
+        Err(e) => {
+            return TokenStream::from(e.write_errors());
+        }
+    };
+
+    if args.event_json.is_none() || args.event_json.clone().unwrap().standard.is_none() {
         return TokenStream::from(
             syn::Error::new(
                 Span::call_site(),
@@ -24,6 +47,8 @@ pub(crate) fn near_events(attr: TokenStream, item: TokenStream) -> TokenStream {
         );
     }
 
+    let standard = args.event_json.unwrap().standard.unwrap();
+
     if let Ok(mut input) = syn::parse::<ItemEnum>(item) {
         let name = &input.ident;
         let standard_name = format!("{}_event_standard", name);
@@ -61,38 +86,3 @@ pub(crate) fn get_event_version(var: &syn::Variant) -> Option<LitStr> {
     }
     None
 }
-
-/// this function returns the `standard` value from `#[near_bindgen(event_json(standard = "nepXXX"))]`
-fn get_standard_arg(meta: syn::Meta) -> Option<LitStr> {
-    let mut standard: Option<LitStr> = None;
-    if meta.path().is_ident("event_json") {
-        match meta {
-            Meta::NameValue(MetaNameValue { path, value, .. }) => {
-                if path.is_ident("standard") {
-                    if let syn::Expr::Lit(lit_str) = value {
-                        if let syn::Lit::Str(lit_str) = lit_str.lit {
-                            standard = Some(lit_str);
-                        }
-                    }
-                }
-            }
-            Meta::Path(path) => {
-                if path.is_ident("standard") {
-                    standard = Some(LitStr::new("nep141", Span::call_site()));
-                }
-            }
-            Meta::List(list) => {
-                let _ = list.parse_nested_meta(|meta| {
-                    if meta.path.is_ident("standard") {
-                        let value = meta.value()?; // this parses the `=`
-                        let s: LitStr = value.parse()?; // this parses `"EarlGrey"`
-                        standard = Some(s);
-                    }
-
-                    Ok(())
-                });
-            }
-        }
-    }
-    standard
-}
diff --git a/near-sdk/tests/event_tests.rs b/near-sdk/tests/event_tests.rs
@@ -1,7 +1,7 @@
 use near_sdk::test_utils::get_logs;
 use near_sdk::{near_bindgen, AccountId};
 
-#[near_bindgen(event_json(standard = "test_standard", random = "random"))]
+#[near_bindgen(event_json(standard = "test_standard"))]
 // #[near_bindgen(event_json(standard = "test_standard", random = "random"), other_random)]
 pub enum TestEvents<'a, 'b, T>
 where