objc-js 0.0.14 → 0.0.15

package/package.json

@@ -39,7 +39,7 @@
     "format": "prettier --write \"**/*.{ts,js,json,md}\"",
     "preinstall-disabled": "npm run build-scripts && npm run make-clangd-config"
   },
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "Objective-C bridge for Node.js",
   "main": "dist/index.js",
   "dependencies": {

package/src/native/bridge.h

@@ -173,6 +173,10 @@ template <typename T>
 T ConvertToNativeValue(const Napi::Value &value,
                        const ObjcArgumentContext &context) {
   if constexpr (std::is_same_v<T, id>) {
+    // Handle null/undefined as nil
+    if (value.IsNull() || value.IsUndefined()) {
+      return nil;
+    }
     // is value an ObjcObject instance?
     if (value.IsObject()) {
       Napi::Object obj = value.As<Napi::Object>();
@@ -183,6 +187,10 @@ T ConvertToNativeValue(const Napi::Value &value,
     }
   }
   if constexpr (std::is_same_v<T, SEL>) {
+    // Handle null/undefined as NULL selector
+    if (value.IsNull() || value.IsUndefined()) {
+      return nullptr;
+    }
     if (!value.IsString()) {
       throw Napi::TypeError::New(value.Env(),
                                  CONVERT_ARG_ERROR_MSG("Expected a string"));
@@ -191,18 +199,30 @@ T ConvertToNativeValue(const Napi::Value &value,
     return sel_registerName(selName.c_str());
   }
   if constexpr (std::is_same_v<T, bool>) {
+    // Handle null/undefined as false
+    if (value.IsNull() || value.IsUndefined()) {
+      return false;
+    }
     if (!value.IsBoolean()) {
       throw Napi::TypeError::New(value.Env(),
                                  CONVERT_ARG_ERROR_MSG("Expected a boolean"));
     }
     return value.As<Napi::Boolean>().Value();
   } else if constexpr (std::is_same_v<T, std::string>) {
+    // Handle null/undefined as empty string
+    if (value.IsNull() || value.IsUndefined()) {
+      return std::string();
+    }
     if (!value.IsString()) {
       throw Napi::TypeError::New(value.Env(),
                                  CONVERT_ARG_ERROR_MSG("Expected a string"));
     }
     return value.As<Napi::String>().Utf8Value();
   } else if constexpr (std::is_arithmetic_v<T>) {
+    // Handle null/undefined as 0
+    if (value.IsNull() || value.IsUndefined()) {
+      return static_cast<T>(0);
+    }
     if (value.IsNumber()) {
       return ConvertJSNumberToNativeValue<T>(value, context);
     } else if (value.IsBigInt()) {

package/src/native/type-conversion.h

@@ -478,13 +478,7 @@ inline void SetInvocationReturnFromJS(NSInvocation *invocation,
         ObjcObject *objcObj = Napi::ObjectWrap<ObjcObject>::Unwrap(resultObj);
         id objcValue = objcObj->objcObject;
         [invocation setReturnValue:&objcValue];
-      } else if (result.IsNull() || result.IsUndefined()) {
-        id nilValue = nil;
-        [invocation setReturnValue:&nilValue];
       }
-    } else if (result.IsNull() || result.IsUndefined()) {
-      id nilValue = nil;
-      [invocation setReturnValue:&nilValue];
     }
     break;
   }