From 976acc773e62d5d9953deb442804e325b900a899 Mon Sep 17 00:00:00 2001
From: Hana <andywangsy@gmail.com>
Date: Thu, 12 Jan 2023 13:32:59 +0800
Subject: [PATCH] fix(napi-derive): remove ts type on field attrs (#1436)

---
 crates/macro/src/lib.rs | 58 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 7 deletions(-)

diff --git a/crates/macro/src/lib.rs b/crates/macro/src/lib.rs
index 118e02f7..889d3e1c 100644
--- a/crates/macro/src/lib.rs
+++ b/crates/macro/src/lib.rs
@@ -17,21 +17,23 @@ use std::{
   io::{BufWriter, Result as IOResult, Write},
 };
 
+use napi_derive_backend::BindgenResult;
 #[cfg(not(feature = "noop"))]
-use napi_derive_backend::{BindgenResult, TryToTokens};
+use napi_derive_backend::TryToTokens;
 #[cfg(all(feature = "type-def", not(feature = "noop")))]
 use napi_derive_backend::{ToTypeDef, TypeDef};
 #[cfg(not(feature = "noop"))]
 use parser::{attrs::BindgenAttrs, ParseNapi};
 use proc_macro::TokenStream as RawStream;
+use proc_macro2::TokenStream;
 #[cfg(not(feature = "noop"))]
-use proc_macro2::{TokenStream, TokenTree};
-#[cfg(not(feature = "noop"))]
+use proc_macro2::TokenTree;
 use quote::ToTokens;
+use syn::Attribute;
+#[cfg(not(feature = "noop"))]
+use syn::Item;
 #[cfg(feature = "compat-mode")]
 use syn::{fold::Fold, parse_macro_input, ItemFn};
-#[cfg(not(feature = "noop"))]
-use syn::{Attribute, Item};
 
 /// ```ignore
 /// #[napi]
@@ -59,8 +61,50 @@ pub fn napi(attr: RawStream, input: RawStream) -> RawStream {
 
 #[cfg(feature = "noop")]
 #[proc_macro_attribute]
-pub fn napi(_attr: RawStream, input: RawStream) -> RawStream {
-  input
+pub fn napi(attr: RawStream, input: RawStream) -> RawStream {
+  match expand(attr.into(), input.into()) {
+    Ok(tokens) => tokens.into(),
+    Err(diagnostic) => {
+      println!("`napi` macro expand failed.");
+
+      (quote! { #diagnostic }).into()
+    }
+  }
+}
+
+#[cfg(feature = "noop")]
+fn expand(_attr: TokenStream, input: TokenStream) -> BindgenResult<TokenStream> {
+  let mut item = syn::parse2::<syn::Item>(input.into())?;
+  let mut tokens = proc_macro2::TokenStream::new();
+
+  match item {
+    syn::Item::Struct(ref mut struct_) => struct_
+      .fields
+      .iter_mut()
+      .for_each(|field| find_and_remove_napi_attr(&mut field.attrs)),
+    _ => {}
+  }
+
+  item.to_tokens(&mut tokens);
+
+  Ok(tokens)
+}
+
+#[cfg(feature = "noop")]
+fn find_and_remove_napi_attr(attrs: &mut Vec<Attribute>) {
+  loop {
+    let napi_attr = attrs
+      .iter()
+      .enumerate()
+      .find(|&(_, m)| m.path.segments[0].ident == "napi");
+
+    let pos = match napi_attr {
+      Some((pos, _raw_attr)) => pos,
+      None => break,
+    };
+
+    attrs.remove(pos);
+  }
 }
 
 #[cfg(not(feature = "noop"))]