From 940be7df9938f77738b269d4d53eb2b9c26594f0 Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Thu, 23 Dec 2021 14:07:35 +0800
Subject: [PATCH] fix(napi-derive): return Class instance in function

---
 crates/backend/src/codegen/struct.rs        |   2 +-
 examples/napi/__test__/typegen.spec.ts.md   |   5 +++++
 examples/napi/__test__/typegen.spec.ts.snap | Bin 2094 -> 2116 bytes
 examples/napi/__test__/values.spec.ts       |   2 ++
 examples/napi/index.d.ts                    |   5 +++++
 examples/napi/src/class.rs                  |  12 ++++++++++++
 6 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/crates/backend/src/codegen/struct.rs b/crates/backend/src/codegen/struct.rs
index 3ed55f91..70c9a316 100644
--- a/crates/backend/src/codegen/struct.rs
+++ b/crates/backend/src/codegen/struct.rs
@@ -163,7 +163,7 @@ impl NapiStruct {
 
   fn gen_to_napi_value_ctor_impl(&self) -> TokenStream {
     let name = &self.name;
-    let js_name_str = &self.js_name;
+    let js_name_str = format!("{}\0", &self.js_name);
 
     let mut field_conversions = vec![];
     let mut field_destructions = vec![];
diff --git a/examples/napi/__test__/typegen.spec.ts.md b/examples/napi/__test__/typegen.spec.ts.md
index 54bd26ac..f00894e4 100644
--- a/examples/napi/__test__/typegen.spec.ts.md
+++ b/examples/napi/__test__/typegen.spec.ts.md
@@ -144,6 +144,11 @@ Generated by [AVA](https://avajs.dev).
       whoami(): string␊
       /** This is static... */␊
       static getDogKind(): Kind␊
+      returnOtherClass(): Dog␊
+    }␊
+    export class Dog {␊
+      name: string␊
+      constructor(name: string)␊
     }␊
     /** 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 2249df9d222003ec2628f9930a4135d2dbdd3b96..4abe403e7c8e0afa31bc1fdd3897cbd9107374e1 100644
GIT binary patch
literal 2116
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

literal 2094
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
Yk`cDvr*D@2hH$s?6TF*EB7_(K0P6Ah0ssI2

diff --git a/examples/napi/__test__/values.spec.ts b/examples/napi/__test__/values.spec.ts
index a61b4d42..83eccc11 100644
--- a/examples/napi/__test__/values.spec.ts
+++ b/examples/napi/__test__/values.spec.ts
@@ -69,6 +69,7 @@ import {
   appendBuffer,
   returnNull,
   returnUndefined,
+  Dog,
 } from '../'
 
 test('export const', (t) => {
@@ -125,6 +126,7 @@ test('class', (t) => {
 
   dog.name = '可乐'
   t.is(dog.name, '可乐')
+  t.deepEqual(dog.returnOtherClass(), new Dog('Doge'))
 })
 
 test('class factory', (t) => {
diff --git a/examples/napi/index.d.ts b/examples/napi/index.d.ts
index 6282cf8f..da828cfa 100644
--- a/examples/napi/index.d.ts
+++ b/examples/napi/index.d.ts
@@ -134,6 +134,11 @@ export class Animal {
   whoami(): string
   /** This is static... */
   static getDogKind(): Kind
+  returnOtherClass(): Dog
+}
+export class Dog {
+  name: string
+  constructor(name: string)
 }
 /** Smoking test for type generation */
 export class Blake2BHasher {
diff --git a/examples/napi/src/class.rs b/examples/napi/src/class.rs
index d4b864c2..bb8e5dd0 100644
--- a/examples/napi/src/class.rs
+++ b/examples/napi/src/class.rs
@@ -60,6 +60,18 @@ impl Animal {
   pub fn get_dog_kind() -> Kind {
     Kind::Dog
   }
+
+  #[napi]
+  pub fn return_other_class(&self) -> Dog {
+    Dog {
+      name: "Doge".to_owned(),
+    }
+  }
+}
+
+#[napi(constructor)]
+pub struct Dog {
+  pub name: String,
 }
 
 /// Smoking test for type generation