From 4ec44007031411240aa49d98088db3652f6e66e6 Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Sat, 18 Dec 2021 13:36:45 +0800
Subject: [PATCH] fix(napi-derive-backend): Null and Undefined return type

---
 crates/backend/src/typegen.rs               |   2 ++
 examples/napi/__test__/typegen.spec.ts.md   |   2 ++
 examples/napi/__test__/typegen.spec.ts.snap | Bin 1972 -> 1979 bytes
 examples/napi/__test__/values.spec.ts       |  10 ++++++++++
 examples/napi/index.d.ts                    |   2 ++
 examples/napi/src/nullable.rs               |  10 ++++++++++
 6 files changed, 26 insertions(+)

diff --git a/crates/backend/src/typegen.rs b/crates/backend/src/typegen.rs
index 86aa6092..527e46d7 100644
--- a/crates/backend/src/typegen.rs
+++ b/crates/backend/src/typegen.rs
@@ -98,6 +98,7 @@ static KNOWN_TYPES: Lazy<HashMap<&'static str, &'static str>> = Lazy::new(|| {
   map.extend([
     ("JsUndefined", "undefined"),
     ("()", "undefined"),
+    ("Undefined", "undefined"),
     ("JsNumber", "number"),
     ("i8", "number"),
     ("i16", "number"),
@@ -152,6 +153,7 @@ static KNOWN_TYPES: Lazy<HashMap<&'static str, &'static str>> = Lazy::new(|| {
     ("Either4", "{} | {} | {} | {}"),
     ("Either5", "{} | {} | {} | {} | {}"),
     ("unknown", "unknown"),
+    ("Null", "null"),
     ("null", "null"),
     ("Symbol", "symbol"),
     ("JsSymbol", "symbol"),
diff --git a/examples/napi/__test__/typegen.spec.ts.md b/examples/napi/__test__/typegen.spec.ts.md
index 4424ebd3..106ed2e6 100644
--- a/examples/napi/__test__/typegen.spec.ts.md
+++ b/examples/napi/__test__/typegen.spec.ts.md
@@ -66,6 +66,8 @@ Generated by [AVA](https://avajs.dev).
     export function tsRename(a: { foo: number }): string[]␊
     export function xxh64Alias(input: Buffer): BigInt␊
     export function mapOption(val?: number | undefined | null): number | undefined | null␊
+    export function returnNull(): null␊
+    export function returnUndefined(): void␊
     export function add(a: number, b: number): number␊
     export function fibonacci(n: number): number␊
     export function listObjKeys(obj: object): Array<string>␊
diff --git a/examples/napi/__test__/typegen.spec.ts.snap b/examples/napi/__test__/typegen.spec.ts.snap
index d392610085ed0b9a492f6c2b7aadf401768adf88..43419afb7c8e77e98f924c63a19fb9f43a0a3959 100644
GIT binary patch
literal 1979
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
N{s*&hcAhsE004+SxGDeu

literal 1972
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
G761SYY0f?X

diff --git a/examples/napi/__test__/values.spec.ts b/examples/napi/__test__/values.spec.ts
index daefa0ca..b080e2d5 100644
--- a/examples/napi/__test__/values.spec.ts
+++ b/examples/napi/__test__/values.spec.ts
@@ -65,6 +65,8 @@ import {
   ALIAS,
   AliasedStruct,
   appendBuffer,
+  returnNull,
+  returnUndefined,
 } from '../'
 
 test('export const', (t) => {
@@ -192,6 +194,14 @@ test('get null', (t) => {
   }
 })
 
+test('return Null', (t) => {
+  t.is(returnNull(), null)
+})
+
+test('return Undefined', (t) => {
+  t.is(returnUndefined(), undefined)
+})
+
 test('pass symbol in', (t) => {
   const sym = Symbol('test')
   const obj = setSymbolInObj(sym)
diff --git a/examples/napi/index.d.ts b/examples/napi/index.d.ts
index ab36c034..5ee6c2fc 100644
--- a/examples/napi/index.d.ts
+++ b/examples/napi/index.d.ts
@@ -56,6 +56,8 @@ export function mutateExternal(external: ExternalObject<number>, newVal: number)
 export function tsRename(a: { foo: number }): string[]
 export function xxh64Alias(input: Buffer): BigInt
 export function mapOption(val?: number | undefined | null): number | undefined | null
+export function returnNull(): null
+export function returnUndefined(): void
 export function add(a: number, b: number): number
 export function fibonacci(n: number): number
 export function listObjKeys(obj: object): Array<string>
diff --git a/examples/napi/src/nullable.rs b/examples/napi/src/nullable.rs
index eb52c12c..18a532c8 100644
--- a/examples/napi/src/nullable.rs
+++ b/examples/napi/src/nullable.rs
@@ -1,4 +1,14 @@
+use napi::bindgen_prelude::*;
+
 #[napi]
 fn map_option(val: Option<u32>) -> Option<u32> {
   val.map(|v| v + 1)
 }
+
+#[napi]
+fn return_null() -> Null {
+  Null
+}
+
+#[napi]
+fn return_undefined() -> Undefined {}