expo-modules-core 1.1.0 → 1.2.0

package/CHANGELOG.md

@@ -10,6 +10,35 @@
 
 ### 💡 Others
 
+## 1.2.0 — 2023-02-03
+
+### 🎉 New features
+
+- View-related DSL functions do not require providing the view's type in function parameters on Android. ([#20751](https://github.com/expo/expo/pull/20751) by [@lukmccall](https://github.com/lukmccall))
+- Add support for the `Long` type as function parameters on Android. ([#20787](https://github.com/expo/expo/pull/20787) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Added experimental support for building the function result from the object definition. ([#20864](https://github.com/expo/expo/pull/20864) by [@lukmccall](https://github.com/lukmccall))
+- Removed boost dependency which needs extra downloading on Android. ([#21000](https://github.com/expo/expo/pull/21000) by [@kudo](https://github.com/kudo))
+
+### 🐛 Bug fixes
+
+- Fix view prop setter not being called when its new value is `null` or `undefined`. ([#20755](https://github.com/expo/expo/pull/20755) & [#20766](https://github.com/expo/expo/pull/20766) by [@tsapeta](https://github.com/tsapeta) & [@lukmccall](https://github.com/lukmccall))
+- Fixed "Tried to register two views with the same name" error on fast refresh. ([#20788](https://github.com/expo/expo/pull/20788) by [@tsapeta](https://github.com/tsapeta))
+
+### 💡 Others
+
+- On Android bump `compileSdkVersion` and `targetSdkVersion` to `33`. ([#20721](https://github.com/expo/expo/pull/20721) by [@lukmccall](https://github.com/lukmccall))
+
+## 1.1.1 — 2023-01-06
+
+### 🎉 New features
+
+- Added support for concurrent (async/await) functions in Swift. ([#20645](https://github.com/expo/expo/pull/20645) by [@tsapeta](https://github.com/tsapeta))
+- [iOS] Added experimental support for building the function result from the object definition. ([#20623](https://github.com/expo/expo/pull/20623) by [@tsapeta](https://github.com/tsapeta))
+
+### 🐛 Bug fixes
+
+- Fixed boost build error on Android. ([#20719](https://github.com/expo/expo/pull/20719) by [@kudo](https://github.com/kudo))
+
 ## 1.1.0 — 2022-12-30
 
 ### 🎉 New features

package/android/CMakeLists.txt

@@ -6,7 +6,9 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_CXX_STANDARD 17)
 set(PACKAGE_NAME "expo-modules-core")
 set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
-set(ignoreMe "${PROJECT_BUILD_DIR} ${REACT_ANDROID_BUILD_DIR} ${REACT_NATIVE_TARGET_VERSION} ${REACT_ANDROID_DIR} ${HERMES_HEADER_DIR}")
+set(ignoreMe "${PROJECT_BUILD_DIR} ${REACT_ANDROID_BUILD_DIR} ${REACT_ANDROID_DIR} ${HERMES_HEADER_DIR} ${BOOST_VERSION}")
+
+string(APPEND CMAKE_CXX_FLAGS " -DREACT_NATIVE_TARGET_VERSION=${REACT_NATIVE_TARGET_VERSION}")
 
 if (${NATIVE_DEBUG})
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
@@ -76,26 +78,12 @@ endif ()
 
 if(${UNIT_TEST})
   if(${USE_HERMES})
-    file(GLOB HERMES_SO_DIR "${BUILD_DIR}/third-party-ndk/hermes/jni/${ANDROID_ABI}")
-    find_library(
-        JSEXECUTOR_LIB
-        hermes
-        PATHS ${HERMES_SO_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-    )
-    set(JSEXECUTOR_INCLUDE ${HERMES_HEADER_DIR} ${HERMES_HEADER_DIR}/API ${HERMES_HEADER_DIR}/public)
+    set(JSEXECUTOR_LIB ReactAndroid::hermes_executor)
   else()
-    find_library(
-        JSEXECUTOR_LIB
-        jscexecutor
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-    )
-    set(JSEXECUTOR_INCLUDE "")
+    set(JSEXECUTOR_LIB ReactAndroid::jscexecutor)
   endif()
 else()
   set(JSEXECUTOR_LIB "")
-  set(JSEXECUTOR_INCLUDE "")
 endif()
 
 # find libraries
@@ -118,22 +106,18 @@ target_include_directories(
 
         # header only imports from turbomodule, e.g. CallInvokerHolder.h
         "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/react/turbomodule"
-
-        "${BUILD_DIR}/third-party-ndk/boost/boost_${BOOST_VERSION}"
         "${COMMON_DIR}"
-        "${JSEXECUTOR_INCLUDE}"
         "${SRC_DIR}/fabric"
 )
 
 # linking
 
+include("${REACT_NATIVE_DIR}/ReactAndroid/cmake-utils/folly-flags.cmake")
+
 target_compile_options(
         ${PACKAGE_NAME}
-        PRIVATE -DFOLLY_NO_CONFIG=1
-        -DFOLLY_HAVE_CLOCK_GETTIME=1
-        -DFOLLY_HAVE_MEMRCHR=1
-        -DFOLLY_USE_LIBCPP=1
-        -DFOLLY_MOBILE=1
+        PRIVATE
+        ${folly_FLAGS}
 )
 
 target_link_libraries(

package/android/ExpoModulesCorePlugin.gradle

@@ -74,7 +74,6 @@ class LegacyReactNativeLibsExtractionPlugin implements Plugin<Project> {
     def reactProperties = new Properties()
     new File("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
     def FOLLY_VERSION = reactProperties.getProperty("FOLLY_VERSION")
-    def BOOST_VERSION = reactProperties.getProperty("BOOST_VERSION")
     def DOUBLE_CONVERSION_VERSION = reactProperties.getProperty("DOUBLE_CONVERSION_VERSION")
     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()

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.1.0'
+version = '1.2.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -150,24 +150,13 @@ afterEvaluate {
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 31)
+  compileSdkVersion safeExtGet("compileSdkVersion", 33)
 
-  if (REACT_NATIVE_BUILD_FROM_SOURCE) {
-    if (rootProject.hasProperty("ndkPath")) {
-      ndkPath rootProject.ext.ndkPath
-    }
-    if (rootProject.hasProperty("ndkVersion")) {
-      ndkVersion rootProject.ext.ndkVersion
-    }
-  } else {
-    // This ndkVersion should align to prebuilt react-native building ndkVersion.
-    // Because the unwind library is different before NDK r23 and after,
-    // if we build this library with newer NDK, C++ exceptions are incompatible between these libraries.
-    // For example, C++ exceptions throwing from hermes are not catchable from this library.
-    // Ref: https://android.googlesource.com/platform/ndk/+/master/docs/BuildSystemMaintainers.md#unwinding
-    //
-    // TODO: Revisit this version when upgrade react-native 0.71 (Expo SDK 48)
-    ndkVersion = "21.4.7075529"
+  if (rootProject.hasProperty("ndkPath")) {
+    ndkPath rootProject.ext.ndkPath
+  }
+  if (rootProject.hasProperty("ndkVersion")) {
+    ndkVersion rootProject.ext.ndkVersion
   }
 
   compileOptions {
@@ -181,10 +170,10 @@ android {
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 31)
+    targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.1.0"
+    versionName "1.2.0"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"
@@ -300,7 +289,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-native:+'
 
-  compileOnly 'com.facebook.fbjni:fbjni:0.2.2'
+  compileOnly 'com.facebook.fbjni:fbjni:0.3.0'
 
   testImplementation 'androidx.test:core:1.4.0'
   testImplementation 'junit:junit:4.13.1'
@@ -404,10 +393,27 @@ def prepareBoost = tasks.register('prepareBoost', Copy) {
   }
 }
 
+void nativeBuildDependsOn(project, dependsOnTask, buildTypesIncludes) {
+  def buildTasks = project.tasks.findAll { task ->
+    def taskName = task.name
+    if (taskName.contains("Clean")) { return false }
+    if (taskName.contains("externalNative") || taskName.contains("CMake") || taskName.contains("generateJsonModel")) {
+      if (buildTypesIncludes == null) { return true }
+      for (buildType in buildTypesIncludes) {
+        if (taskName.contains(buildType)) { return true }
+      }
+    }
+    return false
+  }
+  buildTasks.forEach { task -> task.dependsOn(dependsOnTask) }
+}
+
 afterEvaluate {
-  preBuild.dependsOn(prepareBoost)
+  if (REACT_NATIVE_TARGET_VERSION < 71) {
+    nativeBuildDependsOn(project, prepareBoost, null)
+  }
   if (USE_HERMES) {
-    preBuild.dependsOn(prepareHermes)
+    nativeBuildDependsOn(project, prepareHermes, null)
     if (hasHermesProject && !prebuiltHermesCacheHit) {
       prepareHermes.dependsOn(":ReactAndroid:hermes-engine:assembleDebug")
     }

package/android/legacy/CMakeLists.txt

@@ -9,6 +9,8 @@ set(PACKAGE_NAME "expo-modules-core")
 set(BUILD_DIR ${CMAKE_SOURCE_DIR}/../build)
 set(ignoreMe "${PROJECT_BUILD_DIR} ${REACT_ANDROID_BUILD_DIR} ${REACT_ANDROID_DIR} ${HERMES_HEADER_DIR}")
 
+string(APPEND CMAKE_CXX_FLAGS " -DREACT_NATIVE_TARGET_VERSION=${REACT_NATIVE_TARGET_VERSION}")
+
 if (${NATIVE_DEBUG})
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")

package/android/src/fabric/CMakeLists.txt

@@ -9,24 +9,27 @@ add_library(fabric STATIC
   ${SOURCES}
 )
 
+include("${REACT_NATIVE_DIR}/ReactAndroid/cmake-utils/folly-flags.cmake")
+
 target_compile_options(fabric PRIVATE
   "-std=c++17"
-  -DFOLLY_NO_CONFIG=1
-  -DFOLLY_HAVE_CLOCK_GETTIME=1
-  -DFOLLY_HAVE_MEMRCHR=1
-  -DFOLLY_USE_LIBCPP=1
-  -DFOLLY_MOBILE=1
+  ${folly_FLAGS}
 )
 
+find_package(ReactAndroid REQUIRED CONFIG)
+
+find_package(fbjni REQUIRED CONFIG)
+
+get_target_property(INCLUDE_fabricjni
+        ReactAndroid::fabricjni
+        INTERFACE_INCLUDE_DIRECTORIES)
+
 target_include_directories(fabric PRIVATE
   "${REACT_NATIVE_DIR}/ReactCommon"
   "${COMMON_FABRIC_DIR}"
+  "${INCLUDE_fabricjni}/react/fabric"
 )
 
-find_package(ReactAndroid REQUIRED CONFIG)
-
-find_package(fbjni REQUIRED CONFIG)
-
 target_link_libraries(fabric
   CommonSettings
   fbjni::fbjni

package/android/src/main/cpp/JavaReferencesCache.cpp

@@ -2,6 +2,8 @@
 
 #include "JavaReferencesCache.h"
 
+#include <vector>
+
 namespace expo {
 std::shared_ptr<JavaReferencesCache> JavaReferencesCache::instance() {
   static std::shared_ptr<JavaReferencesCache> singleton{new JavaReferencesCache};
@@ -21,6 +23,10 @@ void JavaReferencesCache::loadJClasses(JNIEnv *env) {
     {"<init>", "(I)V"}
   });
 
+  loadJClass(env, "java/lang/Long", {
+    {"<init>", "(J)V"}
+  });
+
   loadJClass(env, "java/lang/Float", {
     {"<init>", "(F)V"}
   });

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

@@ -3,7 +3,6 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
-#include "boost/functional/hash.hpp"
 
 #include <memory>
 #include <unordered_map>
@@ -11,11 +10,26 @@
 namespace jni = facebook::jni;
 
 namespace expo {
-using MethodHashMap = std::unordered_map<
-  std::pair<std::string, std::string>,
-  jmethodID,
-  boost::hash<std::pair<std::string, std::string>>
->;
+
+template <typename T>
+inline void hash_combine(std::size_t& seed, const T& v)
+{
+  std::hash<T> hasher;
+  // Reference from: https://github.com/boostorg/container_hash/blob/boost-1.76.0/include/boost/container_hash/hash.hpp
+  seed ^= hasher(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+}
+
+struct pairhash {
+  template <typename A, typename B>
+  std::size_t operator()(const std::pair<A, B>& v) const {
+    std::size_t seed = 0;
+    hash_combine(seed, v.first);
+    hash_combine(seed, v.second);
+    return seed;
+  }
+};
+
+using MethodHashMap = std::unordered_map<std::pair<std::string, std::string>, jmethodID, pairhash>;
 
 /**
  * Singleton registry used to store references to often used Java classes.

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

@@ -42,13 +42,15 @@ void JavaScriptModuleObject::registerNatives() {
 }
 
 std::shared_ptr<jsi::Object> JavaScriptModuleObject::getJSIObject(jsi::Runtime &runtime) {
-  if (jsiObject == nullptr) {
-    auto hostObject = std::make_shared<JavaScriptModuleObject::HostObject>(this);
-    jsiObject = std::make_shared<jsi::Object>(
-      jsi::Object::createFromHostObject(runtime, hostObject));
+  if (auto object = jsiObject.lock()) {
+    return object;
   }
 
-  return jsiObject;
+  auto hostObject = std::make_shared<JavaScriptModuleObject::HostObject>(this);
+  auto object = std::make_shared<jsi::Object>(
+    jsi::Object::createFromHostObject(runtime, hostObject));
+  jsiObject = object;
+  return object;
 }
 
 void JavaScriptModuleObject::exportConstants(
@@ -143,9 +145,8 @@ JavaScriptModuleObject::HostObject::HostObject(
  * Clears all the JSI references held by the `JavaScriptModuleObject`.
  */
 JavaScriptModuleObject::HostObject::~HostObject() {
-  if (jsModule->jsiObject != nullptr) {
-    jsModule->jsiObject.reset();
-  }
+  jObjectRef.reset();
+  jsModule->jsiObject.reset();
   jsModule->methodsMetadata.clear();
   jsModule->constants.clear();
   jsModule->properties.clear();
@@ -236,5 +237,4 @@ JavaScriptModuleObject::JavaScriptModuleObject(jni::alias_ref<jhybridobject> jTh
   : javaPart_(jni::make_global(jThis)) {
   longLivedObjectCollection_ = std::make_shared<react::LongLivedObjectCollection>();
 }
-
 } // namespace expo

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

@@ -105,7 +105,7 @@ public:
   public:
     HostObject(JavaScriptModuleObject *);
 
-  ~HostObject() override;
+    ~HostObject() override;
 
     jsi::Value get(jsi::Runtime &, const jsi::PropNameID &name) override;
 
@@ -113,6 +113,7 @@ public:
 
     std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt) override;
 
+    jni::global_ref<jobject> jObjectRef;
   private:
     JavaScriptModuleObject *jsModule;
   };
@@ -125,8 +126,10 @@ private:
   /**
    * A reference to the `JavaScriptModuleObject::HostObject`.
    * Simple we cached that value to return the same object each time.
+   * It's a weak reference because the JS runtime holds the actual object. 
+   * Doing that allows the runtime to deallocate jsi::Object if it's not needed anymore.
    */
-  std::shared_ptr<jsi::Object> jsiObject = nullptr;
+  std::weak_ptr<jsi::Object> jsiObject;
   jni::global_ref<JavaScriptModuleObject::javaobject> javaPart_;
 
   /**
@@ -149,6 +152,5 @@ private:
    * The `LongLivedObjectCollection` to hold `LongLivedObject` (callbacks or promises) for this module.
    */
   std::shared_ptr<react::LongLivedObjectCollection> longLivedObjectCollection_;
-
 };
 } // namespace expo

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

@@ -15,7 +15,11 @@
 
 #else
 
+#if REACT_NATIVE_TARGET_VERSION >= 71
+#include <jsc/JSCRuntime.h>
+#else
 #include <jsi/JSCRuntime.h>
+#endif // REACT_NATIVE_TARGET_VERSION >= 71
 
 #endif
 

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

@@ -164,7 +164,7 @@ MethodMetadata::MethodMetadata(
     args(args),
     isAsync(isAsync),
     jBodyReference(std::move(jBodyReference)),
-    longLivedObjectCollection_(longLivedObjectCollection) {
+    longLivedObjectCollection_(std::move(longLivedObjectCollection)) {
   argTypes.reserve(args);
   for (size_t i = 0; i < args; i++) {
     auto expectedType = expectedArgTypes->getElement(i);
@@ -186,7 +186,7 @@ MethodMetadata::MethodMetadata(
     isAsync(isAsync),
     argTypes(std::move(expectedArgTypes)),
     jBodyReference(std::move(jBodyReference)),
-    longLivedObjectCollection_(longLivedObjectCollection) {
+    longLivedObjectCollection_(std::move(longLivedObjectCollection)) {
 }
 
 std::shared_ptr<jsi::Function> MethodMetadata::toJSFunction(
@@ -270,6 +270,9 @@ jsi::Value MethodMetadata::callSync(
   if (env->IsInstanceOf(unpackedResult, cache->getJClass("java/lang/Integer").clazz)) {
     return {jni::static_ref_cast<jni::JInteger>(result)->value()};
   }
+  if (env->IsInstanceOf(unpackedResult, cache->getJClass("java/lang/Long").clazz)) {
+    return {(double) jni::static_ref_cast<jni::JLong>(result)->value()};
+  }
   if (env->IsInstanceOf(unpackedResult, cache->getJClass("java/lang/String").clazz)) {
     return jsi::String::createFromUtf8(
       rt,
@@ -300,6 +303,14 @@ jsi::Value MethodMetadata::callSync(
       ->consume();
     return jsi::valueFromDynamic(rt, dynamic);
   }
+  if (env->IsInstanceOf(unpackedResult, JavaScriptModuleObject::javaClassStatic().get())) {
+    auto anonymousObject = jni::static_ref_cast<JavaScriptModuleObject::javaobject>(result)
+      ->cthis();
+    anonymousObject->jsiInteropModuleRegistry = moduleRegistry;
+    auto hostObject = std::make_shared<JavaScriptModuleObject::HostObject>(anonymousObject);
+    hostObject->jObjectRef = jni::make_global(result);
+    return jsi::Object::createFromHostObject(rt, hostObject);
+  }
 
   return jsi::Value::undefined();
 }

package/android/src/main/cpp/types/CppType.h

@@ -11,16 +11,17 @@ enum CppType {
   NONE = 0,
   DOUBLE = 1 << 0,
   INT = 1 << 1,
-  FLOAT = 1 << 2,
-  BOOLEAN = 1 << 3,
-  STRING = 1 << 4,
-  JS_OBJECT = 1 << 5,
-  JS_VALUE = 1 << 6,
-  READABLE_ARRAY = 1 << 7,
-  READABLE_MAP = 1 << 8,
-  TYPED_ARRAY = 1 << 9,
-  PRIMITIVE_ARRAY = 1 << 10,
-  LIST = 1 << 11,
-  MAP = 1 << 12
+  LONG = 1 << 2,
+  FLOAT = 1 << 3,
+  BOOLEAN = 1 << 4,
+  STRING = 1 << 5,
+  JS_OBJECT = 1 << 6,
+  JS_VALUE = 1 << 7,
+  READABLE_ARRAY = 1 << 8,
+  READABLE_MAP = 1 << 9,
+  TYPED_ARRAY = 1 << 10,
+  PRIMITIVE_ARRAY = 1 << 11,
+  LIST = 1 << 12,
+  MAP = 1 << 13
 };
 } // namespace expo

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

@@ -40,6 +40,23 @@ bool IntegerFrontendConverter::canConvert(jsi::Runtime &rt, const jsi::Value &va
   return value.isNumber();
 }
 
+jobject LongFrontendConverter::convert(
+  jsi::Runtime &rt,
+  JNIEnv *env,
+  JSIInteropModuleRegistry *moduleRegistry,
+  const jsi::Value &value
+) const {
+  auto &longClass = JavaReferencesCache::instance()
+    ->getJClass("java/lang/Long");
+  jmethodID longConstructor = longClass.getMethod("<init>", "(J)V");
+  return env->NewObject(longClass.clazz, longConstructor,
+                        static_cast<jlong>(value.getNumber()));
+}
+
+bool LongFrontendConverter::canConvert(jsi::Runtime &rt, const jsi::Value &value) const {
+  return value.isNumber();
+}
+
 jobject FloatFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
@@ -293,6 +310,12 @@ jobject PrimitiveArrayFrontendConverter::convert(
       &JNIEnv::SetIntArrayRegion
     );
   }
+  if (parameterType == CppType::LONG) {
+    return _createPrimitiveArray(
+      &JNIEnv::NewLongArray,
+      &JNIEnv::SetLongArrayRegion
+    );
+  }
   if (parameterType == CppType::DOUBLE) {
     return _createPrimitiveArray(
       &JNIEnv::NewDoubleArray,

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

@@ -55,6 +55,21 @@ public:
   bool canConvert(jsi::Runtime &rt, const jsi::Value &value) const override;
 };
 
+/**
+ * Converter from js number to [java.lang.Long].
+ */
+class LongFrontendConverter : public FrontendConverter {
+public:
+  jobject convert(
+    jsi::Runtime &rt,
+    JNIEnv *env,
+    JSIInteropModuleRegistry *moduleRegistry,
+    const jsi::Value &value
+  ) const override;
+
+  bool canConvert(jsi::Runtime &rt, const jsi::Value &value) const override;
+};
+
 /**
  * Converter from js number to [java.lang.Float].
  */

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

@@ -12,6 +12,7 @@ void FrontendConverterProvider::createConverters() {
 #define RegisterConverter(type, clazz)  simpleConverters.insert({type, std::make_shared<clazz>()})
   RegisterConverter(CppType::NONE, UnknownFrontendConverter);
   RegisterConverter(CppType::INT, IntegerFrontendConverter);
+  RegisterConverter(CppType::LONG, LongFrontendConverter);
   RegisterConverter(CppType::FLOAT, FloatFrontendConverter);
   RegisterConverter(CppType::DOUBLE, DoubleFrontendConverter);
   RegisterConverter(CppType::BOOLEAN, BooleanFrontendConverter);

package/android/src/main/java/expo/modules/kotlin/DynamicExtenstions.kt

@@ -1,6 +1,7 @@
 package expo.modules.kotlin
 
 import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.DynamicFromObject
 
 inline fun <T> Dynamic.recycle(block: Dynamic.() -> T): T {
   try {
@@ -9,3 +10,5 @@ inline fun <T> Dynamic.recycle(block: Dynamic.() -> T): T {
     this.recycle()
   }
 }
+
+val DynamicNull = DynamicFromObject(null)

package/android/src/main/java/expo/modules/kotlin/exception/CodedException.kt

@@ -85,8 +85,14 @@ internal class MissingTypeConverter(
   message = "Cannot find type converter for '$forType'.",
 )
 
-internal class InvalidArgsNumberException(received: Int, expected: Int) :
-  CodedException(message = "Received $received arguments, but $expected was expected.")
+internal class InvalidArgsNumberException(received: Int, expected: Int, required: Int = expected) :
+  CodedException(
+    message = if (required < expected) {
+      "Received $received arguments, but $expected was expected and at least $required is required"
+    } else {
+      "Received $received arguments, but $expected was expected"
+    }
+  )
 
 internal class MethodNotFoundException :
   CodedException(message = "Method does not exist.")

package/android/src/main/java/expo/modules/kotlin/functions/AnyFunction.kt

@@ -22,6 +22,20 @@ abstract class AnyFunction(
 ) {
   internal val argsCount get() = desiredArgsTypes.size
 
+  /**
+   * A minimum number of arguments the functions needs which equals to `argumentsCount` reduced by the number of trailing optional arguments.
+   */
+  internal val requiredArgumentsCount = run {
+    val nonNullableArgIndex = desiredArgsTypes
+      .reversed()
+      .indexOfFirst { !it.kType.isMarkedNullable }
+    if (nonNullableArgIndex < 0) {
+      return@run desiredArgsTypes.size
+    }
+
+    return@run desiredArgsTypes.size - nonNullableArgIndex
+  }
+
   /**
    * Tries to convert arguments from RN representation to expected types.
    *
@@ -30,23 +44,22 @@ abstract class AnyFunction(
    */
   @Throws(CodedException::class)
   protected fun convertArgs(args: ReadableArray): Array<out Any?> {
-    if (desiredArgsTypes.size != args.size()) {
-      throw InvalidArgsNumberException(args.size(), desiredArgsTypes.size)
+    if (requiredArgumentsCount > args.size() || args.size() > desiredArgsTypes.size) {
+      throw InvalidArgsNumberException(args.size(), desiredArgsTypes.size, requiredArgumentsCount)
     }
 
     val finalArgs = Array<Any?>(desiredArgsTypes.size) { null }
     val argIterator = args.iterator()
-    desiredArgsTypes
-      .withIndex()
-      .forEach { (index, desiredType) ->
-        argIterator.next().recycle {
-          exceptionDecorator({ cause ->
-            ArgumentCastException(desiredType.kType, index, type, cause)
-          }) {
-            finalArgs[index] = desiredType.convert(this)
-          }
+    for (index in 0 until args.size()) {
+      val desiredType = desiredArgsTypes[index]
+      argIterator.next().recycle {
+        exceptionDecorator({ cause ->
+          ArgumentCastException(desiredType.kType, index, type, cause)
+        }) {
+          finalArgs[index] = desiredType.convert(this)
         }
       }
+    }
     return finalArgs
   }
 
@@ -58,30 +71,28 @@ abstract class AnyFunction(
    */
   @Throws(CodedException::class)
   protected fun convertArgs(args: Array<Any?>): Array<out Any?> {
-    if (desiredArgsTypes.size != args.size) {
-      throw InvalidArgsNumberException(args.size, desiredArgsTypes.size)
+    if (requiredArgumentsCount > args.size || args.size > desiredArgsTypes.size) {
+      throw InvalidArgsNumberException(args.size, desiredArgsTypes.size, requiredArgumentsCount)
     }
 
     val finalArgs = Array<Any?>(desiredArgsTypes.size) { null }
     val argIterator = args.iterator()
-    desiredArgsTypes
-      .withIndex()
-      .forEach { (index, desiredType) ->
-        val element = argIterator.next()
-
-        exceptionDecorator({ cause ->
-          ArgumentCastException(desiredType.kType, index, ReadableType.String, cause)
-        }) {
-          finalArgs[index] = desiredType.convert(element)
-        }
+    for (index in args.indices) {
+      val element = argIterator.next()
+      val desiredType = desiredArgsTypes[index]
+      exceptionDecorator({ cause ->
+        ArgumentCastException(desiredType.kType, index, ReadableType.String, cause)
+      }) {
+        finalArgs[index] = desiredType.convert(element)
       }
+    }
     return finalArgs
   }
 
   /**
    * Attaches current function to the provided js object.
    */
-  internal abstract fun attachToJSObject(appContext: AppContext, jsObject: JavaScriptModuleObject)
+  abstract fun attachToJSObject(appContext: AppContext, jsObject: JavaScriptModuleObject)
 
   fun getCppRequiredTypes(): List<ExpectedType> {
     return desiredArgsTypes.map { it.getCppRequiredTypes() }