fix(napi-derive,cli): register function cross crates

cli/src/api/build.ts

@@ -609,18 +609,27 @@ class Builder {
       const intermediateWasiRegisterFile = this.envs.WASI_REGISTER_TMP_PATH
       const wasiRegisterFunctions =
         this.target.arch === 'wasm32'
-          ? JSON.parse(
-              await readFileAsync(intermediateWasiRegisterFile, 'utf8').catch(
-                (err) => {
-                  console.warn(
-                    `Read ${colors.yellowBright(
-                      intermediateWasiRegisterFile,
-                    )} failed, reason: ${err.message}`,
-                  )
-                  return `[]`
-                },
-              ),
-            )
+          ? await (async function readIntermediateWasiRegisterFile() {
+              const fileContent = await readFileAsync(
+                intermediateWasiRegisterFile,
+                'utf8',
+              ).catch((err) => {
+                console.warn(
+                  `Read ${colors.yellowBright(
+                    intermediateWasiRegisterFile,
+                  )} failed, reason: ${err.message}`,
+                )
+                return ``
+              })
+              return fileContent
+                .split('\n')
+                .map((l) => l.trim())
+                .filter((l) => l.length)
+                .map((line) => {
+                  const [_, fn] = line.split(':')
+                  return fn.trim()
+                })
+            })()
           : []
       const jsOutput = await this.writeJsBinding(idents)
       const wasmOutput = await this.writeWasiBinding(
@@ -780,18 +789,14 @@ class Builder {
       const { name, dir } = parse(distFileName)
       const newPath = join(dir, `${this.config.binaryName}.wasi.cjs`)
       const workerPath = join(dir, 'wasi-worker.mjs')
-      const declareCodes = `const { ${idents.join(
-        ', ',
-      )} } = __napiModule.exports\n`
       const exportsCode = idents
-        .map((ident) => `module.exports.${ident} = ${ident}`)
+        .map(
+          (ident) => `module.exports.${ident} = __napiModule.exports.${ident}`,
+        )
         .join(',\n')
       await writeFileAsync(
         newPath,
-        createWasiBinding(name, wasiRegisterFunctions) +
-          declareCodes +
-          exportsCode +
-          '\n',
+        createWasiBinding(name, wasiRegisterFunctions) + exportsCode + '\n',
         'utf8',
       )
       await writeFileAsync(workerPath, WASI_WORKER_TEMPLATE, 'utf8')

cli/src/api/load-wasi-template.ts

@@ -56,7 +56,7 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
 
 function __napi_rs_initialize_modules(__napiInstance) {
 ${wasiRegisterFunctions
-  .map((name) => `  __napiInstance.exports['${name}']()`)
+  .map((name) => `  __napiInstance.exports['${name}']?.()`)
   .join('\n')}
 }
 `

crates/backend/src/ast.rs

@@ -28,6 +28,7 @@ pub struct NapiFn {
   pub configurable: bool,
   pub catch_unwind: bool,
   pub unsafe_: bool,
+  pub register_name: Ident,
 }
 
 #[derive(Debug, Clone)]
@@ -86,6 +87,7 @@ pub struct NapiStruct {
   pub comments: Vec<String>,
   pub implement_iterator: bool,
   pub use_custom_finalize: bool,
+  pub register_name: Ident,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -121,6 +123,7 @@ pub struct NapiImpl {
   pub iterator_return_type: Option<Type>,
   pub js_mod: Option<String>,
   pub comments: Vec<String>,
+  pub register_name: Ident,
 }
 
 #[derive(Debug, Clone)]
@@ -131,6 +134,7 @@ pub struct NapiEnum {
   pub js_mod: Option<String>,
   pub comments: Vec<String>,
   pub skip_typescript: bool,
+  pub register_name: Ident,
 }
 
 #[derive(Debug, Clone)]
@@ -164,6 +168,7 @@ pub struct NapiConst {
   pub js_mod: Option<String>,
   pub comments: Vec<String>,
   pub skip_typescript: bool,
+  pub register_name: Ident,
 }
 
 #[derive(Debug, Clone)]

crates/backend/src/codegen.rs

@@ -1,5 +1,3 @@
-use std::sync::atomic::AtomicUsize;
-
 use proc_macro2::{Ident, Span, TokenStream};
 
 use crate::BindgenResult;
@@ -14,12 +12,6 @@ pub const PROPERTY_ATTRIBUTE_WRITABLE: i32 = 1 << 0;
 pub const PROPERTY_ATTRIBUTE_ENUMERABLE: i32 = 1 << 1;
 pub const PROPERTY_ATTRIBUTE_CONFIGURABLE: i32 = 1 << 2;
 
-static REGISTER_INDEX: AtomicUsize = AtomicUsize::new(0);
-
-thread_local! {
-  pub static REGISTER_IDENTS: std::cell::RefCell<Vec<String>> = std::cell::RefCell::new(Vec::new());
-}
-
 pub trait TryToTokens {
   fn try_to_tokens(&self, tokens: &mut TokenStream) -> BindgenResult<()>;
 
@@ -36,15 +28,6 @@ fn get_intermediate_ident(name: &str) -> Ident {
   Ident::new(&new_name, Span::call_site())
 }
 
-fn get_register_ident(name: &str) -> Ident {
-  let new_name = format!(
-    "__napi_register__{}_{}",
-    name,
-    REGISTER_INDEX.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
-  );
-  Ident::new(&new_name, Span::call_site())
-}
-
 fn js_mod_to_token_stream(js_mod: Option<&String>) -> TokenStream {
   js_mod
     .map(|i| {

crates/backend/src/codegen/const.rs

@@ -1,10 +1,7 @@
 use proc_macro2::{Ident, Literal, TokenStream};
 use quote::ToTokens;
 
-use crate::{
-  codegen::{get_register_ident, js_mod_to_token_stream},
-  BindgenResult, NapiConst, TryToTokens,
-};
+use crate::{codegen::js_mod_to_token_stream, BindgenResult, NapiConst, TryToTokens};
 
 impl TryToTokens for NapiConst {
   fn try_to_tokens(&self, tokens: &mut TokenStream) -> BindgenResult<()> {
@@ -20,19 +17,16 @@ impl TryToTokens for NapiConst {
 
 impl NapiConst {
   fn gen_module_register(&self) -> TokenStream {
-    let name_str = self.name.to_string();
-    let name_ident = self.name.clone();
+    let name_ident = &self.name;
     let js_name_lit = Literal::string(&format!("{}\0", self.name));
-    let register_name = get_register_ident(&name_str);
+    let register_name = &self.register_name;
     let type_name = &self.type_name;
     let cb_name = Ident::new(
       &format!("__register__const__{}_callback__", register_name),
       self.name.span(),
     );
     let js_mod_ident = js_mod_to_token_stream(self.js_mod.as_ref());
-    crate::codegen::REGISTER_IDENTS.with(|c| {
-      c.borrow_mut().push(register_name.to_string());
-    });
+
     quote! {
       #[allow(non_snake_case)]
       #[allow(clippy::all)]

crates/backend/src/codegen/enum.rs

@@ -1,10 +1,7 @@
 use proc_macro2::{Ident, Literal, Span, TokenStream};
 use quote::ToTokens;
 
-use crate::{
-  codegen::{get_register_ident, js_mod_to_token_stream},
-  BindgenResult, NapiEnum, TryToTokens,
-};
+use crate::{codegen::js_mod_to_token_stream, BindgenResult, NapiEnum, TryToTokens};
 
 impl TryToTokens for NapiEnum {
   fn try_to_tokens(&self, tokens: &mut TokenStream) -> BindgenResult<()> {
@@ -103,7 +100,7 @@ impl NapiEnum {
   fn gen_module_register(&self) -> TokenStream {
     let name_str = self.name.to_string();
     let js_name_lit = Literal::string(&format!("{}\0", &self.js_name));
-    let register_name = get_register_ident(&name_str);
+    let register_name = &self.register_name;
 
     let mut define_properties = vec![];
 
@@ -134,10 +131,6 @@ impl NapiEnum {
 
     let js_mod_ident = js_mod_to_token_stream(self.js_mod.as_ref());
 
-    crate::codegen::REGISTER_IDENTS.with(|c| {
-      c.borrow_mut().push(register_name.to_string());
-    });
-
     quote! {
       #[allow(non_snake_case)]
       #[allow(clippy::all)]

crates/backend/src/codegen/fn.rs

@@ -3,7 +3,7 @@ use quote::ToTokens;
 use syn::spanned::Spanned;
 
 use crate::{
-  codegen::{get_intermediate_ident, get_register_ident, js_mod_to_token_stream},
+  codegen::{get_intermediate_ident, js_mod_to_token_stream},
   BindgenResult, CallbackArg, Diagnostic, FnKind, FnSelf, NapiFn, NapiFnArgKind, TryToTokens,
 };
 
@@ -567,13 +567,11 @@ impl NapiFn {
       let name_str = self.name.to_string();
       let js_name = format!("{}\0", &self.js_name);
       let name_len = self.js_name.len();
-      let module_register_name = get_register_ident(&name_str);
+      let module_register_name = &self.register_name;
       let intermediate_ident = get_intermediate_ident(&name_str);
       let js_mod_ident = js_mod_to_token_stream(self.js_mod.as_ref());
       let cb_name = Ident::new(&format!("{}_js_function", name_str), Span::call_site());
-      crate::codegen::REGISTER_IDENTS.with(|c| {
-        c.borrow_mut().push(module_register_name.to_string());
-      });
+
       quote! {
         #[allow(non_snake_case)]
         #[allow(clippy::all)]

crates/backend/src/codegen/struct.rs

@@ -5,7 +5,7 @@ use proc_macro2::{Ident, Literal, Span, TokenStream};
 use quote::ToTokens;
 
 use crate::{
-  codegen::{get_intermediate_ident, get_register_ident, js_mod_to_token_stream},
+  codegen::{get_intermediate_ident, js_mod_to_token_stream},
   BindgenResult, FnKind, NapiImpl, NapiStruct, NapiStructKind, TryToTokens,
 };
 
@@ -717,7 +717,7 @@ impl NapiStruct {
 
   fn gen_register(&self) -> TokenStream {
     let name_str = self.name.to_string();
-    let struct_register_name = get_register_ident(&format!("{}_struct", name_str));
+    let struct_register_name = &self.register_name;
     let js_name = format!("{}\0", self.js_name);
     let mut props = vec![];
 
@@ -772,9 +772,6 @@ impl NapiStruct {
       props.push(prop);
     }
     let js_mod_ident = js_mod_to_token_stream(self.js_mod.as_ref());
-    crate::codegen::REGISTER_IDENTS.with(|c| {
-      c.borrow_mut().push(struct_register_name.to_string());
-    });
     quote! {
       #[allow(non_snake_case)]
       #[allow(clippy::all)]
@@ -842,7 +839,7 @@ impl NapiImpl {
       Span::call_site(),
     );
 
-    let register_name = get_register_ident(&format!("{}_impl", name_str));
+    let register_name = &self.register_name;
 
     let mut methods = vec![];
     let mut props = HashMap::new();
@@ -891,9 +888,6 @@ impl NapiImpl {
     let props = props.into_iter().map(|(_, prop)| prop);
     let props_wasm = props.clone();
     let js_mod_ident = js_mod_to_token_stream(self.js_mod.as_ref());
-    crate::codegen::REGISTER_IDENTS.with(|c| {
-      c.borrow_mut().push(register_name.to_string());
-    });
     Ok(quote! {
       #[allow(non_snake_case)]
       #[allow(clippy::all)]

crates/backend/src/lib.rs

@@ -47,6 +47,14 @@ macro_rules! napi_ast_impl {
         }
 			}
 		}
+
+    impl Napi {
+      pub fn register_name(&self) -> String {
+        match self.item {
+          $( NapiItem::$v(ref ast) => ast.register_name.to_string() ),*
+        }
+      }
+    }
   };
 }