expo-modules-core 1.6.0 → 1.7.0

package/CHANGELOG.md

@@ -10,6 +10,30 @@
 
 ### 💡 Others
 
+## 1.7.0 — 2023-09-04
+
+### 🎉 New features
+
+- [Android] Surfaced errorManager to allow throwing errors and warnings from modules. ([#23848](https://github.com/expo/expo/pull/23848) by [@aleqsio](https://github.com/aleqsio))
+- [Android] Enums can now be used to define events. ([#23875](https://github.com/expo/expo/pull/23875) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Promises can now be resolved without arguments. ([#23907](https://github.com/expo/expo/pull/23907) by [@lukmccall](https://github.com/lukmccall))
+- Added support for React Native 0.73. ([#24018](https://github.com/expo/expo/pull/24018), [#24019](https://github.com/expo/expo/pull/24019) by [@kudo](https://github.com/kudo))
+- [Android] `Property` component can now take the native shared object instance as the first argument. ([#24206](https://github.com/expo/expo/pull/24206) by [@lukmccall](https://github.com/lukmccall))
+
+### 🐛 Bug fixes
+
+- [Android] Refresh NativeModulesProxy if app bundle is reloaded. ([#23824](https://github.com/expo/expo/pull/23824) by [@douglowder](https://github.com/douglowder))
+- [Android] Fix nullability of parameter type in `List` and `Map` when converting from JS to native. ([#23942](https://github.com/expo/expo/pull/23942) by [@lukmccall](https://github.com/lukmccall))
+- Fixed Fabric setup error on iOS. ([#24004](https://github.com/expo/expo/pull/24004) by [@kudo](https://github.com/kudo))
+- Fixed uuid v4 generation. ([#24123](https://github.com/expo/expo/pull/24123) by [@tsapeta](https://github.com/tsapeta))
+- [Android] Fixed owner type of view functions. ([#24135](https://github.com/expo/expo/pull/24135) by [@lukmccall](https://github.com/lukmccall))
+
+### 💡 Others
+
+- [Android] Add type converter for the `ReadableArguments` class to allow backward compatibility with older modules. ([#24137](https://github.com/expo/expo/pull/24137) by [@lukmccall](https://github.com/lukmccall))
+- [Android] `SharedObjectTypeConverter` now can work with the `Dynamic` class. ([#24207](https://github.com/expo/expo/pull/24207) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Expose a conversion between id and shared objects. ([#24220](https://github.com/expo/expo/pull/24220) by [@lukmccall](https://github.com/lukmccall))
+
 ## 1.6.0 — 2023-07-28
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.6.0'
+version = '1.7.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -64,7 +64,8 @@ def REACT_NATIVE_SO_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
 def reactProperties = new Properties()
 file("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
 
-def BOOST_VERSION = reactProperties.getProperty("BOOST_VERSION")
+// TODO: Remove react-native < 0.71 support
+def BOOST_VERSION = reactProperties.getProperty("BOOST_VERSION") ?: "1_76_0"
 def REACT_NATIVE_VERSION = System.getenv("REACT_NATIVE_OVERRIDE_VERSION") ?: reactProperties.getProperty("VERSION_NAME")
 def REACT_NATIVE_TARGET_VERSION = REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
 
@@ -113,13 +114,16 @@ android {
     ndkVersion rootProject.ext.ndkVersion
   }
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
-  }
+  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
 
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.majorVersion
+    kotlinOptions {
+      jvmTarget = JavaVersion.VERSION_11.majorVersion
+    }
   }
 
   namespace "expo.modules"
@@ -128,7 +132,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.6.0"
+    versionName "1.7.0"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"
@@ -161,7 +165,20 @@ android {
     }
   }
 
+  sourceSets {
+    main {
+      java {
+        if (REACT_NATIVE_TARGET_VERSION >= 73) {
+          srcDirs += "src/reactnative"
+        } else {
+          srcDirs += "src/reactnative72"
+        }
+      }
+    }
+  }
+
   buildFeatures {
+    buildConfig true
     prefab true
   }
 
@@ -277,16 +294,6 @@ dependencies {
   }
 }
 
-/**
- * To make the users of annotations @OptIn and @RequiresOptIn aware of their experimental status,
- * the compiler raises warnings when compiling the code with these annotations:
- * This class can only be used with the compiler argument '-Xopt-in=kotlin.RequiresOptIn'
- * To remove the warnings, we add the compiler argument -Xopt-in=kotlin.RequiresOptIn.
- */
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-  kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
-}
-
 def createNativeDepsDirectories = project.tasks.findByName('createNativeDepsDirectories') ?: project.tasks.register('createNativeDepsDirectories') {
   downloadsDir.mkdirs()
   thirdPartyNdkDir.mkdirs()

package/android/src/main/cpp/JSIInteropModuleRegistry.cpp

@@ -14,6 +14,23 @@ namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 
 namespace expo {
+
+namespace {
+
+#if REACT_NATIVE_TARGET_VERSION >= 73
+std::shared_ptr<NativeMethodCallInvokerCompatible> getNativeMethodCallInvokerHolderCompatible(
+  jni::alias_ref<NativeMethodCallInvokerHolderCompatible::javaobject> holder) {
+  return holder->cthis()->getNativeMethodCallInvoker();
+}
+#else
+std::shared_ptr<NativeMethodCallInvokerCompatible> getNativeMethodCallInvokerHolderCompatible(
+  jni::alias_ref<NativeMethodCallInvokerHolderCompatible::javaobject> holder) {
+  return holder->cthis()->getCallInvoker();
+}
+#endif
+
+} // namespace
+
 jni::local_ref<JSIInteropModuleRegistry::jhybriddata>
 JSIInteropModuleRegistry::initHybrid(jni::alias_ref<jhybridobject> jThis) {
   return makeCxxInstance(jThis);
@@ -39,7 +56,7 @@ void JSIInteropModuleRegistry::installJSI(
   jlong jsRuntimePointer,
   jni::alias_ref<JNIDeallocator::javaobject> jniDeallocator,
   jni::alias_ref<react::CallInvokerHolder::javaobject> jsInvokerHolder,
-  jni::alias_ref<react::CallInvokerHolder::javaobject> nativeInvokerHolder
+  jni::alias_ref<NativeMethodCallInvokerHolderCompatible::javaobject> nativeInvokerHolder
 ) {
   this->jniDeallocator = jni::make_global(jniDeallocator);
 
@@ -51,7 +68,7 @@ void JSIInteropModuleRegistry::installJSI(
     this,
     runtime,
     jsInvokerHolder->cthis()->getCallInvoker(),
-    nativeInvokerHolder->cthis()->getCallInvoker()
+    getNativeMethodCallInvokerHolderCompatible(nativeInvokerHolder)
   );
 
   auto expoModules = std::make_shared<ExpoModulesHostObject>(this);

package/android/src/main/cpp/JSIInteropModuleRegistry.h

@@ -14,6 +14,9 @@
 #include <jsi/jsi.h>
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/CallInvoker.h>
+#if REACT_NATIVE_TARGET_VERSION >= 73
+#include <ReactCommon/NativeMethodCallInvokerHolder.h>
+#endif
 
 #include <memory>
 
@@ -22,6 +25,13 @@ namespace jsi = facebook::jsi;
 namespace react = facebook::react;
 
 namespace expo {
+
+#if REACT_NATIVE_TARGET_VERSION >= 73
+using NativeMethodCallInvokerHolderCompatible = react::NativeMethodCallInvokerHolder;
+#else
+using NativeMethodCallInvokerHolderCompatible = react::CallInvokerHolder;
+#endif
+
 /**
  * A JNI wrapper to initialize CPP part of modules and access all data from the module registry.
  */
@@ -42,7 +52,7 @@ public:
     jlong jsRuntimePointer,
     jni::alias_ref<JNIDeallocator::javaobject> jniDeallocator,
     jni::alias_ref<react::CallInvokerHolder::javaobject> jsInvokerHolder,
-    jni::alias_ref<react::CallInvokerHolder::javaobject> nativeInvokerHolder
+    jni::alias_ref<NativeMethodCallInvokerHolderCompatible::javaobject> nativeInvokerHolder
   );
 
   /**

package/android/src/main/cpp/JavaScriptModuleObject.cpp

@@ -2,7 +2,7 @@
 
 #include "JavaScriptModuleObject.h"
 #include "JSIInteropModuleRegistry.h"
-#include "ObjectDeallocator.h"
+#include "JSIUtils.h"
 
 #include <folly/dynamic.h>
 #include <jsi/JSIDynamic.h>
@@ -61,7 +61,7 @@ void decorateObjectWithProperties(
       jsi::Value(runtime, *setter.toJSFunction(runtime,
                                                jsiInteropModuleRegistry))
     );
-    JavaScriptObject::defineProperty(runtime, jsObject, name, std::move(descriptor));
+    common::definePropertyOnJSIObject(runtime, jsObject, name.c_str(), std::move(descriptor));
   }
 }
 
@@ -215,8 +215,8 @@ std::shared_ptr<jsi::Object> JavaScriptModuleObject::getJSIObject(jsi::Runtime &
     auto descriptor = JavaScriptObject::preparePropertyDescriptor(runtime, 0);
     descriptor.setProperty(runtime, "value", jsi::Value(runtime, nativeConstructor));
 
-    JavaScriptObject::defineProperty(runtime, &prototype, nativeConstructorKey,
-                                     std::move(descriptor));
+    common::definePropertyOnJSIObject(runtime, &prototype, nativeConstructorKey.c_str(),
+                                      std::move(descriptor));
 
     moduleObject->setProperty(
       runtime,
@@ -321,29 +321,30 @@ void JavaScriptModuleObject::registerViewPrototype(
 
 void JavaScriptModuleObject::registerProperty(
   jni::alias_ref<jstring> name,
-  jni::alias_ref<ExpectedType> expectedArgType,
+  jboolean getterTakesOwner,
+  jni::alias_ref<jni::JArrayClass<ExpectedType>> getterExpectedArgsTypes,
   jni::alias_ref<JNIFunctionBody::javaobject> getter,
+  jboolean setterTakesOwner,
+  jni::alias_ref<jni::JArrayClass<ExpectedType>> setterExpectedArgsTypes,
   jni::alias_ref<JNIFunctionBody::javaobject> setter
 ) {
   auto cName = name->toStdString();
 
   auto getterMetadata = MethodMetadata(
     cName,
+    getterTakesOwner,
+    getterExpectedArgsTypes->size(),
     false,
-    0,
-    false,
-    std::vector<std::unique_ptr<AnyType>>(),
+    jni::make_local(getterExpectedArgsTypes),
     jni::make_global(getter)
   );
 
-  auto types = std::vector<std::unique_ptr<AnyType>>();
-  types.push_back(std::make_unique<AnyType>(jni::make_local(expectedArgType)));
   auto setterMetadata = MethodMetadata(
     cName,
+    setterTakesOwner,
+    setterExpectedArgsTypes->size(),
     false,
-    1,
-    false,
-    std::move(types),
+    jni::make_local(setterExpectedArgsTypes),
     jni::make_global(setter)
   );
 

package/android/src/main/cpp/JavaScriptModuleObject.h

@@ -122,8 +122,11 @@ public:
    */
   void registerProperty(
     jni::alias_ref<jstring> name,
-    jni::alias_ref<ExpectedType> expectedArgType,
+    jboolean getterTakesOwner,
+    jni::alias_ref<jni::JArrayClass<ExpectedType>> getterExpectedArgsTypes,
     jni::alias_ref<JNIFunctionBody::javaobject> getter,
+    jboolean setterTakesOwner,
+    jni::alias_ref<jni::JArrayClass<ExpectedType>> setterExpectedArgsTypes,
     jni::alias_ref<JNIFunctionBody::javaobject> setter
   );
 

package/android/src/main/cpp/JavaScriptObject.cpp

@@ -112,7 +112,11 @@ jni::local_ref<jni::JArrayClass<jstring>> JavaScriptObject::jniGetPropertyNames(
 jni::local_ref<JavaScriptFunction::javaobject> JavaScriptObject::jniAsFunction() {
   auto &jsRuntime = runtimeHolder.getJSRuntime();
   auto jsFuncion = std::make_shared<jsi::Function>(jsObject->asFunction(jsRuntime));
-  return JavaScriptFunction::newInstance(runtimeHolder.getModuleRegistry(), runtimeHolder, jsFuncion);
+  return JavaScriptFunction::newInstance(
+    runtimeHolder.getModuleRegistry(),
+    runtimeHolder,
+    jsFuncion
+  );
 }
 
 void JavaScriptObject::setProperty(const std::string &name, jsi::Value value) {
@@ -143,27 +147,6 @@ jsi::Object JavaScriptObject::preparePropertyDescriptor(
   return descriptor;
 }
 
-void JavaScriptObject::defineProperty(
-  jsi::Runtime &runtime,
-  jsi::Object *jsthis,
-  const std::string &name,
-  jsi::Object descriptor
-) {
-  jsi::Object global = runtime.global();
-  jsi::Object objectClass = global.getPropertyAsObject(runtime, "Object");
-  jsi::Function definePropertyFunction = objectClass.getPropertyAsFunction(
-    runtime,
-    "defineProperty"
-  );
-
-  // This call is basically the same as `Object.defineProperty(object, name, descriptor)` in JS
-  definePropertyFunction.callWithThis(runtime, objectClass, {
-    jsi::Value(runtime, *jsthis),
-    jsi::String::createFromUtf8(runtime, name),
-    std::move(descriptor),
-  });
-}
-
 jni::local_ref<JavaScriptObject::javaobject> JavaScriptObject::newInstance(
   JSIInteropModuleRegistry *jsiInteropModuleRegistry,
   std::weak_ptr<JavaScriptRuntime> runtime,
@@ -179,7 +162,10 @@ void JavaScriptObject::defineNativeDeallocator(
 ) {
   auto &rt = runtimeHolder.getJSRuntime();
   jni::global_ref<JNIFunctionBody::javaobject> globalRef = jni::make_global(deallocator);
-  std::shared_ptr<ObjectDeallocator> nativeDeallocator = std::make_shared<ObjectDeallocator>(
+
+  common::setDeallocator(
+    rt,
+    jsObject,
     [globalRef = std::move(globalRef)]() mutable {
       auto args = jni::Environment::current()->NewObjectArray(
         0,
@@ -188,9 +174,8 @@ void JavaScriptObject::defineNativeDeallocator(
       );
       globalRef->invoke(args);
       globalRef.reset();
-    });
-  auto descriptor = JavaScriptObject::preparePropertyDescriptor(rt, 0);
-  descriptor.setProperty(rt, "value", jsi::Object::createFromHostObject(rt, nativeDeallocator));
-  jsObject->setProperty(rt, "__expo_shared_object_deallocator__", std::move(descriptor));
+    },
+    "__expo_shared_object_deallocator__"
+  );
 }
 } // namespace expo

package/android/src/main/cpp/JavaScriptObject.h

@@ -8,6 +8,7 @@
 #include "WeakRuntimeHolder.h"
 #include "JNIFunctionBody.h"
 #include "JNIDeallocator.h"
+#include "JSIUtils.h"
 
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
@@ -71,13 +72,6 @@ public:
 
   static jsi::Object preparePropertyDescriptor(jsi::Runtime &jsRuntime, int options);
 
-  static void defineProperty(
-    jsi::Runtime &runtime,
-    jsi::Object *jsthis,
-    const std::string &name,
-    jsi::Object descriptor
-  );
-
   void defineNativeDeallocator(
     jni::alias_ref<JNIFunctionBody::javaobject> deallocator
   );
@@ -139,7 +133,7 @@ private:
     auto cName = name->toStdString();
     jsi::Object descriptor = preparePropertyDescriptor(jsRuntime, options);
     descriptor.setProperty(jsRuntime, "value", jsi_type_converter<T>::convert(jsRuntime, value));
-    JavaScriptObject::defineProperty(jsRuntime, jsObject.get(), cName, std::move(descriptor));
+    common::definePropertyOnJSIObject(jsRuntime, jsObject.get(), cName.c_str(), std::move(descriptor));
   }
 };
 } // namespace expo

package/android/src/main/cpp/JavaScriptRuntime.cpp

@@ -5,6 +5,7 @@
 #include "JavaScriptObject.h"
 #include "Exceptions.h"
 #include "JSIInteropModuleRegistry.h"
+#include "JSIUtils.h"
 
 #if UNIT_TEST
 
@@ -30,19 +31,49 @@ namespace jsi = facebook::jsi;
 
 namespace expo {
 
-void SyncCallInvoker::invokeAsync(std::function<void()> &&func) {
-  func();
-}
+namespace {
 
-void SyncCallInvoker::invokeSync(std::function<void()> &&func) {
-  func();
-}
+/**
+ * Dummy CallInvoker that invokes everything immediately.
+ * Used in the test environment to check the async flow.
+ */
+class SyncCallInvoker : public react::CallInvoker {
+public:
+  void invokeAsync(std::function<void()> &&func) override {
+    func();
+  }
+
+  void invokeSync(std::function<void()> &&func) override {
+    func();
+  }
+
+  ~SyncCallInvoker() override = default;
+};
+
+#if REACT_NATIVE_TARGET_VERSION >= 73
+class SyncNativeMethodCallInvoker : public react::NativeMethodCallInvoker {
+public:
+  void invokeAsync(const std::string &methodName, std::function<void()> &&func) override {
+    func();
+  }
+
+  void invokeSync(const std::string &methodName, std::function<void()> &&func) override {
+    func();
+  }
+
+  ~SyncNativeMethodCallInvoker() override = default;
+};
+#else
+using SyncNativeMethodCallInvoker = SyncCallInvoker;
+#endif // REACT_NATIVE_TARGET_VERSION >= 73
+
+} // namespace
 
 JavaScriptRuntime::JavaScriptRuntime(
   JSIInteropModuleRegistry *jsiInteropModuleRegistry
 )
   : jsInvoker(std::make_shared<SyncCallInvoker>()),
-    nativeInvoker(std::make_shared<SyncCallInvoker>()),
+    nativeInvoker(std::make_shared<SyncNativeMethodCallInvoker>()),
     jsiInteropModuleRegistry(jsiInteropModuleRegistry) {
 #if !UNIT_TEST
   throw std::logic_error(
@@ -107,7 +138,7 @@ JavaScriptRuntime::JavaScriptRuntime(
   JSIInteropModuleRegistry *jsiInteropModuleRegistry,
   jsi::Runtime *runtime,
   std::shared_ptr<react::CallInvoker> jsInvoker,
-  std::shared_ptr<react::CallInvoker> nativeInvoker
+  std::shared_ptr<NativeMethodCallInvokerCompatible> nativeInvoker
 ) : jsInvoker(std::move(jsInvoker)), nativeInvoker(std::move(nativeInvoker)),
     jsiInteropModuleRegistry(jsiInteropModuleRegistry) {
   // Creating a shared pointer that points to the runtime but doesn't own it, thus doesn't release it.
@@ -167,21 +198,17 @@ void JavaScriptRuntime::installMainObject() {
   mainObject = coreModule->cthis()->getJSIObject(*runtime);
 
   auto global = runtime->global();
-  auto objectClass = global.getPropertyAsObject(*runtime, "Object");
-  jsi::Function definePropertyFunction = objectClass.getPropertyAsFunction(
-    *runtime,
-    "defineProperty"
-  );
 
   jsi::Object descriptor = JavaScriptObject::preparePropertyDescriptor(*runtime, 1 << 1);
 
   descriptor.setProperty(*runtime, "value", jsi::Value(*runtime, *mainObject));
 
-  definePropertyFunction.callWithThis(*runtime, objectClass, {
-    jsi::Value(*runtime, global),
-    jsi::String::createFromUtf8(*runtime, "expo"),
+  common::definePropertyOnJSIObject(
+    *runtime,
+    &global,
+    "expo",
     std::move(descriptor)
-  });
+  );
 }
 
 std::shared_ptr<jsi::Object> JavaScriptRuntime::getMainObject() {

package/android/src/main/cpp/JavaScriptRuntime.h

@@ -13,24 +13,16 @@ namespace jni = facebook::jni;
 namespace react = facebook::react;
 
 namespace expo {
-class JavaScriptValue;
 
+class JavaScriptValue;
 class JavaScriptObject;
-
 class JSIInteropModuleRegistry;
 
-/**
- * Dummy CallInvoker that invokes everything immediately.
- * Used in the test environment to check the async flow.
- */
-class SyncCallInvoker : public react::CallInvoker {
-public:
-  void invokeAsync(std::function<void()> &&func) override;
-
-  void invokeSync(std::function<void()> &&func) override;
-
-  ~SyncCallInvoker() override = default;
-};
+#if REACT_NATIVE_TARGET_VERSION >= 73
+using NativeMethodCallInvokerCompatible = react::NativeMethodCallInvoker;
+#else
+using NativeMethodCallInvokerCompatible = react::CallInvoker;
+#endif
 
 /**
  * A wrapper for the jsi::Runtime.
@@ -45,6 +37,7 @@ public:
   /**
    * Initializes a runtime that is independent from React Native and its runtime initialization.
    * This flow is mostly intended for tests. The JS call invoker is set to `SyncCallInvoker`.
+   * See **JavaScriptRuntime.cpp** for the `SyncCallInvoker` implementation.
    */
   JavaScriptRuntime(
     JSIInteropModuleRegistry *jsiInteropModuleRegistry
@@ -54,7 +47,7 @@ public:
     JSIInteropModuleRegistry *jsiInteropModuleRegistry,
     jsi::Runtime *runtime,
     std::shared_ptr<react::CallInvoker> jsInvoker,
-    std::shared_ptr<react::CallInvoker> nativeInvoker
+    std::shared_ptr<NativeMethodCallInvokerCompatible> nativeInvoker
   );
 
   /**
@@ -87,7 +80,7 @@ public:
   void drainJSEventLoop();
 
   std::shared_ptr<react::CallInvoker> jsInvoker;
-  std::shared_ptr<react::CallInvoker> nativeInvoker;
+  std::shared_ptr<NativeMethodCallInvokerCompatible> nativeInvoker;
 
   std::shared_ptr<jsi::Object> getMainObject();
 

package/android/src/main/cpp/MethodMetadata.cpp

@@ -134,7 +134,6 @@ jobjectArray MethodMetadata::convertJSIArgsToJNI(
     nullptr
   );
 
-  std::vector<jobject> result(count);
 
   const auto getCurrentArg = [&thisValue, args, takesOwner = takesOwner](
     size_t index
@@ -155,19 +154,19 @@ jobjectArray MethodMetadata::convertJSIArgsToJNI(
     if (arg.isNull() || arg.isUndefined()) {
       // If value is null or undefined, we just passes a null
       // Kotlin code will check if expected type is nullable.
-      result[argIndex] = nullptr;
+      continue;
+    }
+
+    if (type->converter->canConvert(rt, arg)) {
+      auto converterValue = type->converter->convert(rt, env, moduleRegistry, arg);
+      env->SetObjectArrayElement(argumentArray, argIndex, converterValue);
+      env->DeleteLocalRef(converterValue);
     } else {
-      if (type->converter->canConvert(rt, arg)) {
-        auto converterValue = type->converter->convert(rt, env, moduleRegistry, arg);
-        env->SetObjectArrayElement(argumentArray, argIndex, converterValue);
-        env->DeleteLocalRef(converterValue);
-      } else {
-        auto stringRepresentation = arg.toString(rt).utf8(rt);
-        throwNewJavaException(
-          UnexpectedException::create(
-            "Cannot convert '" + stringRepresentation + "' to a Kotlin type.").get()
-        );
-      }
+      auto stringRepresentation = arg.toString(rt).utf8(rt);
+      throwNewJavaException(
+        UnexpectedException::create(
+          "Cannot convert '" + stringRepresentation + "' to a Kotlin type.").get()
+      );
     }
   }
 

package/android/src/main/cpp/types/FrontendConverter.cpp

@@ -398,8 +398,16 @@ jobject ListFrontendConverter::convert(
 
   auto arrayList = java::ArrayList<jobject>::create(size);
   for (size_t i = 0; i < size; i++) {
+    auto jsValue = jsArray.getValueAtIndex(rt, i);
+
+    // TODO(@lukmccall): pass information to CPP if the underlying type is nullable or not.
+    if (jsValue.isNull() || jsValue.isUndefined()) {
+      arrayList->add(nullptr);
+      continue;
+    }
+
     auto convertedElement = parameterConverter->convert(
-      rt, env, moduleRegistry, jsArray.getValueAtIndex(rt, i)
+      rt, env, moduleRegistry, jsValue
     );
     arrayList->add(convertedElement);
     env->DeleteLocalRef(convertedElement);
@@ -433,11 +441,20 @@ jobject MapFrontendConverter::convert(
 
   for (size_t i = 0; i < size; i++) {
     auto key = propertyNames.getValueAtIndex(rt, i).getString(rt);
+    auto jsValue = jsObject.getProperty(rt, key);
+
+    auto convertedKey = env->NewStringUTF(key.utf8(rt).c_str());
+
+    // TODO(@lukmccall): pass information to CPP if the underlying type is nullable or not.
+    if (jsValue.isNull() || jsValue.isUndefined()) {
+      map->put(convertedKey, nullptr);
+      continue;
+    }
+
     auto convertedValue = valueConverter->convert(
-      rt, env, moduleRegistry, jsObject.getProperty(rt, key)
+      rt, env, moduleRegistry, jsValue
     );
 
-    auto convertedKey = env->NewStringUTF(key.utf8(rt).c_str());
     map->put(convertedKey, convertedValue);
 
     env->DeleteLocalRef(convertedKey);

package/android/src/main/cpp/types/JNIToJSIConverter.cpp

@@ -2,7 +2,7 @@
 
 #include "JNIToJSIConverter.h"
 #include "../JavaReferencesCache.h"
-#include "../ObjectDeallocator.h"
+#include "ObjectDeallocator.h"
 
 #include <react/jni/ReadableNativeMap.h>
 #include <react/jni/ReadableNativeArray.h>
@@ -70,15 +70,14 @@ jsi::Value convert(
     auto jsiObject = anonymousObject->getJSIObject(rt);
 
     jni::global_ref<jobject> globalRef = jni::make_global(value);
-    std::shared_ptr<expo::ObjectDeallocator> deallocator = std::make_shared<ObjectDeallocator>(
+
+    common::setDeallocator(
+      rt,
+      jsiObject,
       [globalRef = std::move(globalRef)]() mutable {
         globalRef.reset();
-      });
-
-    auto descriptor = JavaScriptObject::preparePropertyDescriptor(rt, 0);
-    descriptor.setProperty(rt, "value", jsi::Object::createFromHostObject(rt, deallocator));
-    JavaScriptObject::defineProperty(rt, jsiObject.get(), "__expo_object_deallocator__",
-                                     std::move(descriptor));
+      }
+    );
 
     return jsi::Value(rt, *jsiObject);
   }