fix(napi-derive): lifetime codegen issue (#2794)

Author: Brooooooklyn

crates/backend/src/codegen/fn.rs

@@ -824,10 +824,12 @@ fn hidden_ty_lifetime(ty: &mut syn::Type) -> BindgenResult<()> {
       ..
     }) = segments.last_mut()
     {
+      let mut has_lifetime = false;
       if let Some(syn::GenericArgument::Lifetime(lt)) = args.first_mut() {
         *lt = syn::Lifetime::new("'_", Span::call_site());
+        has_lifetime = true;
       }
-      for arg in args.iter_mut().skip(1) {
+      for arg in args.iter_mut().skip(if has_lifetime { 1 } else { 0 }) {
         if let syn::GenericArgument::Type(ty) = arg {
           hidden_ty_lifetime(ty)?;
         }

examples/napi/__tests__/__snapshots__/values.spec.ts.md

@@ -171,6 +171,12 @@ Generated by [AVA](https://avajs.dev).
       method(): string␊
     }␊
     ␊
+    export declare class CreateStringClass {␊
+      static new(): CreateStringClass␊
+      createString(): string | null␊
+      createStringResult(): string␊
+    }␊
+    ␊
     export declare class CssRuleList {␊
       getRules(): Array<string>␊
       get parentStyleSheet(): CSSStyleSheet␊

examples/napi/__tests__/__snapshots__/values.spec.ts.snap

@@ -84,6 +84,7 @@ export const ClassReturnInPromise = __napiModule.exports.ClassReturnInPromise
 export const ClassWithFactory = __napiModule.exports.ClassWithFactory
 export const ClassWithLifetime = __napiModule.exports.ClassWithLifetime
 export const Context = __napiModule.exports.Context
+export const CreateStringClass = __napiModule.exports.CreateStringClass
 export const CssRuleList = __napiModule.exports.CssRuleList
 export const CSSRuleList = __napiModule.exports.CSSRuleList
 export const CssStyleSheet = __napiModule.exports.CssStyleSheet

examples/napi/example.wasi-browser.js

@@ -129,6 +129,7 @@ module.exports.ClassReturnInPromise = __napiModule.exports.ClassReturnInPromise
 module.exports.ClassWithFactory = __napiModule.exports.ClassWithFactory
 module.exports.ClassWithLifetime = __napiModule.exports.ClassWithLifetime
 module.exports.Context = __napiModule.exports.Context
+module.exports.CreateStringClass = __napiModule.exports.CreateStringClass
 module.exports.CssRuleList = __napiModule.exports.CssRuleList
 module.exports.CSSRuleList = __napiModule.exports.CSSRuleList
 module.exports.CssStyleSheet = __napiModule.exports.CssStyleSheet

examples/napi/example.wasi.cjs

@@ -414,6 +414,7 @@ module.exports.ClassReturnInPromise = nativeBinding.ClassReturnInPromise
 module.exports.ClassWithFactory = nativeBinding.ClassWithFactory
 module.exports.ClassWithLifetime = nativeBinding.ClassWithLifetime
 module.exports.Context = nativeBinding.Context
+module.exports.CreateStringClass = nativeBinding.CreateStringClass
 module.exports.CssRuleList = nativeBinding.CssRuleList
 module.exports.CSSRuleList = nativeBinding.CSSRuleList
 module.exports.CssStyleSheet = nativeBinding.CssStyleSheet

examples/napi/index.cjs

@@ -133,6 +133,12 @@ export declare class Context {
   method(): string
 }
 
+export declare class CreateStringClass {
+  static new(): CreateStringClass
+  createString(): string | null
+  createStringResult(): string
+}
+
 export declare class CssRuleList {
   getRules(): Array<string>
   get parentStyleSheet(): CSSStyleSheet

examples/napi/index.d.cts

@@ -8,7 +8,7 @@
 #[cfg(not(target_family = "wasm"))]
 use napi::bindgen_prelude::create_custom_tokio_runtime;
 use napi::bindgen_prelude::{JsObjectValue, Object, Result, Symbol};
-pub use napi_shared::*;
+// pub use napi_shared::*;
 
 #[macro_use]
 extern crate napi_derive;
@@ -75,6 +75,7 @@ mod fn_ts_override;
 mod function;
 mod generator;
 mod js_mod;
+mod lifetime;
 mod map;
 mod nullable;
 mod number;

examples/napi/src/lib.rs

@@ -0,0 +1,33 @@
+use std::path::{Path, PathBuf};
+
+use napi::{Env, JsString, Result};
+
+#[napi]
+pub struct CreateStringClass {
+  inner: PathBuf,
+}
+
+#[napi]
+impl CreateStringClass {
+  #[napi]
+  pub fn new() -> Self {
+    Self {
+      inner: PathBuf::from(""),
+    }
+  }
+
+  #[napi]
+  pub fn create_string<'env>(&self, env: &'env Env) -> Option<JsString<'env>> {
+    create_string(env, &self.inner).ok()
+  }
+
+  #[napi]
+  pub fn create_string_result<'env>(&self, env: &'env Env) -> Result<JsString<'env>> {
+    create_string(env, &self.inner)
+  }
+}
+
+fn create_string<'env>(env: &'env Env, path: &Path) -> Result<JsString<'env>> {
+  let path = path.to_string_lossy();
+  env.create_string(path.as_ref())
+}