chore(cli): remove outdated WASI_REGISTER_TMP_PATH (#2633)

Author: Brooooooklyn

cli/src/api/build.ts

@@ -463,8 +463,6 @@ class Builder {
   private setEnvs() {
     // type definition intermediate file
     this.envs.TYPE_DEF_TMP_PATH = this.getIntermediateTypeFile()
-    // WASI register intermediate file
-    this.envs.WASI_REGISTER_TMP_PATH = this.getIntermediateWasiRegisterFile()
     // TODO:
     //   remove after napi-derive@v3 release
     this.envs.CARGO_CFG_NAPI_RS_CLI_VERSION = CLI_VERSION
@@ -664,17 +662,6 @@ class Builder {
     return `${dtsPath}.tmp`
   }
 
-  private getIntermediateWasiRegisterFile() {
-    return join(
-      tmpdir(),
-      `${this.crate.name}-${createHash('sha256')
-        .update(this.crate.manifest_path)
-        .update(CLI_VERSION)
-        .digest('hex')
-        .substring(0, 8)}.napi_wasi_register.tmp`,
-    )
-  }
-
   private async postBuild() {
     try {
       debug(`Try to create output directory:`)
@@ -692,36 +679,8 @@ class Builder {
     // only for cdylib
     if (this.cdyLibName) {
       const idents = await this.generateTypeDef()
-      const intermediateWasiRegisterFile = this.envs.WASI_REGISTER_TMP_PATH
-      const wasiRegisterFunctions = this.config.targets.some(
-        (t) => t.platform === 'wasi',
-      )
-        ? 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()
-              })
-              .filter((fn) => !!fn)
-          })()
-        : []
       const jsOutput = await this.writeJsBinding(idents)
       const wasmBindingsOutput = await this.writeWasiBinding(
-        wasiRegisterFunctions,
         wasmBinaryName ?? 'index.wasm',
         idents,
       )
@@ -926,11 +885,10 @@ class Builder {
   }
 
   private async writeWasiBinding(
-    wasiRegisterFunctions: string[],
     distFileName: string | undefined,
     idents: string[],
   ) {
-    if (distFileName && wasiRegisterFunctions.length) {
+    if (distFileName) {
       const { name, dir } = parse(distFileName)
       const bindingPath = join(dir, `${this.config.binaryName}.wasi.cjs`)
       const browserBindingPath = join(

crates/backend/src/typegen.rs

@@ -19,9 +19,6 @@ pub static NAPI_RS_CLI_VERSION: LazyLock<semver::Version> = LazyLock::new(|| {
   semver::Version::parse(&version).unwrap_or_else(|_| semver::Version::new(0, 0, 0))
 });
 
-pub static NAPI_RS_CLI_VERSION_WITH_SHARED_CRATES_FIX: LazyLock<semver::Version> =
-  LazyLock::new(|| semver::Version::new(2, 15, 1));
-
 #[derive(Default, Debug)]
 pub struct TypeDef {
   pub kind: String,
@@ -117,14 +114,8 @@ impl Display for TypeDef {
     } else {
       "".to_string()
     };
-    // TODO: remove this in v3
-    // This is a workaround for lower version of @napi-rs/cli
-    // See https://github.com/napi-rs/napi-rs/pull/1531
-    let prefix = if *NAPI_RS_CLI_VERSION >= *NAPI_RS_CLI_VERSION_WITH_SHARED_CRATES_FIX {
-      format!("{}:", pkg_name)
-    } else {
-      "".to_string()
-    };
+
+    let prefix = format!("{}:", pkg_name);
     write!(
       f,
       r#"{}{{"kind": "{}", "name": "{}", "js_doc": "{}", "def": "{}"{}{}}}"#,

crates/macro/src/expand/napi.rs

@@ -89,7 +89,6 @@ pub fn expand(attr: TokenStream, input: TokenStream) -> BindgenResult<TokenStrea
           #[cfg(feature = "type-def")]
           {
             output_type_def(&napi);
-            output_wasi_register_def(&napi);
           }
         } else {
           item.to_tokens(&mut tokens);
@@ -116,32 +115,11 @@ pub fn expand(attr: TokenStream, input: TokenStream) -> BindgenResult<TokenStrea
     #[cfg(feature = "type-def")]
     {
       output_type_def(&napi);
-      output_wasi_register_def(&napi);
     }
     Ok(tokens)
   }
 }
 
-#[cfg(feature = "type-def")]
-fn output_wasi_register_def(napi: &Napi) {
-  if let Ok(wasi_register_file) = env::var("WASI_REGISTER_TMP_PATH") {
-    fs::OpenOptions::new()
-      .append(true)
-      .create(true)
-      .open(wasi_register_file)
-      .and_then(|file| {
-        let mut writer = BufWriter::<fs::File>::new(file);
-        let pkg_name: String = std::env::var("CARGO_PKG_NAME").expect("CARGO_PKG_NAME is not set");
-        writer.write_all(format!("{pkg_name}: {}", napi.register_name()).as_bytes())?;
-        writer.write_all("\n".as_bytes())?;
-        writer.flush()
-      })
-      .unwrap_or_else(|e| {
-        println!("Failed to write wasi register file: {:?}", e);
-      });
-  }
-}
-
 #[cfg(feature = "type-def")]
 fn output_type_def(napi: &Napi) {
   if let Ok(type_def_file) = env::var("TYPE_DEF_TMP_PATH") {
@@ -199,12 +177,7 @@ fn replace_napi_attr_in_mod(
 #[cfg(feature = "type-def")]
 fn prepare_type_def_file() {
   if let Ok(ref type_def_file) = env::var("TYPE_DEF_TMP_PATH") {
-    use napi_derive_backend::{NAPI_RS_CLI_VERSION, NAPI_RS_CLI_VERSION_WITH_SHARED_CRATES_FIX};
-    if let Err(_e) = if *NAPI_RS_CLI_VERSION >= *NAPI_RS_CLI_VERSION_WITH_SHARED_CRATES_FIX {
-      remove_existed_def_file(type_def_file)
-    } else {
-      fs::remove_file(type_def_file)
-    } {
+    if let Err(_e) = remove_existed_def_file(type_def_file) {
       #[cfg(debug_assertions)]
       {
         println!("Failed to manipulate type def file: {:?}", _e);