expo-modules-core 2.3.13 → 2.4.1

package/CHANGELOG.md

@@ -10,6 +10,31 @@
 
 ### 💡 Others
 
+## 2.4.1 — 2025-07-01
+
+### 🐛 Bug fixes
+
+- Added Android 16KB page size support. ([#37446](https://github.com/expo/expo/pull/37446) by [@kudo](https://github.com/kudo))
+
+## 2.4.0 — 2025-06-04
+
+### 🎉 New features
+
+- [iOS] Add module registry encoder for JSON. ([#36677](https://github.com/expo/expo/pull/36677) by [@aleqsio](https://github.com/aleqsio))
+- [Android] New custom Type Converter API ([#36823](https://github.com/expo/expo/pull/36823) by [@jakex7](https://github.com/jakex7))
+- [iOS] Natively support `rgb` color conversions. ([#36914](https://github.com/expo/expo/pull/36914) by [@alanjhughes](https://github.com/alanjhughes))
+- Add default values to prop definition. ([#37011](https://github.com/expo/expo/pull/37011), [#37013](https://github.com/expo/expo/pull/37013) by [@jakex7](https://github.com/jakex7))
+
+### 🐛 Bug fixes
+
+- [iOS] Call `createRootViewController` from the `ExpoReactNativeFactoryDelegate`. ([#36787](https://github.com/expo/expo/pull/36787) by [@alanjhughes](https://github.com/alanjhughes))
+- [iOS] Prevent crash on failed networked requests ([#36896](https://github.com/expo/expo/pull/36896) by [@adrum](https://github.com/adrum))
+
+### 💡 Others
+
+- Improved `@expo/ui/swift-ui-primitives` integrations. ([#36937](https://github.com/expo/expo/pull/36937) by [@kudo](https://github.com/kudo))
+- [iOS] Use dynamic type for AsyncFunction result conversion ([#36986](https://github.com/expo/expo/pull/36986) by [@jakex7](https://github.com/jakex7))
+
 ## 2.3.13 — 2025-05-08
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -25,7 +25,7 @@ if (shouldIncludeCompose) {
 }
 
 group = 'host.exp.exponent'
-version = '2.3.13'
+version = '2.4.1'
 
 def isExpoModulesCoreTests = {
   Gradle gradle = getGradle()
@@ -75,7 +75,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "2.3.13"
+    versionName "2.4.1"
     buildConfigField "String", "EXPO_MODULES_CORE_VERSION", "\"${versionName}\""
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
@@ -85,6 +85,7 @@ android {
       cmake {
         abiFilters(*reactNativeArchitectures())
         arguments "-DANDROID_STL=c++_shared",
+          "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON",
           "-DREACT_NATIVE_DIR=${expoModuleExtension.reactNativeDir}",
           "-DREACT_NATIVE_TARGET_VERSION=${expoModuleExtension.reactNativeVersion.minor}",
           "-DUSE_HERMES=${USE_HERMES}",

package/android/src/main/java/expo/modules/kotlin/classcomponent/ClassComponentBuilder.kt

@@ -2,6 +2,7 @@
 
 package expo.modules.kotlin.classcomponent
 
+import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.component6
 import expo.modules.kotlin.component7
 import expo.modules.kotlin.component8
@@ -10,7 +11,9 @@ import expo.modules.kotlin.objects.ObjectDefinitionBuilder
 import expo.modules.kotlin.objects.PropertyComponentBuilderWithThis
 import expo.modules.kotlin.sharedobjects.SharedObject
 import expo.modules.kotlin.sharedobjects.SharedRef
+import expo.modules.kotlin.traits.Trait
 import expo.modules.kotlin.types.AnyType
+import expo.modules.kotlin.types.TypeConverterProvider
 import expo.modules.kotlin.types.enforceType
 import expo.modules.kotlin.types.toAnyType
 import expo.modules.kotlin.types.toArgsArray
@@ -19,11 +22,14 @@ import kotlin.reflect.KClass
 import kotlin.reflect.full.isSubclassOf
 
 class ClassComponentBuilder<SharedObjectType : Any>(
+  private val appContext: AppContext,
   val name: String,
   private val ownerClass: KClass<SharedObjectType>,
-  val ownerType: AnyType
-) : ObjectDefinitionBuilder() {
+  val ownerType: AnyType,
+  converters: TypeConverterProvider? = null
+) : ObjectDefinitionBuilder(converters) {
   var constructor: SyncFunctionComponent? = null
+  val traits = mutableListOf<Trait<in SharedObjectType>>()
 
   fun buildClass(): ClassDefinitionData {
     val hasOwnerType = ownerClass != Unit::class
@@ -43,7 +49,8 @@ class ClassComponentBuilder<SharedObjectType : Any>(
         }
     }
 
-    val objectData = buildObject()
+    val objectData = buildObject() + traits.map { t -> t.export(appContext) }.reduceOrNull { t1, t2 -> t1 + t2 }
+
     objectData.functions.forEach {
       it.ownerType = ownerType.kType
       it.canTakeOwner = true
@@ -70,6 +77,10 @@ class ClassComponentBuilder<SharedObjectType : Any>(
     )
   }
 
+  fun UseTrait(trait: Trait<in SharedObjectType>) {
+    traits.add(trait)
+  }
+
   inline fun Constructor(
     crossinline body: () -> SharedObjectType
   ): SyncFunctionComponent {
@@ -82,7 +93,7 @@ class ClassComponentBuilder<SharedObjectType : Any>(
   inline fun <reified P0> Constructor(
     crossinline body: (p0: P0) -> SharedObjectType
   ): SyncFunctionComponent {
-    return SyncFunctionComponent("constructor", toArgsArray<P0>(), toReturnType<Any>()) { (p0) ->
+    return SyncFunctionComponent("constructor", toArgsArray<P0>(converterProvider = converters), toReturnType<Any>()) { (p0) ->
       enforceType<P0>(p0)
       body(p0)
     }.also {
@@ -93,7 +104,7 @@ class ClassComponentBuilder<SharedObjectType : Any>(
   inline fun <reified P0, reified P1> Constructor(
     crossinline body: (p0: P0, p1: P1) -> SharedObjectType
   ): SyncFunctionComponent {
-    return SyncFunctionComponent("constructor", toArgsArray<P0, P1>(), toReturnType<Any>()) { (p0, p1) ->
+    return SyncFunctionComponent("constructor", toArgsArray<P0, P1>(converterProvider = converters), toReturnType<Any>()) { (p0, p1) ->
       enforceType<P0, P1>(p0, p1)
       body(p0, p1)
     }.also {
@@ -104,7 +115,7 @@ class ClassComponentBuilder<SharedObjectType : Any>(
   inline fun <reified P0, reified P1, reified P2> Constructor(
     crossinline body: (p0: P0, p1: P1, p2: P2) -> SharedObjectType
   ): SyncFunctionComponent {
-    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2>(), toReturnType<Any>()) { (p0, p1, p2) ->
+    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2>(converterProvider = converters), toReturnType<Any>()) { (p0, p1, p2) ->
       enforceType<P0, P1, P2>(p0, p1, p2)
       body(p0, p1, p2)
     }.also {
@@ -115,7 +126,7 @@ class ClassComponentBuilder<SharedObjectType : Any>(
   inline fun <reified P0, reified P1, reified P2, reified P3> Constructor(
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3) -> SharedObjectType
   ): SyncFunctionComponent {
-    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3>(), toReturnType<Any>()) { (p0, p1, p2, p3) ->
+    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3>(converterProvider = converters), toReturnType<Any>()) { (p0, p1, p2, p3) ->
       enforceType<P0, P1, P2, P3>(p0, p1, p2, p3)
       body(p0, p1, p2, p3)
     }.also {
@@ -126,7 +137,7 @@ class ClassComponentBuilder<SharedObjectType : Any>(
   inline fun <reified P0, reified P1, reified P2, reified P3, reified P4> Constructor(
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) -> SharedObjectType
   ): SyncFunctionComponent {
-    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3, P4>(), toReturnType<Any>()) { (p0, p1, p2, p3, p4) ->
+    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3, P4>(converterProvider = converters), toReturnType<Any>()) { (p0, p1, p2, p3, p4) ->
       enforceType<P0, P1, P2, P3, P4>(p0, p1, p2, p3, p4)
       body(p0, p1, p2, p3, p4)
     }.also {
@@ -137,7 +148,7 @@ class ClassComponentBuilder<SharedObjectType : Any>(
   inline fun <reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> Constructor(
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> SharedObjectType
   ): SyncFunctionComponent {
-    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3, P4, P5>(), toReturnType<Any>()) { (p0, p1, p2, p3, p4, p5) ->
+    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3, P4, P5>(converterProvider = converters), toReturnType<Any>()) { (p0, p1, p2, p3, p4, p5) ->
       enforceType<P0, P1, P2, P3, P4, P5>(p0, p1, p2, p3, p4, p5)
       body(p0, p1, p2, p3, p4, p5)
     }.also {
@@ -148,7 +159,7 @@ class ClassComponentBuilder<SharedObjectType : Any>(
   inline fun <reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> Constructor(
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6) -> SharedObjectType
   ): SyncFunctionComponent {
-    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3, P4, P5, P6>(), toReturnType<Any>()) { (p0, p1, p2, p3, p4, p5, p6) ->
+    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3, P4, P5, P6>(converterProvider = converters), toReturnType<Any>()) { (p0, p1, p2, p3, p4, p5, p6) ->
       enforceType<P0, P1, P2, P3, P4, P5, P6>(p0, p1, p2, p3, p4, p5, p6)
       body(p0, p1, p2, p3, p4, p5, p6)
     }.also {
@@ -159,7 +170,7 @@ class ClassComponentBuilder<SharedObjectType : Any>(
   inline fun <reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6, reified P7> Constructor(
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7) -> SharedObjectType
   ): SyncFunctionComponent {
-    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3, P4, P5, P6, P7>(), toReturnType<Any>()) { (p0, p1, p2, p3, p4, p5, p6, p7) ->
+    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3, P4, P5, P6, P7>(converterProvider = converters), toReturnType<Any>()) { (p0, p1, p2, p3, p4, p5, p6, p7) ->
       enforceType<P0, P1, P2, P3, P4, P5, P6, P7>(p0, p1, p2, p3, p4, p5, p6, p7)
       body(p0, p1, p2, p3, p4, p5, p6, p7)
     }.also {

package/android/src/main/java/expo/modules/kotlin/events/EventsDefinition.kt

@@ -1,3 +1,11 @@
 package expo.modules.kotlin.events
 
-class EventsDefinition(val names: Array<out String>)
+class EventsDefinition(val names: Array<String>) {
+  operator fun plus(other: EventsDefinition?): EventsDefinition {
+    if (other == null) {
+      return this
+    }
+
+    return EventsDefinition(names + other.names)
+  }
+}

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

@@ -93,6 +93,12 @@ internal class MissingTypeConverter(
   message = "Cannot find type converter for '$forType'. Make sure the class implements `expo.modules.kotlin.records.Record` (i.e. `class MyObj : Record`)."
 )
 
+internal class InvalidExpectedType(
+  forType: KType
+) : CodedException(
+  message = "Cannot obtain ExpectedType form '$forType'."
+)
+
 @DoNotStrip
 internal class InvalidArgsNumberException(received: Int, expected: Int, required: Int = expected) :
   CodedException(

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

@@ -6,10 +6,14 @@ import expo.modules.kotlin.component6
 import expo.modules.kotlin.component7
 import expo.modules.kotlin.component8
 import expo.modules.kotlin.Promise
+import expo.modules.kotlin.types.TypeConverterProvider
 import expo.modules.kotlin.types.enforceType
 import expo.modules.kotlin.types.toArgsArray
 
-class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
+class AsyncFunctionBuilder(
+  @PublishedApi internal val name: String,
+  @PublishedApi internal val converters: TypeConverterProvider? = null
+) {
   @PublishedApi
   internal var asyncFunctionComponent: BaseAsyncFunctionComponent? = null
 
@@ -20,7 +24,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0> SuspendBody(crossinline block: suspend (p0: P0) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, toArgsArray<P0>()) { (p0) ->
+    return SuspendFunctionComponent(name, toArgsArray<P0>(converterProvider = converters)) { (p0) ->
       enforceType<P0>(p0)
       block(p0)
     }.also {
@@ -29,7 +33,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1> SuspendBody(crossinline block: suspend (p0: P0, p1: P1) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, toArgsArray<P0, P1>()) { (p0, p1) ->
+    return SuspendFunctionComponent(name, toArgsArray<P0, P1>(converterProvider = converters)) { (p0, p1) ->
       enforceType<P0, P1>(p0, p1)
       block(p0, p1)
     }.also {
@@ -38,7 +42,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2> SuspendBody(crossinline block: suspend (p0: P0, p1: P1, p2: P2) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, toArgsArray<P0, P1, P2>()) { (p0, p1, p2) ->
+    return SuspendFunctionComponent(name, toArgsArray<P0, P1, P2>(converterProvider = converters)) { (p0, p1, p2) ->
       enforceType<P0, P1, P2>(p0, p1, p2)
       block(p0, p1, p2)
     }.also {
@@ -47,7 +51,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3> SuspendBody(crossinline block: suspend (p0: P0, p1: P1, p2: P2, p3: P3) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, toArgsArray<P0, P1, P2, P3>()) { (p0, p1, p2, p3) ->
+    return SuspendFunctionComponent(name, toArgsArray<P0, P1, P2, P3>(converterProvider = converters)) { (p0, p1, p2, p3) ->
       enforceType<P0, P1, P2, P3>(p0, p1, p2, p3)
       block(p0, p1, p2, p3)
     }.also {
@@ -56,7 +60,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> SuspendBody(crossinline block: suspend (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4>()) { (p0, p1, p2, p3, p4) ->
+    return SuspendFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4>(converterProvider = converters)) { (p0, p1, p2, p3, p4) ->
       enforceType<P0, P1, P2, P3, P4>(p0, p1, p2, p3, p4)
       block(p0, p1, p2, p3, p4)
     }.also {
@@ -65,7 +69,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> SuspendBody(crossinline block: suspend (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>()) { (p0, p1, p2, p3, p4, p5) ->
+    return SuspendFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>(converterProvider = converters)) { (p0, p1, p2, p3, p4, p5) ->
       enforceType<P0, P1, P2, P3, P4, P5>(p0, p1, p2, p3, p4, p5)
       block(p0, p1, p2, p3, p4, p5)
     }.also {
@@ -74,7 +78,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> SuspendBody(crossinline block: suspend (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>()) { (p0, p1, p2, p3, p4, p5, p6) ->
+    return SuspendFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>(converterProvider = converters)) { (p0, p1, p2, p3, p4, p5, p6) ->
       enforceType<P0, P1, P2, P3, P4, P5, P6>(p0, p1, p2, p3, p4, p5, p6)
       block(p0, p1, p2, p3, p4, p5, p6)
     }.also {
@@ -83,7 +87,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6, reified P7> SuspendBody(crossinline block: suspend (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6, P7>()) { (p0, p1, p2, p3, p4, p5, p6, p7) ->
+    return SuspendFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6, P7>(converterProvider = converters)) { (p0, p1, p2, p3, p4, p5, p6, p7) ->
       enforceType<P0, P1, P2, P3, P4, P5, P6, P7>(p0, p1, p2, p3, p4, p5, p6, p7)
       block(p0, p1, p2, p3, p4, p5, p6, p7)
     }.also {
@@ -108,7 +112,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
     return if (P0::class == Promise::class) {
       AsyncFunctionWithPromiseComponent(name, emptyArray()) { _, promise -> body(promise as P0) }
     } else {
-      createAsyncFunctionComponent(name, toArgsArray<P0>()) { (p0) ->
+      createAsyncFunctionComponent(name, toArgsArray<P0>(converterProvider = converters)) { (p0) ->
         enforceType<P0>(p0)
         body(p0)
       }
@@ -118,7 +122,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1> AsyncBody(crossinline body: (p0: P0, p1: P1) -> R): AsyncFunctionComponent {
-    return createAsyncFunctionComponent(name, toArgsArray<P0, P1>()) { (p0, p1) ->
+    return createAsyncFunctionComponent(name, toArgsArray<P0, P1>(converterProvider = converters)) { (p0, p1) ->
       enforceType<P0, P1>(p0, p1)
       body(p0, p1)
     }.also {
@@ -128,7 +132,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
 
   @JvmName("AsyncFunctionWithPromise")
   inline fun <reified R, reified P0> AsyncBody(crossinline body: (p0: P0, p1: Promise) -> R): AsyncFunctionComponent {
-    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0>()) { (p0), promise ->
+    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0>(converterProvider = converters)) { (p0), promise ->
       enforceType<P0>(p0)
       body(p0, promise)
     }.also {
@@ -137,7 +141,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2> AsyncBody(crossinline body: (p0: P0, p1: P1, p2: P2) -> R): AsyncFunctionComponent {
-    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2>()) { (p0, p1, p2) ->
+    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2>(converterProvider = converters)) { (p0, p1, p2) ->
       enforceType<P0, P1, P2>(p0, p1, p2)
       body(p0, p1, p2)
     }.also {
@@ -147,7 +151,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
 
   @JvmName("AsyncFunctionWithPromise")
   inline fun <reified R, reified P0, reified P1> AsyncBody(crossinline body: (p0: P0, p1: P1, p2: Promise) -> R): AsyncFunctionComponent {
-    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1>()) { (p0, p1), promise ->
+    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1>(converterProvider = converters)) { (p0, p1), promise ->
       enforceType<P0, P1>(p0, p1)
       body(p0, p1, promise)
     }.also {
@@ -156,7 +160,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3> AsyncBody(crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3) -> R): AsyncFunctionComponent {
-    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3>()) { (p0, p1, p2, p3) ->
+    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3>(converterProvider = converters)) { (p0, p1, p2, p3) ->
       enforceType<P0, P1, P2, P3>(p0, p1, p2, p3)
       body(p0, p1, p2, p3)
     }.also {
@@ -166,7 +170,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
 
   @JvmName("AsyncFunctionWithPromise")
   inline fun <reified R, reified P0, reified P1, reified P2> AsyncBody(crossinline body: (p0: P0, p1: P1, p2: P2, p3: Promise) -> R): AsyncFunctionComponent {
-    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2>()) { (p0, p1, p2), promise ->
+    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2>(converterProvider = converters)) { (p0, p1, p2), promise ->
       enforceType<P0, P1, P2>(p0, p1, p2)
       body(p0, p1, p2, promise)
     }.also {
@@ -175,7 +179,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> AsyncBody(crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) -> R): AsyncFunctionComponent {
-    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4>()) { (p0, p1, p2, p3, p4) ->
+    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4>(converterProvider = converters)) { (p0, p1, p2, p3, p4) ->
       enforceType<P0, P1, P2, P3, P4>(p0, p1, p2, p3, p4)
       body(p0, p1, p2, p3, p4)
     }.also {
@@ -185,7 +189,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
 
   @JvmName("AsyncFunctionWithPromise")
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3> AsyncBody(crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: Promise) -> R): AsyncFunctionComponent {
-    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3>()) { (p0, p1, p2, p3), promise ->
+    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3>(converterProvider = converters)) { (p0, p1, p2, p3), promise ->
       enforceType<P0, P1, P2, P3>(p0, p1, p2, p3)
       body(p0, p1, p2, p3, promise)
     }.also {
@@ -194,7 +198,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> AsyncBody(crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> R): AsyncFunctionComponent {
-    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>()) { (p0, p1, p2, p3, p4, p5) ->
+    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>(converterProvider = converters)) { (p0, p1, p2, p3, p4, p5) ->
       enforceType<P0, P1, P2, P3, P4, P5>(p0, p1, p2, p3, p4, p5)
       body(p0, p1, p2, p3, p4, p5)
     }.also {
@@ -204,7 +208,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
 
   @JvmName("AsyncFunctionWithPromise")
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> AsyncBody(crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: Promise) -> R): AsyncFunctionComponent {
-    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4>()) { (p0, p1, p2, p3, p4), promise ->
+    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4>(converterProvider = converters)) { (p0, p1, p2, p3, p4), promise ->
       enforceType<P0, P1, P2, P3, P4>(p0, p1, p2, p3, p4)
       body(p0, p1, p2, p3, p4, promise)
     }.also {
@@ -213,7 +217,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> AsyncBody(crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6) -> R): AsyncFunctionComponent {
-    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>()) { (p0, p1, p2, p3, p4, p5, p6) ->
+    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>(converterProvider = converters)) { (p0, p1, p2, p3, p4, p5, p6) ->
       enforceType<P0, P1, P2, P3, P4, P5, P6>(p0, p1, p2, p3, p4, p5, p6)
       body(p0, p1, p2, p3, p4, p5, p6)
     }.also {
@@ -223,7 +227,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
 
   @JvmName("AsyncFunctionWithPromise")
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> AsyncBody(crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: Promise) -> R): AsyncFunctionComponent {
-    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>()) { (p0, p1, p2, p3, p4, p5), promise ->
+    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>(converterProvider = converters)) { (p0, p1, p2, p3, p4, p5), promise ->
       enforceType<P0, P1, P2, P3, P4, P5>(p0, p1, p2, p3, p4, p5)
       body(p0, p1, p2, p3, p4, p5, promise)
     }.also {
@@ -232,7 +236,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6, reified P7> AsyncBody(crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7) -> R): AsyncFunctionComponent {
-    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6, P7>()) { (p0, p1, p2, p3, p4, p5, p6, p7) ->
+    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6, P7>(converterProvider = converters)) { (p0, p1, p2, p3, p4, p5, p6, p7) ->
       enforceType<P0, P1, P2, P3, P4, P5, P6, P7>(p0, p1, p2, p3, p4, p5, p6, p7)
       body(p0, p1, p2, p3, p4, p5, p6, p7)
     }.also {
@@ -242,7 +246,7 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
 
   @JvmName("AsyncFunctionWithPromise")
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> AsyncBody(crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: Promise) -> R): AsyncFunctionComponent {
-    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>()) { (p0, p1, p2, p3, p4, p5, p6), promise ->
+    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>(converterProvider = converters)) { (p0, p1, p2, p3, p4, p5, p6), promise ->
       enforceType<P0, P1, P2, P3, P4, P5, P6>(p0, p1, p2, p3, p4, p5, p6)
       body(p0, p1, p2, p3, p4, p5, p6, promise)
     }.also {

package/android/src/main/java/expo/modules/kotlin/jni/ExpectedType.kt

@@ -1,6 +1,9 @@
 package expo.modules.kotlin.jni
 
 import expo.modules.core.interfaces.DoNotStrip
+import expo.modules.kotlin.exception.InvalidExpectedType
+import kotlin.reflect.KClass
+import kotlin.reflect.KType
 
 /**
  * A basic class that represents metadata about the expected type.
@@ -30,6 +33,66 @@ class SingleType(
    */
   @DoNotStrip
   fun getSecondParameterType() = parameterTypes?.get(1)
+
+  override fun equals(other: Any?): Boolean {
+    if (this === other) {
+      return true
+    }
+
+    if (javaClass != other?.javaClass) {
+      return false
+    }
+
+    other as SingleType
+
+    if (expectedCppType != other.expectedCppType) {
+      return false
+    }
+    if (!parameterTypes.contentEquals(other.parameterTypes)) {
+      return false
+    }
+
+    return true
+  }
+
+  override fun hashCode(): Int {
+    var result = expectedCppType.hashCode()
+    result = 31 * result + (parameterTypes?.contentHashCode() ?: 0)
+    return result
+  }
+
+  companion object {
+    fun merge(
+      first: SingleType,
+      second: SingleType
+    ): SingleType {
+      if (first.expectedCppType != second.expectedCppType) {
+        throw IllegalArgumentException(
+          "Cannot merge types with different CppType: ${first.expectedCppType} and ${second.expectedCppType}"
+        )
+      }
+
+      val firstTypeParameters = first.parameterTypes
+      val secondTypeParameters = second.parameterTypes
+      if (firstTypeParameters == null || secondTypeParameters == null) {
+        return first
+      }
+
+      require(firstTypeParameters.size == secondTypeParameters.size) {
+        "Cannot merge types with different number of parameters: ${first.parameterTypes.size} and ${second.parameterTypes.size}"
+      }
+
+      val size = firstTypeParameters.size
+      val parameters = (0..<size).map { index ->
+        ExpectedType.merge(firstTypeParameters[index], secondTypeParameters[index])
+      }
+
+      return SingleType(
+        first.expectedCppType,
+        parameters.toTypedArray()
+      )
+    }
+  }
 }
 
 /**
@@ -60,11 +123,25 @@ class ExpectedType(
   @DoNotStrip
   fun getFirstType() = innerPossibleTypes.first()
 
-  operator fun plus(other: ExpectedType): ExpectedType {
-    return ExpectedType(
-      *this.innerPossibleTypes,
-      *other.innerPossibleTypes
-    )
+  override fun hashCode(): Int {
+    var result = innerCombinedTypes
+    result = 31 * result + innerPossibleTypes.contentHashCode()
+    return result
+  }
+
+  override operator fun equals(other: Any?): Boolean {
+    if (other !is ExpectedType) return false
+
+    if (this.innerPossibleTypes.size != other.innerPossibleTypes.size) return false
+    for (i in this.innerPossibleTypes.indices) {
+      if (this.innerPossibleTypes[i].expectedCppType != other.innerPossibleTypes[i].expectedCppType) {
+        return false
+      }
+      if (this.innerPossibleTypes[i].getFirstParameterType() != other.innerPossibleTypes[i].getFirstParameterType()) {
+        return false
+      }
+    }
+    return true
   }
 
   companion object {
@@ -96,5 +173,45 @@ class ExpectedType(
     fun forMap(valueType: ExpectedType) = ExpectedType(
       SingleType(CppType.MAP, arrayOf(valueType))
     )
+
+    fun fromKType(type: KType): ExpectedType {
+      val kClass = type.classifier as? KClass<*>
+        ?: throw IllegalArgumentException("Cannot obtain KClass from '$type'")
+      when (kClass) {
+        Int::class -> return ExpectedType(SingleType(CppType.INT))
+        Long::class -> return ExpectedType(SingleType(CppType.LONG))
+        Double::class -> return ExpectedType(SingleType(CppType.DOUBLE))
+        Float::class -> return ExpectedType(SingleType(CppType.FLOAT))
+        Boolean::class -> return ExpectedType(SingleType(CppType.BOOLEAN))
+        String::class -> return ExpectedType(SingleType(CppType.STRING))
+      }
+      if (kClass.java.isAssignableFrom(List::class.java)) {
+        val argType = type.arguments.firstOrNull()?.type
+        if (argType != null) {
+          return forList(fromKType(argType))
+        }
+      }
+      if (kClass.java.isAssignableFrom(Map::class.java)) {
+        val argType = type.arguments.getOrNull(1)?.type
+        if (argType != null) {
+          return forMap(fromKType(argType))
+        }
+      }
+      throw InvalidExpectedType(type)
+    }
+
+    fun merge(
+      vararg types: ExpectedType
+    ): ExpectedType {
+      val typesGroup = types
+        .flatMap { it.innerPossibleTypes.asIterable() }
+        .groupBy { it.expectedCppType }
+
+      val mergedTypes = typesGroup.map { (_, types) ->
+        types.reduce { a, b -> SingleType.merge(a, b) }
+      }
+
+      return ExpectedType(*mergedTypes.toTypedArray())
+    }
   }
 }

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

@@ -51,7 +51,7 @@ abstract class Module : AppContextProvider {
     moduleEventEmitter?.emit(convertEnumToString(enum), body)
   }
 
-  open fun customConverterProvider(): TypeConverterProvider? = null
+  open fun converters(): TypeConverterProvider? = null
 
   abstract fun definition(): ModuleDefinitionData
 }
@@ -60,3 +60,8 @@ abstract class Module : AppContextProvider {
 inline fun Module.ModuleDefinition(crossinline block: ModuleDefinitionBuilder.() -> Unit): ModuleDefinitionData {
   return trace("${this.javaClass}.ModuleDefinition") { ModuleDefinitionBuilder(this).also(block).buildModule() }
 }
+
+@Suppress("FunctionName")
+inline fun Module.ModuleConverters(crossinline block: ModuleConvertersBuilder.() -> Unit): TypeConverterProvider {
+  return trace("${this.javaClass}.TypeConverters") { ModuleConvertersBuilder().also(block).buildTypeConverterProvider() }
+}

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

@@ -0,0 +1,50 @@
+@file:Suppress("FunctionName")
+
+package expo.modules.kotlin.modules
+
+import expo.modules.kotlin.exception.MissingTypeConverter
+import expo.modules.kotlin.types.TypeConverter
+import expo.modules.kotlin.types.TypeConverterComponent
+import expo.modules.kotlin.types.TypeConverterProvider
+import expo.modules.kotlin.types.lazyTypeOf
+import kotlin.reflect.KClass
+import kotlin.reflect.KType
+
+class ModuleConvertersBuilder {
+  @PublishedApi
+  internal var convertersComponent = mutableListOf<TypeConverterComponent<*>>()
+
+  inline fun <reified T : Any> TypeConverter(classifier: KClass<T>): TypeConverterComponent<T> {
+    val converterComponent = TypeConverterComponent<T>(lazyTypeOf<T>(), lazyTypeOf<(T?)?>())
+    convertersComponent.add(converterComponent)
+    return converterComponent
+  }
+
+  inline fun <reified T : Any, reified P0 : Any> TypeConverter(
+    classifier: KClass<T>,
+    crossinline body: (p0: P0) -> T
+  ): TypeConverterComponent<T> {
+    return TypeConverter<T>(classifier).apply {
+      from<P0> { value ->
+        body(value)
+      }
+    }
+  }
+
+  fun buildTypeConverterProvider(): TypeConverterProvider {
+    val converterMap = convertersComponent
+      .map { it.build() }
+      .flatten()
+      .toMap()
+    return object : TypeConverterProvider {
+      override fun obtainTypeConverter(type: KType): TypeConverter<*> {
+        val typeConverter = converterMap[type]
+        if (typeConverter != null) {
+          return typeConverter
+        } else {
+          throw MissingTypeConverter(type)
+        }
+      }
+    }
+  }
+}