From 785388ae40f054b39f9dd310297a3850e6266f63 Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Sat, 6 Nov 2021 22:19:42 +0800
Subject: [PATCH] fix(napi-derive): missing move in async fn

---
 crates/backend/src/codegen/fn.rs            |   2 +-
 examples/napi/__test__/typegen.spec.ts.md   |   1 +
 examples/napi/__test__/typegen.spec.ts.snap | Bin 909 -> 923 bytes
 examples/napi/__test__/values.spec.ts       |   5 +++++
 examples/napi/index.d.ts                    |   1 +
 examples/napi/src/async.rs                  |   7 +++++++
 6 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/crates/backend/src/codegen/fn.rs b/crates/backend/src/codegen/fn.rs
index 2f828ffc..a5b869a2 100644
--- a/crates/backend/src/codegen/fn.rs
+++ b/crates/backend/src/codegen/fn.rs
@@ -33,7 +33,7 @@ impl TryToTokens for NapiFn {
         quote! { Ok(#receiver(#(#arg_names),*).await) }
       };
       quote! {
-        execute_tokio_future(env, async { #call }, |env, #receiver_ret_name| {
+        execute_tokio_future(env, async move { #call }, |env, #receiver_ret_name| {
           #ret
         })
       }
diff --git a/examples/napi/__test__/typegen.spec.ts.md b/examples/napi/__test__/typegen.spec.ts.md
index a5412e72..4f2bb9cf 100644
--- a/examples/napi/__test__/typegen.spec.ts.md
+++ b/examples/napi/__test__/typegen.spec.ts.md
@@ -12,6 +12,7 @@ Generated by [AVA](https://avajs.dev).
     export function getNums(): Array<number>␊
     export function sumNums(nums: Array<number>): number␊
     export function readFileAsync(path: string): Promise<Buffer>␊
+    export function asyncMultiTwo(arg: number): Promise<number>␊
     export function getCwd(callback: (arg0: string) => void): void␊
     export function readFile(callback: (arg0: Error | undefined, arg1: string | null) => void): void␊
     export function eitherStringOrNumber(input: string | number): number␊
diff --git a/examples/napi/__test__/typegen.spec.ts.snap b/examples/napi/__test__/typegen.spec.ts.snap
index 0071ef33c1151ef6b60252889bbb1c1de36d0a18..d92c080ac4ad25d7b8c5e7a0eac488bbcd2d9f33 100644
GIT binary patch
literal 923
zcmV;M17!R`RzV<BZeeh9Xm4~Nb}|YA06K^zZ9AgCb9wr=r|KRn(I1Nl00000000Ax
zRn3kQIS}pvtq|Neajl~x^<jR1-EF~0^D9`E3}RTJJ-XeM#H8DfZ1-fM*^zhyZu<)G
z5PMr8ap%k{aO6zcNoP9gw30dWl<lv+&sDCfKomt=(d~a9eEstM@BcnN`t`@R&;Nhg
ziu~V)yHRvIx)bcJU!wcB-rvQ`kv0x`r4mkR1$}gHwaF~&ByeC1pFFY7NY&rJw*uKM
ziyBasMT({gv}F;1bZ(ch<U6$*P6l~)Dsw!r6D8P)yFmien~={dqYG*A$zj>+ty1LP
z>1CNa`DUycH~mVc=G%5#3hQW`F~RdZ<zkqC_urn2!_$4Z&@v+?|F8AlO@b3+w1I!1
zR2lZ9!Yl?l*r}N5M3s5IRsf|Npg9jdXQmsXU{Z}rx4<-uwl%x1H0mT!RnBvtC6<;O
z?6ruJk!qbIS2yxfIW#>k5YEzfaCHyhqA7FTBJ^;r5Lv|Ah!$xHFQm%g3XXLjp2Btv
zN8FLI6T@*ShGgx+^#cB=v`+haJ@Kn6I8!*qQzdyg83TiUZ!d;ZT^h0;#&9k#$#@*Y
ziR=%&!f!EjW$^u-Tu^zEZCDW_$-L3e_jVa3i{kCC=LSZPLpiawDk=ErY~(F=!Sm!M
zW1+;B*3I_GGR7-V3~92qo_aFXiVGo`S`W^pb@W~@aAKKG-z7jF6mIRn5!71_$<s$Y
z^{G|XE9y1g$3H9~eT6ArU{y1|;LunisqJJqLTW`NB+^)Vje^GBOq)7WP4=twc<9CP
zrs(Dq`;kz)oxgo;xoQB_j=K~FjlcPN!FS%Q&0J~axKx%|Dp4^{L=28*4!YVbo%PTv
z2EiT88CI0;yynoZNcg{8Z|5<yo5KI(PO6<v@MD?<x^xFA?H*BZM&~)ru9h-gH{?Cr
zCR8z4*;l@U0{T2GHv18o{x<o?o>~<~<lI^~P_p28C{$k_TICZM(x^(pz@lBs4`reh
zj+*@DAYLfz4&kh$6p9d#2h^~>pMnaZ=sv-db!rV@tIcK3@j&xJE@G!L#6y!b2z6#x
zy<QCLFy}+uJ$%M3jqVWN(j{@ihB!%Pz?9aVWYMdIl8{rrrDOkuc<Cywdg7K6bj%%R
x8GUNyHuEN6fmC5xE$U?*|9wj|r`(fIR!y0jShtbcq(MOvKLMy&c;>GO006xE%A)`P

literal 909
zcmV;819JR9RzV<BZeeh9Xm4~Nb}|YA0CWwD{5VdO>@YJNC0=1!avzHb00000000Ax
zRn2Z2HxOPoD2n8kQ?GNRfIavpO`Anxz_x58O&|wRil9d>cO)^|B?XdeS#bRtd4=R5
zaw`h--g93e$DA{ywDL-;jpW06NPhEuoZ-v}qA1#n?tS?Azkk2{`T657zkdDypT9rt
zMgFgUKZ@=}KLva5$LQe?-TQbw(Z<1`RKiKEV2JLWHkoCe1Wt_Mv!~V>sfNc7HXwUt
zQ3I;7NYONbwk!gW&g~kOeCJlf$so@zWR53xrUaXCH%efB6Y_a&bRjK1JuL@=O^S52
zvuVZz&-0XvaRQ8+;r@~Uo*l!LmKibmf34b0f^%cEfxn<s84jevECxC_sF>+Qm3h8Z
z0HqtD=?9-n(+e43QcX&?!sNHVmmyagbsnfH=cUgYOUn(8T13f6wa$^NJ9()bngJIG
zm+5=Bc>r+Ll(}sYdbCxDEaGiMi?oE7Qe|)hT|I<nuph%2cVryI&@IK7tV6h6!Jn1Z
zX<u{aesu$v3g`H@Q|;koj12m{qZlr9X~=pMLtkE#@i>NaIUIR~-(u*=;QNGJP<fJl
z*bpPhywxv`4jCq^;_a{JMn+FVIkC1XDfr}a;w^T?^W-jLp~TkK4QHNZj8~u-(qwBr
z4P>en7eX?%9h^(+=)GRz%rc$6Pk=rs+}5EXsJ9%Fr;mE>Q>(1k)N6c*zgt533RAqm
zs%Ct_p|M0#+sSZ()QU<-q|x#Q1&ywSHg%?&9arh`(5vpQ=;jmqkx;vxzkO}FX#mxZ
zdlUwZu;qHiciF7XTxsRFRF+vPQL#)!431_Fy4pNk^w1^-!5z&RR+O$^b7)s2{2y*`
z@R-?M;jg%p>R=cAlxBf0-APKjXB3>#c}}ydrA(_K-}bZO*><6d!OEfX9Td?0u-Jj0
zQat~C@sB;XDvZdvwQ!<j!Shh4zC5(bXE3Hwm4tysyObZwL@69K`Q1UhQq~>9Sw|@p
zAs`Q^VSPUZ6++Q{f+y?L8o*YY>zvb(=7n6v&Si*)CTS4rEUtRH8rW&h$9Q=9oLd^*
zA-=Us;*5=PmMnlNtvku8R|_Q}=X`6&{t5BgRa*7LttF_-9cLMRYUQ@@CSZY7VOcHe
jbshhGM>H4Qlg~CynVMLyk=dj{K@#5pWo|m|a|r+d)t$gK

diff --git a/examples/napi/__test__/values.spec.ts b/examples/napi/__test__/values.spec.ts
index d1548995..479e8810 100644
--- a/examples/napi/__test__/values.spec.ts
+++ b/examples/napi/__test__/values.spec.ts
@@ -34,6 +34,7 @@ import {
   either4,
   withoutAbortController,
   withAbortController,
+  asyncMultiTwo,
 } from '../'
 
 test('number', (t) => {
@@ -163,6 +164,10 @@ test('async', async (t) => {
   await t.throwsAsync(() => readFileAsync('some_nonexist_path.file'))
 })
 
+test('async move', async (t) => {
+  t.is(await asyncMultiTwo(2), 4)
+})
+
 test('either', (t) => {
   t.is(eitherStringOrNumber(2), 2)
   t.is(eitherStringOrNumber('hello'), 'hello'.length)
diff --git a/examples/napi/index.d.ts b/examples/napi/index.d.ts
index caa26c4f..ab2e701d 100644
--- a/examples/napi/index.d.ts
+++ b/examples/napi/index.d.ts
@@ -2,6 +2,7 @@ export function getWords(): Array<string>
 export function getNums(): Array<number>
 export function sumNums(nums: Array<number>): number
 export function readFileAsync(path: string): Promise<Buffer>
+export function asyncMultiTwo(arg: number): Promise<number>
 export function getCwd(callback: (arg0: string) => void): void
 export function readFile(callback: (arg0: Error | undefined, arg1: string | null) => void): void
 export function eitherStringOrNumber(input: string | number): number
diff --git a/examples/napi/src/async.rs b/examples/napi/src/async.rs
index 778c53ce..76ea50bd 100644
--- a/examples/napi/src/async.rs
+++ b/examples/napi/src/async.rs
@@ -14,3 +14,10 @@ async fn read_file_async(path: String) -> Result<Buffer> {
     })
     .await
 }
+
+#[napi]
+async fn async_multi_two(arg: u32) -> Result<u32> {
+  tokio::task::spawn(async move { Ok(arg * 2) })
+    .await
+    .unwrap()
+}