expo-modules-core 0.10.0 → 0.11.2

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

@@ -1,51 +1,22 @@
-/**
- * We used a function from the experimental STD API - typeOf (see kotlinlang.org/api/latest/jvm/stdlib/kotlin.reflect/type-of.html).
- * We shouldn't have any problem with that function, cause it's widely used in other libraries created by JetBrains like kotlinx-serializer.
- * This function is super handy if we want to receive a collection type.
- * For example, it's very hard to obtain the generic parameter type from the list class.
- * In plain Java, it's almost impossible. There is a trick to getting such information using something called TypeToken.
- * For instance, the Gson library uses this workaround. But there still will be a problem with nullability.
- * We didn't find a good solution to distinguish between List<Any?> and List<Any>.
- * Mainly because from the JVM perspective it's the same type.
- * That's why we used typeOf. It solves all problems described above.
- */
-@file:OptIn(ExperimentalStdlibApi::class)
 @file:Suppress("FunctionName")
 
 package expo.modules.kotlin.modules
 
 import android.app.Activity
 import android.content.Intent
-import expo.modules.kotlin.Promise
 import expo.modules.kotlin.events.BasicEventListener
 import expo.modules.kotlin.events.EventListener
 import expo.modules.kotlin.events.EventListenerWithPayload
 import expo.modules.kotlin.events.EventListenerWithSenderAndPayload
 import expo.modules.kotlin.events.EventName
-import expo.modules.kotlin.events.EventsDefinition
 import expo.modules.kotlin.events.OnActivityResultPayload
-import expo.modules.kotlin.functions.AsyncFunction
-import expo.modules.kotlin.functions.AsyncFunctionBuilder
-import expo.modules.kotlin.functions.AsyncFunctionComponent
-import expo.modules.kotlin.functions.AsyncFunctionWithPromiseComponent
-import expo.modules.kotlin.functions.SyncFunctionComponent
-import expo.modules.kotlin.types.toAnyType
+import expo.modules.kotlin.objects.ObjectDefinitionBuilder
 import expo.modules.kotlin.views.ViewManagerDefinition
 import expo.modules.kotlin.views.ViewManagerDefinitionBuilder
-import kotlin.reflect.typeOf
 
 @DefinitionMarker
-class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null) {
+class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null) : ObjectDefinitionBuilder() {
   private var name: String? = null
-  private var constantsProvider = { emptyMap<String, Any?>() }
-  private var eventsDefinition: EventsDefinition? = null
-  private var functionBuilders = mutableListOf<AsyncFunctionBuilder>()
-
-  @PublishedApi
-  internal var syncFunctions = mutableMapOf<String, SyncFunctionComponent>()
-
-  @PublishedApi
-  internal var asyncFunctions = mutableMapOf<String, AsyncFunction>()
 
   @PublishedApi
   internal var viewManagerDefinition: ViewManagerDefinition? = null
@@ -53,27 +24,17 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
   @PublishedApi
   internal val eventListeners = mutableMapOf<EventName, EventListener>()
 
-  fun build(): ModuleDefinitionData {
+  fun buildModule(): ModuleDefinitionData {
     val moduleName = name ?: module?.javaClass?.simpleName
 
     return ModuleDefinitionData(
       requireNotNull(moduleName),
-      constantsProvider,
-      syncFunctions,
-      asyncFunctions,
-      functionBuilders.map { it.build() },
+      buildObject(),
       viewManagerDefinition,
-      eventListeners,
-      eventsDefinition
+      eventListeners
     )
   }
 
-  @Deprecated(
-    message = "The 'name' component was renamed to 'Name'.",
-    replaceWith = ReplaceWith("Name(name)")
-  )
-  fun name(name: String) = Name(name)
-
   /**
    * Sets the name of the module that is exported to the JavaScript world.
    */
@@ -81,335 +42,6 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     this.name = name
   }
 
-  @Deprecated(
-    message = "The 'constants' component was renamed to 'Constants'.",
-    replaceWith = ReplaceWith("Constants(constantsProvider)")
-  )
-  fun constants(constantsProvider: () -> Map<String, Any?>) = Constants(constantsProvider)
-
-  /**
-   * Definition function setting the module's constants to export.
-   */
-  fun Constants(constantsProvider: () -> Map<String, Any?>) {
-    this.constantsProvider = constantsProvider
-  }
-
-  @Deprecated(
-    message = "The 'constants' component was renamed to 'Constants'.",
-    replaceWith = ReplaceWith("Constants(constants)")
-  )
-  fun constants(vararg constants: Pair<String, Any?>) = Constants(*constants)
-
-  /**
-   * Definition of the module's constants to export.
-   */
-  fun Constants(vararg constants: Pair<String, Any?>) {
-    constantsProvider = { constants.toMap() }
-  }
-
-  @JvmName("FunctionWithoutArgs")
-  inline fun Function(
-    name: String,
-    crossinline body: () -> Any?
-  ) {
-    SyncFunctionComponent(name, arrayOf()) { body() }.also {
-      syncFunctions[name] = it
-    }
-  }
-
-  inline fun <reified R> Function(
-    name: String,
-    crossinline body: () -> R
-  ) {
-    SyncFunctionComponent(name, arrayOf()) { body() }.also {
-      syncFunctions[name] = it
-    }
-  }
-
-  inline fun <reified R, reified P0> Function(
-    name: String,
-    crossinline body: (p0: P0) -> R
-  ) {
-    SyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType())) { body(it[0] as P0) }.also {
-      syncFunctions[name] = it
-    }
-  }
-
-  inline fun <reified R, reified P0, reified P1> Function(
-    name: String,
-    crossinline body: (p0: P0, p1: P1) -> R
-  ) {
-    SyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType())) { body(it[0] as P0, it[1] as P1) }.also {
-      syncFunctions[name] = it
-    }
-  }
-
-  inline fun <reified R, reified P0, reified P1, reified P2> Function(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2) -> R
-  ) {
-    SyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2) }.also {
-      syncFunctions[name] = it
-    }
-  }
-
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3> function(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3) -> R
-  ) {
-    SyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3) }.also {
-      syncFunctions[name] = it
-    }
-  }
-
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> function(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) -> R
-  ) {
-    SyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4) }.also {
-      syncFunctions[name] = it
-    }
-  }
-
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> Function(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> R
-  ) {
-    SyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5) }.also {
-      syncFunctions[name] = it
-    }
-  }
-
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> function(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6) -> R
-  ) {
-    SyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType(), typeOf<P6>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5, it[6] as P6) }.also {
-      syncFunctions[name] = it
-    }
-  }
-
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6, reified P7> function(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7) -> R
-  ) {
-    SyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType(), typeOf<P6>().toAnyType(), typeOf<P7>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5, it[6] as P6, it[7] as P7) }.also {
-      syncFunctions[name] = it
-    }
-  }
-
-  @Deprecated(
-    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
-    replaceWith = ReplaceWith("AsyncFunction(name, body)")
-  )
-  @JvmName("asyncFunctionWithoutArgs")
-  inline fun asyncFunction(
-    name: String,
-    crossinline body: () -> Any?
-  ) = AsyncFunction(name, body)
-
-  @JvmName("AsyncFunctionWithoutArgs")
-  inline fun AsyncFunction(
-    name: String,
-    crossinline body: () -> Any?
-  ) {
-    asyncFunctions[name] = AsyncFunctionComponent(name, arrayOf()) { body() }
-  }
-
-  @Deprecated(
-    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
-    replaceWith = ReplaceWith("AsyncFunction(name, body)")
-  )
-  inline fun <reified R> asyncFunction(
-    name: String,
-    crossinline body: () -> R
-  ) = AsyncFunction(name, body)
-
-  inline fun <reified R> AsyncFunction(
-    name: String,
-    crossinline body: () -> R
-  ) {
-    asyncFunctions[name] = AsyncFunctionComponent(name, arrayOf()) { body() }
-  }
-
-  @Deprecated(
-    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
-    replaceWith = ReplaceWith("AsyncFunction(name, body)")
-  )
-  inline fun <reified R, reified P0> asyncFunction(
-    name: String,
-    crossinline body: (p0: P0) -> R
-  ) = AsyncFunction(name, body)
-
-  inline fun <reified R, reified P0> AsyncFunction(
-    name: String,
-    crossinline body: (p0: P0) -> R
-  ) {
-    asyncFunctions[name] = if (P0::class == Promise::class) {
-      AsyncFunctionWithPromiseComponent(name, arrayOf()) { _, promise -> body(promise as P0) }
-    } else {
-      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType())) { body(it[0] as P0) }
-    }
-  }
-
-  @Deprecated(
-    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
-    replaceWith = ReplaceWith("AsyncFunction(name, body)")
-  )
-  inline fun <reified R, reified P0, reified P1> asyncFunction(
-    name: String,
-    crossinline body: (p0: P0, p1: P1) -> R
-  ) = AsyncFunction(name, body)
-
-  inline fun <reified R, reified P0, reified P1> AsyncFunction(
-    name: String,
-    crossinline body: (p0: P0, p1: P1) -> R
-  ) {
-    asyncFunctions[name] = if (P1::class == Promise::class) {
-      AsyncFunctionWithPromiseComponent(name, arrayOf(typeOf<P0>().toAnyType())) { args, promise -> body(args[0] as P0, promise as P1) }
-    } else {
-      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType())) { body(it[0] as P0, it[1] as P1) }
-    }
-  }
-
-  @Deprecated(
-    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
-    replaceWith = ReplaceWith("AsyncFunction(name, body)")
-  )
-  inline fun <reified R, reified P0, reified P1, reified P2> asyncFunction(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2) -> R
-  ) = AsyncFunction(name, body)
-
-  inline fun <reified R, reified P0, reified P1, reified P2> AsyncFunction(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2) -> R
-  ) {
-    asyncFunctions[name] = if (P2::class == Promise::class) {
-      AsyncFunctionWithPromiseComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, promise as P2) }
-    } else {
-      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2) }
-    }
-  }
-
-  @Deprecated(
-    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
-    replaceWith = ReplaceWith("AsyncFunction(name, body)")
-  )
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3> asyncFunction(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3) -> R
-  ) = AsyncFunction(name, body)
-
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3> AsyncFunction(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3) -> R
-  ) {
-    asyncFunctions[name] = if (P3::class == Promise::class) {
-      AsyncFunctionWithPromiseComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, promise as P3) }
-    } else {
-      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3) }
-    }
-  }
-
-  @Deprecated(
-    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
-    replaceWith = ReplaceWith("AsyncFunction(name, body)")
-  )
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> asyncFunction(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) -> R
-  ) = AsyncFunction(name, body)
-
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> AsyncFunction(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) -> R
-  ) {
-    asyncFunctions[name] = if (P4::class == Promise::class) {
-      AsyncFunctionWithPromiseComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, args[3] as P3, promise as P4) }
-    } else {
-      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4) }
-    }
-  }
-
-  @Deprecated(
-    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
-    replaceWith = ReplaceWith("AsyncFunction(name, body)")
-  )
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> asyncFunction(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> R
-  ) = AsyncFunction(name, body)
-
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> AsyncFunction(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> R
-  ) {
-    asyncFunctions[name] = if (P5::class == Promise::class) {
-      AsyncFunctionWithPromiseComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, args[3] as P3, args[4] as P4, promise as P5) }
-    } else {
-      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5) }
-    }
-  }
-
-  @Deprecated(
-    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
-    replaceWith = ReplaceWith("AsyncFunction(name, body)")
-  )
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> asyncFunction(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6) -> R
-  ) = AsyncFunction(name, body)
-
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> AsyncFunction(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6) -> R
-  ) {
-    asyncFunctions[name] = if (P6::class == Promise::class) {
-      AsyncFunctionWithPromiseComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, args[3] as P3, args[4] as P4, args[5] as P5, promise as P6) }
-    } else {
-      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType(), typeOf<P6>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5, it[6] as P6) }
-    }
-  }
-
-  @Deprecated(
-    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
-    replaceWith = ReplaceWith("AsyncFunction(name, body)")
-  )
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6, reified P7> asyncFunction(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7) -> R
-  ) = AsyncFunction(name, body)
-
-  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6, reified P7> AsyncFunction(
-    name: String,
-    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7) -> R
-  ) {
-    asyncFunctions[name] = if (P7::class == Promise::class) {
-      AsyncFunctionWithPromiseComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType(), typeOf<P6>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, args[3] as P3, args[4] as P4, args[5] as P5, args[6] as P6, promise as P7) }
-    } else {
-      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType(), typeOf<P6>().toAnyType(), typeOf<P7>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5, it[6] as P6, it[7] as P7) }
-    }
-  }
-
-  @Deprecated(
-    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
-    replaceWith = ReplaceWith("AsyncFunction(name, body)")
-  )
-  fun asyncFunction(
-    name: String
-  ) = AsyncFunction(name)
-
-  fun AsyncFunction(
-    name: String
-  ) = AsyncFunctionBuilder(name).also { functionBuilders.add(it) }
-
-  @Deprecated(
-    message = "The 'viewManager' component was renamed to 'ViewManager'.",
-    replaceWith = ReplaceWith("ViewManager(body)")
-  )
-  inline fun viewManager(body: ViewManagerDefinitionBuilder.() -> Unit) = ViewManager(body)
-
   /**
    * Creates the view manager definition that scopes other view-related definitions.
    */
@@ -421,12 +53,6 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     viewManagerDefinition = viewManagerDefinitionBuilder.build()
   }
 
-  @Deprecated(
-    message = "The 'onCreate' component was renamed to 'OnCreate'.",
-    replaceWith = ReplaceWith("OnCreate(body)")
-  )
-  inline fun onCreate(crossinline body: () -> Unit) = OnCreate(body)
-
   /**
    * Creates module's lifecycle listener that is called right after the module initialization.
    */
@@ -434,12 +60,6 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     eventListeners[EventName.MODULE_CREATE] = BasicEventListener(EventName.MODULE_CREATE) { body() }
   }
 
-  @Deprecated(
-    message = "The 'onDestroy' component was renamed to 'OnDestroy'.",
-    replaceWith = ReplaceWith("OnDestroy(body)")
-  )
-  inline fun onDestroy(crossinline body: () -> Unit) = OnDestroy(body)
-
   /**
    * Creates module's lifecycle listener that is called when the module is about to be deallocated.
    */
@@ -447,12 +67,6 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     eventListeners[EventName.MODULE_DESTROY] = BasicEventListener(EventName.MODULE_DESTROY) { body() }
   }
 
-  @Deprecated(
-    message = "The 'onActivityEntersForeground' component was renamed to 'OnActivityEntersForeground'.",
-    replaceWith = ReplaceWith("OnActivityEntersForeground(body)")
-  )
-  inline fun onActivityEntersForeground(crossinline body: () -> Unit) = OnActivityEntersForeground(body)
-
   /**
    * Creates module's lifecycle listener that is called right after the activity is resumed.
    */
@@ -460,12 +74,6 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     eventListeners[EventName.ACTIVITY_ENTERS_FOREGROUND] = BasicEventListener(EventName.ACTIVITY_ENTERS_FOREGROUND) { body() }
   }
 
-  @Deprecated(
-    message = "The 'onActivityEntersBackground' component was renamed to 'OnActivityEntersBackground'.",
-    replaceWith = ReplaceWith("OnActivityEntersBackground(body)")
-  )
-  inline fun onActivityEntersBackground(crossinline body: () -> Unit) = OnActivityEntersBackground(body)
-
   /**
    * Creates module's lifecycle listener that is called right after the activity is paused.
    */
@@ -473,12 +81,6 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     eventListeners[EventName.ACTIVITY_ENTERS_BACKGROUND] = BasicEventListener(EventName.ACTIVITY_ENTERS_BACKGROUND) { body() }
   }
 
-  @Deprecated(
-    message = "The 'onActivityDestroys' component was renamed to 'OnActivityDestroys'.",
-    replaceWith = ReplaceWith("OnActivityDestroys(body)")
-  )
-  inline fun onActivityDestroys(crossinline body: () -> Unit) = OnActivityDestroys(body)
-
   /**
    * Creates module's lifecycle listener that is called right after the activity is destroyed.
    */
@@ -486,51 +88,6 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     eventListeners[EventName.ACTIVITY_DESTROYS] = BasicEventListener(EventName.ACTIVITY_DESTROYS) { body() }
   }
 
-  @Deprecated(
-    message = "The 'events' component was renamed to 'Events'.",
-    replaceWith = ReplaceWith("Events(events)")
-  )
-  fun events(vararg events: String) = Events(*events)
-
-  /**
-   * Defines event names that this module can send to JavaScript.
-   */
-  fun Events(vararg events: String) {
-    eventsDefinition = EventsDefinition(events)
-  }
-
-  @Deprecated(
-    message = "The 'onStartObserving' component was renamed to 'OnStartObserving'.",
-    replaceWith = ReplaceWith("OnStartObserving(body)")
-  )
-  inline fun onStartObserving(crossinline body: () -> Unit) = OnStartObserving(body)
-
-  /**
-   * Creates module's lifecycle listener that is called right after the first event listener is added.
-   */
-  inline fun OnStartObserving(crossinline body: () -> Unit) {
-    AsyncFunction("startObserving", body)
-  }
-
-  @Deprecated(
-    message = "The 'onStopObserving' component was renamed to 'OnStopObserving'.",
-    replaceWith = ReplaceWith("OnStopObserving(body)")
-  )
-  inline fun onStopObserving(crossinline body: () -> Unit) = OnStopObserving(body)
-
-  /**
-   * Creates module's lifecycle listener that is called right after all event listeners are removed.
-   */
-  inline fun OnStopObserving(crossinline body: () -> Unit) {
-    AsyncFunction("stopObserving", body)
-  }
-
-  @Deprecated(
-    message = "The 'onNewIntent' component was renamed to 'OnNewIntent'.",
-    replaceWith = ReplaceWith("OnNewIntent(body)")
-  )
-  inline fun onNewIntent(crossinline body: (Intent) -> Unit) = OnNewIntent(body)
-
   /**
    * Creates module's lifecycle listener that is called right after the new intent was received.
    */
@@ -538,12 +95,6 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     eventListeners[EventName.ON_NEW_INTENT] = EventListenerWithPayload<Intent>(EventName.ON_NEW_INTENT) { body(it) }
   }
 
-  @Deprecated(
-    message = "The 'onActivityResult' component was renamed to 'OnActivityResult'.",
-    replaceWith = ReplaceWith("OnActivityResult(body)")
-  )
-  inline fun onActivityResult(crossinline body: (Activity, OnActivityResultPayload) -> Unit) = OnActivityResult(body)
-
   /**
    * Creates module's lifecycle listener that is called right after the activity has received a result.
    */

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

@@ -4,10 +4,7 @@ import expo.modules.kotlin.ConcatIterator
 import expo.modules.kotlin.ModuleHolder
 import expo.modules.kotlin.events.EventListener
 import expo.modules.kotlin.events.EventName
-import expo.modules.kotlin.events.EventsDefinition
-import expo.modules.kotlin.functions.AsyncFunction
-import expo.modules.kotlin.functions.SuspendFunctionComponentBuilder
-import expo.modules.kotlin.functions.SyncFunctionComponent
+import expo.modules.kotlin.objects.ObjectDefinitionData
 import expo.modules.kotlin.views.ViewManagerDefinition
 
 /**
@@ -16,13 +13,9 @@ import expo.modules.kotlin.views.ViewManagerDefinition
  */
 class ModuleDefinitionData(
   val name: String,
-  val constantsProvider: () -> Map<String, Any?>,
-  val syncFunctions: Map<String, SyncFunctionComponent>,
-  val asyncFunctions: Map<String, AsyncFunction>,
-  val suspendFunctionBuilders: List<SuspendFunctionComponentBuilder>,
+  val objectDefinition: ObjectDefinitionData,
   val viewManagerDefinition: ViewManagerDefinition? = null,
   val eventListeners: Map<EventName, EventListener> = emptyMap(),
-  val eventsDefinition: EventsDefinition? = null
 )
 
 /**
@@ -35,14 +28,13 @@ class ProcessedModuleDefinition(
   moduleHolder: ModuleHolder
 ) {
   val name = data.name
-  val constantsProvider = data.constantsProvider
-  val syncFunctions = data.syncFunctions
-  val asyncFunctions = data.asyncFunctions + data.suspendFunctionBuilders.associate { builder ->
-    builder.name to builder.build((moduleHolder))
-  }
+  val constantsProvider = data.objectDefinition.constantsProvider
+  val syncFunctions = data.objectDefinition.syncFunctions
+  val asyncFunctions = data.objectDefinition.asyncFunctions + data.objectDefinition.buildSuspendFunctions(moduleHolder)
   val viewManagerDefinition = data.viewManagerDefinition
   val eventListeners = data.eventListeners
-  val eventsDefinition = data.eventsDefinition
+  val eventsDefinition = data.objectDefinition.eventsDefinition
+  val properties = data.objectDefinition.properties
 
   val functions
     get() = ConcatIterator(syncFunctions.values.iterator(), asyncFunctions.values.iterator())