fix(napi-derive): generate types for threadsafe_function with WEAK=true correctly (#2813)

sapphi-red · web-flow · commit bde407ddabec · 2025-07-30T00:24:15.000+08:00
diff --git a/crates/backend/src/typegen.rs b/crates/backend/src/typegen.rs
@@ -511,9 +511,9 @@ pub fn ty_to_ts_type(
         {
           Some((t, false))
         } else if rust_ty == TSFN_RUST_TY {
-          let fatal_tsfn = match args.last() {
-            Some((arg, _)) => arg == "false",
-            _ => false,
+          let handled_tsfn = match args.get(4) {
+            Some((arg, _)) => arg == "true",
+            _ => true,
           };
           let fn_args = args
             .get(2)
@@ -534,13 +534,13 @@ pub fn ty_to_ts_type(
             .get(1)
             .map(|(ty, _)| ty.clone())
             .unwrap_or("any".to_owned());
-          if fatal_tsfn {
-            Some((format!("(({fn_args}) => {return_ty})"), false))
-          } else {
+          if handled_tsfn {
             Some((
               format!("((err: Error | null, {fn_args}) => {return_ty})"),
               false,
             ))
+          } else {
+            Some((format!("(({fn_args}) => {return_ty})"), false))
           }
         } else {
           // there should be runtime registered type in else
diff --git a/examples/napi/__tests__/__snapshots__/values.spec.ts.md b/examples/napi/__tests__/__snapshots__/values.spec.ts.md
@@ -999,6 +999,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     export declare function tsfnThrowFromJsCallbackContainsTsfn(tsfn: ((err: Error | null, arg: number) => Promise<number>)): Promise<void>␊
     ␊
+    export declare function tsfnWeak(tsfn: (() => void)): Promise<void>␊
+    ␊
     export declare function tsRename(a: { foo: number }): string[]␊
     ␊
     export interface TsTypeChanged {␊
diff --git a/examples/napi/__tests__/__snapshots__/values.spec.ts.snap b/examples/napi/__tests__/__snapshots__/values.spec.ts.snap
diff --git a/examples/napi/example.wasi-browser.js b/examples/napi/example.wasi-browser.js
@@ -350,6 +350,7 @@ export const tsfnReturnPromise = __napiModule.exports.tsfnReturnPromise
 export const tsfnReturnPromiseTimeout = __napiModule.exports.tsfnReturnPromiseTimeout
 export const tsfnThrowFromJs = __napiModule.exports.tsfnThrowFromJs
 export const tsfnThrowFromJsCallbackContainsTsfn = __napiModule.exports.tsfnThrowFromJsCallbackContainsTsfn
+export const tsfnWeak = __napiModule.exports.tsfnWeak
 export const tsRename = __napiModule.exports.tsRename
 export const u16ArrayToArray = __napiModule.exports.u16ArrayToArray
 export const u32ArrayToArray = __napiModule.exports.u32ArrayToArray
diff --git a/examples/napi/example.wasi.cjs b/examples/napi/example.wasi.cjs
@@ -395,6 +395,7 @@ module.exports.tsfnReturnPromise = __napiModule.exports.tsfnReturnPromise
 module.exports.tsfnReturnPromiseTimeout = __napiModule.exports.tsfnReturnPromiseTimeout
 module.exports.tsfnThrowFromJs = __napiModule.exports.tsfnThrowFromJs
 module.exports.tsfnThrowFromJsCallbackContainsTsfn = __napiModule.exports.tsfnThrowFromJsCallbackContainsTsfn
+module.exports.tsfnWeak = __napiModule.exports.tsfnWeak
 module.exports.tsRename = __napiModule.exports.tsRename
 module.exports.u16ArrayToArray = __napiModule.exports.u16ArrayToArray
 module.exports.u32ArrayToArray = __napiModule.exports.u32ArrayToArray
diff --git a/examples/napi/index.cjs b/examples/napi/index.cjs
@@ -680,6 +680,7 @@ module.exports.tsfnReturnPromise = nativeBinding.tsfnReturnPromise
 module.exports.tsfnReturnPromiseTimeout = nativeBinding.tsfnReturnPromiseTimeout
 module.exports.tsfnThrowFromJs = nativeBinding.tsfnThrowFromJs
 module.exports.tsfnThrowFromJsCallbackContainsTsfn = nativeBinding.tsfnThrowFromJsCallbackContainsTsfn
+module.exports.tsfnWeak = nativeBinding.tsfnWeak
 module.exports.tsRename = nativeBinding.tsRename
 module.exports.u16ArrayToArray = nativeBinding.u16ArrayToArray
 module.exports.u32ArrayToArray = nativeBinding.u32ArrayToArray
diff --git a/examples/napi/index.d.cts b/examples/napi/index.d.cts
@@ -961,6 +961,8 @@ export declare function tsfnThrowFromJs(tsfn: ((err: Error | null, arg: number)
 
 export declare function tsfnThrowFromJsCallbackContainsTsfn(tsfn: ((err: Error | null, arg: number) => Promise<number>)): Promise<void>
 
+export declare function tsfnWeak(tsfn: (() => void)): Promise<void>
+
 export declare function tsRename(a: { foo: number }): string[]
 
 export interface TsTypeChanged {
diff --git a/examples/napi/src/threadsafe_function.rs b/examples/napi/src/threadsafe_function.rs
@@ -284,3 +284,10 @@ pub fn tsfn_in_either(pet: Pet) {
     });
   }
 }
+
+#[napi]
+pub async fn tsfn_weak(
+  tsfn: ThreadsafeFunction<(), (), (), Status, false, true>,
+) -> napi::Result<()> {
+  tsfn.call_async(()).await
+}

Original file line number	Diff line number	Diff line change
`@@ -284,3 +284,10 @@ pub fn tsfn_in_either(pet: Pet) {`
`284`	`284`	`});`
`285`	`285`	`}`
`286`	`286`	`}`
	`287`	`+`
	`288`	`+#[napi]`
	`289`	`+pub async fn tsfn_weak(`
	`290`	`+ tsfn: ThreadsafeFunction<(), (), (), Status, false, true>,`
	`291`	`+) -> napi::Result<()> {`
	`292`	`+ tsfn.call_async(()).await`
	`293`	`+}`