Consider undefined/null for optional rust types

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## [6.0.2] - 2023-11-17
+- Consider undefined/null for rust type Option<T>
+
 ## [6.0.1] - 2023-09-27
 - doc update
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "node-bindgen"
-version = "6.0.1"
+version = "6.0.2"
 authors = ["Fluvio Contributors <team@fluvio.io>"]
 edition = "2021"
 description = "easy way to write nodejs module using rust"

nj-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nj-core"
-version = "6.0.0"
+version = "6.0.1"
 authors = ["fluvio.io"]
 edition = "2021"
 description = "high level wrapper for Node N-API"

nj-core/src/basic.rs

@@ -571,6 +571,14 @@ impl JsEnv {
         Ok(valuetype)
     }
 
+    /// is value undefined or null
+    #[allow(clippy::not_unsafe_ptr_arg_deref)]
+    pub fn is_undefined_or_null(&self, napi_value: napi_value) -> Result<bool, NjError> {
+        let valuetype = self.value_type(napi_value)?;
+        Ok(valuetype == crate::sys::napi_valuetype_napi_undefined
+            || valuetype == crate::sys::napi_valuetype_napi_null)
+    }
+
     /// get string representation of value type
     pub fn value_type_string(&self, napi_value: napi_value) -> Result<&'static str, NjError> {
         Ok(napi_value_type_to_string(self.value_type(napi_value)?))
@@ -886,7 +894,11 @@ where
 
     fn convert_arg_at(js_cb: &'a JsCallback, index: usize) -> Result<Self, NjError> {
         if index < js_cb.args.len() {
-            Ok(Some(T::convert_to_rust(js_cb.env(), js_cb.args[index])?))
+            if js_cb.env().is_undefined_or_null(js_cb.args[index])? {
+                Ok(None)
+            } else {
+                Ok(Some(T::convert_to_rust(js_cb.env(), js_cb.args[index])?))
+            }
         } else {
             Ok(None)
         }