From 3d48d4464bd3b5c7866183bad007fcc9269d8721 Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Tue, 21 Mar 2023 18:12:52 +0800
Subject: [PATCH] fix(cli,napi-derive): re-export types from shared crate
 (#1531)

* fix(cli,napi-derive): re-export types from shared crate

* chore: publish

 - @napi-rs/cli@2.15.1-alpha.0

* Clippy fix

* Fix memory testing
---
 Cargo.toml                                  |   1 +
 cli/package.json                            |   2 +-
 cli/src/build.ts                            |  12 ++++++
 crates/backend/src/typegen.rs               |   4 +-
 crates/macro/src/lib.rs                     |  39 +++++++++++++++++++-
 examples/napi-shared/Cargo.toml             |  22 +++++++++++
 examples/napi-shared/src/lib.rs             |   6 +++
 examples/napi/Cargo.toml                    |   1 +
 examples/napi/__test__/typegen.spec.ts.md   |   4 ++
 examples/napi/__test__/typegen.spec.ts.snap | Bin 3842 -> 3877 bytes
 examples/napi/__test__/values.spec.ts       |   7 ++++
 examples/napi/index.d.ts                    |   4 ++
 examples/napi/src/lib.rs                    |   1 +
 examples/napi/src/shared.rs                 |   7 ++++
 examples/napi/src/threadsafe_function.rs    |   4 +-
 memory-testing/test-util.mjs                |   2 +-
 16 files changed, 109 insertions(+), 7 deletions(-)
 create mode 100644 examples/napi-shared/Cargo.toml
 create mode 100644 examples/napi-shared/src/lib.rs
 create mode 100644 examples/napi/src/shared.rs

diff --git a/Cargo.toml b/Cargo.toml
index 1b6d31f2..060f0091 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,6 +7,7 @@ members = [
   "./crates/napi",
   "./crates/sys",
   "./examples/napi",
+  "./examples/napi-shared",
   "./examples/napi-compat-mode",
   "./examples/binary",
   "./bench",
diff --git a/cli/package.json b/cli/package.json
index 4fe7533a..977c24a9 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "2.15.0",
+  "version": "2.15.1-alpha.0",
   "description": "Cli tools for napi-rs",
   "keywords": [
     "cli",
diff --git a/cli/src/build.ts b/cli/src/build.ts
index 466c20d8..d5b78a59 100644
--- a/cli/src/build.ts
+++ b/cli/src/build.ts
@@ -9,6 +9,8 @@ import * as chalk from 'colorette'
 import envPaths from 'env-paths'
 import { groupBy } from 'lodash-es'
 
+import { version } from '../package.json'
+
 import { ARM_FEATURES_H } from './arm-features.h'
 import { getNapiConfig } from './consts'
 import { debugFactory } from './debug'
@@ -493,6 +495,7 @@ export class BuildCommand extends Command {
     }
     const cwdSha = createHash('sha256')
       .update(process.cwd())
+      .update(version)
       .digest('hex')
       .substring(0, 8)
     const intermediateTypeFile = join(
@@ -698,6 +701,15 @@ async function processIntermediateTypeFile(
     .split('\n')
     .map((line) => line.trim())
     .filter(Boolean)
+    .map((line) => {
+      // compatible with old version
+      if (line.startsWith('{')) {
+        return line
+      } else {
+        const [_crateName, ...rest] = line.split(':')
+        return rest.join(':')
+      }
+    })
 
   if (!lines.length) {
     return idents
diff --git a/crates/backend/src/typegen.rs b/crates/backend/src/typegen.rs
index 2f0efdf7..4da7eead 100644
--- a/crates/backend/src/typegen.rs
+++ b/crates/backend/src/typegen.rs
@@ -92,6 +92,7 @@ fn escape_json(src: &str) -> String {
 
 impl ToString for TypeDef {
   fn to_string(&self) -> String {
+    let pkg_name = std::env::var("CARGO_PKG_NAME").expect("CARGO_PKG_NAME is not set");
     let js_mod = if let Some(js_mod) = &self.js_mod {
       format!(", \"js_mod\": \"{}\"", js_mod)
     } else {
@@ -103,7 +104,8 @@ impl ToString for TypeDef {
       "".to_owned()
     };
     format!(
-      r#"{{"kind": "{}", "name": "{}", "js_doc": "{}", "def": "{}"{}{}}}"#,
+      r#"{}:{{"kind": "{}", "name": "{}", "js_doc": "{}", "def": "{}"{}{}}}"#,
+      pkg_name,
       self.kind,
       self.name,
       escape_json(&self.js_doc),
diff --git a/crates/macro/src/lib.rs b/crates/macro/src/lib.rs
index f9fc6dd9..af5770f5 100644
--- a/crates/macro/src/lib.rs
+++ b/crates/macro/src/lib.rs
@@ -67,8 +67,8 @@ pub fn napi(attr: RawStream, input: RawStream) -> RawStream {
   {
     // logic on first macro expansion
     #[cfg(feature = "type-def")]
-    if let Ok(type_def_file) = env::var("TYPE_DEF_TMP_PATH") {
-      if let Err(_e) = fs::remove_file(type_def_file) {
+    if let Ok(ref type_def_file) = env::var("TYPE_DEF_TMP_PATH") {
+      if let Err(_e) = remove_existed_type_def(type_def_file) {
         #[cfg(debug_assertions)]
         {
           println!("Failed to manipulate type def file: {:?}", _e);
@@ -432,3 +432,38 @@ fn replace_napi_attr_in_mod(
     None
   }
 }
+
+#[cfg(all(feature = "type-def", not(feature = "noop")))]
+fn remove_existed_type_def(type_def_file: &str) -> std::io::Result<()> {
+  use std::io::{BufRead, BufReader};
+
+  let pkg_name = std::env::var("CARGO_PKG_NAME").expect("CARGO_PKG_NAME is not set");
+  if let Ok(content) = std::fs::File::open(type_def_file) {
+    let reader = BufReader::new(content);
+    let cleaned_content = reader
+      .lines()
+      .filter_map(|line| {
+        if let Ok(line) = line {
+          if let Some((package_name, _)) = line.split_once(':') {
+            if pkg_name == package_name {
+              return None;
+            }
+          }
+          Some(line)
+        } else {
+          None
+        }
+      })
+      .collect::<Vec<String>>()
+      .join("\n");
+    let mut content = std::fs::OpenOptions::new()
+      .read(true)
+      .write(true)
+      .truncate(true)
+      .open(type_def_file)?;
+
+    content.write_all(cleaned_content.as_bytes())?;
+    content.write_all(b"\n")?;
+  }
+  Ok(())
+}
diff --git a/examples/napi-shared/Cargo.toml b/examples/napi-shared/Cargo.toml
new file mode 100644
index 00000000..a2106ee6
--- /dev/null
+++ b/examples/napi-shared/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+authors = ["LongYinan <lynweklm@gmail.com>"]
+edition = "2021"
+name = "napi-shared"
+publish = false
+version = "0.1.0"
+
+[dependencies]
+napi = { path = "../../crates/napi", default-features = false, features = [
+  "tokio_fs",
+  "napi8",
+  "tokio_rt",
+  "serde-json",
+  "async",
+  "experimental",
+  "latin1",
+  "chrono_date",
+] }
+napi-derive = { path = "../../crates/macro", features = ["type-def"] }
+
+[build-dependencies]
+napi-build = { path = "../../crates/build" }
diff --git a/examples/napi-shared/src/lib.rs b/examples/napi-shared/src/lib.rs
new file mode 100644
index 00000000..ef4b2251
--- /dev/null
+++ b/examples/napi-shared/src/lib.rs
@@ -0,0 +1,6 @@
+use napi_derive::napi;
+
+#[napi(object)]
+pub struct Shared {
+  pub value: u32,
+}
diff --git a/examples/napi/Cargo.toml b/examples/napi/Cargo.toml
index 1a7ee3bc..7ccf12a6 100644
--- a/examples/napi/Cargo.toml
+++ b/examples/napi/Cargo.toml
@@ -25,6 +25,7 @@ napi = { path = "../../crates/napi", default-features = false, features = [
   "chrono_date",
 ] }
 napi-derive = { path = "../../crates/macro", features = ["type-def"] }
+napi-shared = { path = "../napi-shared" }
 serde = "1"
 serde_derive = "1"
 serde_json = "1"
diff --git a/examples/napi/__test__/typegen.spec.ts.md b/examples/napi/__test__/typegen.spec.ts.md
index 1a513ae4..dcb71156 100644
--- a/examples/napi/__test__/typegen.spec.ts.md
+++ b/examples/napi/__test__/typegen.spec.ts.md
@@ -19,6 +19,9 @@ Generated by [AVA](https://avajs.dev).
         [K: symbol]: T␊
       }␊
     }␊
+    export interface Shared {␊
+      value: number␊
+    }␊
     /** This is a const */␊
     export const DEFAULT_COST: number␊
     export function getWords(): Array<string>␊
@@ -192,6 +195,7 @@ Generated by [AVA](https://avajs.dev).
     export function readPackageJson(): PackageJson␊
     export function getPackageJsonName(packageJson: PackageJson): string␊
     export function testSerdeRoundtrip(data: any): any␊
+    export function returnFromSharedCrate(): Shared␊
     export function contains(source: string, target: string): boolean␊
     export function concatStr(s: string): string␊
     export function concatUtf16(s: string): string␊
diff --git a/examples/napi/__test__/typegen.spec.ts.snap b/examples/napi/__test__/typegen.spec.ts.snap
index 85740da669453c12d40db35743e45032bcf0d46c..51bfd98d7692effc510870ed6c2d14be2abb3702 100644
GIT binary patch
literal 3877
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

literal 3842
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
E02t6;tN;K2

diff --git a/examples/napi/__test__/values.spec.ts b/examples/napi/__test__/values.spec.ts
index b5bb7847..12cf64e8 100644
--- a/examples/napi/__test__/values.spec.ts
+++ b/examples/napi/__test__/values.spec.ts
@@ -126,6 +126,7 @@ import {
   runScript,
   tsfnReturnPromise,
   tsfnReturnPromiseTimeout,
+  returnFromSharedCrate,
 } from '../'
 
 test('export const', (t) => {
@@ -650,6 +651,12 @@ test('should be able to run script', async (t) => {
   t.is(await runScript(`Promise.resolve(1)`), 1)
 })
 
+test('should be able to return object from shared crate', (t) => {
+  t.deepEqual(returnFromSharedCrate(), {
+    value: 42,
+  })
+})
+
 const AbortSignalTest =
   typeof AbortController !== 'undefined' ? test : test.skip
 
diff --git a/examples/napi/index.d.ts b/examples/napi/index.d.ts
index 3dc1da08..1d04fd43 100644
--- a/examples/napi/index.d.ts
+++ b/examples/napi/index.d.ts
@@ -9,6 +9,9 @@ export class ExternalObject<T> {
     [K: symbol]: T
   }
 }
+export interface Shared {
+  value: number
+}
 /** This is a const */
 export const DEFAULT_COST: number
 export function getWords(): Array<string>
@@ -182,6 +185,7 @@ export interface PackageJson {
 export function readPackageJson(): PackageJson
 export function getPackageJsonName(packageJson: PackageJson): string
 export function testSerdeRoundtrip(data: any): any
+export function returnFromSharedCrate(): Shared
 export function contains(source: string, target: string): boolean
 export function concatStr(s: string): string
 export function concatUtf16(s: string): string
diff --git a/examples/napi/src/lib.rs b/examples/napi/src/lib.rs
index e03619e1..9fd31d27 100644
--- a/examples/napi/src/lib.rs
+++ b/examples/napi/src/lib.rs
@@ -43,6 +43,7 @@ mod object;
 mod promise;
 mod reference;
 mod serde;
+mod shared;
 mod string;
 mod symbol;
 mod task;
diff --git a/examples/napi/src/shared.rs b/examples/napi/src/shared.rs
new file mode 100644
index 00000000..4a892518
--- /dev/null
+++ b/examples/napi/src/shared.rs
@@ -0,0 +1,7 @@
+use napi_derive::napi;
+use napi_shared::Shared;
+
+#[napi]
+pub fn return_from_shared_crate() -> Shared {
+  Shared { value: 42 }
+}
diff --git a/examples/napi/src/threadsafe_function.rs b/examples/napi/src/threadsafe_function.rs
index d54ee7b6..468c6e51 100644
--- a/examples/napi/src/threadsafe_function.rs
+++ b/examples/napi/src/threadsafe_function.rs
@@ -140,10 +140,10 @@ pub async fn tsfn_return_promise_timeout(func: ThreadsafeFunction<u32>) -> Resul
   let sleep = time::sleep(Duration::from_nanos(1));
   tokio::select! {
     _ = sleep => {
-      return Err(Error::new(Status::GenericFailure, "Timeout".to_owned()));
+      Err(Error::new(Status::GenericFailure, "Timeout".to_owned()))
     }
     value = promise => {
-      return Ok(value? + 2);
+      Ok(value? + 2)
     }
   }
 }
diff --git a/memory-testing/test-util.mjs b/memory-testing/test-util.mjs
index e2744bb9..1e442c4e 100644
--- a/memory-testing/test-util.mjs
+++ b/memory-testing/test-util.mjs
@@ -50,9 +50,9 @@ export async function createSuite(testFile, maxMemoryUsage) {
     stats.on('data', (d) => {
       const { memory_stats } = JSON.parse(d.toString('utf8'))
       if (Date.now() - initialDate > 10000 && !shouldAssertMemoryUsage) {
-        resolve()
         initialMemoryUsage = memory_stats.usage
         shouldAssertMemoryUsage = true
+        resolve()
       }
       if (shouldAssertMemoryUsage && memory_stats?.usage) {
         const memoryGrowth = memory_stats.usage - initialMemoryUsage