expo-modules-core 1.11.13 → 1.12.1

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

@@ -0,0 +1,14 @@
+package expo.modules.kotlin
+
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.ThemedReactContext
+import expo.modules.adapters.react.NativeModulesProxy
+
+internal fun ReactContext.getUnimoduleProxy(): NativeModulesProxy? {
+  @Suppress("DEPRECATION")
+  return if (!isBridgeless) {
+    catalystInstance?.getNativeModule("NativeUnimoduleProxy") as? NativeModulesProxy
+  } else {
+    (this as ThemedReactContext).reactApplicationContext.nativeModules?.find { it is NativeModulesProxy } as? NativeModulesProxy
+  }
+}

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

@@ -2,9 +2,10 @@ package expo.modules.kotlin
 
 import android.os.Looper
 import expo.modules.kotlin.exception.Exceptions
+import java.lang.ref.WeakReference
 
 object Utils {
-  @Suppress("UseExpressionBody")
+  @Suppress("NOTHING_TO_INLINE")
   inline fun assertMainThread() {
     if (Thread.currentThread() !== Looper.getMainLooper().thread) {
       throw Exceptions.IncorrectThreadException(
@@ -19,3 +20,5 @@ object Utils {
 inline fun AppContext?.toStrongReference(): AppContext {
   return this ?: throw Exceptions.AppContextLost()
 }
+
+fun <T : Any> T?.weak() = WeakReference<T>(this)

package/android/src/main/java/expo/modules/kotlin/activityaware/AppCompatActivityAwareHelper.kt

@@ -12,7 +12,7 @@ import java.util.concurrent.CopyOnWriteArrayList
 class AppCompatActivityAwareHelper : AppCompatActivityAware {
   val listeners = CopyOnWriteArrayList<OnActivityAvailableListener>()
 
-  var activityReference = WeakReference<AppCompatActivity>(null)
+  private var activityReference = WeakReference<AppCompatActivity>(null)
 
   fun dispatchOnActivityAvailable(activity: AppCompatActivity) {
     this.activityReference = WeakReference(activity)

package/android/src/main/java/expo/modules/kotlin/activityresult/AppContextActivityResultCaller.kt

@@ -34,7 +34,7 @@ internal class DefaultAppContextActivityResultCaller(
    * For the time being [fallbackCallback] is not working.
    * There are some problems with saving and restoring the state of [activityResultsManager]
    * connected with [Activity]'s lifecycle and [AppContext] lifespan. So far, we've failed with identifying
-   * what parts of the application outlives the Activity destruction (especially [AppContext] and other [Bridge]-related parts).
+   * what parts of the application outlives the Activity destruction (especially [AppContext] and other bridge-related parts).
    */
   override suspend fun <I : Serializable, O> registerForActivityResult(
     contract: AppContextActivityResultContract<I, O>,

package/android/src/main/java/expo/modules/kotlin/activityresult/AppContextActivityResultRegistry.kt

@@ -30,6 +30,11 @@ import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
 
+private const val TAG = "ActivityResultRegistry"
+
+// Use upper 16 bits for request codes
+private const val INITIAL_REQUEST_CODE_VALUE = 0x00010000
+
 /**
  * A registry that stores activity result callbacks ([ActivityResultCallback]) for
  * [AppContextActivityResultCaller.registerForActivityResult] registered calls.
@@ -60,10 +65,6 @@ import kotlin.collections.HashMap
 class AppContextActivityResultRegistry(
   private val currentActivityProvider: CurrentActivityProvider
 ) {
-  private val LOG_TAG = "ActivityResultRegistry"
-
-  // Use upper 16 bits for request codes
-  private val INITIAL_REQUEST_CODE_VALUE = 0x00010000
   private var random: Random = Random()
 
   private val requestCodeToKey: MutableMap<Int, String> = HashMap()
@@ -215,7 +216,6 @@ class AppContextActivityResultRegistry(
         val requestCode = keyToRequestCode[key]
           ?: throw IllegalStateException("Attempting to launch an unregistered ActivityResultLauncher with contract $contract and input $input. You must ensure the ActivityResultLauncher is registered before calling launch()")
 
-        @Suppress("UNCHECKED_CAST")
         keyToCallbacksAndContract[key] = CallbacksAndContract(fallbackCallback, callback, contract)
         keyToInputParam[key] = input
         launchedKeys.add(key)
@@ -274,7 +274,7 @@ class AppContextActivityResultRegistry(
     }
     keyToCallbacksAndContract.remove(key)
     if (pendingResults.containsKey(key)) {
-      Log.w(LOG_TAG, "Dropping pending result for request $key : ${pendingResults.getParcelable<ActivityResult>(key)}")
+      Log.w(TAG, "Dropping pending result for request $key : ${pendingResults.getParcelable<ActivityResult>(key)}")
       pendingResults.remove(key)
     }
     keyToLifecycleContainers[key]?.let {

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

@@ -2,13 +2,18 @@
 
 package expo.modules.kotlin.classcomponent
 
+import expo.modules.kotlin.component6
+import expo.modules.kotlin.component7
+import expo.modules.kotlin.component8
 import expo.modules.kotlin.functions.SyncFunctionComponent
 import expo.modules.kotlin.objects.ObjectDefinitionBuilder
 import expo.modules.kotlin.objects.PropertyComponentBuilderWithThis
-import expo.modules.kotlin.types.toAnyType
+import expo.modules.kotlin.sharedobjects.SharedRef
+import expo.modules.kotlin.types.enforceType
+import expo.modules.kotlin.types.toArgsArray
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
-import kotlin.reflect.typeOf
+import kotlin.reflect.full.isSubclassOf
 
 class ClassComponentBuilder<SharedObjectType : Any>(
   val name: String,
@@ -24,14 +29,14 @@ class ClassComponentBuilder<SharedObjectType : Any>(
       it.canTakeOwner = true
     }
 
-    val hasSharedObject = ownerClass !== Unit::class
-    if (hasSharedObject && constructor == null) {
+    val hasSharedObject = ownerClass !== Unit::class // TODO: Add an empty constructor that throws when called from JS
+    if (hasSharedObject && constructor == null && !ownerClass.isSubclassOf(SharedRef::class)) {
       throw IllegalArgumentException("constructor cannot be null")
     }
 
-    val constructor = constructor ?: SyncFunctionComponent("constructor", arrayOf()) {}
+    val constructor = constructor ?: SyncFunctionComponent("constructor", emptyArray()) {}
     constructor.canTakeOwner = true
-
+    constructor.ownerType = ownerType
     return ClassDefinitionData(
       name,
       constructor,
@@ -42,7 +47,7 @@ class ClassComponentBuilder<SharedObjectType : Any>(
   inline fun Constructor(
     crossinline body: () -> SharedObjectType
   ): SyncFunctionComponent {
-    return SyncFunctionComponent("constructor", arrayOf()) { body() }.also {
+    return SyncFunctionComponent("constructor", emptyArray()) { body() }.also {
       constructor = it
     }
   }
@@ -50,7 +55,10 @@ class ClassComponentBuilder<SharedObjectType : Any>(
   inline fun <reified P0> Constructor(
     crossinline body: (p0: P0) -> SharedObjectType
   ): SyncFunctionComponent {
-    return SyncFunctionComponent("constructor", arrayOf({ typeOf<P0>() }.toAnyType<P0>())) { body(it[0] as P0) }.also {
+    return SyncFunctionComponent("constructor", toArgsArray<P0>()) { (p0) ->
+      enforceType<P0>(p0)
+      body(p0)
+    }.also {
       constructor = it
     }
   }
@@ -58,7 +66,10 @@ class ClassComponentBuilder<SharedObjectType : Any>(
   inline fun <reified P0, reified P1> Constructor(
     crossinline body: (p0: P0, p1: P1) -> SharedObjectType
   ): SyncFunctionComponent {
-    return SyncFunctionComponent("constructor", arrayOf({ typeOf<P0>() }.toAnyType<P0>(), { typeOf<P1>() }.toAnyType<P1>())) { body(it[0] as P0, it[1] as P1) }.also {
+    return SyncFunctionComponent("constructor", toArgsArray<P0, P1>()) { (p0, p1) ->
+      enforceType<P0, P1>(p0, p1)
+      body(p0, p1)
+    }.also {
       constructor = it
     }
   }
@@ -66,7 +77,10 @@ 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", arrayOf({ typeOf<P0>() }.toAnyType<P0>(), { typeOf<P1>() }.toAnyType<P1>(), { typeOf<P2>() }.toAnyType<P2>())) { body(it[0] as P0, it[1] as P1, it[2] as P2) }.also {
+    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2>()) { (p0, p1, p2) ->
+      enforceType<P0, P1, P2>(p0, p1, p2)
+      body(p0, p1, p2)
+    }.also {
       constructor = it
     }
   }
@@ -74,7 +88,10 @@ 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", arrayOf({ typeOf<P0>() }.toAnyType<P0>(), { typeOf<P1>() }.toAnyType<P1>(), { typeOf<P2>() }.toAnyType<P2>(), { typeOf<P3>() }.toAnyType<P3>())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3) }.also {
+    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3>()) { (p0, p1, p2, p3) ->
+      enforceType<P0, P1, P2, P3>(p0, p1, p2, p3)
+      body(p0, p1, p2, p3)
+    }.also {
       constructor = it
     }
   }
@@ -82,7 +99,10 @@ 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", arrayOf({ typeOf<P0>() }.toAnyType<P0>(), { typeOf<P1>() }.toAnyType<P1>(), { typeOf<P2>() }.toAnyType<P2>(), { typeOf<P3>() }.toAnyType<P3>(), { typeOf<P4>() }.toAnyType<P4>())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4) }.also {
+    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3, P4>()) { (p0, p1, p2, p3, p4) ->
+      enforceType<P0, P1, P2, P3, P4>(p0, p1, p2, p3, p4)
+      body(p0, p1, p2, p3, p4)
+    }.also {
       constructor = it
     }
   }
@@ -90,7 +110,10 @@ 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", arrayOf({ typeOf<P0>() }.toAnyType<P0>(), { typeOf<P1>() }.toAnyType<P1>(), { typeOf<P2>() }.toAnyType<P2>(), { typeOf<P3>() }.toAnyType<P3>(), { typeOf<P4>() }.toAnyType<P4>(), { typeOf<P5>() }.toAnyType<P5>())) { 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 {
+    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3, P4, P5>()) { (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 {
       constructor = it
     }
   }
@@ -98,7 +121,10 @@ 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", arrayOf({ typeOf<P0>() }.toAnyType<P0>(), { typeOf<P1>() }.toAnyType<P1>(), { typeOf<P2>() }.toAnyType<P2>(), { typeOf<P3>() }.toAnyType<P3>(), { typeOf<P4>() }.toAnyType<P4>(), { typeOf<P5>() }.toAnyType<P5>(), { typeOf<P6>() }.toAnyType<P6>())) { 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 {
+    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3, P4, P5, P6>()) { (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 {
       constructor = it
     }
   }
@@ -106,7 +132,10 @@ 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", arrayOf({ typeOf<P0>() }.toAnyType<P0>(), { typeOf<P1>() }.toAnyType<P1>(), { typeOf<P2>() }.toAnyType<P2>(), { typeOf<P3>() }.toAnyType<P3>(), { typeOf<P4>() }.toAnyType<P4>(), { typeOf<P5>() }.toAnyType<P5>(), { typeOf<P6>() }.toAnyType<P6>(), { typeOf<P7>() }.toAnyType<P7>())) { 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 {
+    return SyncFunctionComponent("constructor", toArgsArray<P0, P1, P2, P3, P4, P5, P6, P7>()) { (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 {
       constructor = it
     }
   }

package/android/src/main/java/expo/modules/kotlin/defaultmodules/CoreModule.kt

@@ -1,8 +1,10 @@
 package expo.modules.kotlin.defaultmodules
 
-import expo.modules.kotlin.uuidv5.*
+import expo.modules.kotlin.events.normalizeEventName
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
+import expo.modules.kotlin.uuidv5.InvalidNamespaceException
+import expo.modules.kotlin.uuidv5.uuidv5
 import java.util.UUID
 
 class CoreModule : Module() {
@@ -20,5 +22,33 @@ class CoreModule : Module() {
       }
       return@Function uuidv5(namespaceUUID, name).toString()
     }
+
+    Function("getViewConfig") { viewName: String ->
+      val holder = appContext.registry.getModuleHolder(viewName)
+        ?: return@Function null
+
+      val viewManagerDefinition = holder.definition.viewManagerDefinition
+        ?: return@Function null
+
+      val validAttributes = viewManagerDefinition
+        .props
+        .keys
+        .associateWith { true }
+
+      val directEventTypes = viewManagerDefinition
+        .callbacksDefinition
+        ?.names
+        ?.associate {
+          val normalizedEventName = normalizeEventName(it)
+          normalizedEventName to mapOf(
+            "registrationName" to it
+          )
+        }
+
+      return@Function mapOf(
+        "validAttributes" to validAttributes,
+        "directEventTypes" to directEventTypes
+      )
+    }
   }
 }

package/android/src/main/java/expo/modules/kotlin/defaultmodules/ErrorManagerModule.kt

@@ -15,8 +15,7 @@ class ErrorManagerModule : Module() {
   }
 
   fun reportExceptionToLogBox(codedException: CodedException) {
-    val eventEmitter = appContext.eventEmitter(this) ?: return
-    eventEmitter.emit(
+    sendEvent(
       onNewException,
       Bundle().apply {
         putString("message", codedException.message ?: codedException.toString())
@@ -25,8 +24,7 @@ class ErrorManagerModule : Module() {
   }
 
   fun reportWarningToLogBox(warning: String) {
-    val eventEmitter = appContext.eventEmitter(this) ?: return
-    eventEmitter.emit(
+    sendEvent(
       onNewWarning,
       Bundle().apply {
         putString("message", warning)

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

@@ -3,12 +3,14 @@ package expo.modules.kotlin.events
 import android.os.Bundle
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableNativeMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
 import com.facebook.react.uimanager.UIManagerHelper
 import expo.modules.kotlin.ModuleHolder
 import expo.modules.kotlin.records.Record
 import expo.modules.kotlin.types.JSTypeConverter
+import expo.modules.kotlin.types.toJSValue
 import java.lang.ref.WeakReference
 
 /**
@@ -23,22 +25,27 @@ class KModuleEventEmitterWrapper(
 ) : KEventEmitterWrapper(legacyEventEmitter, reactContextHolder) {
   override fun emit(eventName: String, eventBody: Bundle?) {
     checkIfEventWasExported(eventName)
-    super.emit(eventName, eventBody)
+    emitNative(eventName, eventBody?.toJSValue(JSTypeConverter.DefaultContainerProvider) as? ReadableNativeMap)
   }
 
   override fun emit(eventName: String, eventBody: WritableMap?) {
     checkIfEventWasExported(eventName)
-    super.emit(eventName, eventBody)
+    emitNative(eventName, eventBody as? ReadableNativeMap)
   }
 
   override fun emit(eventName: String, eventBody: Record?) {
     checkIfEventWasExported(eventName)
-    super.emit(eventName, eventBody)
+    emitNative(eventName, eventBody?.toJSValue(JSTypeConverter.DefaultContainerProvider) as? ReadableNativeMap)
   }
 
   override fun emit(eventName: String, eventBody: Map<*, *>?) {
     checkIfEventWasExported(eventName)
-    super.emit(eventName, eventBody)
+    emitNative(eventName, eventBody?.toJSValue(JSTypeConverter.DefaultContainerProvider) as? ReadableNativeMap)
+  }
+
+  private fun emitNative(eventName: String, eventBody: ReadableNativeMap?) {
+    val appContext = moduleHolder.module.appContext
+    moduleHolder.jsObject.emitEvent(appContext.jsiInterop, eventName, eventBody)
   }
 
   private fun checkIfEventWasExported(eventName: String) {

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

@@ -45,11 +45,10 @@ open class CodedException(
     internal fun inferCode(clazz: Class<*>): String {
       val name = requireNotNull(clazz.simpleName) { "Cannot infer code name from class name. We don't support anonymous classes." }
 
-      @Suppress("Deprecation")
       return "ERR_" + name
         .replace("(Exception)$".toRegex(), "")
         .replace("(.)([A-Z])".toRegex(), "$1_$2")
-        .toUpperCase(Locale.ROOT)
+        .uppercase(Locale.ROOT)
     }
   }
 }
@@ -246,5 +245,5 @@ internal class UnsupportedClass(
 ) : CodedException(message = "Unsupported type: '$clazz'")
 
 internal class PromiseAlreadySettledException(functionName: String) : CodedException(
-  message = "Promised pass to '$functionName' was already settled. It will lead to a crash in the production environment!"
+  message = "Promise passed to '$functionName' was already settled. It will lead to a crash in the production environment!"
 )