expo-modules-core 0.10.0 → 0.11.2

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

@@ -10,92 +10,38 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   @PublishedApi
   internal var functionBuilder: SuspendFunctionComponentBuilder? = null
 
-  @Deprecated(
-    message = "The 'suspendBody' component was renamed to 'SuspendBody'.",
-    replaceWith = ReplaceWith("SuspendBody(block)")
-  )
-  inline fun <reified R> suspendBody(crossinline block: suspend () -> R) = SuspendBody(block)
-
   inline fun <reified R> SuspendBody(crossinline block: suspend () -> R) {
     functionBuilder = SuspendFunctionComponentBuilder(name, arrayOf()) { block() }
   }
 
-  @Deprecated(
-    message = "The 'suspendBody' component was renamed to 'SuspendBody'.",
-    replaceWith = ReplaceWith("SuspendBody(block)")
-  )
-  inline fun <reified R, reified P0> suspendBody(crossinline block: suspend (p0: P0) -> R) = SuspendBody(block)
-
   inline fun <reified R, reified P0> SuspendBody(crossinline block: suspend (p0: P0) -> R) {
     functionBuilder = SuspendFunctionComponentBuilder(name, arrayOf(typeOf<P0>().toAnyType())) { block(it[0] as P0) }
   }
 
-  @Deprecated(
-    message = "The 'suspendBody' component was renamed to 'SuspendBody'.",
-    replaceWith = ReplaceWith("SuspendBody(block)")
-  )
-  inline fun <reified R, reified P0, reified P1> suspendBody(crossinline block: suspend (p0: P0, p1: P1) -> R) = SuspendBody(block)
-
   inline fun <reified R, reified P0, reified P1> SuspendBody(crossinline block: suspend (p0: P0, p1: P1) -> R) {
     functionBuilder = SuspendFunctionComponentBuilder(name, arrayOf(typeOf<P0>().toAnyType())) { block(it[0] as P0, it[0] as P1) }
   }
 
-  @Deprecated(
-    message = "The 'suspendBody' component was renamed to 'SuspendBody'.",
-    replaceWith = ReplaceWith("SuspendBody(block)")
-  )
-  inline fun <reified R, reified P0, reified P1, reified P2> suspendBody(crossinline block: suspend (p0: P0, p1: P1, p2: P2) -> R) = SuspendBody(block)
-
   inline fun <reified R, reified P0, reified P1, reified P2> SuspendBody(crossinline block: suspend (p0: P0, p1: P1, p2: P2) -> R) {
     functionBuilder = SuspendFunctionComponentBuilder(name, arrayOf(typeOf<P0>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2) }
   }
 
-  @Deprecated(
-    message = "The 'suspendBody' component was renamed to 'SuspendBody'.",
-    replaceWith = ReplaceWith("SuspendBody(block)")
-  )
-  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) = SuspendBody(block)
-
   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) {
     functionBuilder = SuspendFunctionComponentBuilder(name, arrayOf(typeOf<P0>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3) }
   }
 
-  @Deprecated(
-    message = "The 'suspendBody' component was renamed to 'SuspendBody'.",
-    replaceWith = ReplaceWith("SuspendBody(block)")
-  )
-  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) = SuspendBody(block)
-
   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) {
     functionBuilder = SuspendFunctionComponentBuilder(name, arrayOf(typeOf<P0>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4) }
   }
 
-  @Deprecated(
-    message = "The 'suspendBody' component was renamed to 'SuspendBody'.",
-    replaceWith = ReplaceWith("SuspendBody(block)")
-  )
-  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) = SuspendBody(block)
-
   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) {
     functionBuilder = SuspendFunctionComponentBuilder(name, arrayOf(typeOf<P0>().toAnyType())) { block(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 'suspendBody' component was renamed to 'SuspendBody'.",
-    replaceWith = ReplaceWith("SuspendBody(block)")
-  )
-  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) = SuspendBody(block)
-
   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) {
     functionBuilder = SuspendFunctionComponentBuilder(name, arrayOf(typeOf<P0>().toAnyType())) { block(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 'suspendBody' component was renamed to 'SuspendBody'.",
-    replaceWith = ReplaceWith("SuspendBody(block)")
-  )
-  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) = SuspendBody(block)
-
   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) {
     functionBuilder = SuspendFunctionComponentBuilder(name, arrayOf(typeOf<P0>().toAnyType())) { block(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) }
   }
@@ -105,60 +51,6 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 }
 
-@Deprecated(
-  message = "The 'coroutine' component was renamed to 'Coroutine'.",
-  replaceWith = ReplaceWith("Coroutine(block)")
-)
-inline infix fun <reified R> AsyncFunctionBuilder.coroutine(crossinline block: suspend () -> R) = Coroutine(block)
-
-@Deprecated(
-  message = "The 'coroutine' component was renamed to 'Coroutine'.",
-  replaceWith = ReplaceWith("Coroutine(block)")
-)
-inline infix fun <reified R, reified P0> AsyncFunctionBuilder.coroutine(crossinline block: suspend (P0) -> R) = Coroutine(block)
-
-@Deprecated(
-  message = "The 'coroutine' component was renamed to 'Coroutine'.",
-  replaceWith = ReplaceWith("Coroutine(block)")
-)
-inline infix fun <reified R, reified P0, reified P1> AsyncFunctionBuilder.coroutine(crossinline block: suspend (P0, P1) -> R) = Coroutine(block)
-
-@Deprecated(
-  message = "The 'coroutine' component was renamed to 'Coroutine'.",
-  replaceWith = ReplaceWith("Coroutine(block)")
-)
-inline infix fun <reified R, reified P0, reified P1, reified P2> AsyncFunctionBuilder.coroutine(crossinline block: suspend (P0, P1, P2) -> R) = Coroutine(block)
-
-@Deprecated(
-  message = "The 'coroutine' component was renamed to 'Coroutine'.",
-  replaceWith = ReplaceWith("Coroutine(block)")
-)
-inline infix fun <reified R, reified P0, reified P1, reified P2, reified P3> AsyncFunctionBuilder.coroutine(crossinline block: suspend (P0, P1, P2, P3) -> R) = Coroutine(block)
-
-@Deprecated(
-  message = "The 'coroutine' component was renamed to 'Coroutine'.",
-  replaceWith = ReplaceWith("Coroutine(block)")
-)
-inline infix fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> AsyncFunctionBuilder.coroutine(crossinline block: suspend (P0, P1, P2, P3, P4) -> R) = Coroutine(block)
-
-@Deprecated(
-  message = "The 'coroutine' component was renamed to 'Coroutine'.",
-  replaceWith = ReplaceWith("Coroutine(block)")
-)
-inline infix fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> AsyncFunctionBuilder.coroutine(crossinline block: suspend (P0, P1, P2, P3, P4, P5) -> R) = Coroutine(block)
-
-@Deprecated(
-  message = "The 'coroutine' component was renamed to 'Coroutine'.",
-  replaceWith = ReplaceWith("Coroutine(block)")
-)
-inline infix fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> AsyncFunctionBuilder.coroutine(crossinline block: suspend (P0, P1, P2, P3, P4, P5, P6) -> R) = Coroutine(block)
-
-@Deprecated(
-  message = "The 'coroutine' component was renamed to 'Coroutine'.",
-  replaceWith = ReplaceWith("Coroutine(block)")
-)
-inline infix fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6, reified P7> AsyncFunctionBuilder.coroutine(crossinline block: suspend (P0, P1, P2, P3, P4, P5, P6, P7) -> R) = Coroutine(block)
-
 inline infix fun <reified R> AsyncFunctionBuilder.Coroutine(crossinline block: suspend () -> R) = SuspendBody(block)
 inline infix fun <reified R, reified P0> AsyncFunctionBuilder.Coroutine(crossinline block: suspend (P0) -> R) = SuspendBody(block)
 inline infix fun <reified R, reified P0, reified P1> AsyncFunctionBuilder.Coroutine(crossinline block: suspend (P0, P1) -> R) = SuspendBody(block)

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

@@ -12,7 +12,10 @@ class AsyncFunctionComponent(
 ) : AsyncFunction(name, desiredArgsTypes) {
   @Throws(CodedException::class)
   override fun call(args: ReadableArray, promise: Promise) {
-    val convertedArgs = convertArgs(args)
-    promise.resolve(body(convertedArgs))
+    promise.resolve(body(convertArgs(args)))
+  }
+
+  override fun call(args: Array<Any?>, promise: Promise) {
+    promise.resolve(body(convertArgs(args)))
   }
 }

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

@@ -12,7 +12,10 @@ class AsyncFunctionWithPromiseComponent(
 ) : AsyncFunction(name, desiredArgsTypes) {
   @Throws(CodedException::class)
   override fun call(args: ReadableArray, promise: Promise) {
-    val convertedArgs = convertArgs(args)
-    body(convertedArgs, promise)
+    body(convertArgs(args), promise)
+  }
+
+  override fun call(args: Array<Any?>, promise: Promise) {
+    body(convertArgs(args), promise)
   }
 }

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

@@ -12,7 +12,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import java.lang.ref.WeakReference
-import kotlin.jvm.Throws
 
 /**
  * We can't construct a `SuspendFunctionComponent` in the build phase, because it has to have access to module coroutine scope.
@@ -35,9 +34,17 @@ class SuspendFunctionComponent(
 ) : AsyncFunction(name, desiredArgsTypes) {
   @Throws(CodedException::class)
   override fun call(args: ReadableArray, promise: Promise) {
+    callWithConvertedArguments(convertArgs(args), promise)
+  }
+
+  override fun call(args: Array<Any?>, promise: Promise) {
+    callWithConvertedArguments(convertArgs(args), promise)
+  }
+
+  private fun callWithConvertedArguments(convertedArgs: Array<out Any?>, promise: Promise) {
     val holder = moduleHolderRef.get() ?: return
     val scope = holder.module.coroutineScopeDelegate.value
-    val convertedArgs = convertArgs(args)
+
     scope.launch {
       try {
         val result = exceptionDecorator({ cause -> FunctionCallException(name, holder.name, cause) }) {

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

@@ -18,8 +18,16 @@ class SyncFunctionComponent(
     return body(convertArgs(args))
   }
 
+  fun call(args: Array<Any?>): Any? {
+    return body(convertArgs(args))
+  }
+
   override fun attachToJSObject(appContext: AppContext, jsObject: JavaScriptModuleObject) {
-    jsObject.registerSyncFunction(name, argsCount) { args ->
+    jsObject.registerSyncFunction(
+      name,
+      argsCount,
+      getCppRequiredTypes()
+    ) { args ->
       val result = call(args)
       val convertedResult = JSTypeConverter.convertToJSValue(result)
       return@registerSyncFunction Arguments.fromJavaArgs(arrayOf(convertedResult))

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

@@ -8,6 +8,7 @@ private fun nextValue(): Int = (1 shl nextValue).also { nextValue++ }
  * Enum that represents Cpp types. Objects of those types can be obtained via JNI.
  */
 enum class CppType(val value: Int) {
+  NONE(0),
   DOUBLE(nextValue()),
   BOOLEAN(nextValue()),
   STRING(nextValue()),

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

@@ -18,7 +18,7 @@ fun interface JNIFunctionBody {
    * In the future, we may want to swap it for something else.
    */
   @DoNotStrip
-  fun invoke(args: ReadableNativeArray): ReadableNativeArray?
+  fun invoke(args: Array<Any?>): ReadableNativeArray?
 }
 
 /**
@@ -35,5 +35,5 @@ fun interface JNIAsyncFunctionBody {
    * This is dictated by the fact that [com.facebook.react.bridge.Promise] isn't a hybrid object of jni::HybridClass.
    */
   @DoNotStrip
-  fun invoke(args: ReadableNativeArray, bridgePromise: Any)
+  fun invoke(args: Array<Any?>, bridgePromise: Any)
 }

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

@@ -29,13 +29,15 @@ class JavaScriptModuleObject {
    * Register a promise-less function on the CPP module representation.
    * After calling this function, user can access the exported function in the JS code.
    */
-  external fun registerSyncFunction(name: String, args: Int, body: JNIFunctionBody)
+  external fun registerSyncFunction(name: String, args: Int, desiredTypes: IntArray, body: JNIFunctionBody)
 
   /**
    * Register a promise function on the CPP module representation.
    * After calling this function, user can access the exported function in the JS code.
    */
-  external fun registerAsyncFunction(name: String, args: Int, body: JNIAsyncFunctionBody)
+  external fun registerAsyncFunction(name: String, args: Int, desiredTypes: IntArray, body: JNIAsyncFunctionBody)
+
+  external fun registerProperty(name: String, desiredType: Int, getter: JNIFunctionBody?, setter: JNIFunctionBody?)
 
   @Throws(Throwable::class)
   protected fun finalize() {

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

@@ -45,5 +45,5 @@ abstract class Module : AppContextProvider {
 
 @Suppress("FunctionName")
 inline fun Module.ModuleDefinition(block: ModuleDefinitionBuilder.() -> Unit): ModuleDefinitionData {
-  return ModuleDefinitionBuilder(this).also(block).build()
+  return ModuleDefinitionBuilder(this).also(block).buildModule()
 }