From 3e187151a608522eda6497be8b61e6b0adfdb564 Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Sun, 25 Feb 2024 00:56:30 +0800
Subject: [PATCH] fix(napi-derive): HashMap/IndexMap and slice generated types
 (#1977)

---
 crates/backend/src/codegen/fn.rs              |   6 ++--
 crates/backend/src/lib.rs                     |  18 ++++++++++
 crates/backend/src/typegen.rs                 |  16 ++++++++-
 .../__snapshots__/typegen.spec.ts.md          |  34 +++++++++---------
 .../__snapshots__/typegen.spec.ts.snap        | Bin 4577 -> 4598 bytes
 .../__snapshots__/values.spec.ts.snap         | Bin 368 -> 368 bytes
 examples/napi/index.d.ts                      |  34 +++++++++---------
 7 files changed, 69 insertions(+), 39 deletions(-)

diff --git a/crates/backend/src/codegen/fn.rs b/crates/backend/src/codegen/fn.rs
index a2f3d42b..66973867 100644
--- a/crates/backend/src/codegen/fn.rs
+++ b/crates/backend/src/codegen/fn.rs
@@ -5,6 +5,7 @@ use syn::spanned::Spanned;
 use crate::{
   codegen::{get_intermediate_ident, js_mod_to_token_stream},
   BindgenResult, CallbackArg, Diagnostic, FnKind, FnSelf, NapiFn, NapiFnArgKind, TryToTokens,
+  TYPEDARRAY_SLICE_TYPES,
 };
 
 impl TryToTokens for NapiFn {
@@ -428,10 +429,7 @@ impl NapiFn {
         if let syn::Type::Slice(slice) = &**elem {
           if let syn::Type::Path(ele) = &*slice.elem {
             if let Some(syn::PathSegment { ident, .. }) = ele.path.segments.first() {
-              static TYPEDARRAY_SLICE_TYPES: &[&str] = &[
-                "u8", "i8", "u16", "i16", "u32", "i32", "f32", "f64", "u64", "i64",
-              ];
-              if TYPEDARRAY_SLICE_TYPES.contains(&&*ident.to_string()) {
+              if TYPEDARRAY_SLICE_TYPES.contains_key(&&*ident.to_string()) {
                 let q = quote! {
                   let #arg_name = {
                     #type_check
diff --git a/crates/backend/src/lib.rs b/crates/backend/src/lib.rs
index 16881cb6..aff83ba7 100644
--- a/crates/backend/src/lib.rs
+++ b/crates/backend/src/lib.rs
@@ -1,6 +1,9 @@
 #[macro_use]
 extern crate quote;
 
+use std::collections::HashMap;
+
+use once_cell::sync::Lazy;
 use proc_macro2::TokenStream;
 
 #[macro_use]
@@ -105,3 +108,18 @@ pub(crate) static PRIMITIVE_TYPES: &[(&str, (&str, bool, bool))] = &[
   ("JsSymbol", ("symbol", false, false)),
   ("JsFunction", ("(...args: any[]) => any", true, false)),
 ];
+
+pub(crate) static TYPEDARRAY_SLICE_TYPES: Lazy<HashMap<&str, &str>> = Lazy::new(|| {
+  HashMap::from([
+    ("u8", "Uint8Array"),
+    ("i8", "Int8Array"),
+    ("u16", "Uint16Array"),
+    ("i16", "Int16Array"),
+    ("u32", "Uint32Array"),
+    ("i32", "Int32Array"),
+    ("f32", "Float32Array"),
+    ("f64", "Float64Array"),
+    ("u64", "BigUint64Array"),
+    ("i64", "BigInt64Array"),
+  ])
+});
diff --git a/crates/backend/src/typegen.rs b/crates/backend/src/typegen.rs
index a05ba110..4e853151 100644
--- a/crates/backend/src/typegen.rs
+++ b/crates/backend/src/typegen.rs
@@ -6,7 +6,7 @@ pub(crate) mod r#struct;
 use std::{cell::RefCell, collections::HashMap, env};
 
 use once_cell::sync::Lazy;
-use syn::Type;
+use syn::{PathSegment, Type, TypePath, TypeSlice};
 
 pub static NAPI_RS_CLI_VERSION: Lazy<semver::Version> = Lazy::new(|| {
   let version = env::var("CARGO_CFG_NAPI_RS_CLI_VERSION").unwrap_or_else(|_| "0.0.0".to_string());
@@ -147,11 +147,14 @@ static KNOWN_TYPES: Lazy<HashMap<&'static str, (&'static str, bool, bool)>> = La
     ("Value", ("any", false, false)),
     ("Map", ("Record<string, any>", false, false)),
     ("HashMap", ("Record<{}, {}>", false, false)),
+    ("BTreeMap", ("Record<{}, {}>", false, false)),
+    ("IndexMap", ("Record<{}, {}>", false, false)),
     ("ArrayBuffer", ("ArrayBuffer", false, false)),
     ("JsArrayBuffer", ("ArrayBuffer", false, false)),
     ("Int8Array", ("Int8Array", false, false)),
     ("Uint8Array", ("Uint8Array", false, false)),
     ("Uint8ClampedArray", ("Uint8ClampedArray", false, false)),
+    ("Uint8ClampedSlice", ("Uint8ClampedArray", false, false)),
     ("Int16Array", ("Int16Array", false, false)),
     ("Uint16Array", ("Uint16Array", false, false)),
     ("Int32Array", ("Int32Array", false, false)),
@@ -166,6 +169,7 @@ static KNOWN_TYPES: Lazy<HashMap<&'static str, (&'static str, bool, bool)>> = La
     ("Date", ("Date", false, false)),
     ("JsDate", ("Date", false, false)),
     ("JsBuffer", ("Buffer", false, false)),
+    ("BufferSlice", ("Buffer", false, false)),
     ("Buffer", ("Buffer", false, false)),
     ("Vec", ("Array<{}>", false, false)),
     ("Result", ("Error | {}", false, true)),
@@ -445,6 +449,16 @@ pub fn ty_to_ts_type(
         ty_to_ts_type(&p.elem, is_return_ty, is_struct_field, false);
       (element_type, is_optional)
     }
+    Type::Slice(TypeSlice { elem, .. }) => {
+      if let Type::Path(TypePath { path, .. }) = &**elem {
+        if let Some(PathSegment { ident, .. }) = path.segments.last() {
+          if let Some(js_type) = crate::TYPEDARRAY_SLICE_TYPES.get(&ident.to_string().as_str()) {
+            return (js_type.to_string(), false);
+          }
+        }
+      }
+      ("any[]".to_owned(), false)
+    }
     _ => ("any".to_owned(), false),
   }
 }
diff --git a/examples/napi/__tests__/__snapshots__/typegen.spec.ts.md b/examples/napi/__tests__/__snapshots__/typegen.spec.ts.md
index 93e4c626..d82ccfe6 100644
--- a/examples/napi/__tests__/__snapshots__/typegen.spec.ts.md
+++ b/examples/napi/__tests__/__snapshots__/typegen.spec.ts.md
@@ -85,7 +85,7 @@ Generated by [AVA](https://avajs.dev).
       constructor(name: string)␊
       getCount(): number␊
       getNameAsync(): Promise<string>␊
-      acceptSliceMethod(slice: any): number␊
+      acceptSliceMethod(slice: Uint8Array): number␊
     }␊
     ␊
     /** Smoking test for type generation */␊
@@ -247,7 +247,7 @@ Generated by [AVA](https://avajs.dev).
       foo: number␊
     }␊
     ␊
-    export function acceptSlice(fixture: any): bigint␊
+    export function acceptSlice(fixture: Uint8Array): bigint␊
     ␊
     export function acceptThreadsafeFunction(func: (err: Error | null, arg: number) => any): void␊
     ␊
@@ -423,15 +423,15 @@ Generated by [AVA](https://avajs.dev).
     ␊
     export function enumToI32(e: CustomNumEnum): number␊
     ␊
-    export function f32ArrayToArray(input: any): Array<number>␊
+    export function f32ArrayToArray(input: Float32Array): Array<number>␊
     ␊
-    export function f64ArrayToArray(input: any): Array<number>␊
+    export function f64ArrayToArray(input: Float64Array): Array<number>␊
     ␊
     export function fibonacci(n: number): number␊
     ␊
     export function fnReceivedAliased(s: AliasedStruct, e: ALIAS): void␊
     ␊
-    export function getBtreeMapping(): BTreeMap␊
+    export function getBtreeMapping(): Record<string, number>␊
     ␊
     export function getBuffer(): Buffer␊
     ␊
@@ -443,7 +443,7 @@ Generated by [AVA](https://avajs.dev).
     ␊
     export function getGlobal(): typeof global␊
     ␊
-    export function getIndexMapping(): IndexMap␊
+    export function getIndexMapping(): Record<string, number>␊
     ␊
     export function getMapping(): Record<string, number>␊
     ␊
@@ -468,15 +468,15 @@ Generated by [AVA](https://avajs.dev).
     ␊
     export function getWords(): Array<string>␊
     ␊
-    export function i16ArrayToArray(input: any): Array<number>␊
+    export function i16ArrayToArray(input: Int16Array): Array<number>␊
     ␊
-    export function i32ArrayToArray(input: any): Array<number>␊
+    export function i32ArrayToArray(input: Int32Array): Array<number>␊
     ␊
-    export function i64ArrayToArray(input: any): Array<number>␊
+    export function i64ArrayToArray(input: BigInt64Array): Array<number>␊
     ␊
-    export function i8ArrayToArray(input: any): Array<number>␊
+    export function i8ArrayToArray(input: Int8Array): Array<number>␊
     ␊
-    export function indexmapPassthrough(fixture: IndexMap): IndexMap␊
+    export function indexmapPassthrough(fixture: Record<string, number>): Record<string, number>␊
     ␊
     /** default enum values are continuos i32s start from 0 */␊
     export const enum Kind {␊
@@ -604,9 +604,9 @@ Generated by [AVA](https://avajs.dev).
       name: string␊
     }␊
     ␊
-    export function sumBtreeMapping(nums: BTreeMap): number␊
+    export function sumBtreeMapping(nums: Record<string, number>): number␊
     ␊
-    export function sumIndexMapping(nums: IndexMap): number␊
+    export function sumIndexMapping(nums: Record<string, number>): number␊
     ␊
     export function sumMapping(nums: Record<string, number>): number␊
     ␊
@@ -649,13 +649,13 @@ Generated by [AVA](https://avajs.dev).
       typeOverrideOptional?: object␊
     }␊
     ␊
-    export function u16ArrayToArray(input: any): Array<number>␊
+    export function u16ArrayToArray(input: Uint16Array): Array<number>␊
     ␊
-    export function u32ArrayToArray(input: any): Array<number>␊
+    export function u32ArrayToArray(input: Uint32Array): Array<number>␊
     ␊
-    export function u64ArrayToArray(input: any): Array<bigint>␊
+    export function u64ArrayToArray(input: BigUint64Array): Array<bigint>␊
     ␊
-    export function u8ArrayToArray(input: any): Array<number>␊
+    export function u8ArrayToArray(input: Uint8Array): Array<number>␊
     ␊
     export interface UseNullableStruct {␊
       requiredNumberField: number␊
diff --git a/examples/napi/__tests__/__snapshots__/typegen.spec.ts.snap b/examples/napi/__tests__/__snapshots__/typegen.spec.ts.snap
index d8e2ce56a278216354cef86cd67eef84282c30dd..a5c5f0a0580df5e3d5a4a00a7d70c6b0cae6e8d9 100644
GIT binary patch
literal 4598
zcmV<S5ee==RzV<BZeeh9Xm4~Nb~6eC000^m!NT{1!4m)%_@W)=;5(UFBxkH}FJR~g
zexCn}93P7a00000000B+TwiY-Idb152m<IW-+<X5@W>edk!%>wU}a+@TRwR$$<T~%
z_uw;bIo&lgw0g){k}YZ07La?)Tb}cBxch|n5rX2MZgw}jXQb63dB`rXJKbINW075~
zDppnN&(ldJl5_RPzkp^sgR6g2bCG8$nE?k$HIPI|35h0pwFHvFluTI$OmVtYbD`BA
z|D2{&)8D=O&wu#lpT5C={_Y>Y`RBj?<=vzEgyvd2@IWb<tjNjm{n3N75xM_p>(PAz
zDq~zfNSUIO4DjaG7F;cb)FjEMQsniO2FYo5I{6HV{%-t&eAyyI0!;<aR^;Bjfw@t;
zm2>uU4n(aM6Ooz6AHN^C%TEI`-Xi3B>w4?a{rg+wKKUsTTxppnTF9S>SZXFXnF>jM
zvUh(X5`NB^1Vw0;ktu^LRYVIi0kX^|8B6*IBlH~PB~w5&oe{QJW@O3<RV08%x_|x1
z>5}z=yW5|(aO#zb4>?=V%uMdl{rlv5##17ugxcHpABC%M&UiX7B#wGKXNoXI^c=#`
zEn9G-S910VrwbSmr6uFD?HUjzQ;G~LvH(37sYOznYL<{orsoI|pluJ_1hxp7fi~E^
zZI6zu{$_ntq(((UYBwY0Zw2^PK76%-koIzsXPQ087{|FU7QnT=k75$a2`t2CM*jMz
z|NakiA187-7j(fY0*14<^L+U5VP)Dg(67YIOnf_BeLLE3Kmwr>h!P7R$(%}>Xpo9f
zo|czH!OuDH1eE2{bE=8ke-j{}61s%c@4##|uw=jg`02~_qu&p{{q~E!aa~MBg3cvB
zMO{2VMMBwLiCN^y4@}Pwa;3%MAkc{I0oi8~ry?#uN|wSAPuT@abD9n1?35oH1?X`h
z7c?8M{F3!OeF_}!e&PPfwTHakim5n?@d~Ci&vYP%QT$Lhwun=6o-ZaKYkC|~_A7+j
zkzqx#28TkvW_V@B3lZD-lp5((2BSHEHf*S}GS9%Q^?_1nc?R#8(p%Raz*tVtKN<!6
zdr{c>$V$1PsuJ3v(Hg&}dXA&J#i<VbR#|{O3lsxaZRkB#uH>LV`bv17W$|H@A4k;&
zLLG>`*0%TPBsdT`*TLM(%@ewSp<3|-AH0`h!4!OF*<NfBLX!lRdX%vQoVqIfJs=+#
z*UyJi(p9)v=m^MYA<h|}5e-Tk>u)CId>49zx`p1)=sE1}|As2BKcPK@Rqq^D14lLa
z9&p48%N8N|GNl@N=spKzKc7y`Dqjee*4EacxUu$XKvB8AhZXs<701D6djVk$;ehI7
ze#-0Hv3q+onRYkf@|Nh(`Im@-1j~BTa2bOJM3v)djKynAo%Kb8_Y72?=^G(f{j9U-
zIaAH~3$EeHZtewLP2dC|eK{Z#Au^zRi;#&?i%@kVJ2epc71h*fRJlZUlq#Xsx85Y5
z*7ik7ZJmAK7aQW2*3O&4Gj9nET(Bw8RxPOnu1iB_EM{mBqwzxA-W-fZ#n^ilyW5bl
zX0Y2mhcV+d(YL!yJRvk<zs>YxcD*r!iYw^y0oGF=GEOu03pA#2$x=P{Caq8Az-DvZ
z?gO2}{h;6^&oYd?jUv0?+624liQzrOXg4sv{^`gpj(b{cRU16hEZ}_^F#E>=^UD@b
z&>=;?ONf4_4E;_KBI_h(H*;BafI~Jh03S!@@bQpobSFZ7LKQi37vFi|(DL`4s4v#q
z&O<iY{T1NO6eJSR2PuHi(<63lz$aGoa*6vmc(WX?bW3bjBkosdw{IzaU9>l#HOP_q
zuL*23p>jO2t#?6h)r~{Jx9SWQLN~Xegryjm$4jy8^rpjnTEYfO%48S>Ni$Y&dr*wq
z06Jm(GactrXVBq6nL6T1Q=Y)-w0A+X9Pp@o&c!9)4qXn0LkC7J$V%jra6~8C!2b*R
z>!1GXFO`E3hs!g%H1TI3hqao=RGlA)%pNQXd0Yfnxo3|jc;xD#r?mdE&265D|F>Q1
zY}bj<KS-vl3v`3nyCsZq(P?$8Qzuy%23u)g^R!rx<~&~pE<WceOc{sNx%=&=0$a9`
zrc(DjL<d5-*n#{Vm?*1<-MJBNIiuZMP3e?ptKQ8PrTz*=kU<fu3z>r4Up0d;WvC+e
zjTQvrUCu#5n}WyT`*HMs4ZL5&ZffqGZ*A_-BD_AfEQulzCDGk%^Y!xdHxQ?}a6e!a
zXjaQv_ozdzJPSb>*C3}f0WvfoQz61rvZI>jJTV92;FR5)vMZg-`U!i&W{m4L&hZ>G
zn2Ju}&^_oO#enoc$^m&Tr6`w!%2^>Y*?U1KUwLD+G5jIbH1lKJ1>iVeW-yd9)h+nr
zQZ1;Q?G&!oT<#Y8V67Bs+M^}ZBna2sODePh-!=iBFUauS(Qstm=8)`>$Neor_Q@XE
ziNE%YQDt;CPwY{N4lDv5L?gNovS!{1*j#<#ZbBnMXYjI9rIt(JX?QX%vLg0JlqFj|
z?j`!l=bZZ_p;<Pe$@zfv9zJ|X<xCB5Wj}sezs88Rb3?RR?z|NncZHqCd#coUE=4|@
zM-JdVxlrDG5kbTBmqi;3Lu8SL<tW7=+(*rEkYh}kk1s`KOO#S{Gr!Mrwe$FKZ`okj
z7~%}lJb~y--wa?()wx%`GZRMk8oX{lc0v4Bu(ZjJ@A5@N;rES#PpItDXKMh5cH`O$
zvvKXu4hw1TA4;(}+Sz^H+l=zr)AfXJK!14lbf~Ob=}lN5jN7J7&bZDt-jcl$TdV`O
zSif{F7Vfjhy-oIR&D>QGcGe?Qy-7FR?uKwX6&t_1Av)q(mGf&je$n$3M|_#<0qL1>
z#^ft0X(~o3;&h}*S`NtA@S+ND4{8t_3N+;DXh|=5@3T5A9OvVT&#L9$BN_SVP=(V^
zCVr9|t(oV;WByRiEPKq$2F^Wr&_;HnL5Dm&&{s7#G4WAFur@Ahv59-YVcrQoi-bkD
z_h-m?$AC)=^o+V4@dJm`OC~%1CE6(`lilLA7~)V9TcGDsaPf+27^dmYG2^+09<!SO
z?{3@wbuo^`G0QThYHY1<)-aw>%`U*OvxTX~z^yn--+_1hnW4!lctZ6%su|zuspiSF
zg<+)S4X8ip>CUrF={03s^_0kE66C@)l{3%*f=>{|ATB`a4^MV&9O4!q!xwjJeI#Pj
zko#<QWUGB`UM!?r<M1r0?;z<Z_6r2Nz1CT>Mlet9+$JuX$!QjgQ-f=_d=<FyY6+=b
zwC&1*wK1MfJ|m?tqjV5KqHP)!Gn;sJL@s;ZT$%?y8`yz^An&DEg49ODFaBg1gqeL)
z9+{ckYgwozF%NHG&tM7?n;uSi#0NMN(LF<(F*f-_+vC$ocZfMvP)WEO92=%Oe<yO1
z*p>?k^xSmKC=E-~s)3bY$}z`jb_(OU$dz4$hha&$JaO4d%}Ks^jaL}=oN~Y;7oNSw
zmxAn(UGsA;0q;M-i$lz_?vbbXd&I8D9(jg8Ut<}E?2+eqal#DFzZ+)Y2>Cb~M;QS|
zn(AB~h}5K6D;Bqm%g|6MpR|+CU~Ult95ajNA~HZ~EUismv{>3|^N?Mg`f9y;eK`E^
zZv2OX)6uwLX#*J>wW{EJ`oER%jjakun3hL2jQGnd6ZM<RgN!cxrtfetU}_Oh{PG5g
zA9tE@)_5(%)3p%fD_VxNK>I>ur?S|w4z<MSwS^L`4&UP9(ZyP(!fg-9SF%sOl7kMv
z6)>9@W$PogQcjRSZ9}lH_f%HZxwcrHDVEoZrFOj*%`tes7>lDPyFD0GEknn8Pn{F+
z=Xxj8VJ7J24t4tMX)B0(v;hd42u_oP_4o#X@|2%J0_*}(mq@|@q>@wW6L1NoR;8GM
z-q#Y~m@b#-YPSdE3=$#J@5=0Hi?qmUvj`peB5WzTOv4DcaiHmpQfHve3*Ts@BKQFJ
zqb=^}Sk)QmH<_4F<L<C;KupQZ+=$X1@f5CZw|KYY5^0{nA<Ljv(~A+GfYQcV4`mQ5
zeEfv}#u@S~vxKo&+7Q&StoM0?t!SqC(%x5r|Eci@?J8XpeNU5fI)k@La5K|oc|9P(
z!|oLr>A>POTysdN3)|T1R*w(f#&yE|AY>Y8%xRFaoo6w_am2NIuzs;v+<+b3;5@+M
z=F0~D8{04TyhV=Zn*!i&TF@mXzqCt!6}67|Ch6EcsF$e?XRPZmailVR!allGxO&RQ
zV`M7Df;^7LnWiP&_lNIOd9G|#9(z_?rr&msXPF`sCR6wPfNCF&nkbDby>gs+a*oky
z%#meG>C?&Q?_s5SV)EGs=<C&KL6^=!UzpNn5q(5To7IwB6Drr?fo`2m#ZHsU-{SMa
zbHz7@#SPA4afjOyLsxqd{!hiGrI4qS&$ceu2yNQPqbEh1#$_^Xv~<^bv7(LE>#c9W
z$t(Rr-Ra9nZ7!yhWrsnFH@7Li&U*S<e;*X+Yopu+uI*)L5kJ~`V3U@cMk}@MhT9Hg
zliI&>!tw73iUS1~`n33jpd5JW69a`c4e7!}dz;f;GqA~%OiU)ZTpcYg0~so1%(lr#
z<qO2~8I8)(m<JmNQw=Vrc=%aWI?hX?AkK(2^jL5p7a*0H`_!Z}9IQ3-?peT<0+wBY
zCk)ifhWn!2v^A%2@oGI?WScH2XGwc#vdnUI%E5JgnHGkQaA#>t3rF0Z@Vu!mJV$#G
z(w$VD8^&+2$R6gi+)80qhD?EK(>AzAK7Ok}rtkpY#J8Wwbu4_uygCNH&3)zVS)nO+
zVT$~4_REJQ#g5-bM|!;oSK$t{$J98>%NV^m%QXu7=>A_0A_f1bOK+Qr!8X37IC|Uj
zc<?Uk$N3JmaDcDa)Z`Ym{r1TtM)CsDuYlGMaGdKq7rO2+ZG82m>ND3>{3^tSDv|4T
zuOON$wx+5*VeG%?Y6HcvB+*V?RB$mM;iGl3xn%n$RSfBK%0pGwr0SdUZ&Mz$jjJ(p
zwA~E0I=QXV)*)Ios|^gbXf&r1(gXbL7B{-RY-4z<3MahXS`lnx?mnPfnhg%9HNvCm
z5x<}rOKW+?t};{`gtLqusqPP=E~0@ga-M3*mYbI0WX?y4WJ}#s=6?Z;Yq@UnDA2ZG
zam4Y^Z)+63R?)19ltF=gy^+Shph2)aINHj9p?)u!(zdK{&;P!MC&PDwrl`1k<evL!
zZl3{7@zb$;=EuEg{2%V{W{47r4^+OWWc+x(P#uTsww<K%MJ4xjdzfF3V3JCfy^>()
z;KJ_?M;LMJvzhfR?<FKmnb6o=2PzcZj|IY+S625On62l>c^bU|?#qb-Tj%$UjW_HP
zXu_J_%VVrYnNr`~;Tbo0N1)i=bor|Q#ia?(EJkY=S(T$8?m!)_xTaT@67av};Up1h
z_u-@!SiDth>d9J7xtS0;)wQ~?ZnA1>8b(a8;hpp?^-E!`A!t*&ap&;b&cenJ*y15_
z{kIv(Xr2rI@cNDiI0N$~62-7G=;}7%p;eq9{a%{#vBIR-!JP7$b1ztbaHm@+)TVm-
zwET?0J&)M@Jf3963hBmK<~*KdzERsr-kN4cn0lVscACUsqIu>@Q*T_5a;@(^hj>?C
zJw#rgiL0<t%T~HkQ#bW<o^{`>Wf9)3Yltn_Y>3ul8-;`gmuoH#npW4z_sV>kzqS!9
zB)9Ej8?%&&>|0a?J;-gkC_OL!`G8}(^zY!tfsV&9M*ueP-e&FF@TK+*4p*MV8x<>S
zXC9?b49)J#usI>(6xWLBUCZrS+daw+4zUG`?QT**=)YFjX7wWWw=P=Q%M%(Kl#A6h
zF#ZXF;Y3LMt1ViJECU(+I;Bq(o0%$&p&prwO%@Ob5V_uDj7{LKuIA64nr4K;$a_;z
zvpMK0)e>#;)z#d7VI2Y6#V;S$e2)`leDdR3Nv`9vJSob3KjMY`=F6mX{UOiX`O#B0
z|4xMEwtsfSau$Dtq%MjHyzqI-W}w2JOk)1rP~}`Xe0TKb<oNZ;IG8$)bage~*?nG4
gKNL1x6a2=ZWi8@s_=jgtI~MPM0JAa06Vyxq0QoH(?*IS*

literal 4577
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
LLLca6AWQ%Nba%)d

diff --git a/examples/napi/__tests__/__snapshots__/values.spec.ts.snap b/examples/napi/__tests__/__snapshots__/values.spec.ts.snap
index f693200f2138abfed89c24cef35dfd670dffa354..84b413863d284fa14c228a24b35f2156dcc80667 100644
GIT binary patch
literal 368
zcmV-$0gwJcRzV<BZeeh9Xm4~Nb~6eC00zA)QbnACPp~fguiY>$19CGwq&^o{O!r5}
zYrmx}G9QZw00000000A3k2_8SF%(7bV=|LJqbSh88b;};!wzWaaAq9h;MgNSXQEUn
zVht=Hl<b0%C9nk+K#d}JLAbKcIg+pU^O^PK1MgmRG|}oM>rm-p$=(@us^*1{yxUim
zit3iW60~tR)S>(iz#PC6fL8$T06qa^1Y8nuMZgUK3j!VqcqZVDfDZ!3l#M984nb{+
z<d)|-s0TU)4KSt?oKXTwM>Lo^RhuI4q_pN&5{W%O+Ku8>5!No6m6q&8vf(stYt0ku
zE5!@ZiRgUVn5a2UX2EY*2MJmd^dwjxC#2#M)hL0Pz-}2lbD>=$sx7LctuABmPE1Ek
z_J3Yic*@58<vqcz!zQ79p%({Q)OLMuT;Y7Bi`v`m+*r%f4vr80{7U#xcz>g3RWOYX
O#(x7Ue7w^o0ssJ;2cfb6

literal 368
zcmV-$0gwJcRzV<BZeeh9Xm4~Nb~6eC07d%`jnI&}+*iwWp$DYW_TpLFtluI?1xf#0
zhVB!0dLN4j00000000A3kwH$wFc3vOO_Qc+OH=_HI75^j>v99O>~Is8y0~`aaZ`1L
zD$c+G%92~K<Op1W1F&W)m>?oO#rp3{9@~e-+_>ri_b)2wVAKkguT`-^XEj>c;L-)$
zAL?2Lc?(~W7>MHsDdczbUl32kEAdWz5(x-#Nn8;(#FBU<o{2Z&gE)m`3h}k~atFYx
zJkJGW0!{>ssnHW>5DAE<FrLvQy6{+5M*m6xw&$JQN?aFyV}o8RuJyP!nT1`Wur#ig
zxMUr%&S$L-3PU;fZcCTIg+3QDE^N9HVs?>iC5H)z!^%6vLfMwpfK{rDs)BcxP0A+u
zKi-h@7`6SYXB_vBGjTfN^x~KnjoI95TUbZ$**LRXXk(DO<8H&BQ*l1we6&^b+Ur(%
O?Y;pje7w^o0ssI>CaIkO

diff --git a/examples/napi/index.d.ts b/examples/napi/index.d.ts
index 814003eb..800e9771 100644
--- a/examples/napi/index.d.ts
+++ b/examples/napi/index.d.ts
@@ -75,7 +75,7 @@ export class Bird {
   constructor(name: string)
   getCount(): number
   getNameAsync(): Promise<string>
-  acceptSliceMethod(slice: any): number
+  acceptSliceMethod(slice: Uint8Array): number
 }
 
 /** Smoking test for type generation */
@@ -237,7 +237,7 @@ export interface A {
   foo: number
 }
 
-export function acceptSlice(fixture: any): bigint
+export function acceptSlice(fixture: Uint8Array): bigint
 
 export function acceptThreadsafeFunction(func: (err: Error | null, arg: number) => any): void
 
@@ -413,15 +413,15 @@ export const enum Empty {
 
 export function enumToI32(e: CustomNumEnum): number
 
-export function f32ArrayToArray(input: any): Array<number>
+export function f32ArrayToArray(input: Float32Array): Array<number>
 
-export function f64ArrayToArray(input: any): Array<number>
+export function f64ArrayToArray(input: Float64Array): Array<number>
 
 export function fibonacci(n: number): number
 
 export function fnReceivedAliased(s: AliasedStruct, e: ALIAS): void
 
-export function getBtreeMapping(): BTreeMap
+export function getBtreeMapping(): Record<string, number>
 
 export function getBuffer(): Buffer
 
@@ -433,7 +433,7 @@ export function getExternal(external: ExternalObject<number>): number
 
 export function getGlobal(): typeof global
 
-export function getIndexMapping(): IndexMap
+export function getIndexMapping(): Record<string, number>
 
 export function getMapping(): Record<string, number>
 
@@ -458,15 +458,15 @@ export function getUndefined(): void
 
 export function getWords(): Array<string>
 
-export function i16ArrayToArray(input: any): Array<number>
+export function i16ArrayToArray(input: Int16Array): Array<number>
 
-export function i32ArrayToArray(input: any): Array<number>
+export function i32ArrayToArray(input: Int32Array): Array<number>
 
-export function i64ArrayToArray(input: any): Array<number>
+export function i64ArrayToArray(input: BigInt64Array): Array<number>
 
-export function i8ArrayToArray(input: any): Array<number>
+export function i8ArrayToArray(input: Int8Array): Array<number>
 
-export function indexmapPassthrough(fixture: IndexMap): IndexMap
+export function indexmapPassthrough(fixture: Record<string, number>): Record<string, number>
 
 /** default enum values are continuos i32s start from 0 */
 export const enum Kind {
@@ -594,9 +594,9 @@ export interface StrictObject {
   name: string
 }
 
-export function sumBtreeMapping(nums: BTreeMap): number
+export function sumBtreeMapping(nums: Record<string, number>): number
 
-export function sumIndexMapping(nums: IndexMap): number
+export function sumIndexMapping(nums: Record<string, number>): number
 
 export function sumMapping(nums: Record<string, number>): number
 
@@ -639,13 +639,13 @@ export interface TsTypeChanged {
   typeOverrideOptional?: object
 }
 
-export function u16ArrayToArray(input: any): Array<number>
+export function u16ArrayToArray(input: Uint16Array): Array<number>
 
-export function u32ArrayToArray(input: any): Array<number>
+export function u32ArrayToArray(input: Uint32Array): Array<number>
 
-export function u64ArrayToArray(input: any): Array<bigint>
+export function u64ArrayToArray(input: BigUint64Array): Array<bigint>
 
-export function u8ArrayToArray(input: any): Array<number>
+export function u8ArrayToArray(input: Uint8Array): Array<number>
 
 export interface UseNullableStruct {
   requiredNumberField: number