expo-modules-core 2.3.13 → 2.4.1

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

@@ -17,6 +17,8 @@ import expo.modules.kotlin.events.OnActivityResultPayload
 import expo.modules.kotlin.objects.ObjectDefinitionBuilder
 import expo.modules.kotlin.sharedobjects.SharedObject
 import expo.modules.kotlin.types.LazyKType
+import expo.modules.kotlin.types.TypeConverterProvider
+import expo.modules.kotlin.types.mergeWithDefault
 import expo.modules.kotlin.types.toAnyType
 import expo.modules.kotlin.views.ModuleDefinitionBuilderWithCompose
 import expo.modules.kotlin.views.ViewDefinitionBuilder
@@ -33,10 +35,10 @@ class ModuleDefinitionBuilder(
 
 @DefinitionMarker
 open class InternalModuleDefinitionBuilder(
-  @PublishedApi internal val module: Module? = null
+  @PublishedApi internal val module: Module? = null,
+  converters: TypeConverterProvider? = module?.converters()?.mergeWithDefault()
 ) : ObjectDefinitionBuilder(
-  module
-    ?.customConverterProvider()
+  converters
 ) {
   @PublishedApi
   internal var name: String? = null
@@ -89,7 +91,11 @@ open class InternalModuleDefinitionBuilder(
    * Creates the view manager definition that scopes other view-related definitions.
    */
   inline fun <reified T : View> View(viewClass: KClass<T>, body: ViewDefinitionBuilder<T>.() -> Unit) {
-    val viewDefinitionBuilder = ViewDefinitionBuilder(viewClass, LazyKType(classifier = T::class, kTypeProvider = { typeOf<T>() }))
+    val viewDefinitionBuilder = ViewDefinitionBuilder(
+      viewClass,
+      LazyKType(classifier = T::class, kTypeProvider = { typeOf<T>() }),
+      converters
+    )
 
     viewDefinitionBuilder.UseCSSProps()
 
@@ -162,7 +168,13 @@ open class InternalModuleDefinitionBuilder(
   }
 
   inline fun Class(name: String, body: ClassComponentBuilder<Unit>.() -> Unit = {}) {
-    val clazzBuilder = ClassComponentBuilder(name, Unit::class, toAnyType<Unit>())
+    val clazzBuilder = ClassComponentBuilder(
+      requireNotNull(module).appContext,
+      name,
+      Unit::class,
+      toAnyType<Unit>(),
+      converters
+    )
     body.invoke(clazzBuilder)
     classData.add(clazzBuilder.buildClass())
   }
@@ -172,7 +184,13 @@ open class InternalModuleDefinitionBuilder(
     sharedObjectClass: KClass<SharedObjectType> = SharedObjectType::class,
     body: ClassComponentBuilder<SharedObjectType>.() -> Unit = {}
   ) {
-    val clazzBuilder = ClassComponentBuilder(name, sharedObjectClass, toAnyType<SharedObjectType>())
+    val clazzBuilder = ClassComponentBuilder(
+      requireNotNull(module).appContext,
+      name,
+      sharedObjectClass,
+      toAnyType<SharedObjectType>(),
+      converters
+    )
     body.invoke(clazzBuilder)
     classData.add(clazzBuilder.buildClass())
   }
@@ -181,7 +199,13 @@ open class InternalModuleDefinitionBuilder(
     sharedObjectClass: KClass<SharedObjectType> = SharedObjectType::class,
     body: ClassComponentBuilder<SharedObjectType>.() -> Unit = {}
   ) {
-    val clazzBuilder = ClassComponentBuilder(sharedObjectClass.java.simpleName, sharedObjectClass, toAnyType<SharedObjectType>())
+    val clazzBuilder = ClassComponentBuilder(
+      requireNotNull(module).appContext,
+      sharedObjectClass.java.simpleName,
+      sharedObjectClass,
+      toAnyType<SharedObjectType>(),
+      converters
+    )
     body.invoke(clazzBuilder)
     classData.add(clazzBuilder.buildClass())
   }

package/android/src/main/java/expo/modules/kotlin/objects/ObjectDefinitionBuilder.kt

@@ -22,7 +22,6 @@ import expo.modules.kotlin.modules.convertEnumToString
 import expo.modules.kotlin.types.Enumerable
 import expo.modules.kotlin.types.TypeConverterProvider
 import expo.modules.kotlin.types.enforceType
-import expo.modules.kotlin.types.mergeWithDefault
 import expo.modules.kotlin.types.toArgsArray
 import expo.modules.kotlin.types.toReturnType
 import kotlin.reflect.full.declaredMemberProperties
@@ -31,10 +30,9 @@ import kotlin.reflect.full.primaryConstructor
 /**
  * Base class for other definitions representing an object, such as `ModuleDefinition`.
  */
-open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = null) {
-  @PublishedApi
-  internal val converterProvider = customConverter.mergeWithDefault()
-
+open class ObjectDefinitionBuilder(
+  @PublishedApi internal val converters: TypeConverterProvider? = null
+) {
   private var legacyConstantsProvider = { emptyMap<String, Any?>() }
 
   @PublishedApi
@@ -126,7 +124,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     crossinline body: (p0: P0) -> R
   ): SyncFunctionComponent {
-    return SyncFunctionComponent(name, toArgsArray<P0>(converterProvider = converterProvider), toReturnType<R>()) { (p0) ->
+    return SyncFunctionComponent(name, toArgsArray<P0>(converterProvider = converters), toReturnType<R>()) { (p0) ->
       enforceType<P0>(p0)
       body(p0)
     }.also {
@@ -138,7 +136,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     crossinline body: (p0: P0, p1: P1) -> R
   ): SyncFunctionComponent {
-    return SyncFunctionComponent(name, toArgsArray<P0, P1>(), toReturnType<R>()) { (p0, p1) ->
+    return SyncFunctionComponent(name, toArgsArray<P0, P1>(converterProvider = converters), toReturnType<R>()) { (p0, p1) ->
       enforceType<P0, P1>(p0, p1)
       body(p0, p1)
     }.also {
@@ -150,7 +148,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2) -> R
   ): SyncFunctionComponent {
-    return SyncFunctionComponent(name, toArgsArray<P0, P1, P2>(), toReturnType<R>()) { (p0, p1, p2) ->
+    return SyncFunctionComponent(name, toArgsArray<P0, P1, P2>(converterProvider = converters), toReturnType<R>()) { (p0, p1, p2) ->
       enforceType<P0, P1, P2>(p0, p1, p2)
       body(p0, p1, p2)
     }.also {
@@ -162,7 +160,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3) -> R
   ): SyncFunctionComponent {
-    return SyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3>(), toReturnType<R>()) { (p0, p1, p2, p3) ->
+    return SyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3>(converterProvider = converters), toReturnType<R>()) { (p0, p1, p2, p3) ->
       enforceType<P0, P1, P2, P3>(p0, p1, p2, p3)
       body(p0, p1, p2, p3)
     }.also {
@@ -174,7 +172,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) -> R
   ): SyncFunctionComponent {
-    return SyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4>(), toReturnType<R>()) { (p0, p1, p2, p3, p4) ->
+    return SyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4>(converterProvider = converters), toReturnType<R>()) { (p0, p1, p2, p3, p4) ->
       enforceType<P0, P1, P2, P3, P4>(p0, p1, p2, p3, p4)
       body(p0, p1, p2, p3, p4)
     }.also {
@@ -186,7 +184,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> R
   ): SyncFunctionComponent {
-    return SyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>(), toReturnType<R>()) { (p0, p1, p2, p3, p4, p5) ->
+    return SyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>(converterProvider = converters), toReturnType<R>()) { (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 {
@@ -198,7 +196,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6) -> R
   ): SyncFunctionComponent {
-    return SyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>(), toReturnType<R>()) { (p0, p1, p2, p3, p4, p5, p6) ->
+    return SyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>(converterProvider = converters), toReturnType<R>()) { (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 {
@@ -210,7 +208,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7) -> R
   ): SyncFunctionComponent {
-    return SyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6, P7>(), toReturnType<R>()) { (p0, p1, p2, p3, p4, p5, p6, p7) ->
+    return SyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6, P7>(converterProvider = converters), toReturnType<R>()) { (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 {
@@ -245,7 +243,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     return if (P0::class.java == Promise::class.java) {
       AsyncFunctionWithPromiseComponent(name, arrayOf()) { _, promise -> body(promise as P0) }
     } else {
-      createAsyncFunctionComponent(name, toArgsArray<P0>()) { (p0) ->
+      createAsyncFunctionComponent(name, toArgsArray<P0>(converterProvider = converters)) { (p0) ->
         enforceType<P0>(p0)
         body(p0)
       }
@@ -258,7 +256,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     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 {
@@ -271,7 +269,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     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 {
@@ -283,7 +281,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     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 {
@@ -296,7 +294,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     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 {
@@ -308,7 +306,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     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 {
@@ -321,7 +319,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     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 {
@@ -333,7 +331,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     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 {
@@ -346,7 +344,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     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 {
@@ -358,7 +356,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     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 {
@@ -371,7 +369,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     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 {
@@ -383,7 +381,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     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 {
@@ -396,7 +394,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     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 {
@@ -408,7 +406,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     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 {
@@ -421,7 +419,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
     name: String,
     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 {
@@ -431,13 +429,13 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
 
   fun AsyncFunction(
     name: String
-  ) = AsyncFunctionBuilder(name).also { asyncFunctionBuilders[name] = it }
+  ) = AsyncFunctionBuilder(name, converters).also { asyncFunctionBuilders[name] = it }
 
   /**
    * Defines event names that this module can send to JavaScript.
    */
   fun Events(vararg events: String) {
-    eventsDefinition = EventsDefinition(events)
+    eventsDefinition = EventsDefinition(events.asList().toTypedArray())
   }
 
   /**

package/android/src/main/java/expo/modules/kotlin/objects/ObjectDefinitionData.kt

@@ -15,4 +15,19 @@ class ObjectDefinitionData(
 ) {
   val functions
     get() = ConcatIterator(syncFunctions.values.iterator(), asyncFunctions.values.iterator())
+
+  operator fun plus(other: ObjectDefinitionData?): ObjectDefinitionData {
+    if (other == null) {
+      return this
+    }
+
+    return ObjectDefinitionData(
+      legacyConstantsProvider = { legacyConstantsProvider() + other.legacyConstantsProvider() },
+      syncFunctions = syncFunctions + other.syncFunctions,
+      asyncFunctions = asyncFunctions + other.asyncFunctions,
+      eventsDefinition = eventsDefinition?.plus(other.eventsDefinition),
+      properties = properties + other.properties,
+      constants = constants + other.constants
+    )
+  }
 }

package/android/src/main/java/expo/modules/kotlin/traits/SavableTrait.kt

@@ -0,0 +1,57 @@
+package expo.modules.kotlin.traits
+
+import android.graphics.Bitmap
+import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.exception.Exceptions
+import expo.modules.kotlin.objects.ObjectDefinitionBuilder
+import expo.modules.kotlin.objects.ObjectDefinitionData
+import expo.modules.kotlin.records.Record
+import expo.modules.kotlin.sharedobjects.SharedRef
+import expo.modules.kotlin.weak
+import java.io.File
+import java.util.UUID
+import kotlin.reflect.KClass
+
+class SavableTrait<InputType> @PublishedApi internal constructor(
+  val exportImpl: (AppContext) -> ObjectDefinitionData
+) : Trait<InputType> {
+  override fun export(appContext: AppContext) = exportImpl(appContext)
+
+  companion object {
+    data class SavableBitmapOptions(
+      val compression: Int = 100
+    ) : Record
+
+    @PublishedApi
+    internal inline fun <reified InputType, reified OptionType> createImplementation(
+      appContext: AppContext,
+      crossinline saveToFile: (file: File, input: InputType, options: OptionType) -> Unit
+    ): ObjectDefinitionData {
+      val appContextWeakRef = appContext.weak()
+
+      return ObjectDefinitionBuilder().apply {
+        AsyncFunction("saveAsync") { input: InputType, options: OptionType ->
+          val context = appContextWeakRef.get() ?: throw Exceptions.AppContextLost()
+          val outputFile = File(context.cacheDirectory, UUID.randomUUID().toString())
+          outputFile.createNewFile()
+
+          saveToFile(outputFile, input, options)
+        }
+      }.buildObject()
+    }
+
+    inline fun <reified T : SharedRef<Bitmap>> create(klass: KClass<T> = T::class) =
+      SavableTrait<T>(
+        exportImpl = { appContext ->
+          createImplementation<T, SavableBitmapOptions>(appContext) { file, input, options ->
+            input.appContext
+            input.ref.compress(
+              Bitmap.CompressFormat.PNG,
+              options.compression,
+              file.outputStream()
+            )
+          }
+        }
+      )
+  }
+}

package/android/src/main/java/expo/modules/kotlin/traits/Trait.kt

@@ -0,0 +1,8 @@
+package expo.modules.kotlin.traits
+
+import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.objects.ObjectDefinitionData
+
+interface Trait<InputType> {
+  fun export(appContext: AppContext): ObjectDefinitionData
+}

package/android/src/main/java/expo/modules/kotlin/types/AnyType.kt

@@ -145,6 +145,15 @@ object AnyTypeProvider {
   }
 }
 
+inline fun <reified T> lazyTypeOf() = { typeOf<T>() }.toLazyType<T>()
+
+inline fun <reified T> (() -> KType).toLazyType() =
+  LazyKType(
+    classifier = T::class,
+    isMarkedNullable = null is T,
+    kTypeProvider = this
+  )
+
 inline fun <reified T> (() -> KType).toAnyType(converterProvider: TypeConverterProvider? = null) =
   AnyType(
     LazyKType(

package/android/src/main/java/expo/modules/kotlin/types/EitherTypeConverter.kt

@@ -98,7 +98,7 @@ class EitherTypeConverter<FirstType : Any, SecondType : Any>(
     )
   }
 
-  override fun getCppRequiredTypes(): ExpectedType = firstType + secondType
+  override fun getCppRequiredTypes(): ExpectedType = ExpectedType.merge(firstType, secondType)
 
   override fun isTrivial(): Boolean = false
 }
@@ -144,7 +144,7 @@ class EitherOfThreeTypeConverter<FirstType : Any, SecondType : Any, ThirdType :
     )
   }
 
-  override fun getCppRequiredTypes(): ExpectedType = firstType + secondType + thirdType
+  override fun getCppRequiredTypes(): ExpectedType = ExpectedType.merge(firstType, secondType, thirdType)
 }
 
 @EitherType
@@ -194,5 +194,5 @@ class EitherOfFourTypeConverter<FirstType : Any, SecondType : Any, ThirdType : A
     )
   }
 
-  override fun getCppRequiredTypes(): ExpectedType = firstType + secondType + thirdType
+  override fun getCppRequiredTypes(): ExpectedType = ExpectedType.merge(firstType, secondType, thirdType, fourthType)
 }

package/android/src/main/java/expo/modules/kotlin/types/ExpoDynamic.kt

@@ -0,0 +1,57 @@
+package expo.modules.kotlin.types
+
+import com.facebook.react.bridge.Dynamic
+
+class ExpoDynamic(private val dynamic: Dynamic) {
+  enum class Type {
+    Boolean,
+    Number,
+    String,
+    Map,
+    Array
+  }
+
+  val type: Type
+    get() {
+      return when (dynamic.type) {
+        com.facebook.react.bridge.ReadableType.Null -> throw IllegalStateException("ExpoDynamic is null")
+        com.facebook.react.bridge.ReadableType.Boolean -> Type.Boolean
+        com.facebook.react.bridge.ReadableType.Number -> Type.Number
+        com.facebook.react.bridge.ReadableType.String -> Type.String
+        com.facebook.react.bridge.ReadableType.Map -> Type.Map
+        com.facebook.react.bridge.ReadableType.Array -> Type.Array
+      }
+    }
+
+  val isNull: Boolean
+    get() {
+      if (dynamic.isNull) {
+        throw IllegalStateException("ExpoDynamic is null")
+      }
+      return false
+    }
+
+  fun asArray(): List<Any?> {
+    return dynamic.asArray().toArrayList()
+  }
+
+  fun asBoolean(): Boolean {
+    return dynamic.asBoolean()
+  }
+
+  fun asDouble(): Double {
+    return dynamic.asDouble()
+  }
+
+  fun asInt(): Int {
+    return dynamic.asInt()
+  }
+
+  fun asMap(): Map<String, Any?> {
+    return dynamic.asMap().toHashMap()
+  }
+
+  fun asString(): String {
+    return dynamic.asString()
+  }
+}

package/android/src/main/java/expo/modules/kotlin/types/TypeConverterCollection.kt

@@ -0,0 +1,81 @@
+package expo.modules.kotlin.types
+
+import com.facebook.react.bridge.Dynamic
+import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.exception.MissingTypeConverter
+import expo.modules.kotlin.jni.ExpectedType
+import kotlin.reflect.KClass
+import kotlin.reflect.KType
+import kotlin.reflect.typeOf
+
+class TypeConverterComponent<Type : Any>(val notNullableType: KType, val nullableType: KType) {
+  val nonNullableConverter = lazy { TypeConverterCollection<Type>(notNullableType, false) }
+  val nullableConverter = lazy { TypeConverterCollection<Type>(nullableType, true) }
+
+  inline fun <reified P0 : Any> from(crossinline body: (p0: P0) -> Type): TypeConverterComponent<Type> {
+    nonNullableConverter.value.from(body)
+    nullableConverter.value.from(body)
+    return this
+  }
+
+  fun build(): List<Pair<KType, TypeConverter<*>>> {
+    if (nonNullableConverter.isInitialized() && nullableConverter.isInitialized()) {
+      return listOf(
+        notNullableType to nonNullableConverter.value,
+        nullableType to nullableConverter.value
+      )
+    }
+
+    return emptyList()
+  }
+}
+
+class TypeConverterCollection<Type : Any>(
+  val type: KType,
+  isOptional: Boolean
+) : NullAwareTypeConverter<Type>(isOptional) {
+  @PublishedApi
+  internal var converters: MutableMap<KType, (Any?) -> Type> = mutableMapOf()
+
+  inline fun <reified P0> from(crossinline body: (p0: P0) -> Type): TypeConverterCollection<Type> {
+    converters[typeOf<P0>()] = { value ->
+      enforceType<P0>(value)
+      body(value)
+    }
+
+    return this
+  }
+
+  override fun convertNonOptional(value: Any, context: AppContext?): Type {
+    val possibleConverters = converters
+      .map { (key, converter) -> key to converter }
+      .filter { (key, _) ->
+        val kClass = key.classifier as? KClass<*>
+        kClass?.isInstance(value) == true
+      }
+
+    if (possibleConverters.isEmpty()) {
+      // We don't have a converter for Dynamic, but we can try to convert it to ExpoDynamic
+      // and see if we have a converter for that.
+      if (value is Dynamic) {
+        return convertNonOptional(ExpoDynamic(value), context)
+      }
+
+      throw MissingTypeConverter(type)
+    }
+
+    if (possibleConverters.size > 1) {
+      throw TypeCastException("Cannot cast '$value' to '$type'. Type converters conflict")
+    }
+
+    return possibleConverters.first().second.invoke(value)
+  }
+
+  override fun getCppRequiredTypes(): ExpectedType {
+    return ExpectedType.merge(
+      *converters.keys.map { key ->
+        ExpectedType.fromKType(key)
+      }.toTypedArray()
+    )
+  }
+}

package/android/src/main/java/expo/modules/kotlin/views/ConcreteViewProp.kt

@@ -7,12 +7,11 @@ import expo.modules.kotlin.exception.PropSetException
 import expo.modules.kotlin.exception.exceptionDecorator
 import expo.modules.kotlin.types.AnyType
 
-class ConcreteViewProp<ViewType : View, PropType>(
+open class ConcreteViewProp<ViewType : View, PropType>(
   name: String,
   propType: AnyType,
-  private val setter: (view: ViewType, prop: PropType) -> Unit
+  protected val setter: (view: ViewType, prop: PropType) -> Unit
 ) : AnyViewProp(name, propType) {
-
   @Suppress("UNCHECKED_CAST")
   override fun set(prop: Dynamic, onView: View, appContext: AppContext?) {
     exceptionDecorator({
@@ -24,3 +23,19 @@ class ConcreteViewProp<ViewType : View, PropType>(
 
   override val isNullable: Boolean = propType.kType.isMarkedNullable
 }
+
+class ConcreteViewPropWithDefault<ViewType : View, PropType>(
+  name: String,
+  propType: AnyType,
+  setter: (view: ViewType, prop: PropType) -> Unit,
+  private val defaultValue: PropType
+) : ConcreteViewProp<ViewType, PropType>(name, propType, setter) {
+  @Suppress("UNCHECKED_CAST")
+  override fun set(prop: Dynamic, onView: View, appContext: AppContext?) {
+    if (prop.isNull) {
+      setter(onView as ViewType, defaultValue)
+      return
+    }
+    super.set(prop, onView, appContext)
+  }
+}