From c1e07b3c122b14ee44959a757c9e6ac0e8d66bba Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Sat, 4 Jun 2022 01:07:39 +0800
Subject: [PATCH] feat(napi): support into_instance in class struct

---
 crates/backend/src/codegen/struct.rs          |  15 ++++
 crates/backend/src/typegen.rs                 |   1 +
 crates/napi/src/bindgen_runtime/js_values.rs  |   2 +
 .../src/bindgen_runtime/js_values/class.rs    |  65 ++++++++++++++++++
 examples/napi/__test__/typegen.spec.ts.md     |   5 ++
 examples/napi/__test__/typegen.spec.ts.snap   | Bin 3242 -> 3285 bytes
 examples/napi/__test__/values.spec.ts         |   8 +++
 examples/napi/index.d.ts                      |   5 ++
 examples/napi/src/class.rs                    |  27 +++++++-
 9 files changed, 127 insertions(+), 1 deletion(-)
 create mode 100644 crates/napi/src/bindgen_runtime/js_values/class.rs

diff --git a/crates/backend/src/codegen/struct.rs b/crates/backend/src/codegen/struct.rs
index 54659e59..63bcb09e 100644
--- a/crates/backend/src/codegen/struct.rs
+++ b/crates/backend/src/codegen/struct.rs
@@ -263,6 +263,21 @@ impl NapiStruct {
           }
         }
 
+        pub fn into_instance(self, env: napi::Env) -> napi::Result<napi::bindgen_prelude::ClassInstance<#name>> {
+          if let Some(ctor_ref) = napi::bindgen_prelude::get_class_constructor(#js_name_str) {
+            unsafe {
+              let wrapped_value = Box::leak(Box::new(self));
+              let instance_value = #name::new_instance(env.raw(), wrapped_value as *mut _ as *mut std::ffi::c_void, ctor_ref)?;
+
+              Ok(napi::bindgen_prelude::ClassInstance::<#name>::new(instance_value, wrapped_value))
+            }
+          } else {
+            Err(napi::bindgen_prelude::Error::new(
+              napi::bindgen_prelude::Status::InvalidArg, format!("Failed to get constructor of class `{}`", #js_name_raw))
+            )
+          }
+        }
+
         unsafe fn new_instance(
           env: napi::sys::napi_env,
           wrapped_value: *mut std::ffi::c_void,
diff --git a/crates/backend/src/typegen.rs b/crates/backend/src/typegen.rs
index 5e76f71a..3f835ef1 100644
--- a/crates/backend/src/typegen.rs
+++ b/crates/backend/src/typegen.rs
@@ -175,6 +175,7 @@ static KNOWN_TYPES: Lazy<HashMap<&'static str, &'static str>> = Lazy::new(|| {
     ("Buffer", "Buffer"),
     ("Vec", "Array<{}>"),
     ("Result", "Error | {}"),
+    ("ClassInstance", "{}"),
     ("Either", "{} | {}"),
     ("Either3", "{} | {} | {}"),
     ("Either4", "{} | {} | {} | {}"),
diff --git a/crates/napi/src/bindgen_runtime/js_values.rs b/crates/napi/src/bindgen_runtime/js_values.rs
index d8669bf8..cb1af7f8 100644
--- a/crates/napi/src/bindgen_runtime/js_values.rs
+++ b/crates/napi/src/bindgen_runtime/js_values.rs
@@ -8,6 +8,7 @@ mod arraybuffer;
 mod bigint;
 mod boolean;
 mod buffer;
+mod class;
 #[cfg(all(feature = "chrono_date", feature = "napi5"))]
 mod date;
 mod either;
@@ -34,6 +35,7 @@ pub use arraybuffer::*;
 #[cfg(feature = "napi6")]
 pub use bigint::*;
 pub use buffer::*;
+pub use class::*;
 pub use either::*;
 pub use external::*;
 #[cfg(feature = "napi4")]
diff --git a/crates/napi/src/bindgen_runtime/js_values/class.rs b/crates/napi/src/bindgen_runtime/js_values/class.rs
new file mode 100644
index 00000000..c2dab55c
--- /dev/null
+++ b/crates/napi/src/bindgen_runtime/js_values/class.rs
@@ -0,0 +1,65 @@
+use std::any::type_name;
+use std::ops::{Deref, DerefMut};
+use std::ptr;
+
+use crate::{bindgen_runtime::FromNapiValue, check_status, sys, NapiRaw};
+
+pub struct ClassInstance<T: 'static> {
+  pub value: sys::napi_value,
+  inner: &'static mut T,
+}
+
+impl<T: 'static> ClassInstance<T> {
+  #[doc(hidden)]
+  pub fn new(value: sys::napi_value, inner: &'static mut T) -> Self {
+    Self { value, inner }
+  }
+}
+
+impl<T: 'static> NapiRaw for ClassInstance<T> {
+  unsafe fn raw(&self) -> sys::napi_value {
+    self.value
+  }
+}
+
+impl<T: 'static> FromNapiValue for ClassInstance<T> {
+  unsafe fn from_napi_value(env: sys::napi_env, napi_val: sys::napi_value) -> crate::Result<Self> {
+    let mut value = ptr::null_mut();
+    check_status!(
+      unsafe { sys::napi_unwrap(env, napi_val, &mut value) },
+      "Unwrap value [{}] from class failed",
+      type_name::<T>(),
+    )?;
+    let value = unsafe { Box::from_raw(value as *mut T) };
+    Ok(Self {
+      value: napi_val,
+      inner: Box::leak(value),
+    })
+  }
+}
+
+impl<T: 'static> Deref for ClassInstance<T> {
+  type Target = T;
+
+  fn deref(&self) -> &Self::Target {
+    self.inner
+  }
+}
+
+impl<T: 'static> DerefMut for ClassInstance<T> {
+  fn deref_mut(&mut self) -> &mut T {
+    self.inner
+  }
+}
+
+impl<T: 'static> AsRef<T> for ClassInstance<T> {
+  fn as_ref(&self) -> &T {
+    self.inner
+  }
+}
+
+impl<T: 'static> AsMut<T> for ClassInstance<T> {
+  fn as_mut(&mut self) -> &mut T {
+    self.inner
+  }
+}
diff --git a/examples/napi/__test__/typegen.spec.ts.md b/examples/napi/__test__/typegen.spec.ts.md
index f4698cc0..cfc7453c 100644
--- a/examples/napi/__test__/typegen.spec.ts.md
+++ b/examples/napi/__test__/typegen.spec.ts.md
@@ -41,6 +41,11 @@ Generated by [AVA](https://avajs.dev).
     export function readFile(callback: (arg0: Error | undefined, arg1?: string | undefined | null) => void): void␊
     export function returnJsFunction(): (...args: any[]) => any␊
     export function callbackReturnPromise<T>(functionInput: () => T | Promise<T>, callback: (err: Error | null, result: T) => void): T | Promise<T>␊
+    export interface ObjectFieldClassInstance {␊
+      bird: Bird␊
+    }␊
+    export function createObjectWithClassField(): ObjectFieldClassInstance␊
+    export function receiveObjectWithClassField(object: ObjectFieldClassInstance): Bird␊
     export function dateToNumber(input: Date): number␊
     export function chronoDateToMillis(input: Date): number␊
     export function chronoDateAdd1Minute(input: Date): Date␊
diff --git a/examples/napi/__test__/typegen.spec.ts.snap b/examples/napi/__test__/typegen.spec.ts.snap
index 40c7c246f46b866e6a7b11712d3cc88c713f51b9..a7eaeb365f12c122dc3abcea82e16c073fc52729 100644
GIT binary patch
literal 3285
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
T^~#&E+k5{92EUjt=q&&M%ppk>

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

diff --git a/examples/napi/__test__/values.spec.ts b/examples/napi/__test__/values.spec.ts
index 2a6012e1..412e053e 100644
--- a/examples/napi/__test__/values.spec.ts
+++ b/examples/napi/__test__/values.spec.ts
@@ -97,6 +97,8 @@ import {
   eitherFromOption,
   overrideIndividualArgOnFunction,
   overrideIndividualArgOnFunctionWithCbArg,
+  createObjectWithClassField,
+  receiveObjectWithClassField,
 } from '../'
 
 test('export const', (t) => {
@@ -206,6 +208,12 @@ test('class Factory return Result', (t) => {
   t.is(c.method(), 'not empty')
 })
 
+test('class in object field', (t) => {
+  const obj = createObjectWithClassField()
+  t.is(obj.bird.name, 'Carolyn')
+  t.is(receiveObjectWithClassField(obj), obj.bird)
+})
+
 test('should be able to create object reference and shared reference', (t) => {
   const repo = new JsRepo('.')
   t.is(repo.remote().name(), 'origin')
diff --git a/examples/napi/index.d.ts b/examples/napi/index.d.ts
index b59573d7..0531adfe 100644
--- a/examples/napi/index.d.ts
+++ b/examples/napi/index.d.ts
@@ -31,6 +31,11 @@ export function optionOnly(callback: (arg0?: string | undefined | null) => void)
 export function readFile(callback: (arg0: Error | undefined, arg1?: string | undefined | null) => void): void
 export function returnJsFunction(): (...args: any[]) => any
 export function callbackReturnPromise<T>(functionInput: () => T | Promise<T>, callback: (err: Error | null, result: T) => void): T | Promise<T>
+export interface ObjectFieldClassInstance {
+  bird: Bird
+}
+export function createObjectWithClassField(): ObjectFieldClassInstance
+export function receiveObjectWithClassField(object: ObjectFieldClassInstance): Bird
 export function dateToNumber(input: Date): number
 export function chronoDateToMillis(input: Date): number
 export function chronoDateAdd1Minute(input: Date): Date
diff --git a/examples/napi/src/class.rs b/examples/napi/src/class.rs
index 2f4bec89..9d3c937e 100644
--- a/examples/napi/src/class.rs
+++ b/examples/napi/src/class.rs
@@ -1,4 +1,7 @@
-use napi::{bindgen_prelude::Buffer, Result};
+use napi::{
+  bindgen_prelude::{Buffer, ClassInstance},
+  Env, Result,
+};
 
 use crate::r#enum::Kind;
 
@@ -305,3 +308,25 @@ impl Optional {
     }
   }
 }
+
+#[napi(object)]
+pub struct ObjectFieldClassInstance {
+  pub bird: ClassInstance<Bird>,
+}
+
+#[napi]
+pub fn create_object_with_class_field(env: Env) -> Result<ObjectFieldClassInstance> {
+  Ok(ObjectFieldClassInstance {
+    bird: Bird {
+      name: "Carolyn".to_owned(),
+    }
+    .into_instance(env)?,
+  })
+}
+
+#[napi]
+pub fn receive_object_with_class_field(
+  object: ObjectFieldClassInstance,
+) -> Result<ClassInstance<Bird>> {
+  Ok(object.bird)
+}