expo-modules-core 1.6.0 → 1.7.0

package/android/src/main/java/expo/modules/kotlin/sharedobjects/SharedObjectTypeConverter.kt

@@ -1,5 +1,6 @@
 package expo.modules.kotlin.sharedobjects
 
+import com.facebook.react.bridge.Dynamic
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.exception.InvalidSharedObjectException
 import expo.modules.kotlin.jni.CppType
@@ -13,15 +14,22 @@ class SharedObjectTypeConverter<T : SharedObject>(
 ) : NullAwareTypeConverter<T>(type.isMarkedNullable) {
   @Suppress("UNCHECKED_CAST")
   override fun convertNonOptional(value: Any, context: AppContext?): T {
-    val id = SharedObjectId(value as Int)
+    val id = SharedObjectId(
+      if (value is Dynamic) {
+        value.asInt()
+      } else {
+        value as Int
+      }
+    )
+
     val appContext = context.toStrongReference()
-    val result = appContext.sharedObjectRegistry.toNativeObject(id)
+    val result = id.toNativeObject(appContext)
       ?: throw InvalidSharedObjectException(type)
 
     return result as T
   }
 
-  override fun getCppRequiredTypes() = ExpectedType(CppType.SHARED_OBJECT_ID)
+  override fun getCppRequiredTypes() = ExpectedType(CppType.SHARED_OBJECT_ID, CppType.INT)
 
   override fun isTrivial(): Boolean = false
 }

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

@@ -88,7 +88,6 @@ class EnumTypeConverter(
     parameterName: String
   ): Enum<*> {
     // To obtain the value of parameter, we have to find a property that is connected with this parameter.
-    @Suppress("UNCHECKED_CAST")
     val parameterProperty = enumClass
       .declaredMemberProperties
       .find { it.name == parameterName }

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

@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalStdlibApi::class)
-
 package expo.modules.kotlin.types
 
 import com.facebook.react.bridge.Dynamic

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

@@ -0,0 +1,24 @@
+package expo.modules.kotlin.types
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.ReadableMap
+import expo.modules.core.arguments.MapArguments
+import expo.modules.core.arguments.ReadableArguments
+import expo.modules.kotlin.jni.CppType
+import expo.modules.kotlin.jni.ExpectedType
+
+class ReadableArgumentsTypeConverter(
+  isOptional: Boolean,
+) : DynamicAwareTypeConverters<ReadableArguments>(isOptional) {
+  override fun convertFromDynamic(value: Dynamic): ReadableArguments {
+    return MapArguments(value.asMap().toHashMap())
+  }
+
+  override fun convertFromAny(value: Any): ReadableArguments {
+    return MapArguments((value as ReadableMap).toHashMap())
+  }
+
+  override fun getCppRequiredTypes(): ExpectedType = ExpectedType(CppType.READABLE_MAP)
+
+  override fun isTrivial(): Boolean = false
+}

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

@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalStdlibApi::class)
-
 package expo.modules.kotlin.types
 
 import android.graphics.Color
@@ -9,6 +7,7 @@ import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import expo.modules.annotation.Config
+import expo.modules.core.arguments.ReadableArguments
 import expo.modules.kotlin.apifeatures.EitherType
 import expo.modules.kotlin.exception.MissingTypeConverter
 import expo.modules.kotlin.jni.CppType
@@ -288,6 +287,8 @@ object TypeConverterProviderImpl : TypeConverterProvider {
       File::class to FileTypeConverter(isOptional),
 
       Any::class to AnyTypeConverter(isOptional),
+
+      ReadableArguments::class to ReadableArgumentsTypeConverter(isOptional),
     )
 
     if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {

package/android/src/main/java/expo/modules/kotlin/viewevent/ViewEventDelegate.kt

@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalStdlibApi::class)
-
 package expo.modules.kotlin.viewevent
 
 import android.view.View

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

@@ -2,13 +2,14 @@ package expo.modules.kotlin.views
 
 import android.view.View
 import com.facebook.react.bridge.Dynamic
+import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.types.AnyType
 
 abstract class AnyViewProp(
   val name: String,
   internal val type: AnyType
 ) {
-  abstract fun set(prop: Dynamic, onView: View)
+  abstract fun set(prop: Dynamic, onView: View, appContext: AppContext? = null)
 
   abstract val isNullable: Boolean
 }

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

@@ -2,6 +2,7 @@ package expo.modules.kotlin.views
 
 import android.view.View
 import com.facebook.react.bridge.Dynamic
+import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.exception.PropSetException
 import expo.modules.kotlin.exception.exceptionDecorator
 import expo.modules.kotlin.types.AnyType
@@ -13,11 +14,11 @@ class ConcreteViewProp<ViewType : View, PropType>(
 ) : AnyViewProp(name, propType) {
 
   @Suppress("UNCHECKED_CAST")
-  override fun set(prop: Dynamic, onView: View) {
+  override fun set(prop: Dynamic, onView: View, appContext: AppContext?) {
     exceptionDecorator({
       PropSetException(name, onView::class, it)
     }) {
-      setter(onView as ViewType, type.convert(prop) as PropType)
+      setter(onView as ViewType, type.convert(prop, appContext) as PropType)
     }
   }
 

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

@@ -1,4 +1,3 @@
-@file:OptIn(ExperimentalStdlibApi::class)
 @file:Suppress("FunctionName")
 
 package expo.modules.kotlin.views
@@ -52,6 +51,7 @@ class ViewDefinitionBuilder<T : View>(
     asyncFunctions.forEach { (_, function) ->
       function.runOnQueue(Queues.MAIN)
       function.ownerType = viewType
+      function.canTakeOwner = true
     }
 
     return ViewManagerDefinition(
@@ -186,7 +186,6 @@ class ViewDefinitionBuilder<T : View>(
     } else {
       AsyncFunctionComponent(name, arrayOf({ typeOf<P0>() }.toAnyType<P0>())) { body(it[0] as P0) }
     }.also {
-      it.ownerType = viewType
       asyncFunctions[name] = it
     }
   }

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

@@ -5,7 +5,6 @@ import android.view.View
 import android.view.ViewGroup
 import com.facebook.react.bridge.ReactContext
 import expo.modules.adapters.react.NativeModulesProxy
-import expo.modules.core.ViewManager
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.functions.BaseAsyncFunctionComponent
@@ -25,11 +24,11 @@ class ViewManagerDefinition(
 
   val propsNames: List<String> = props.keys.toList()
 
-  fun getViewManagerType(): ViewManager.ViewManagerType {
+  fun getViewManagerType(): ViewManagerType {
     return if (ViewGroup::class.java.isAssignableFrom(viewType)) {
-      ViewManager.ViewManagerType.GROUP
+      ViewManagerType.GROUP
     } else {
-      ViewManager.ViewManagerType.SIMPLE
+      ViewManagerType.SIMPLE
     }
   }
 

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

@@ -0,0 +1,5 @@
+package expo.modules.kotlin.views
+
+enum class ViewManagerType {
+  SIMPLE, GROUP
+}

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

@@ -73,7 +73,7 @@ class ViewManagerWrapperDelegate(internal var moduleHolder: ModuleHolder) {
       val key = iterator.nextKey()
       expoProps[key]?.let { expoProp ->
         try {
-          expoProp.set(propsMap.getDynamic(key), view)
+          expoProp.set(propsMap.getDynamic(key), view, moduleHolder.module._appContext)
         } catch (exception: Throwable) {
           // The view wasn't constructed correctly, so errors are expected.
           // We can ignore them.

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

@@ -2,7 +2,6 @@ package expo.modules.kotlin.views
 
 import android.view.View
 import expo.modules.kotlin.AppContext
-import expo.modules.kotlin.Utils
 import expo.modules.kotlin.exception.Exceptions
 import expo.modules.kotlin.exception.NullArgumentException
 import expo.modules.kotlin.jni.CppType
@@ -17,7 +16,9 @@ class ViewTypeConverter<T : View>(
 ) : TypeConverter<T>() {
 
   override fun convert(value: Any?, context: AppContext?): T? {
-    Utils.assertMainThread()
+    val appContext = context.toStrongReference()
+    appContext.assertMainThread()
+
     if (value == null) {
       if (type.isMarkedNullable) {
         return null
@@ -25,7 +26,6 @@ class ViewTypeConverter<T : View>(
       throw NullArgumentException()
     }
 
-    val appContext = context.toStrongReference()
     val viewTag = value as Int
     val view = appContext.findView<T>(viewTag)
     if (!type.isMarkedNullable && view == null) {

package/android/src/reactnative/expo/modules/kotlin/ReactNativeCompatibleHelper.kt

@@ -0,0 +1,12 @@
+package expo.modules.kotlin
+
+import com.facebook.react.bridge.CatalystInstance
+import com.facebook.react.turbomodule.core.NativeMethodCallInvokerHolderImpl
+
+typealias NativeMethodCallInvokerHolderImplCompatible = NativeMethodCallInvokerHolderImpl
+
+object ReactNativeCompatibleHelper {
+  fun getNativeMethodCallInvokerHolderImplCompatible(catalystInstance: CatalystInstance): NativeMethodCallInvokerHolderImplCompatible {
+    return catalystInstance.nativeMethodCallInvokerHolder as NativeMethodCallInvokerHolderImplCompatible
+  }
+}

package/android/src/reactnative72/expo/modules/kotlin/ReactNativeCompatibleHelper.kt

@@ -0,0 +1,12 @@
+package expo.modules.kotlin
+
+import com.facebook.react.bridge.CatalystInstance
+import com.facebook.react.turbomodule.core.CallInvokerHolderImpl
+
+typealias NativeMethodCallInvokerHolderImplCompatible = CallInvokerHolderImpl
+
+object ReactNativeCompatibleHelper {
+  fun getNativeMethodCallInvokerHolderImplCompatible(catalystInstance: CatalystInstance): NativeMethodCallInvokerHolderImplCompatible {
+    return catalystInstance.nativeCallInvokerHolder as NativeMethodCallInvokerHolderImplCompatible
+  }
+}

package/android-annotation/build.gradle

@@ -35,9 +35,12 @@ buildscript {
   }
 }
 
-java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
+def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+if (agpVersion.tokenize('.')[0].toInteger() < 8) {
+  java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+  }
 }
 
 dependencies {

package/android-annotation-processor/build.gradle

@@ -35,9 +35,12 @@ buildscript {
   }
 }
 
-java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
+def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+if (agpVersion.tokenize('.')[0].toInteger() < 8) {
+  java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+  }
 }
 
 dependencies {

package/build/errors/UnavailabilityError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UnavailabilityError.d.ts","sourceRoot":"","sources":["../../src/errors/UnavailabilityError.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,UAAU;gBACrC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;CAMrD"}
+{"version":3,"file":"UnavailabilityError.d.ts","sourceRoot":"","sources":["../../src/errors/UnavailabilityError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,UAAU;gBACrC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;CAMrD"}

package/build/errors/UnavailabilityError.js

@@ -1,5 +1,5 @@
-import Platform from '../Platform';
 import { CodedError } from './CodedError';
+import Platform from '../Platform';
 /**
  * A class for errors to be thrown when a property is accessed which is
  * unavailable, unsupported, or not currently implemented on the running

package/build/errors/UnavailabilityError.js.map

@@ -1 +1 @@
-{"version":3,"file":"UnavailabilityError.js","sourceRoot":"","sources":["../../src/errors/UnavailabilityError.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C;;;;GAIG;AACH,MAAM,OAAO,mBAAoB,SAAQ,UAAU;IACjD,YAAY,UAAkB,EAAE,YAAoB;QAClD,KAAK,CACH,iBAAiB,EACjB,0BAA0B,UAAU,IAAI,YAAY,wBAAwB,QAAQ,CAAC,EAAE,oEAAoE,CAC5J,CAAC;IACJ,CAAC;CACF","sourcesContent":["import Platform from '../Platform';\nimport { CodedError } from './CodedError';\n\n/**\n * A class for errors to be thrown when a property is accessed which is\n * unavailable, unsupported, or not currently implemented on the running\n * platform.\n */\nexport class UnavailabilityError extends CodedError {\n  constructor(moduleName: string, propertyName: string) {\n    super(\n      'ERR_UNAVAILABLE',\n      `The method or property ${moduleName}.${propertyName} is not available on ${Platform.OS}, are you sure you've linked all the native dependencies properly?`\n    );\n  }\n}\n"]}
+{"version":3,"file":"UnavailabilityError.js","sourceRoot":"","sources":["../../src/errors/UnavailabilityError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,QAAQ,MAAM,aAAa,CAAC;AAEnC;;;;GAIG;AACH,MAAM,OAAO,mBAAoB,SAAQ,UAAU;IACjD,YAAY,UAAkB,EAAE,YAAoB;QAClD,KAAK,CACH,iBAAiB,EACjB,0BAA0B,UAAU,IAAI,YAAY,wBAAwB,QAAQ,CAAC,EAAE,oEAAoE,CAC5J,CAAC;IACJ,CAAC;CACF","sourcesContent":["import { CodedError } from './CodedError';\nimport Platform from '../Platform';\n\n/**\n * A class for errors to be thrown when a property is accessed which is\n * unavailable, unsupported, or not currently implemented on the running\n * platform.\n */\nexport class UnavailabilityError extends CodedError {\n  constructor(moduleName: string, propertyName: string) {\n    super(\n      'ERR_UNAVAILABLE',\n      `The method or property ${moduleName}.${propertyName} is not available on ${Platform.OS}, are you sure you've linked all the native dependencies properly?`\n    );\n  }\n}\n"]}

package/build/sweet/setUpErrorManager.fx.js

@@ -1,13 +1,17 @@
+import NativeErrorManager from './NativeErrorManager';
 import { EventEmitter } from '../EventEmitter';
 import Platform from '../Platform';
 import { CodedError } from '../errors/CodedError';
-import NativeErrorManager from './NativeErrorManager';
 if (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {
     const onNewException = 'ExpoModulesCoreErrorManager.onNewException';
+    const onNewWarning = 'ExpoModulesCoreErrorManager.onNewWarning';
     const eventEmitter = new EventEmitter(NativeErrorManager);
     eventEmitter.addListener(onNewException, ({ message }) => {
         console.error(message);
     });
+    eventEmitter.addListener(onNewWarning, ({ message }) => {
+        console.warn(message);
+    });
 }
 // We have to export `CodedError` via global object to use in later in the C++ code.
 globalThis.ExpoModulesCore_CodedError = CodedError;

package/build/sweet/setUpErrorManager.fx.js.map

@@ -1 +1 @@
-{"version":3,"file":"setUpErrorManager.fx.js","sourceRoot":"","sources":["../../src/sweet/setUpErrorManager.fx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AAEtD,IAAI,OAAO,IAAI,QAAQ,CAAC,EAAE,KAAK,SAAS,IAAI,kBAAkB,EAAE;IAC9D,MAAM,cAAc,GAAG,4CAA4C,CAAC;IACpE,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,kBAAkB,CAAC,CAAC;IAE1D,YAAY,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAuB,EAAE,EAAE;QAC5E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;CACJ;AAED,oFAAoF;AACpF,UAAU,CAAC,0BAA0B,GAAG,UAAU,CAAC","sourcesContent":["import { EventEmitter } from '../EventEmitter';\nimport Platform from '../Platform';\nimport { CodedError } from '../errors/CodedError';\nimport NativeErrorManager from './NativeErrorManager';\n\nif (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {\n  const onNewException = 'ExpoModulesCoreErrorManager.onNewException';\n  const eventEmitter = new EventEmitter(NativeErrorManager);\n\n  eventEmitter.addListener(onNewException, ({ message }: { message: string }) => {\n    console.error(message);\n  });\n}\n\n// We have to export `CodedError` via global object to use in later in the C++ code.\nglobalThis.ExpoModulesCore_CodedError = CodedError;\n"]}
+{"version":3,"file":"setUpErrorManager.fx.js","sourceRoot":"","sources":["../../src/sweet/setUpErrorManager.fx.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,IAAI,OAAO,IAAI,QAAQ,CAAC,EAAE,KAAK,SAAS,IAAI,kBAAkB,EAAE;IAC9D,MAAM,cAAc,GAAG,4CAA4C,CAAC;IACpE,MAAM,YAAY,GAAG,0CAA0C,CAAC;IAChE,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,kBAAkB,CAAC,CAAC;IAE1D,YAAY,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAuB,EAAE,EAAE;QAC5E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,YAAY,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAuB,EAAE,EAAE;QAC1E,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;CACJ;AAED,oFAAoF;AACpF,UAAU,CAAC,0BAA0B,GAAG,UAAU,CAAC","sourcesContent":["import NativeErrorManager from './NativeErrorManager';\nimport { EventEmitter } from '../EventEmitter';\nimport Platform from '../Platform';\nimport { CodedError } from '../errors/CodedError';\n\nif (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {\n  const onNewException = 'ExpoModulesCoreErrorManager.onNewException';\n  const onNewWarning = 'ExpoModulesCoreErrorManager.onNewWarning';\n  const eventEmitter = new EventEmitter(NativeErrorManager);\n\n  eventEmitter.addListener(onNewException, ({ message }: { message: string }) => {\n    console.error(message);\n  });\n\n  eventEmitter.addListener(onNewWarning, ({ message }: { message: string }) => {\n    console.warn(message);\n  });\n}\n\n// We have to export `CodedError` via global object to use in later in the C++ code.\nglobalThis.ExpoModulesCore_CodedError = CodedError;\n"]}

package/build/uuid/v4.js

@@ -8,13 +8,8 @@ export function uuidv4(options, buf, offset) {
         options = undefined;
     }
     options = options || undefined;
-    let rnds = [];
-    if (options && 'random' in options) {
-        rnds = options.random;
-    }
-    else if (options && 'rng' in options) {
-        rnds = (options.rng || rng)();
-    }
+    // @ts-expect-error
+    const rnds = options?.random || (options?.rng || rng)();
     // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
     rnds[6] = (rnds[6] & 0x0f) | 0x40;
     rnds[8] = (rnds[8] & 0x3f) | 0x80;

package/build/uuid/v4.js.map

@@ -1 +1 @@
-{"version":3,"file":"v4.js","sourceRoot":"","sources":["../../src/uuid/v4.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,GAAG,MAAM,WAAW,CAAC;AAO5B,MAAM,UAAU,MAAM,CACpB,OAAqC,EACrC,GAAO,EACP,MAAe;IAEf,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/B,IAAI,MAAM,GAAoB,IAAI,CAAC;IAEnC,IAAI,OAAO,OAAO,IAAI,QAAQ,EAAE;QAC9B,MAAM,GAAG,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrD,OAAO,GAAG,SAAS,CAAC;KACrB;IAED,OAAO,GAAG,OAAO,IAAI,SAAS,CAAC;IAE/B,IAAI,IAAI,GAAa,EAAE,CAAC;IACxB,IAAI,OAAO,IAAI,QAAQ,IAAI,OAAO,EAAE;QAClC,IAAI,GAAG,OAAO,CAAC,MAAkB,CAAC;KACnC;SAAM,IAAI,OAAO,IAAI,KAAK,IAAI,OAAO,EAAE;QACtC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,EAAc,CAAC;KAC3C;IAED,gEAAgE;IAChE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IAClC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IAElC,oCAAoC;IACpC,IAAI,MAAM,EAAE;QACV,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE;YAC9B,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;SAC3B;KACF;IAED,OAAO,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC","sourcesContent":["import bytesToUuid from './lib/bytesToUuid';\nimport rng from './lib/rng';\nimport { OutputBuffer, V4Options } from './types/uuid.types';\n\n/**\n * DO NOT USE this function in security-sensitive contexts.\n */\nexport function uuidv4(options?: V4Options): string;\nexport function uuidv4<T extends OutputBuffer>(\n  options: V4Options | null | undefined,\n  buf?: T,\n  offset?: number\n) {\n  const i = (buf && offset) || 0;\n\n  let buffer: number[] | null = null;\n\n  if (typeof options == 'string') {\n    buffer = options === 'binary' ? new Array(16) : null;\n    options = undefined;\n  }\n\n  options = options || undefined;\n\n  let rnds: number[] = [];\n  if (options && 'random' in options) {\n    rnds = options.random as number[];\n  } else if (options && 'rng' in options) {\n    rnds = (options.rng || rng)() as number[];\n  }\n\n  // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`\n  rnds[6] = (rnds[6] & 0x0f) | 0x40;\n  rnds[8] = (rnds[8] & 0x3f) | 0x80;\n\n  // Copy bytes to buffer, if provided\n  if (buffer) {\n    for (let ii = 0; ii < 16; ++ii) {\n      buffer[i + ii] = rnds[ii];\n    }\n  }\n\n  return buffer || bytesToUuid(rnds);\n}\n"]}
+{"version":3,"file":"v4.js","sourceRoot":"","sources":["../../src/uuid/v4.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,GAAG,MAAM,WAAW,CAAC;AAO5B,MAAM,UAAU,MAAM,CACpB,OAAqC,EACrC,GAAO,EACP,MAAe;IAEf,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/B,IAAI,MAAM,GAAoB,IAAI,CAAC;IAEnC,IAAI,OAAO,OAAO,IAAI,QAAQ,EAAE;QAC9B,MAAM,GAAG,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrD,OAAO,GAAG,SAAS,CAAC;KACrB;IAED,OAAO,GAAG,OAAO,IAAI,SAAS,CAAC;IAE/B,mBAAmB;IACnB,MAAM,IAAI,GAAa,OAAO,EAAE,MAAM,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC;IAElE,gEAAgE;IAChE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IAClC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IAElC,oCAAoC;IACpC,IAAI,MAAM,EAAE;QACV,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE;YAC9B,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;SAC3B;KACF;IAED,OAAO,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC","sourcesContent":["import bytesToUuid from './lib/bytesToUuid';\nimport rng from './lib/rng';\nimport { OutputBuffer, V4Options } from './types/uuid.types';\n\n/**\n * DO NOT USE this function in security-sensitive contexts.\n */\nexport function uuidv4(options?: V4Options): string;\nexport function uuidv4<T extends OutputBuffer>(\n  options: V4Options | null | undefined,\n  buf?: T,\n  offset?: number\n) {\n  const i = (buf && offset) || 0;\n\n  let buffer: number[] | null = null;\n\n  if (typeof options == 'string') {\n    buffer = options === 'binary' ? new Array(16) : null;\n    options = undefined;\n  }\n\n  options = options || undefined;\n\n  // @ts-expect-error\n  const rnds: number[] = options?.random || (options?.rng || rng)();\n\n  // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`\n  rnds[6] = (rnds[6] & 0x0f) | 0x40;\n  rnds[8] = (rnds[8] & 0x3f) | 0x80;\n\n  // Copy bytes to buffer, if provided\n  if (buffer) {\n    for (let ii = 0; ii < 16; ++ii) {\n      buffer[i + ii] = rnds[ii];\n    }\n  }\n\n  return buffer || bytesToUuid(rnds);\n}\n"]}

package/common/cpp/JSIUtils.cpp

@@ -2,7 +2,7 @@
 
 #include "JSIUtils.h"
 
-namespace expo {
+namespace expo::common {
 
 std::vector<jsi::PropNameID> jsiArrayToPropNameIdsVector(jsi::Runtime &runtime, const jsi::Array &array) {
   size_t size = array.size(runtime);
@@ -17,4 +17,25 @@ std::vector<jsi::PropNameID> jsiArrayToPropNameIdsVector(jsi::Runtime &runtime,
   return vector;
 }
 
-} // namespace expo
+void definePropertyOnJSIObject(
+  jsi::Runtime &runtime,
+  jsi::Object *jsthis,
+  const char *name,
+  jsi::Object descriptor
+) {
+  jsi::Object global = runtime.global();
+  jsi::Object objectClass = global.getPropertyAsObject(runtime, "Object");
+  jsi::Function definePropertyFunction = objectClass.getPropertyAsFunction(
+    runtime,
+    "defineProperty"
+  );
+
+  // This call is basically the same as `Object.defineProperty(object, name, descriptor)` in JS
+  definePropertyFunction.callWithThis(runtime, objectClass, {
+    jsi::Value(runtime, *jsthis),
+    jsi::String::createFromUtf8(runtime, name),
+    std::move(descriptor),
+  });
+}
+
+} // namespace expo::common

package/common/cpp/JSIUtils.h

@@ -7,13 +7,23 @@
 
 namespace jsi = facebook::jsi;
 
-namespace expo {
+namespace expo::common {
 
 /**
  Converts `jsi::Array` to a vector with prop name ids (`std::vector<jsi::PropNameID>`).
  */
 std::vector<jsi::PropNameID> jsiArrayToPropNameIdsVector(jsi::Runtime &runtime, const jsi::Array &array);
 
-} // namespace expo
+/**
+ Calls Object.defineProperty(jsThis, name, descriptor)`.
+ */
+void definePropertyOnJSIObject(
+  jsi::Runtime &runtime,
+  jsi::Object *jsthis,
+  const char *name,
+  jsi::Object descriptor
+);
+
+} // namespace expo::common
 
 #endif // __cplusplus

package/common/cpp/LazyObject.cpp

@@ -37,7 +37,7 @@ std::vector<jsi::PropNameID> LazyObject::getPropertyNames(jsi::Runtime &runtime)
   }
   if (backedObject) {
     jsi::Array propertyNames = backedObject->getPropertyNames(runtime);
-    return jsiArrayToPropNameIdsVector(runtime, propertyNames);
+    return common::jsiArrayToPropNameIdsVector(runtime, propertyNames);
   }
   return {};
 }

package/common/cpp/ObjectDeallocator.cpp

@@ -0,0 +1,21 @@
+// Copyright 2022-present 650 Industries. All rights reserved.
+
+#include "ObjectDeallocator.h"
+#include "JSIUtils.h"
+
+namespace expo::common {
+
+void setDeallocator(
+  jsi::Runtime &runtime,
+  const std::shared_ptr<jsi::Object> &jsThis,
+  ObjectDeallocator::Block deallocatorBlock,
+  const std::string &key
+) {
+  std::shared_ptr<ObjectDeallocator> hostObjectPtr = std::make_shared<ObjectDeallocator>(
+    deallocatorBlock
+  );
+  jsi::Object jsDeallocator = jsi::Object::createFromHostObject(runtime, hostObjectPtr);
+  jsThis->setProperty(runtime, key.c_str(), jsi::Value(runtime, jsDeallocator));
+}
+
+} // namespace expo::common

package/common/cpp/ObjectDeallocator.h

@@ -0,0 +1,37 @@
+// Copyright 2022-present 650 Industries. All rights reserved.
+
+#ifdef __cplusplus
+
+#import <jsi/jsi.h>
+
+namespace jsi = facebook::jsi;
+
+namespace expo::common {
+
+class JSI_EXPORT ObjectDeallocator : public jsi::HostObject {
+public:
+  typedef std::function<void()> Block;
+
+  ObjectDeallocator(const Block deallocator) : deallocator(deallocator) {};
+
+  virtual ~ObjectDeallocator() {
+    deallocator();
+  }
+
+  const Block deallocator;
+
+}; // class ObjectDeallocator
+
+/**
+ Sets the deallocator block on a given object, which is called when the object is being deallocated.
+ */
+void setDeallocator(
+  jsi::Runtime &runtime,
+  const std::shared_ptr<jsi::Object> &jsThis,
+  ObjectDeallocator::Block deallocatorBlock,
+  const std::string &key = "__expo_object_deallocator__"
+);
+
+} // namespace expo::common
+
+#endif

package/ios/JSI/EXJSIUtils.h

@@ -7,7 +7,7 @@
 #import <jsi/jsi.h>
 #import <ReactCommon/RCTTurboModule.h>
 #import <ReactCommon/TurboModuleUtils.h>
-#import <ExpoModulesCore/EXObjectDeallocator.h>
+#import <ExpoModulesCore/ObjectDeallocator.h>
 
 namespace jsi = facebook::jsi;
 namespace react = facebook::react;
@@ -53,17 +53,6 @@ std::shared_ptr<jsi::Object> createWeakRef(jsi::Runtime &runtime, std::shared_pt
  */
 std::shared_ptr<jsi::Object> derefWeakRef(jsi::Runtime &runtime, std::shared_ptr<jsi::Object> object);
 
-#pragma mark - Define property
-
-void defineProperty(jsi::Runtime &runtime, const jsi::Object *object, const char *name, jsi::Value value);
-
-#pragma mark - Deallocator
-
-/**
- Sets the deallocator block on a given object, which is called when the object is being deallocated.
- */
-void setDeallocator(jsi::Runtime &runtime, std::shared_ptr<jsi::Object> object, ObjectDeallocatorBlock deallocatorBlock);
-
 #pragma mark - Errors
 
 jsi::Value makeCodedError(jsi::Runtime &runtime, NSString *code, NSString *message);

package/ios/JSI/EXJSIUtils.mm

@@ -5,6 +5,7 @@
 #import <React/RCTUtils.h>
 #import <ExpoModulesCore/EXJSIConversions.h>
 #import <ExpoModulesCore/EXJSIUtils.h>
+#import <ExpoModulesCore/JSIUtils.h>
 
 namespace expo {
 
@@ -110,7 +111,10 @@ std::shared_ptr<jsi::Function> createClass(jsi::Runtime &runtime, const char *na
       return jsi::Value::undefined();
     });
 
-  defineProperty(runtime, &prototype, nativeConstructorKey.c_str(), jsi::Value(runtime, nativeConstructor));
+  jsi::Object descriptor(runtime);
+  descriptor.setProperty(runtime, "value", jsi::Value(runtime, nativeConstructor));
+
+  common::definePropertyOnJSIObject(runtime, &prototype, nativeConstructorKey.c_str(), std::move(descriptor));
 
   return std::make_shared<jsi::Function>(klass.asFunction(runtime));
 }
@@ -161,32 +165,6 @@ std::shared_ptr<jsi::Object> derefWeakRef(jsi::Runtime &runtime, std::shared_ptr
   return std::make_shared<jsi::Object>(ref.asObject(runtime));
 }
 
-#pragma mark - Define property
-
-void defineProperty(jsi::Runtime &runtime, const jsi::Object *object, const char *name, jsi::Value value) {
-  jsi::Object global = runtime.global();
-  jsi::Object objectClass = global.getPropertyAsObject(runtime, "Object");
-  jsi::Function definePropertyFunction = objectClass.getPropertyAsFunction(runtime, "defineProperty");
-
-  jsi::Object descriptor(runtime);
-  descriptor.setProperty(runtime, "value", value);
-
-  definePropertyFunction.callWithThis(runtime, objectClass, {
-    jsi::Value(runtime, *object),
-    jsi::String::createFromUtf8(runtime, name),
-    std::move(descriptor),
-  });
-}
-
-#pragma mark - Deallocator
-
-void setDeallocator(jsi::Runtime &runtime, std::shared_ptr<jsi::Object> object, ObjectDeallocatorBlock deallocatorBlock) {
-  std::shared_ptr<expo::ObjectDeallocator> hostObjectPtr = std::make_shared<ObjectDeallocator>(deallocatorBlock);
-  jsi::Object jsObject = jsi::Object::createFromHostObject(runtime, hostObjectPtr);
-
-  object->setProperty(runtime, "__expo_object_deallocator__", jsi::Value(runtime, jsObject));
-}
-
 #pragma mark - Errors
 
 jsi::Value makeCodedError(jsi::Runtime &runtime, NSString *code, NSString *message) {

package/ios/JSI/EXJavaScriptObject.mm

@@ -6,6 +6,7 @@
 #import <ExpoModulesCore/EXJavaScriptRuntime.h>
 #import <ExpoModulesCore/EXJavaScriptWeakObject.h>
 #import <ExpoModulesCore/EXJSIUtils.h>
+#import <ExpoModulesCore/JSIUtils.h>
 
 @implementation EXJavaScriptObject {
   /**
@@ -73,34 +74,20 @@
 - (void)defineProperty:(nonnull NSString *)name descriptor:(nonnull EXJavaScriptObject *)descriptor
 {
   jsi::Runtime *runtime = [_runtime get];
-  jsi::Object global = runtime->global();
-  jsi::Object objectClass = global.getPropertyAsObject(*runtime, "Object");
-  jsi::Function definePropertyFunction = objectClass.getPropertyAsFunction(*runtime, "defineProperty");
-
-  // This call is basically the same as `Object.defineProperty(object, name, descriptor)` in JS
-  definePropertyFunction.callWithThis(*runtime, objectClass, {
-    jsi::Value(*runtime, *_jsObjectPtr.get()),
-    jsi::String::createFromUtf8(*runtime, [name UTF8String]),
-    std::move(*[descriptor get]),
-  });
+  jsi::Object *jsThis = _jsObjectPtr.get();
+
+  expo::common::definePropertyOnJSIObject(*runtime, jsThis, [name UTF8String], std::move(*[descriptor get]));
 }
 
 - (void)defineProperty:(nonnull NSString *)name value:(nullable id)value options:(EXJavaScriptObjectPropertyDescriptor)options
 {
   jsi::Runtime *runtime = [_runtime get];
-  jsi::Object global = runtime->global();
-  jsi::Object objectClass = global.getPropertyAsObject(*runtime, "Object");
-  jsi::Function definePropertyFunction = objectClass.getPropertyAsFunction(*runtime, "defineProperty");
-  jsi::Object descriptor = [self preparePropertyDescriptorWithOptions:options];
+  jsi::Object *jsThis = _jsObjectPtr.get();
 
+  jsi::Object descriptor = [self preparePropertyDescriptorWithOptions:options];
   descriptor.setProperty(*runtime, "value", expo::convertObjCObjectToJSIValue(*runtime, value));
 
-  // This call is basically the same as `Object.defineProperty(object, name, descriptor)` in JS
-  definePropertyFunction.callWithThis(*runtime, objectClass, {
-    jsi::Value(*runtime, *_jsObjectPtr.get()),
-    jsi::String::createFromUtf8(*runtime, [name UTF8String]),
-    std::move(descriptor),
-  });
+  expo::common::definePropertyOnJSIObject(*runtime, jsThis, [name UTF8String], std::move(descriptor));
 }
 
 #pragma mark - WeakObject
@@ -114,7 +101,7 @@
 
 - (void)setObjectDeallocator:(void (^)(void))deallocatorBlock
 {
-  expo::setDeallocator(*[_runtime get], _jsObjectPtr, deallocatorBlock);
+  expo::common::setDeallocator(*[_runtime get], _jsObjectPtr, deallocatorBlock);
 }
 
 #pragma mark - Equality