expo-modules-core 0.7.0 → 0.8.0

package/android/src/main/java/expo/modules/kotlin/records/ValidationBinder.kt

@@ -0,0 +1,110 @@
+package expo.modules.kotlin.records
+
+import kotlin.reflect.KClass
+import kotlin.reflect.KType
+import kotlin.reflect.full.createType
+import kotlin.reflect.full.isSubclassOf
+
+interface ValidationBinder {
+  fun bind(annotation: Annotation, fieldType: KType): FieldValidator<*>
+}
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.ANNOTATION_CLASS)
+annotation class BindUsing(val binder: KClass<*>)
+
+internal class IntRangeBinder : ValidationBinder {
+  override fun bind(annotation: Annotation, fieldType: KType): FieldValidator<*> {
+    val rangeAnnotation = annotation as IntRange
+    return NumericRangeValidator(
+      rangeAnnotation.from,
+      rangeAnnotation.to,
+      rangeAnnotation.fromInclusive,
+      rangeAnnotation.toInclusive
+    )
+  }
+}
+
+internal class LongRangeBinder : ValidationBinder {
+  override fun bind(annotation: Annotation, fieldType: KType): FieldValidator<*> {
+    val rangeAnnotation = annotation as LongRange
+    return NumericRangeValidator(
+      rangeAnnotation.from,
+      rangeAnnotation.to,
+      rangeAnnotation.fromInclusive,
+      rangeAnnotation.toInclusive
+    )
+  }
+}
+
+internal class FloatRangeBinder : ValidationBinder {
+  override fun bind(annotation: Annotation, fieldType: KType): FieldValidator<*> {
+    val rangeAnnotation = annotation as FloatRange
+    return NumericRangeValidator(
+      rangeAnnotation.from,
+      rangeAnnotation.to,
+      rangeAnnotation.fromInclusive,
+      rangeAnnotation.toInclusive
+    )
+  }
+}
+
+internal class DoubleRangeBinder : ValidationBinder {
+  override fun bind(annotation: Annotation, fieldType: KType): FieldValidator<*> {
+    val rangeAnnotation = annotation as DoubleRange
+    return NumericRangeValidator(
+      rangeAnnotation.from,
+      rangeAnnotation.to,
+      rangeAnnotation.fromInclusive,
+      rangeAnnotation.toInclusive
+    )
+  }
+}
+
+internal class IsCollectionNotEmptyBinder : ValidationBinder {
+  override fun bind(annotation: Annotation, fieldType: KType): FieldValidator<*> {
+    assert(annotation is IsNotEmpty)
+
+    when (fieldType) {
+      IntArray::class.createType() -> return IsNotEmptyIntArrayValidator()
+      DoubleArray::class.createType() -> return IsNotEmptyDoubleArrayValidator()
+      FloatArray::class.createType() -> return IsNotEmptyFloatArrayValidator()
+    }
+
+    val kClass = fieldType.classifier as KClass<*>
+    if (kClass.isSubclassOf(Array::class) || kClass.java.isArray) {
+      return IsNotEmptyArrayValidator()
+    }
+
+    return IsNotEmptyCollectionValidator()
+  }
+}
+
+internal class SizeBinder : ValidationBinder {
+  override fun bind(annotation: Annotation, fieldType: KType): FieldValidator<*> {
+    val sizeAnnotation = annotation as Size
+
+    when (fieldType) {
+      IntArray::class.createType() -> return IntArraySizeValidator(sizeAnnotation.min, sizeAnnotation.max)
+      DoubleArray::class.createType() -> return DoubleArraySizeValidator(sizeAnnotation.min, sizeAnnotation.max)
+      FloatArray::class.createType() -> return FloatArraySizeValidator(sizeAnnotation.min, sizeAnnotation.max)
+    }
+
+    val kClass = fieldType.classifier as KClass<*>
+
+    if (kClass.isSubclassOf(String::class)) {
+      return StringSizeValidator(sizeAnnotation.min, sizeAnnotation.max)
+    } else if (kClass.isSubclassOf(Array::class) || kClass.java.isArray) {
+      return ArraySizeValidator(sizeAnnotation.min, sizeAnnotation.max)
+    }
+
+    return CollectionSizeValidator(sizeAnnotation.min, sizeAnnotation.max)
+  }
+}
+
+internal class RegexBinder : ValidationBinder {
+  override fun bind(annotation: Annotation, fieldType: KType): FieldValidator<*> {
+    val regexAnnotation = annotation as RegularExpression
+    return RegexValidator(regexAnnotation.regex.toRegex())
+  }
+}

package/android/src/main/java/expo/modules/kotlin/records/Validators.kt

@@ -0,0 +1,61 @@
+package expo.modules.kotlin.records
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.PROPERTY, AnnotationTarget.TYPE, AnnotationTarget.VALUE_PARAMETER)
+@BindUsing(IntRangeBinder::class)
+annotation class IntRange(
+  val from: Int,
+  val to: Int,
+  val fromInclusive: Boolean = true,
+  val toInclusive: Boolean = true,
+)
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.PROPERTY)
+@BindUsing(LongRangeBinder::class)
+annotation class LongRange(
+  val from: Long,
+  val to: Long,
+  val fromInclusive: Boolean = true,
+  val toInclusive: Boolean = true
+)
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.PROPERTY)
+@BindUsing(FloatRangeBinder::class)
+annotation class FloatRange(
+  val from: Float,
+  val to: Float,
+  val fromInclusive: Boolean = true,
+  val toInclusive: Boolean = true
+)
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.PROPERTY)
+@BindUsing(DoubleRangeBinder::class)
+annotation class DoubleRange(
+  val from: Double,
+  val to: Double,
+  val fromInclusive: Boolean = true,
+  val toInclusive: Boolean = true
+)
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.PROPERTY)
+@BindUsing(IsCollectionNotEmptyBinder::class)
+annotation class IsNotEmpty
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.PROPERTY)
+@BindUsing(SizeBinder::class)
+annotation class Size(
+  val min: Int = 0,
+  val max: Int = Int.MAX_VALUE
+)
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.PROPERTY)
+@BindUsing(RegexBinder::class)
+annotation class RegularExpression(
+  val regex: String
+)

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

@@ -0,0 +1,35 @@
+package expo.modules.kotlin.types
+
+import android.os.Bundle
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableArray
+import com.facebook.react.bridge.WritableMap
+import expo.modules.kotlin.records.Record
+
+object JSTypeConverter {
+  interface ContainerProvider {
+    fun createMap(): WritableMap
+    fun createArray(): WritableArray
+  }
+
+  internal object DefaultContainerProvider : ContainerProvider {
+    override fun createMap(): WritableMap = Arguments.createMap()
+    override fun createArray(): WritableArray = Arguments.createArray()
+  }
+
+  fun convertToJSValue(value: Any?, containerProvider: ContainerProvider = DefaultContainerProvider): Any? {
+    return when (value) {
+      null, is Unit -> null
+      is Bundle -> value.toJSValue(containerProvider)
+      is Iterable<*> -> value.toJSValue(containerProvider)
+      is Array<*> -> value.toJSValue(containerProvider)
+      is IntArray -> value.toJSValue(containerProvider)
+      is FloatArray -> value.toJSValue(containerProvider)
+      is DoubleArray -> value.toJSValue(containerProvider)
+      is Map<*, *> -> value.toJSValue(containerProvider)
+      is Enum<*> -> value.toJSValue()
+      is Record -> value.toJSValue(containerProvider)
+      else -> value
+    }
+  }
+}

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

@@ -0,0 +1,148 @@
+package expo.modules.kotlin.types
+
+import android.os.Bundle
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableArray
+import com.facebook.react.bridge.WritableMap
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+import kotlin.reflect.KProperty1
+import kotlin.reflect.full.declaredMemberProperties
+import kotlin.reflect.full.findAnnotation
+import kotlin.reflect.full.memberProperties
+import kotlin.reflect.full.primaryConstructor
+import kotlin.reflect.jvm.isAccessible
+
+fun Record.toJSValue(containerProvider: JSTypeConverter.ContainerProvider): WritableMap {
+  val result = containerProvider.createMap()
+
+  javaClass
+    .kotlin
+    .memberProperties.map { property ->
+      val fieldInformation = property.findAnnotation<Field>() ?: return@map
+      val jsKey = fieldInformation.key.takeUnless { it == "" } ?: property.name
+
+      property.isAccessible = true
+
+      val value = property.get(this)
+      val convertedValue = JSTypeConverter.convertToJSValue(value, containerProvider)
+      result.putGeneric(jsKey, convertedValue)
+    }
+
+  return result
+}
+
+fun Bundle.toJSValue(containerProvider: JSTypeConverter.ContainerProvider): WritableMap {
+  val result = containerProvider.createMap()
+
+  for (key in keySet()) {
+    val value = get(key)
+    val convertedValue = JSTypeConverter.convertToJSValue(value, containerProvider)
+    result.putGeneric(key, convertedValue)
+  }
+
+  return result
+}
+
+fun <K, V> Map<K, V>.toJSValue(containerProvider: JSTypeConverter.ContainerProvider): WritableMap {
+  val result = containerProvider.createMap()
+
+  for ((key, value) in entries) {
+    val convertedValue = JSTypeConverter.convertToJSValue(value, containerProvider)
+    result.putGeneric(key.toString(), convertedValue)
+  }
+
+  return result
+}
+
+fun <T> Iterable<T>.toJSValue(containerProvider: JSTypeConverter.ContainerProvider): WritableArray {
+  val result = containerProvider.createArray()
+
+  for (value in this) {
+    val convertedValue = JSTypeConverter.convertToJSValue(value, containerProvider)
+    result.putGeneric(convertedValue)
+  }
+
+  return result
+}
+
+fun <T> Array<T>.toJSValue(containerProvider: JSTypeConverter.ContainerProvider): WritableArray {
+  val result = containerProvider.createArray()
+
+  for (value in this) {
+    val convertedValue = JSTypeConverter.convertToJSValue(value, containerProvider)
+    result.putGeneric(convertedValue)
+  }
+
+  return result
+}
+
+fun IntArray.toJSValue(containerProvider: JSTypeConverter.ContainerProvider): WritableArray {
+  return containerProvider.createArray().also {
+    for (value in this) {
+      it.pushInt(value)
+    }
+  }
+}
+
+fun FloatArray.toJSValue(containerProvider: JSTypeConverter.ContainerProvider): WritableArray {
+  return containerProvider.createArray().also {
+    for (value in this) {
+      it.pushDouble(value.toDouble())
+    }
+  }
+}
+
+fun DoubleArray.toJSValue(containerProvider: JSTypeConverter.ContainerProvider): WritableArray {
+  return containerProvider.createArray().also {
+    for (value in this) {
+      it.pushDouble(value)
+    }
+  }
+}
+
+fun Enum<*>.toJSValue(): Any? {
+  val primaryConstructor = requireNotNull(this::class.primaryConstructor) {
+    "Cannot convert enum without the primary constructor to js value"
+  }
+
+  if (primaryConstructor.parameters.isEmpty()) {
+    return this.name
+  } else if (primaryConstructor.parameters.size == 1) {
+    val parameterName = primaryConstructor.parameters.first().name!!
+    @Suppress("UNCHECKED_CAST")
+    val parameterProperty = this::class.declaredMemberProperties
+      .find { it.name == parameterName } as KProperty1<Enum<*>, *>
+
+    return parameterProperty.get(this)
+  }
+
+  throw IllegalStateException("Enum '$javaClass' cannot be used as return type (incompatible with JS)")
+}
+
+internal fun WritableMap.putGeneric(key: String, value: Any?) {
+  when (value) {
+    null, is Unit -> putNull(key)
+    is ReadableArray -> putArray(key, value)
+    is ReadableMap -> putMap(key, value)
+    is String -> putString(key, value)
+    is Int -> putInt(key, value)
+    is Number -> putDouble(key, value.toDouble())
+    is Boolean -> putBoolean(key, value)
+    else -> throw IllegalArgumentException("Could not put '${value.javaClass}' to WritableMap")
+  }
+}
+
+internal fun WritableArray.putGeneric(value: Any?) {
+  when (value) {
+    null, is Unit -> pushNull()
+    is ReadableArray -> pushArray(value)
+    is ReadableMap -> pushMap(value)
+    is String -> pushString(value)
+    is Int -> pushInt(value)
+    is Number -> pushDouble(value.toDouble())
+    is Boolean -> pushBoolean(value)
+    else -> throw IllegalArgumentException("Could not put '${value.javaClass}' to WritableArray")
+  }
+}

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

@@ -35,6 +35,7 @@ fun convert(value: Dynamic, type: KType): Any? {
 
 object TypeConverterProviderImpl : TypeConverterProvider {
   private val cachedConverters = createCashedConverters(false) + createCashedConverters(true)
+  private val cachedRecordConverters = mutableMapOf<KClass<*>, TypeConverter<*>>()
 
   override fun obtainTypeConverter(type: KType): TypeConverter<*> {
     cachedConverters[type]?.let {
@@ -68,8 +69,15 @@ object TypeConverterProviderImpl : TypeConverterProvider {
       return EnumTypeConverter(kClass as KClass<Enum<*>>, type.isMarkedNullable)
     }
 
+    val cachedConverter = cachedRecordConverters[kClass]
+    if (cachedConverter != null) {
+      return cachedConverter
+    }
+
     if (kClass.isSubclassOf(Record::class)) {
-      return RecordTypeConverter<Record>(this, type)
+      val converter = RecordTypeConverter<Record>(this, type)
+      cachedRecordConverters[kClass] = converter
+      return converter
     }
 
     throw MissingTypeConverter(type)

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

@@ -7,6 +7,7 @@ import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
+import expo.modules.core.utilities.ifNull
 
 class GroupViewManagerWrapper(
   override val viewWrapperDelegate: ViewManagerWrapperDelegate
@@ -41,4 +42,52 @@ class GroupViewManagerWrapper(
 
     return super.getExportedCustomDirectEventTypeConstants()
   }
+
+  override fun addView(parent: ViewGroup, child: View, index: Int) {
+    viewWrapperDelegate
+      .viewGroupDefinition
+      ?.addViewAction
+      ?.invoke(parent, child, index)
+      .ifNull {
+        super.addView(parent, child, index)
+      }
+  }
+
+  override fun getChildCount(parent: ViewGroup): Int {
+    return viewWrapperDelegate.viewGroupDefinition
+      ?.getChildCountAction
+      ?.invoke(parent)
+      .ifNull {
+        super.getChildCount(parent)
+      }
+  }
+
+  override fun getChildAt(parent: ViewGroup, index: Int): View? {
+    viewWrapperDelegate.viewGroupDefinition
+      ?.getChildAtAction
+      ?.let {
+        return it.invoke(parent, index)
+      }
+      .ifNull {
+        return super.getChildAt(parent, index)
+      }
+  }
+
+  override fun removeViewAt(parent: ViewGroup, index: Int) {
+    viewWrapperDelegate.viewGroupDefinition
+      ?.removeViewAtAction
+      ?.invoke(parent, index)
+      .ifNull {
+        super.removeViewAt(parent, index)
+      }
+  }
+
+  override fun removeView(parent: ViewGroup, view: View) {
+    viewWrapperDelegate.viewGroupDefinition
+      ?.removeViewAction
+      ?.invoke(parent, view)
+      .ifNull {
+        super.removeView(parent, view)
+      }
+  }
 }

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

@@ -0,0 +1,18 @@
+package expo.modules.kotlin.views
+
+import android.view.View
+import android.view.ViewGroup
+
+class ViewGroupDefinition(
+  val addViewAction: AddViewAction?,
+  val getChildAtAction: GetChildAtAction?,
+  val getChildCountAction: GetChildCountAction?,
+  val removeViewAction: RemoveViewAction?,
+  val removeViewAtAction: RemoveViewAtAction?
+)
+
+internal typealias AddViewAction = (parent: ViewGroup, child: View, index: Int) -> Unit
+internal typealias GetChildAtAction = (parent: ViewGroup, index: Int) -> View?
+internal typealias GetChildCountAction = (parent: ViewGroup) -> Int
+internal typealias RemoveViewAction = (parent: ViewGroup, childToRemove: View) -> Unit
+internal typealias RemoveViewAtAction = (parent: ViewGroup, index: Int) -> Unit

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

@@ -0,0 +1,64 @@
+@file:OptIn(ExperimentalStdlibApi::class)
+
+package expo.modules.kotlin.views
+
+import android.view.View
+import android.view.ViewGroup
+import expo.modules.kotlin.modules.DefinitionMarker
+
+@DefinitionMarker
+class ViewGroupDefinitionBuilder {
+  @PublishedApi internal var addViewAction: AddViewAction? = null
+  @PublishedApi internal var getChildAtAction: GetChildAtAction? = null
+  @PublishedApi internal var getChildCountAction: GetChildCountAction? = null
+  @PublishedApi internal var removeViewAction: RemoveViewAction? = null
+  @PublishedApi internal var removeViewAtAction: RemoveViewAtAction? = null
+
+  fun build() = ViewGroupDefinition(
+    addViewAction,
+    getChildAtAction,
+    getChildCountAction,
+    removeViewAction,
+    removeViewAtAction
+  )
+
+  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> addChildView(
+    noinline body: (parent: ParentViewType, child: ChildViewType, index: Int) -> Unit
+  ) {
+    addViewAction = { parent, child, index ->
+      body(parent as ParentViewType, child as ChildViewType, index)
+    }
+  }
+
+  inline fun <reified ParentViewType : ViewGroup> getChildCount(
+    noinline body: (view: ParentViewType) -> Int
+  ) {
+    getChildCountAction = { view ->
+      body(view as ParentViewType)
+    }
+  }
+
+  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> getChildViewAt(
+    noinline body: (view: ParentViewType, index: Int) -> ChildViewType?
+  ) {
+    getChildAtAction = { view, index ->
+      body(view as ParentViewType, index)
+    }
+  }
+
+  inline fun <reified ParentViewType : ViewGroup> removeChildViewAt(
+    noinline body: (view: ParentViewType, index: Int) -> Unit
+  ) {
+    removeViewAtAction = { view, index ->
+      body(view as ParentViewType, index)
+    }
+  }
+
+  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> removeChildView(
+    noinline body: (parent: ParentViewType, child: ChildViewType) -> Unit
+  ) {
+    removeViewAction = { view, child ->
+      body(view as ParentViewType, child as ChildViewType)
+    }
+  }
+}

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

@@ -17,11 +17,14 @@ class ViewManagerDefinition(
   private val viewType: Class<out View>,
   private val props: Map<String, AnyViewProp>,
   val onViewDestroys: ((View) -> Unit)? = null,
-  val callbacksDefinition: CallbacksDefinition? = null
+  val callbacksDefinition: CallbacksDefinition? = null,
+  val viewGroupDefinition: ViewGroupDefinition? = null
 ) {
 
   fun createView(context: Context): View = viewFactory(context)
 
+  val propsNames: List<String> = props.keys.toList()
+
   fun getViewManagerType(): ViewManager.ViewManagerType {
     return if (ViewGroup::class.java.isAssignableFrom(viewType)) {
       ViewManager.ViewManagerType.GROUP

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

@@ -18,7 +18,8 @@ class ViewManagerDefinitionBuilder {
   internal var props = mutableMapOf<String, AnyViewProp>()
   @PublishedApi
   internal var onViewDestroys: ((View) -> Unit)? = null
-
+  @PublishedApi
+  internal var viewGroupDefinition: ViewGroupDefinition? = null
   private var callbacksDefinition: CallbacksDefinition? = null
 
   fun build(): ViewManagerDefinition =
@@ -27,7 +28,8 @@ class ViewManagerDefinitionBuilder {
       requireNotNull(viewType),
       props,
       onViewDestroys,
-      callbacksDefinition
+      callbacksDefinition,
+      viewGroupDefinition
     )
 
   /**
@@ -65,4 +67,15 @@ class ViewManagerDefinitionBuilder {
   fun events(vararg callbacks: String) {
     callbacksDefinition = CallbacksDefinition(callbacks)
   }
+
+  /**
+   * Creates the group view definition that scopes group view-related definitions.
+   */
+  inline fun groupView(body: ViewGroupDefinitionBuilder.() -> Unit) {
+    require(viewGroupDefinition == null) { "The viewManager definition may have exported only one groupView definition." }
+
+    val groupViewDefinitionBuilder = ViewGroupDefinitionBuilder()
+    body.invoke(groupViewDefinitionBuilder)
+    viewGroupDefinition = groupViewDefinitionBuilder.build()
+  }
 }

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

@@ -15,6 +15,9 @@ class ViewManagerWrapperDelegate(internal var moduleHolder: ModuleHolder) {
   private val definition: ViewManagerDefinition
     get() = requireNotNull(moduleHolder.definition.viewManagerDefinition)
 
+  internal val viewGroupDefinition: ViewGroupDefinition?
+    get() = definition.viewGroupDefinition
+
   val name: String
     get() = moduleHolder.name
 

package/build/NativeModulesProxy.native.d.ts

@@ -2,9 +2,5 @@ import { ProxyNativeModule } from './NativeModulesProxy.types';
 declare const NativeModulesProxy: {
     [moduleName: string]: ProxyNativeModule;
 };
-/**
- * Sets whether to use a TurboModule version of the proxy.
- */
-export declare function useExpoTurboModules(state?: boolean): void;
 export default NativeModulesProxy;
 //# sourceMappingURL=NativeModulesProxy.native.d.ts.map

package/build/NativeModulesProxy.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeModulesProxy.native.d.ts","sourceRoot":"","sources":["../src/NativeModulesProxy.native.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA0B,MAAM,4BAA4B,CAAC;AAWvF,QAAA,MAAM,kBAAkB,EAAE;IAAE,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB,CAAA;CAAO,CAAC;AAK3E;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,GAAE,OAAc,QAExD;AAuDD,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"NativeModulesProxy.native.d.ts","sourceRoot":"","sources":["../src/NativeModulesProxy.native.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAM/D,QAAA,MAAM,kBAAkB,EAAE;IAAE,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB,CAAA;CAAO,CAAC;AAkD3E,eAAe,kBAAkB,CAAC"}

package/build/NativeModulesProxy.native.js

@@ -3,14 +3,6 @@ const NativeProxy = NativeModules.NativeUnimoduleProxy;
 const modulesConstantsKey = 'modulesConstants';
 const exportedMethodsKey = 'exportedMethods';
 const NativeModulesProxy = {};
-// Keep it opt-in for now. It's too risky without proper and thorough testing.
-let canUseExpoTurboModules = false;
-/**
- * Sets whether to use a TurboModule version of the proxy.
- */
-export function useExpoTurboModules(state = true) {
-    canUseExpoTurboModules = state;
-}
 if (NativeProxy) {
     Object.keys(NativeProxy[exportedMethodsKey]).forEach((moduleName) => {
         NativeModulesProxy[moduleName] = NativeProxy[modulesConstantsKey][moduleName] || {};
@@ -20,12 +12,7 @@ if (NativeProxy) {
                 if (argumentsCount !== args.length) {
                     return Promise.reject(new Error(`Native method ${moduleName}.${methodInfo.name} expects ${argumentsCount} ${argumentsCount === 1 ? 'argument' : 'arguments'} but received ${args.length}`));
                 }
-                if (canUseExpoTurboModules && global.ExpoModulesProxy) {
-                    return global.ExpoModulesProxy.callMethodAsync(moduleName, methodInfo.name, args);
-                }
-                else {
-                    return NativeProxy.callMethod(moduleName, key, args);
-                }
+                return NativeProxy.callMethod(moduleName, key, args);
             };
         });
         // These are called by EventEmitter (which is a wrapper for NativeEventEmitter)

package/build/NativeModulesProxy.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"NativeModulesProxy.native.js","sourceRoot":"","sources":["../src/NativeModulesProxy.native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAS7C,MAAM,WAAW,GAAG,aAAa,CAAC,oBAAoB,CAAC;AACvD,MAAM,mBAAmB,GAAG,kBAAkB,CAAC;AAC/C,MAAM,kBAAkB,GAAG,iBAAiB,CAAC;AAE7C,MAAM,kBAAkB,GAAgD,EAAE,CAAC;AAE3E,8EAA8E;AAC9E,IAAI,sBAAsB,GAAG,KAAK,CAAC;AAEnC;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAAiB,IAAI;IACvD,sBAAsB,GAAG,KAAK,CAAC;AACjC,CAAC;AAED,IAAI,WAAW,EAAE;IACf,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAClE,kBAAkB,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC,mBAAmB,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACpF,WAAW,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACjE,kBAAkB,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAe,EAAgB,EAAE;gBACrF,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,UAAU,CAAC;gBAC3C,IAAI,cAAc,KAAK,IAAI,CAAC,MAAM,EAAE;oBAClC,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,KAAK,CACP,iBAAiB,UAAU,IAAI,UAAU,CAAC,IAAI,YAAY,cAAc,IACtE,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WACtC,iBAAiB,IAAI,CAAC,MAAM,EAAE,CAC/B,CACF,CAAC;iBACH;gBAED,IAAI,sBAAsB,IAAI,MAAM,CAAC,gBAAgB,EAAE;oBACrD,OAAO,MAAM,CAAC,gBAAgB,CAAC,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBACnF;qBAAM;oBACL,OAAO,WAAW,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;iBACtD;YACH,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,+EAA+E;QAC/E,kFAAkF;QAClF,EAAE;QACF,wEAAwE;QACxE,gDAAgD;QAChD,EAAE;QACF,6GAA6G;QAC7G,gGAAgG;QAChG,4HAA4H;QAC5H,qCAAqC;QACrC,IAAI,aAAa,CAAC,yBAAyB,EAAE;YAC3C,kBAAkB,CAAC,UAAU,CAAC,CAAC,WAAW,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,CACvD,aAAa,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;YAClF,kBAAkB,CAAC,UAAU,CAAC,CAAC,eAAe,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,CAC3D,aAAa,CAAC,yBAAyB,CAAC,sBAAsB,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;SACvF;aAAM;YACL,oBAAoB;YACpB,kHAAkH;YAClH,sHAAsH;YACtH,kBAAkB,CAAC,UAAU,CAAC,CAAC,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;YACtD,kBAAkB,CAAC,UAAU,CAAC,CAAC,eAAe,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;SAC3D;IACH,CAAC,CAAC,CAAC;CACJ;KAAM;IACL,OAAO,CAAC,IAAI,CACV,gJAAgJ,CACjJ,CAAC;CACH;AAED,eAAe,kBAAkB,CAAC","sourcesContent":["import { NativeModules } from 'react-native';\n\nimport { ProxyNativeModule, TurboNativeModuleProxy } from './NativeModulesProxy.types';\n\n// `ExpoModulesProxy` is not declared in TypeScript yet. It's installed via JSI.\ndeclare namespace global {\n  const ExpoModulesProxy: TurboNativeModuleProxy;\n}\n\nconst NativeProxy = NativeModules.NativeUnimoduleProxy;\nconst modulesConstantsKey = 'modulesConstants';\nconst exportedMethodsKey = 'exportedMethods';\n\nconst NativeModulesProxy: { [moduleName: string]: ProxyNativeModule } = {};\n\n// Keep it opt-in for now. It's too risky without proper and thorough testing.\nlet canUseExpoTurboModules = false;\n\n/**\n * Sets whether to use a TurboModule version of the proxy.\n */\nexport function useExpoTurboModules(state: boolean = true) {\n  canUseExpoTurboModules = state;\n}\n\nif (NativeProxy) {\n  Object.keys(NativeProxy[exportedMethodsKey]).forEach((moduleName) => {\n    NativeModulesProxy[moduleName] = NativeProxy[modulesConstantsKey][moduleName] || {};\n    NativeProxy[exportedMethodsKey][moduleName].forEach((methodInfo) => {\n      NativeModulesProxy[moduleName][methodInfo.name] = (...args: unknown[]): Promise<any> => {\n        const { key, argumentsCount } = methodInfo;\n        if (argumentsCount !== args.length) {\n          return Promise.reject(\n            new Error(\n              `Native method ${moduleName}.${methodInfo.name} expects ${argumentsCount} ${\n                argumentsCount === 1 ? 'argument' : 'arguments'\n              } but received ${args.length}`\n            )\n          );\n        }\n\n        if (canUseExpoTurboModules && global.ExpoModulesProxy) {\n          return global.ExpoModulesProxy.callMethodAsync(moduleName, methodInfo.name, args);\n        } else {\n          return NativeProxy.callMethod(moduleName, key, args);\n        }\n      };\n    });\n\n    // These are called by EventEmitter (which is a wrapper for NativeEventEmitter)\n    // only on iOS and they use iOS-specific native module, EXReactNativeEventEmitter.\n    //\n    // On Android only {start,stop}Observing are called on the native module\n    // and these should be exported as Expo methods.\n    //\n    // Before the RN 65, addListener/removeListeners weren't called on Android. However, it no longer stays true.\n    // See https://github.com/facebook/react-native/commit/f5502fbda9fe271ff6e1d0da773a3a8ee206a453.\n    // That's why, we check if the `EXReactNativeEventEmitter` exists and only if yes, we use it in the listener implementation.\n    // Otherwise, those methods are NOOP.\n    if (NativeModules.EXReactNativeEventEmitter) {\n      NativeModulesProxy[moduleName].addListener = (...args) =>\n        NativeModules.EXReactNativeEventEmitter.addProxiedListener(moduleName, ...args);\n      NativeModulesProxy[moduleName].removeListeners = (...args) =>\n        NativeModules.EXReactNativeEventEmitter.removeProxiedListeners(moduleName, ...args);\n    } else {\n      // Fixes on Android:\n      // WARN  `new NativeEventEmitter()` was called with a non-null argument without the required `addListener` method.\n      // WARN  `new NativeEventEmitter()` was called with a non-null argument without the required `removeListeners` method.\n      NativeModulesProxy[moduleName].addListener = () => {};\n      NativeModulesProxy[moduleName].removeListeners = () => {};\n    }\n  });\n} else {\n  console.warn(\n    `The \"EXNativeModulesProxy\" native module is not exported through NativeModules; verify that expo-modules-core's native code is linked properly`\n  );\n}\n\nexport default NativeModulesProxy;\n"]}
+{"version":3,"file":"NativeModulesProxy.native.js","sourceRoot":"","sources":["../src/NativeModulesProxy.native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,MAAM,WAAW,GAAG,aAAa,CAAC,oBAAoB,CAAC;AACvD,MAAM,mBAAmB,GAAG,kBAAkB,CAAC;AAC/C,MAAM,kBAAkB,GAAG,iBAAiB,CAAC;AAE7C,MAAM,kBAAkB,GAAgD,EAAE,CAAC;AAE3E,IAAI,WAAW,EAAE;IACf,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAClE,kBAAkB,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC,mBAAmB,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACpF,WAAW,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACjE,kBAAkB,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAe,EAAgB,EAAE;gBACrF,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,UAAU,CAAC;gBAC3C,IAAI,cAAc,KAAK,IAAI,CAAC,MAAM,EAAE;oBAClC,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,KAAK,CACP,iBAAiB,UAAU,IAAI,UAAU,CAAC,IAAI,YAAY,cAAc,IACtE,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WACtC,iBAAiB,IAAI,CAAC,MAAM,EAAE,CAC/B,CACF,CAAC;iBACH;gBACD,OAAO,WAAW,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YACvD,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,+EAA+E;QAC/E,kFAAkF;QAClF,EAAE;QACF,wEAAwE;QACxE,gDAAgD;QAChD,EAAE;QACF,6GAA6G;QAC7G,gGAAgG;QAChG,4HAA4H;QAC5H,qCAAqC;QACrC,IAAI,aAAa,CAAC,yBAAyB,EAAE;YAC3C,kBAAkB,CAAC,UAAU,CAAC,CAAC,WAAW,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,CACvD,aAAa,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;YAClF,kBAAkB,CAAC,UAAU,CAAC,CAAC,eAAe,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,CAC3D,aAAa,CAAC,yBAAyB,CAAC,sBAAsB,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;SACvF;aAAM;YACL,oBAAoB;YACpB,kHAAkH;YAClH,sHAAsH;YACtH,kBAAkB,CAAC,UAAU,CAAC,CAAC,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;YACtD,kBAAkB,CAAC,UAAU,CAAC,CAAC,eAAe,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;SAC3D;IACH,CAAC,CAAC,CAAC;CACJ;KAAM;IACL,OAAO,CAAC,IAAI,CACV,gJAAgJ,CACjJ,CAAC;CACH;AAED,eAAe,kBAAkB,CAAC","sourcesContent":["import { NativeModules } from 'react-native';\n\nimport { ProxyNativeModule } from './NativeModulesProxy.types';\n\nconst NativeProxy = NativeModules.NativeUnimoduleProxy;\nconst modulesConstantsKey = 'modulesConstants';\nconst exportedMethodsKey = 'exportedMethods';\n\nconst NativeModulesProxy: { [moduleName: string]: ProxyNativeModule } = {};\n\nif (NativeProxy) {\n  Object.keys(NativeProxy[exportedMethodsKey]).forEach((moduleName) => {\n    NativeModulesProxy[moduleName] = NativeProxy[modulesConstantsKey][moduleName] || {};\n    NativeProxy[exportedMethodsKey][moduleName].forEach((methodInfo) => {\n      NativeModulesProxy[moduleName][methodInfo.name] = (...args: unknown[]): Promise<any> => {\n        const { key, argumentsCount } = methodInfo;\n        if (argumentsCount !== args.length) {\n          return Promise.reject(\n            new Error(\n              `Native method ${moduleName}.${methodInfo.name} expects ${argumentsCount} ${\n                argumentsCount === 1 ? 'argument' : 'arguments'\n              } but received ${args.length}`\n            )\n          );\n        }\n        return NativeProxy.callMethod(moduleName, key, args);\n      };\n    });\n\n    // These are called by EventEmitter (which is a wrapper for NativeEventEmitter)\n    // only on iOS and they use iOS-specific native module, EXReactNativeEventEmitter.\n    //\n    // On Android only {start,stop}Observing are called on the native module\n    // and these should be exported as Expo methods.\n    //\n    // Before the RN 65, addListener/removeListeners weren't called on Android. However, it no longer stays true.\n    // See https://github.com/facebook/react-native/commit/f5502fbda9fe271ff6e1d0da773a3a8ee206a453.\n    // That's why, we check if the `EXReactNativeEventEmitter` exists and only if yes, we use it in the listener implementation.\n    // Otherwise, those methods are NOOP.\n    if (NativeModules.EXReactNativeEventEmitter) {\n      NativeModulesProxy[moduleName].addListener = (...args) =>\n        NativeModules.EXReactNativeEventEmitter.addProxiedListener(moduleName, ...args);\n      NativeModulesProxy[moduleName].removeListeners = (...args) =>\n        NativeModules.EXReactNativeEventEmitter.removeProxiedListeners(moduleName, ...args);\n    } else {\n      // Fixes on Android:\n      // WARN  `new NativeEventEmitter()` was called with a non-null argument without the required `addListener` method.\n      // WARN  `new NativeEventEmitter()` was called with a non-null argument without the required `removeListeners` method.\n      NativeModulesProxy[moduleName].addListener = () => {};\n      NativeModulesProxy[moduleName].removeListeners = () => {};\n    }\n  });\n} else {\n  console.warn(\n    `The \"EXNativeModulesProxy\" native module is not exported through NativeModules; verify that expo-modules-core's native code is linked properly`\n  );\n}\n\nexport default NativeModulesProxy;\n"]}

package/build/NativeModulesProxy.types.d.ts

@@ -3,7 +3,4 @@ export declare type ProxyNativeModule = {
     addListener: (eventName: string) => void;
     removeListeners: (count: number) => void;
 };
-export declare type TurboNativeModuleProxy = {
-    callMethodAsync: <ReturnType>(moduleName: string, methodName: string, args: any[]) => Promise<ReturnType>;
-};
 //# sourceMappingURL=NativeModulesProxy.types.d.ts.map

package/build/NativeModulesProxy.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeModulesProxy.types.d.ts","sourceRoot":"","sources":["../src/NativeModulesProxy.types.ts"],"names":[],"mappings":"AAAA,oBAAY,iBAAiB,GAAG;IAC9B,CAAC,YAAY,EAAE,MAAM,GAAG,GAAG,CAAC;IAC5B,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC1C,CAAC;AAEF,oBAAY,sBAAsB,GAAG;IACnC,eAAe,EAAE,CAAC,UAAU,EAC1B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,GAAG,EAAE,KACR,OAAO,CAAC,UAAU,CAAC,CAAC;CAC1B,CAAC"}
+{"version":3,"file":"NativeModulesProxy.types.d.ts","sourceRoot":"","sources":["../src/NativeModulesProxy.types.ts"],"names":[],"mappings":"AAAA,oBAAY,iBAAiB,GAAG;IAC9B,CAAC,YAAY,EAAE,MAAM,GAAG,GAAG,CAAC;IAC5B,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC1C,CAAC"}