refactor(ast): align $[estree(via)] behavior

oxc-project · Jan 19, 2025 · d688c7e · d688c7e
1 parent d966e0a
commit d688c7e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/crates/oxc_ast/src/ast/js.rs b/crates/oxc_ast/src/ast/js.rs
@@ -2196,7 +2196,7 @@ pub struct ImportExpression<'a> {
 pub struct ImportDeclaration<'a> {
     pub span: Span,
     /// `None` for `import 'foo'`, `Some([])` for `import {} from 'foo'`
-    #[estree(via = "OptionVecDefault", type = "Array<ImportDeclarationSpecifier>")]
+    #[estree(via = crate::serialize::OptionVecDefault, type = "Array<ImportDeclarationSpecifier>")]
     pub specifiers: Option<Vec<'a, ImportDeclarationSpecifier<'a>>>,
     pub source: StringLiteral<'a>,
     pub phase: Option<ImportPhase>,

diff --git a/tasks/ast_tools/src/derives/estree.rs b/tasks/ast_tools/src/derives/estree.rs
@@ -9,7 +9,6 @@ use crate::{
         serialize::{enum_variant_name, get_always_flatten_structs, get_type_tag},
         EnumDef, FieldDef, GetGenerics, GetIdent, Schema, StructDef, TypeDef,
     },
-    util::ToIdent,
 };
 
 use super::{define_derive, Derive};
@@ -142,12 +141,12 @@ fn serialize_struct(def: &StructDef, schema: &Schema) -> TokenStream {
                     }
                 )?;
             });
-        } else if let Some(with) = &field.markers.derive_attributes.estree.via {
-            let with_ident = with.to_ident();
+        } else if let Some(via) = &field.markers.derive_attributes.estree.via {
+            let via_tokens: TokenStream = via.parse().unwrap();
             fields.push(quote! {
                 map.serialize_entry(
                     #name,
-                    &crate::serialize::#with_ident(&self.#ident)
+                    &#via_tokens(&self.#ident)
                 )?;
             });
         } else {

diff --git a/tasks/ast_tools/src/markers.rs b/tasks/ast_tools/src/markers.rs
@@ -286,7 +286,7 @@ impl Parse for ESTreeFieldAttribute {
                 "via" => {
                     input.parse::<Token![=]>()?;
                     assert!(
-                        via.replace(input.parse::<LitStr>()?.value()).is_none(),
+                        via.replace(input.parse::<Path>()?.to_token_stream().to_string()).is_none(),
                         "Duplicate estree(with)"
                     );
                 }