From cd7c7a342f1c74f9a31a3499aac98dd8303d6d10 Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Wed, 8 Dec 2021 17:32:16 +0800
Subject: [PATCH] fix(napi-derive-backend): missing crate prefix

---
 crates/backend/src/codegen/struct.rs        |  12 ++++++++----
 examples/napi/__test__/typegen.spec.ts.md   |   5 +++++
 examples/napi/__test__/typegen.spec.ts.snap | Bin 1932 -> 1954 bytes
 examples/napi/index.d.ts                    |   5 +++++
 examples/napi/src/class.rs                  |   6 ++++++
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/crates/backend/src/codegen/struct.rs b/crates/backend/src/codegen/struct.rs
index 1af55d32..887833c9 100644
--- a/crates/backend/src/codegen/struct.rs
+++ b/crates/backend/src/codegen/struct.rs
@@ -120,9 +120,9 @@ impl NapiStruct {
       let ty = &field.ty;
       match &field.name {
         syn::Member::Named(ident) => fields
-          .push(quote! { #ident: <#ty as FromNapiValue>::from_napi_value(env, cb.get_arg(#i))? }),
+          .push(quote! { #ident: <#ty as napi::bindgen_prelude::FromNapiValue>::from_napi_value(env, cb.get_arg(#i))? }),
         syn::Member::Unnamed(_) => {
-          fields.push(quote! { <#ty as FromNapiValue>::from_napi_value(env, cb.get_arg(#i))? });
+          fields.push(quote! { <#ty as napi::bindgen_prelude::FromNapiValue>::from_napi_value(env, cb.get_arg(#i))? });
         }
       }
     }
@@ -171,11 +171,15 @@ impl NapiStruct {
       match &field.name {
         syn::Member::Named(ident) => {
           field_destructions.push(quote! { #ident });
-          field_conversions.push(quote! { <#ty as ToNapiValue>::to_napi_value(env, #ident)? });
+          field_conversions.push(
+            quote! { <#ty as napi::bindgen_prelude::ToNapiValue>::to_napi_value(env, #ident)? },
+          );
         }
         syn::Member::Unnamed(i) => {
           field_destructions.push(quote! { arg #i });
-          field_conversions.push(quote! { <#ty as ToNapiValue>::to_napi_value(env, arg #i)? });
+          field_conversions.push(
+            quote! { <#ty as napi::bindgen_prelude::ToNapiValue>::to_napi_value(env, arg #i)? },
+          );
         }
       }
     }
diff --git a/examples/napi/__test__/typegen.spec.ts.md b/examples/napi/__test__/typegen.spec.ts.md
index 4b3b4e40..3fe058e5 100644
--- a/examples/napi/__test__/typegen.spec.ts.md
+++ b/examples/napi/__test__/typegen.spec.ts.md
@@ -147,6 +147,11 @@ Generated by [AVA](https://avajs.dev).
       static withData(data: string): Context␊
       method(): string␊
     }␊
+    export class AnimalWithDefaultConstructor {␊
+      name: string␊
+      kind: number␊
+      constructor(name: string, kind: number)␊
+    }␊
     export class ClassWithFactory {␊
       name: string␊
       static withName(name: string): ClassWithFactory␊
diff --git a/examples/napi/__test__/typegen.spec.ts.snap b/examples/napi/__test__/typegen.spec.ts.snap
index b73f0fe81fb13d3e92602bcefe849a7fbb51cd12..d60e614ed6df907f2aeff4b94a284940b2577236 100644
GIT binary patch
literal 1954
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

literal 1932
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
SFMZ#g&;19aVc_-N6#xKwT)$TU

diff --git a/examples/napi/index.d.ts b/examples/napi/index.d.ts
index 3e9dbb64..b46fd4ab 100644
--- a/examples/napi/index.d.ts
+++ b/examples/napi/index.d.ts
@@ -137,6 +137,11 @@ export class Context {
   static withData(data: string): Context
   method(): string
 }
+export class AnimalWithDefaultConstructor {
+  name: string
+  kind: number
+  constructor(name: string, kind: number)
+}
 export class ClassWithFactory {
   name: string
   static withName(name: string): ClassWithFactory
diff --git a/examples/napi/src/class.rs b/examples/napi/src/class.rs
index a8271527..01984e98 100644
--- a/examples/napi/src/class.rs
+++ b/examples/napi/src/class.rs
@@ -114,3 +114,9 @@ impl Context {
     self.data.clone()
   }
 }
+
+#[napi(constructor)]
+pub struct AnimalWithDefaultConstructor {
+  pub name: String,
+  pub kind: u32,
+}