From 44040e3bfea2c9bc438df5662be43bd072dd2157 Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Sat, 6 Nov 2021 11:53:53 +0800
Subject: [PATCH] fix(napi-derive): type generate issue for Factory and Class

---
 crates/backend/src/typegen.rs               |   8 +++++--
 crates/backend/src/typegen/fn.rs            |   5 +++++
 crates/backend/src/typegen/struct.rs        |   5 +++++
 crates/macro/src/parser/mod.rs              |   2 +-
 examples/napi/__test__/typegen.spec.ts.md   |   7 +++++++
 examples/napi/__test__/typegen.spec.ts.snap | Bin 841 -> 878 bytes
 examples/napi/index.d.ts                    |   7 +++++++
 examples/napi/src/class.rs                  |  22 ++++++++++++++++++++
 8 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/crates/backend/src/typegen.rs b/crates/backend/src/typegen.rs
index 7b3b9da8..0bbd2e1f 100644
--- a/crates/backend/src/typegen.rs
+++ b/crates/backend/src/typegen.rs
@@ -7,7 +7,7 @@ use std::collections::HashMap;
 use once_cell::sync::Lazy;
 use syn::Type;
 
-#[derive(Default)]
+#[derive(Default, Debug)]
 pub struct TypeDef {
   pub kind: String,
   pub name: String,
@@ -149,6 +149,10 @@ pub fn ty_to_ts_type(ty: &Type, is_return_ty: bool) -> String {
           } else {
             ts_ty = Some(known_ty.to_owned());
           }
+        } else if let Some(t) = crate::typegen::r#struct::CLASS_STRUCTS
+          .with(|c| c.borrow_mut().get(rust_ty.as_str()).cloned())
+        {
+          ts_ty = Some(t);
         } else {
           // there should be runtime registered type in else
           ts_ty = Some(rust_ty);
@@ -157,7 +161,7 @@ pub fn ty_to_ts_type(ty: &Type, is_return_ty: bool) -> String {
 
       ts_ty.unwrap_or_else(|| "any".to_owned())
     }
-
+    Type::Group(g) => ty_to_ts_type(&g.elem, is_return_ty),
     _ => "any".to_owned(),
   }
 }
diff --git a/crates/backend/src/typegen/fn.rs b/crates/backend/src/typegen/fn.rs
index 9d7c719a..4c93b3e8 100644
--- a/crates/backend/src/typegen/fn.rs
+++ b/crates/backend/src/typegen/fn.rs
@@ -87,6 +87,11 @@ impl NapiFn {
   fn gen_ts_func_ret(&self) -> String {
     match self.kind {
       FnKind::Constructor | FnKind::Setter => "".to_owned(),
+      FnKind::Factory => self
+        .parent
+        .clone()
+        .map(|i| format!(": {}", i.to_string().to_case(Case::Pascal)))
+        .unwrap_or_else(|| "".to_owned()),
       _ => {
         let ret = if let Some(ret) = &self.ret {
           let ts_type = ty_to_ts_type(ret, true);
diff --git a/crates/backend/src/typegen/struct.rs b/crates/backend/src/typegen/struct.rs
index 7998e0a2..3790bf75 100644
--- a/crates/backend/src/typegen/struct.rs
+++ b/crates/backend/src/typegen/struct.rs
@@ -6,10 +6,15 @@ use crate::{ty_to_ts_type, NapiImpl, NapiStruct, NapiStructKind};
 
 thread_local! {
   pub(crate) static TASK_STRUCTS: RefCell<HashMap<String, String>> = Default::default();
+  pub(crate) static CLASS_STRUCTS: RefCell<HashMap<String, String>> = Default::default();
 }
 
 impl ToTypeDef for NapiStruct {
   fn to_type_def(&self) -> TypeDef {
+    CLASS_STRUCTS.with(|c| {
+      c.borrow_mut()
+        .insert(self.name.to_string(), self.js_name.clone());
+    });
     TypeDef {
       kind: String::from(if self.kind == NapiStructKind::Object {
         "interface"
diff --git a/crates/macro/src/parser/mod.rs b/crates/macro/src/parser/mod.rs
index 6708c032..de4da2f6 100644
--- a/crates/macro/src/parser/mod.rs
+++ b/crates/macro/src/parser/mod.rs
@@ -782,7 +782,7 @@ impl ConvertToAST for syn::ItemImpl {
           continue;
         }
 
-        if opts.constructor().is_some() {
+        if opts.constructor().is_some() || opts.factory().is_some() {
           struct_js_name = check_recorded_struct_for_impl(&struct_name, &opts)?;
         }
 
diff --git a/examples/napi/__test__/typegen.spec.ts.md b/examples/napi/__test__/typegen.spec.ts.md
index a1601ee9..9408013c 100644
--- a/examples/napi/__test__/typegen.spec.ts.md
+++ b/examples/napi/__test__/typegen.spec.ts.md
@@ -54,6 +54,13 @@ Generated by [AVA](https://avajs.dev).
       whoami(): string␊
       static getDogKind(): Kind␊
     }␊
+    export class Blake2BHasher {␊
+      ␊
+      static withKey(key: Blake2bKey): Blake2BHasher␊
+    }␊
+    export class Blake2BKey {␊
+      ␊
+    }␊
     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 f7edba929500b6946a9cdc28cb2a19a416538781..d3478adf0f2bdb1423a8b0c35b429b4945548dbd 100644
GIT binary patch
delta 859
zcmV-h1El=P2JQwTK~_N^Q*L2!b7*gLAa*he0syBEV1_#mZyy78>$!s3(&mvOB7dc6
zE1)Q;Xi>#+z1}3-*t^m0x~WzA8~g%%1UH1lohy6+5=YL=Zkp7IW0D-4+1)qq&5mcr
z;CbGPxBBtPkMDopfBE$E+23E^zJ6Zu?C<xQ=dF5=oW1hUd;H+%8oM4yWuTJ@YPb~8
zW#&SvSo^gQ8cLCTR~yAecYl2jvVWDO1)#{%h^aDAXQ>0?xt_tI@5m}SDMsRBp0I|_
z1@#BS^g<X#f<C88rd+e#gRIk;r--37hp|sdl0<~|L-2{}ZcGSZZy&BCkCDm#Rce<B
zj+BxLK0qd7*5QK10pLM>%#0@@OOk~GjGG=)XU?asS}p@V7lX`9G1=|^Wq-(IN*p<=
zvGc@dhNU8ctqM^zA}JF_#JxNhhN%vr4BF8p+^hp!m1S-#gtiw7p@qDq+cI3j2^TTk
zz@hBI9&7~ABnFLo0EZdvqqPaQQ}|}4jkGm)WLG!P7Hot+A4&^Hqo<hN+X~=VW(uwC
z0M7U|8an|T@ovv5JP)A7oqz8ObYa4hY`~m5qRhE`wYBN9a9X_j?U|mELsw3IRh6V<
z&>mRJzamL^pD|ZrGwYHwiDRFPK><YJ!g}iPND4wJ_r+px!nMKob;5G(%jhx$d@yPj
z4h@REWf*$eTaSDSm34}}M!M{^Mx?DUK~grZ8C!5nX(TD^#B9K@6@LZg3`fgbMsalA
zX=7)Ke1DuC3%xpA7F~YDb|e&{v(Xop^9E4ixP{li5jI&*`A(X(oGU2|;X?ZwOO#F$
z5rDy&!%Sfw-u2Kt21*Rh89&X;S;3)N5%KR#r@rIsW#Mm#;iA3_eu%R`W~LG0ZWAx3
zWRl?QswmU(kgxizSbw%<r~=TuD{Kcj^qE^M!H+2(eP8U$9$8}yO^DXe5IiM`D^yz^
zQY1O_aa4tFVBs$22Q!gTgH3*a5KNVI4RP9F3aPu01r)HhpPUM!FdpaW*9r}w$D6a9
z!=5B5pT>@4kOwEJ6RO>XdOLlwgM{?i=D|y%adf-;%>>DEzcA18@D3Q^x)x4*RZt>w
l#5Z%?w9gBqJ|;F>`MmBg1kftoI4n`1#6JuG#()b6005ogp<)04

delta 822
zcmV-61IhgE2FV5@K~_N^Q*L2!b7*gLAa*he0s!{N3i^{e=Y!*x4P8+Rs|1lEB7cQ6
zm7pl8NKwUcz1}3-+Pl&2I%!n;8~g%%1UH1loio3{ku$TKI(6chBnM}9_sx5=<C!sd
zp10v`et!1r=bw+?zC3^N_xF$QUpGAan{0XBruW3z8;`xGkFK`Z%}^=>y-ZNUrGP#&
zmr}*ruZ7T1icAi*QC#$ox0fK>S$|ppiY$$oDg$+vIv}3w1uXhbt&)>sBtGQ{Yv_rf
z{*ahK2-8T==UmB@Yj*fL>-Cl?Vrb2A>{F5?5uw*1_(b)0W(06_3?s>7WU_yi+GT>4
zQc}Su$VAL~T(CF*JgDc)cp|bSSt-D{88Fp#J{{F|8SuFnW@e7bZvQVsCVx|+<*0J!
zna=`CMFe{lqG&`?CX9#&c`gi7Jwh3DqAR%F1{jrP?ka@#R|=tpyrtVRT*4U_G2Ft5
z?86c41kfY~jd}nl8NEhp7w+cp%}g6<Yp!Kix6l!6ioY033rAz1nBCh8;8bP`t^EMH
z{05DK09w31unI2&XmjWL3V&Ugup~RM<c=tFA>Zun`YfCmuYP-Gpyb$<lV4RODH(Q#
z*78Rr2_G`%N^D_Wawc)?lN=O46t1kN9*?9TlyYCJ1}9t_d|zj5qJ0@%g@6x6&B~!c
zv9}CEPkZaBPoc8TvDZkSz14`c6(&f^@|v*)$CO5r!cNSF3|mo9&VO*Uyk`_g*S$7&
zrkEV(>9Nq!$-3zBE4Cw{5S@*_uv|8P3de1{29B`Vdd_#&tmRxuVF(x6*I1%-mWTih
z&Kzb6^YFfhmN8IbaL)K?X1WE3YDL6<FunSLuh)gYBZiCmI`}cp0-2dcgu6|=oRUd`
zv#X*^^C4gLS+Q*EP=5uWd0*HLa_FvGtig{do_=5K%br>}h9*R7Xb7H?#1*P74=Iuf
zT;r$;-N3?K%nxQFqXwJ&;UJhR>l)&;!4y(=AqyyAZ9h2`L}5J6)2|g8K<Ar_oa2Ec
zDWAtqWsnCasS~Q*hk7@Ev8H`qVl=13#y(lri-nlmCH=5OfeRA<0QJ}~mYE0u0EzsK
AQ~&?~

diff --git a/examples/napi/index.d.ts b/examples/napi/index.d.ts
index 2f236609..c532a62e 100644
--- a/examples/napi/index.d.ts
+++ b/examples/napi/index.d.ts
@@ -43,6 +43,13 @@ export class Animal {
   set name(name: string)
   whoami(): string
   static getDogKind(): Kind
+}
+export class Blake2BHasher {
+  
+  static withKey(key: Blake2bKey): Blake2BHasher
+}
+export class Blake2BKey {
+  
 }
 export class ClassWithFactory {
   name: string
diff --git a/examples/napi/src/class.rs b/examples/napi/src/class.rs
index 9b05a683..7d6ef668 100644
--- a/examples/napi/src/class.rs
+++ b/examples/napi/src/class.rs
@@ -53,3 +53,25 @@ impl Animal {
     Kind::Dog
   }
 }
+
+/// Smoking test for type generation
+#[napi]
+#[repr(transparent)]
+pub struct Blake2bHasher(u32);
+
+#[napi]
+impl Blake2bHasher {
+  #[napi(factory)]
+  pub fn with_key(key: &Blake2bKey) -> Self {
+    Blake2bHasher(key.get_inner())
+  }
+}
+
+#[napi]
+pub struct Blake2bKey(u32);
+
+impl Blake2bKey {
+  fn get_inner(&self) -> u32 {
+    self.0
+  }
+}