From 76798a4343972349daf0d5e297a7edf7cd45de72 Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Fri, 24 Dec 2021 22:56:16 +0800
Subject: [PATCH] fix(napi-derive): missing wrap in NAPI-RS created class
 instance

---
 crates/backend/src/codegen/struct.rs        |  24 +++++++++++++++-----
 examples/napi/__test__/typegen.spec.ts.md   |   1 +
 examples/napi/__test__/typegen.spec.ts.snap | Bin 2131 -> 2141 bytes
 examples/napi/__test__/values.spec.ts       |   1 +
 examples/napi/index.d.ts                    |   1 +
 examples/napi/src/class.rs                  |   5 ++++
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/crates/backend/src/codegen/struct.rs b/crates/backend/src/codegen/struct.rs
index 79df9c9e..539d46d5 100644
--- a/crates/backend/src/codegen/struct.rs
+++ b/crates/backend/src/codegen/struct.rs
@@ -170,25 +170,37 @@ impl NapiStruct {
     quote! {
       impl napi::bindgen_prelude::ToNapiValue for #name {
         unsafe fn to_napi_value(
-          env: napi::bindgen_prelude::sys::napi_env, val: #name
-        ) -> napi::bindgen_prelude::Result<napi::bindgen_prelude::sys::napi_value> {
+          env: napi::sys::napi_env, val: #name
+        ) -> napi::Result<napi::bindgen_prelude::sys::napi_value> {
           if let Some(ctor_ref) = napi::bindgen_prelude::get_class_constructor(#js_name_str) {
             let mut ctor = std::ptr::null_mut();
 
-            napi::bindgen_prelude::check_status!(
-              napi::bindgen_prelude::sys::napi_get_reference_value(env, ctor_ref, &mut ctor),
+            napi::check_status!(
+              napi::sys::napi_get_reference_value(env, ctor_ref, &mut ctor),
               "Failed to get constructor of class `{}`",
               #js_name_str
             )?;
 
             let mut result = std::ptr::null_mut();
             napi::bindgen_prelude::___CALL_FROM_FACTORY.store(true, std::sync::atomic::Ordering::Relaxed);
-            napi::bindgen_prelude::check_status!(
-              napi::bindgen_prelude::sys::napi_new_instance(env, ctor, 0, std::ptr::null_mut(), &mut result),
+            napi::check_status!(
+              napi::sys::napi_new_instance(env, ctor, 0, std::ptr::null_mut(), &mut result),
               "Failed to construct class `{}`",
               #js_name_str
             )?;
             napi::bindgen_prelude::___CALL_FROM_FACTORY.store(false, std::sync::atomic::Ordering::Relaxed);
+            napi::check_status!(
+              napi::sys::napi_wrap(
+                env,
+                result,
+                Box::into_raw(Box::new(val)) as *mut std::ffi::c_void,
+                Some(napi::bindgen_prelude::raw_finalize_unchecked::<#name>),
+                std::ptr::null_mut(),
+                std::ptr::null_mut(),
+              ),
+              "Failed to wrap native object of class `{}`",
+              #js_name_str
+            )?;
             Ok(result)
           } else {
             Err(napi::bindgen_prelude::Error::new(
diff --git a/examples/napi/__test__/typegen.spec.ts.md b/examples/napi/__test__/typegen.spec.ts.md
index 68cb4c58..b8d3c8dd 100644
--- a/examples/napi/__test__/typegen.spec.ts.md
+++ b/examples/napi/__test__/typegen.spec.ts.md
@@ -154,6 +154,7 @@ Generated by [AVA](https://avajs.dev).
     export class Bird {␊
       name: string␊
       constructor(name: string)␊
+      getCount(): number␊
     }␊
     /** Smoking test for type generation */␊
     export class Blake2BHasher {␊
diff --git a/examples/napi/__test__/typegen.spec.ts.snap b/examples/napi/__test__/typegen.spec.ts.snap
index 870adc528bd485e780403fd6c804d4afffcaca71..ff404ed7920740490a7cc2834a52a5cffe2d49c6 100644
GIT binary patch
literal 2141
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
Tdg(WkyOsX|{K-x+WElVeSTGfk

literal 2131
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
JBxz3>001UH47mUR

diff --git a/examples/napi/__test__/values.spec.ts b/examples/napi/__test__/values.spec.ts
index d1c9ae5c..99ce7fa2 100644
--- a/examples/napi/__test__/values.spec.ts
+++ b/examples/napi/__test__/values.spec.ts
@@ -129,6 +129,7 @@ test('class', (t) => {
   t.is(dog.name, '可乐')
   t.deepEqual(dog.returnOtherClass(), new Dog('Doge'))
   t.deepEqual(dog.returnOtherClassWithCustomConstructor(), new Bird('parrot'))
+  t.is(dog.returnOtherClassWithCustomConstructor().getCount(), 1234)
 })
 
 test('class factory', (t) => {
diff --git a/examples/napi/index.d.ts b/examples/napi/index.d.ts
index 5224aef8..a64af8ad 100644
--- a/examples/napi/index.d.ts
+++ b/examples/napi/index.d.ts
@@ -144,6 +144,7 @@ export class Dog {
 export class Bird {
   name: string
   constructor(name: string)
+  getCount(): number
 }
 /** Smoking test for type generation */
 export class Blake2BHasher {
diff --git a/examples/napi/src/class.rs b/examples/napi/src/class.rs
index 4c1a7562..f1d5e720 100644
--- a/examples/napi/src/class.rs
+++ b/examples/napi/src/class.rs
@@ -90,6 +90,11 @@ impl Bird {
   pub fn new(name: String) -> Self {
     Bird { name }
   }
+
+  #[napi]
+  pub fn get_count(&self) -> u32 {
+    1234
+  }
 }
 
 /// Smoking test for type generation