From d56c9c56a8f145f4d4b2a76d1fd4e0d2d522a312 Mon Sep 17 00:00:00 2001
From: Gabriel Francisco <gabrinelson27@gmail.com>
Date: Fri, 22 Apr 2022 05:53:27 -0300
Subject: [PATCH] fix(napi-derive): simplify the optional values in generated
 declaration file (#1141)

---
 crates/backend/src/typegen.rs               |  27 ++++++++++++++------
 crates/backend/src/typegen/const.rs         |   2 +-
 crates/backend/src/typegen/fn.rs            |   8 +++---
 crates/backend/src/typegen/struct.rs        |   8 +++---
 examples/napi/__test__/typegen.spec.ts.md   |  16 ++++++------
 examples/napi/__test__/typegen.spec.ts.snap | Bin 2932 -> 2919 bytes
 examples/napi/index.d.ts                    |  16 ++++++------
 7 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/crates/backend/src/typegen.rs b/crates/backend/src/typegen.rs
index 75efceb7..916fbd37 100644
--- a/crates/backend/src/typegen.rs
+++ b/crates/backend/src/typegen.rs
@@ -213,9 +213,9 @@ fn fill_ty(template: &str, args: Vec<String>) -> String {
   ret
 }
 
-pub fn ty_to_ts_type(ty: &Type, is_return_ty: bool) -> (String, bool) {
+pub fn ty_to_ts_type(ty: &Type, is_return_ty: bool, is_struct_field: bool) -> (String, bool) {
   match ty {
-    Type::Reference(r) => ty_to_ts_type(&r.elem, is_return_ty),
+    Type::Reference(r) => ty_to_ts_type(&r.elem, is_return_ty, is_struct_field),
     Type::Tuple(tuple) => {
       if tuple.elems.is_empty() {
         ("undefined".to_owned(), false)
@@ -226,7 +226,7 @@ pub fn ty_to_ts_type(ty: &Type, is_return_ty: bool) -> (String, bool) {
             tuple
               .elems
               .iter()
-              .map(|elem| ty_to_ts_type(elem, false).0)
+              .map(|elem| ty_to_ts_type(elem, false, false).0)
               .collect::<Vec<_>>()
               .join(", ")
           ),
@@ -244,7 +244,9 @@ pub fn ty_to_ts_type(ty: &Type, is_return_ty: bool) -> (String, bool) {
             .args
             .iter()
             .filter_map(|arg| match arg {
-              syn::GenericArgument::Type(generic_ty) => Some(ty_to_ts_type(generic_ty, false)),
+              syn::GenericArgument::Type(generic_ty) => {
+                Some(ty_to_ts_type(generic_ty, false, false))
+              }
               _ => None,
             })
             .collect::<Vec<_>>()
@@ -255,9 +257,18 @@ pub fn ty_to_ts_type(ty: &Type, is_return_ty: bool) -> (String, bool) {
         if rust_ty == "Result" && is_return_ty {
           ts_ty = Some(args.first().unwrap().to_owned());
         } else if rust_ty == "Option" {
-          ts_ty = args
-            .first()
-            .map(|(arg, _)| (format!("{} | undefined | null", arg), true));
+          ts_ty = args.first().map(|(arg, _)| {
+            (
+              if is_struct_field {
+                arg.to_string()
+              } else if is_return_ty {
+                format!("{}?", arg)
+              } else {
+                format!("{} | undefined | null", arg)
+              },
+              true,
+            )
+          });
         } else if rust_ty == "AsyncTask" {
           ts_ty = r#struct::TASK_STRUCTS.with(|t| {
             let (output_type, _) = args.first().unwrap().to_owned();
@@ -299,7 +310,7 @@ pub fn ty_to_ts_type(ty: &Type, is_return_ty: bool) -> (String, bool) {
 
       ts_ty.unwrap_or_else(|| ("any".to_owned(), false))
     }
-    Type::Group(g) => ty_to_ts_type(&g.elem, is_return_ty),
+    Type::Group(g) => ty_to_ts_type(&g.elem, is_return_ty, is_struct_field),
     _ => ("any".to_owned(), false),
   }
 }
diff --git a/crates/backend/src/typegen/const.rs b/crates/backend/src/typegen/const.rs
index 7def2c14..e926608d 100644
--- a/crates/backend/src/typegen/const.rs
+++ b/crates/backend/src/typegen/const.rs
@@ -17,7 +17,7 @@ impl ToTypeDef for NapiConst {
       def: format!(
         "export const {}: {}",
         &self.js_name,
-        ty_to_ts_type(&self.type_name, false).0
+        ty_to_ts_type(&self.type_name, false, false).0
       ),
       js_mod: self.js_mod.to_owned(),
       js_doc: js_doc_from_comments(&self.comments),
diff --git a/crates/backend/src/typegen/fn.rs b/crates/backend/src/typegen/fn.rs
index b1b2133d..91f65407 100644
--- a/crates/backend/src/typegen/fn.rs
+++ b/crates/backend/src/typegen/fn.rs
@@ -97,7 +97,7 @@ fn gen_callback_type(callback: &CallbackArg) -> String {
       .iter()
       .enumerate()
       .map(|(i, arg)| {
-        let (ts_type, is_optional) = ty_to_ts_type(arg, false);
+        let (ts_type, is_optional) = ty_to_ts_type(arg, false, false);
         FnArg {
           arg: format!("arg{}", i),
           ts_type,
@@ -106,7 +106,7 @@ fn gen_callback_type(callback: &CallbackArg) -> String {
       })
       .collect::<FnArgList>(),
     ret = match &callback.ret {
-      Some(ty) => ty_to_ts_type(ty, true).0,
+      Some(ty) => ty_to_ts_type(ty, true, false).0,
       None => "void".to_owned(),
     }
   )
@@ -131,7 +131,7 @@ impl NapiFn {
               i.mutability = None;
             }
             let arg = path.pat.to_token_stream().to_string().to_case(Case::Camel);
-            let (ts_type, is_optional) = ty_to_ts_type(&path.ty, false);
+            let (ts_type, is_optional) = ty_to_ts_type(&path.ty, false, false);
 
             Some(FnArg {
               arg,
@@ -181,7 +181,7 @@ impl NapiFn {
         .unwrap_or_else(|| "".to_owned()),
       _ => {
         let ret = if let Some(ret) = &self.ret {
-          let (ts_type, _) = ty_to_ts_type(ret, true);
+          let (ts_type, _) = ty_to_ts_type(ret, true, false);
           if ts_type == "undefined" {
             "void".to_owned()
           } else if ts_type == "Self" {
diff --git a/crates/backend/src/typegen/struct.rs b/crates/backend/src/typegen/struct.rs
index d09047bc..36968760 100644
--- a/crates/backend/src/typegen/struct.rs
+++ b/crates/backend/src/typegen/struct.rs
@@ -36,8 +36,10 @@ impl ToTypeDef for NapiImpl {
   fn to_type_def(&self) -> Option<TypeDef> {
     if let Some(output_type) = &self.task_output_type {
       TASK_STRUCTS.with(|t| {
-        t.borrow_mut()
-          .insert(self.js_name.clone(), ty_to_ts_type(output_type, false).0);
+        t.borrow_mut().insert(
+          self.js_name.clone(),
+          ty_to_ts_type(output_type, false, true).0,
+        );
       });
     }
 
@@ -90,7 +92,7 @@ impl NapiStruct {
           field_str.push_str("readonly ")
         }
 
-        let (arg, is_optional) = ty_to_ts_type(&f.ty, false);
+        let (arg, is_optional) = ty_to_ts_type(&f.ty, false, true);
         let arg = f.ts_type.as_ref().map(|ty| ty.to_string()).unwrap_or(arg);
 
         let sep = if is_optional { "?" } else { "" };
diff --git a/examples/napi/__test__/typegen.spec.ts.md b/examples/napi/__test__/typegen.spec.ts.md
index 3a8c38e5..beea5282 100644
--- a/examples/napi/__test__/typegen.spec.ts.md
+++ b/examples/napi/__test__/typegen.spec.ts.md
@@ -46,7 +46,7 @@ Generated by [AVA](https://avajs.dev).
     export function chronoDateAdd1Minute(input: Date): Date␊
     export interface Dates {␊
       start: Date␊
-      end?: Date | undefined | null␊
+      end?: Date␊
     }␊
     export function eitherStringOrNumber(input: string | number): number␊
     export function returnEither(input: number): string | number␊
@@ -106,7 +106,7 @@ Generated by [AVA](https://avajs.dev).
     export function xxh64Alias(input: Buffer): bigint␊
     export function getMapping(): Record<string, number>␊
     export function sumMapping(nums: Record<string, number>): number␊
-    export function mapOption(val?: number | undefined | null): number | undefined | null␊
+    export function mapOption(val?: number | undefined | null): number?␊
     export function returnNull(): null␊
     export function returnUndefined(): void␊
     export function add(a: number, b: number): number␊
@@ -117,8 +117,8 @@ Generated by [AVA](https://avajs.dev).
     export function getUndefined(): void␊
     export function getNull(): JsNull␊
     export interface AllOptionalObject {␊
-      name?: string | undefined | null␊
-      age?: number | undefined | null␊
+      name?: string␊
+      age?: number␊
     }␊
     export function receiveAllOptionalObject(obj?: AllOptionalObject | undefined | null): void␊
     export const enum ALIAS {␊
@@ -147,8 +147,8 @@ Generated by [AVA](https://avajs.dev).
       name: string␊
       /** The version of the package */␊
       version: string␊
-      dependencies?: Record<string, any> | undefined | null␊
-      devDependencies?: Record<string, any> | undefined | null␊
+      dependencies?: Record<string, any>␊
+      devDependencies?: Record<string, any>␊
     }␊
     export function readPackageJson(): PackageJson␊
     export function getPackageJsonName(packageJson: PackageJson): string␊
@@ -221,7 +221,7 @@ Generated by [AVA](https://avajs.dev).
     export type Blake2bKey = Blake2BKey␊
     export class Blake2BKey { }␊
     export class Context {␊
-      maybeNeed?: boolean | undefined | null␊
+      maybeNeed?: boolean␊
       constructor()␊
       static withData(data: string): Context␊
       method(): string␊
@@ -241,7 +241,7 @@ Generated by [AVA](https://avajs.dev).
     export type JsAssets = Assets␊
     export class Assets {␊
       constructor()␊
-      get(id: number): JsAsset | undefined | null␊
+      get(id: number): JsAsset?␊
     }␊
     export type JsAsset = Asset␊
     export class Asset {␊
diff --git a/examples/napi/__test__/typegen.spec.ts.snap b/examples/napi/__test__/typegen.spec.ts.snap
index 68e1450c4a8122191e5d68e64c1677b64a71bf62..0274c678eef07149edbcd10a2f0d7335694e72a1 100644
GIT binary patch
literal 2919
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
R;TZgG<$v@o6%t%0001?hs`mf@

literal 2932
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

diff --git a/examples/napi/index.d.ts b/examples/napi/index.d.ts
index c03e1ff1..ceab0ab7 100644
--- a/examples/napi/index.d.ts
+++ b/examples/napi/index.d.ts
@@ -36,7 +36,7 @@ export function chronoDateToMillis(input: Date): number
 export function chronoDateAdd1Minute(input: Date): Date
 export interface Dates {
   start: Date
-  end?: Date | undefined | null
+  end?: Date
 }
 export function eitherStringOrNumber(input: string | number): number
 export function returnEither(input: number): string | number
@@ -96,7 +96,7 @@ export function tsRename(a: { foo: number }): string[]
 export function xxh64Alias(input: Buffer): bigint
 export function getMapping(): Record<string, number>
 export function sumMapping(nums: Record<string, number>): number
-export function mapOption(val?: number | undefined | null): number | undefined | null
+export function mapOption(val?: number | undefined | null): number?
 export function returnNull(): null
 export function returnUndefined(): void
 export function add(a: number, b: number): number
@@ -107,8 +107,8 @@ export function getGlobal(): typeof global
 export function getUndefined(): void
 export function getNull(): JsNull
 export interface AllOptionalObject {
-  name?: string | undefined | null
-  age?: number | undefined | null
+  name?: string
+  age?: number
 }
 export function receiveAllOptionalObject(obj?: AllOptionalObject | undefined | null): void
 export const enum ALIAS {
@@ -137,8 +137,8 @@ export interface PackageJson {
   name: string
   /** The version of the package */
   version: string
-  dependencies?: Record<string, any> | undefined | null
-  devDependencies?: Record<string, any> | undefined | null
+  dependencies?: Record<string, any>
+  devDependencies?: Record<string, any>
 }
 export function readPackageJson(): PackageJson
 export function getPackageJsonName(packageJson: PackageJson): string
@@ -211,7 +211,7 @@ export class Blake2BHasher {
 export type Blake2bKey = Blake2BKey
 export class Blake2BKey { }
 export class Context {
-  maybeNeed?: boolean | undefined | null
+  maybeNeed?: boolean
   constructor()
   static withData(data: string): Context
   method(): string
@@ -231,7 +231,7 @@ export class NinjaTurtle {
 export type JsAssets = Assets
 export class Assets {
   constructor()
-  get(id: number): JsAsset | undefined | null
+  get(id: number): JsAsset?
 }
 export type JsAsset = Asset
 export class Asset {