expo-modules-core 56.0.4 → 56.0.6

package/android/src/main/cpp/RuntimeHolder.h

@@ -2,8 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
+#include "ExpoHeader.pch"
 
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/CallInvoker.h>

package/android/src/main/cpp/ThreadSafeJNIGlobalRef.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
+#include "ExpoHeader.pch"
 #include <android/log.h>
 
 namespace jni = facebook::jni;

package/android/src/main/cpp/concepts/jni.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include <concepts>
-#include <fbjni/fbjni.h>
 #include "jni_deref.h"
 
 namespace jni = facebook::jni;
@@ -13,9 +13,6 @@ namespace expo {
 template<typename T>
 concept HasCthis = requires(T &t) { t->cthis(); };
 
-template<typename T>
-concept HasToStdString = requires(T &t) { t->toStdString(); };
-
 template<typename T>
 concept HasValue = requires(T &t) { t->value(); };
 
@@ -25,6 +22,9 @@ concept HasGetRegion = requires(T &t, jsize s) { t->getRegion(s, s); };
 template<typename T>
 concept IsJBoolean = std::is_same_v<jni_deref_t<T>, jni::JBoolean>;
 
+template<typename T>
+concept IsJString = std::is_same_v<jni_deref_t<T>, jni::JString>;
+
 template<typename T>
 concept JniRef =
   std::is_same_v<T, jni::local_ref<jni_deref_t<T>>> ||

package/android/src/main/cpp/concepts/jni_deref.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include <concepts>
-#include <fbjni/fbjni.h>
 
 namespace jni = facebook::jni;
 

package/android/src/main/cpp/concepts/jsi.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include <concepts>
-#include <jsi/jsi.h>
 
 namespace jsi = facebook::jsi;
 

package/android/src/main/cpp/decorators/JSClassesDecorator.h

@@ -2,9 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-
-#include <map>
+#include "../ExpoHeader.pch"
 
 #include "JSDecorator.h"
 #include "../MethodMetadata.h"

package/android/src/main/cpp/decorators/JSConstantsDecorator.cpp

@@ -1,15 +1,12 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "../ExpoHeader.pch"
 #include "JSConstantsDecorator.h"
 #include "../JavaScriptObject.h"
 #include "JSIUtils.h"
-#include "JSFunctionsDecorator.h"
 #include "../JSIContext.h"
 #include "../types/JNIToJSIConverter.h"
 
-#include <jsi/jsi.h>
-#include <jsi/JSIDynamic.h>
-
 namespace jsi = facebook::jsi;
 
 namespace expo {

package/android/src/main/cpp/decorators/JSConstantsDecorator.h

@@ -2,9 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <react/jni/ReadableNativeMap.h>
-#include <folly/dynamic.h>
+#include "../ExpoHeader.pch"
 
 #include "JSDecorator.h"
 #include "../JNIFunctionBody.h"

package/android/src/main/cpp/decorators/JSDecorator.h

@@ -2,8 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
+#include "../ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;

package/android/src/main/cpp/decorators/JSDecoratorsBridgingObject.h

@@ -2,12 +2,9 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-
-#include <vector>
+#include "../ExpoHeader.pch"
 
 #include "JSDecorator.h"
-#include "../MethodMetadata.h"
 #include "../JNIFunctionBody.h"
 #include "../types/ExpectedType.h"
 

package/android/src/main/cpp/decorators/JSFunctionsDecorator.cpp

@@ -1,10 +1,9 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "../ExpoHeader.pch"
 #include "JSFunctionsDecorator.h"
 #include "JSIUtils.h"
 
-#include <jsi/jsi.h>
-
 namespace jsi = facebook::jsi;
 
 namespace expo {

package/android/src/main/cpp/decorators/JSFunctionsDecorator.h

@@ -2,11 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <unordered_map>
-#include <memory>
+#include "../ExpoHeader.pch"
 
 #include "JSDecorator.h"
 #include "../MethodMetadata.h"

package/android/src/main/cpp/decorators/JSObjectDecorator.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
+#include "../ExpoHeader.pch"
 
 #include "JSDecorator.h"
 

package/android/src/main/cpp/decorators/JSPropertiesDecorator.cpp

@@ -1,12 +1,11 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "../ExpoHeader.pch"
 #include "JSPropertiesDecorator.h"
 #include "../JavaScriptObject.h"
 #include "JSIUtils.h"
 #include "JSFunctionsDecorator.h"
 
-#include <jsi/jsi.h>
-
 namespace jsi = facebook::jsi;
 
 namespace expo {

package/android/src/main/cpp/decorators/JSPropertiesDecorator.h

@@ -1,8 +1,6 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
-#include <fbjni/fbjni.h>
-
-#include <unordered_map>
+#include "../ExpoHeader.pch"
 
 #include "../MethodMetadata.h"
 #include "../JNIFunctionBody.h"

package/android/src/main/cpp/fabric/AndroidExpoViewProps.h

@@ -1,8 +1,8 @@
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "ExpoViewProps.h"
 
-#include <fbjni/fbjni.h>
 #include <react/renderer/core/RawValue.h>
 
 namespace react = facebook::react;

package/android/src/main/cpp/fabric/AndroidExpoViewState.h

@@ -1,8 +1,6 @@
+#include "../ExpoHeader.pch"
 #include "ExpoViewState.h"
 
-#include "AndroidExpoViewProps.h"
-#include <fbjni/fbjni.h>
-#include <folly/dynamic.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
 

package/android/src/main/cpp/fabric/FabricComponentsRegistry.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
+#include "../ExpoHeader.pch"
 #include <CoreComponentsRegistry.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProvider.h>
 

package/android/src/main/cpp/fabric/NativeStatePropsGetter.h

@@ -1,7 +1,6 @@
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <react/fabric/CoreComponentsRegistry.h>
+#include "../ExpoHeader.pch"
 #include <react/fabric/StateWrapperImpl.h>
 
 namespace jni = facebook::jni;

package/android/src/main/cpp/installers/MainRuntimeInstaller.h

@@ -1,10 +1,9 @@
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "../JSIContext.h"
-#include <fbjni/fbjni.h>
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/CallInvoker.h>
-#include "SharedObject.h"
 
 #if IS_NEW_ARCHITECTURE_ENABLED
 

package/android/src/main/cpp/installers/WorkletRuntimeInstaller.h

@@ -1,9 +1,8 @@
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "MainRuntimeInstaller.h"
 
-#include <fbjni/fbjni.h>
-
 namespace jni = facebook::jni;
 
 namespace expo {

package/android/src/main/cpp/javaclasses/Collections.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <fbjni/fbjni.h>
+#include "../ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 

package/android/src/main/cpp/javaclasses/JSRunnable.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
+#include "../ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 

package/android/src/main/cpp/types/AnyType.cpp

@@ -2,7 +2,6 @@
 
 #include "AnyType.h"
 #include "FrontendConverterProvider.h"
-#include "../JSIContext.h"
 
 namespace expo {
 AnyType::AnyType(

package/android/src/main/cpp/types/AnyType.h

@@ -2,11 +2,10 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "ExpectedType.h"
 #include "FrontendConverter.h"
 
-#include <fbjni/fbjni.h>
-
 namespace jni = facebook::jni;
 
 namespace expo {

package/android/src/main/cpp/types/ExpectedType.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "CppType.h"
-#include <fbjni/fbjni.h>
 
 namespace jni = facebook::jni;
 

package/android/src/main/cpp/types/FrontendConverter.cpp

@@ -1,5 +1,6 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "../ExpoHeader.pch"
 #include "FrontendConverter.h"
 #include "ExpectedType.h"
 #include "FrontendConverterProvider.h"
@@ -17,7 +18,6 @@
 
 #include "react/jni/ReadableNativeMap.h"
 #include "react/jni/ReadableNativeArray.h"
-#include <jsi/JSIDynamic.h>
 
 #include <utility>
 #include <algorithm>

package/android/src/main/cpp/types/FrontendConverter.h

@@ -2,11 +2,9 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "CppType.h"
 
-#include <jsi/jsi.h>
-#include <fbjni/fbjni.h>
-
 #if WORKLETS_ENABLED
 
 #include <worklets/SharedItems/Synchronizable.h>

package/android/src/main/cpp/types/FrontendConverterProvider.h

@@ -2,15 +2,11 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "CppType.h"
 #include "FrontendConverter.h"
 #include "ExpectedType.h"
 
-#include <fbjni/fbjni.h>
-
-#include <memory>
-#include <unordered_map>
-
 namespace jni = facebook::jni;
 
 namespace expo {

package/android/src/main/cpp/types/JNIToJSIConverter.h

@@ -2,11 +2,11 @@
 
 #pragma once
 
+#include "../ExpoHeader.pch"
 #include "../JSIContext.h"
 #include "../JSharedObject.h"
 #include "../JNIUtils.h"
 #include "ObjectDeallocator.h"
-#include "../javaclasses/Collections.h"
 #include "../JavaScriptArrayBuffer.h"
 #include "../NativeArrayBuffer.h"
 #include "../concepts/jni_deref.h"
@@ -14,17 +14,8 @@
 #include "../concepts/jsi.h"
 #include "ReturnType.h"
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-#include <optional>
 #include <concepts>
 
-#include <react/jni/ReadableNativeMap.h>
-#include <react/jni/ReadableNativeArray.h>
-#include <react/jni/WritableNativeArray.h>
-#include <react/jni/WritableNativeMap.h>
-#include <jsi/JSIDynamic.h>
-
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 namespace react = facebook::react;
@@ -63,11 +54,17 @@ struct RawArray {
 };
 
 template<typename T>
-inline auto unwrapJNIRef(T &&value) {
+inline auto unwrapJNIRef(
+  JNIEnv *env,
+  T &&value
+) {
   if constexpr (HasCthis<T>) {
     return value->cthis();
-  } else if constexpr (HasToStdString<T>) {
-    return value->toStdString();
+  } else if constexpr (IsJString<T>) {
+    const char *rawValue = env->GetStringUTFChars(value.get(), nullptr);
+    std::string result = rawValue;
+    env->ReleaseStringUTFChars(value.get(), rawValue);
+    return result;
   } else if constexpr (IsJBoolean<T>) {
     return static_cast<bool>(value->value());
   } else if constexpr (HasValue<T>) {
@@ -287,13 +284,13 @@ concept SimpleConversion = requires(JNIEnv *env, jsi::Runtime &rt, T value) {
 
 template<typename T>
 jsi::Value convertToJS(JNIEnv *env, jsi::Runtime &rt, T &&value) {
-  using UnwrappedType = decltype(unwrapJNIRef(std::declval<T>()));
+  using UnwrappedType = decltype(unwrapJNIRef(env, std::declval<T>()));
   using Converter = JNIToJSIConverter<UnwrappedType>;
 
   if constexpr (SimpleConversion<Converter, UnwrappedType>) {
-    return Converter::convert(env, rt, unwrapJNIRef(std::forward<T>(value)));
+    return Converter::convert(env, rt, unwrapJNIRef(env, std::forward<T>(value)));
   } else {
-    return Converter::convert(env, rt, unwrapJNIRef(value), value);
+    return Converter::convert(env, rt, unwrapJNIRef(env, value), value);
   }
 }
 

package/android/src/main/cpp/worklets/Serializable.h

@@ -1,12 +1,12 @@
 #pragma once
 
+#include "../ExpoHeader.pch"
+
 #if WORKLETS_ENABLED
 
 #include "../JSIContext.h"
 #include "../JNIDeallocator.h"
-#include "WorkletNativeRuntime.h"
 
-#include <fbjni/fbjni.h>
 #include <worklets/SharedItems/Serializable.h>
 
 namespace jni = facebook::jni;

package/android/src/main/cpp/worklets/Worklet.h

@@ -1,15 +1,12 @@
 #pragma once
 
+#include "../ExpoHeader.pch"
+
 #if WORKLETS_ENABLED
 
-#include "../JSIContext.h"
-#include "../JNIDeallocator.h"
 #include "WorkletNativeRuntime.h"
 #include "Serializable.h"
 
-#include <fbjni/fbjni.h>
-#include <worklets/SharedItems/Serializable.h>
-
 namespace jni = facebook::jni;
 
 namespace expo {

package/android/src/main/cpp/worklets/WorkletJSCallInvoker.h

@@ -1,15 +1,13 @@
 #pragma once
 
+#include "../ExpoHeader.pch"
+
 #if WORKLETS_ENABLED
 
 #include <ReactCommon/CallInvoker.h>
-#include <ReactCommon/RuntimeExecutor.h>
 
 #include <worklets/WorkletRuntime/WorkletRuntime.h>
 
-#include <memory>
-
-
 namespace jsi = facebook::jsi;
 namespace react = facebook::react;
 

package/android/src/main/cpp/worklets/WorkletNativeRuntime.h

@@ -1,13 +1,13 @@
 #pragma once
 
+#include "../ExpoHeader.pch"
+
 #if WORKLETS_ENABLED
 
 #include <worklets/WorkletRuntime/WorkletRuntime.h>
 
 #endif
 
-#include <fbjni/fbjni.h>
-
 namespace jni = facebook::jni;
 
 namespace expo {

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

@@ -64,7 +64,7 @@ private fun <T : View> ViewDefinitionBuilder<T>.UseBorderWidthProps() {
     BackgroundStyleApplicator.setBorderWidth(
       view,
       edge,
-      width ?: Float.NaN
+      width
     )
   }
 }

package/ios/Core/AppContext.swift

@@ -429,12 +429,34 @@ public final class AppContext: NSObject, EXAppContextProtocol, @unchecked Sendab
   // MARK: - Runtime
 
   /**
-   Sets the JavaScript runtime from a raw pointer to a `facebook::jsi::Runtime` instance.
-   Called from ObjC++ (e.g. `ExpoReactNativeFactory`) when React Native initializes the runtime.
+   Sets the JavaScript runtime from raw pointers. Called by `ExpoReactNativeFactory`
+   when React Native initializes the runtime. When `scheduler` and `dispatch`
+   are both provided, `JavaScriptRuntime.schedule(...)` / `.execute(...)` dispatch
+   onto the JS thread through them. When either is `nil`, the runtime falls back
+   to a synchronous no-op scheduler — callers can detect this via
+   `JavaScriptRuntime.supportsAsyncScheduling`.
+
+   `dispatch` is a raw pointer to a C function with signature
+   `void (*)(void *scheduler, int priority, void (^callback)())` — cast back
+   to the typed pointer inside `ExpoModulesJSI`. It's typed as `UnsafeRawPointer`
+   here rather than `@convention(c)` so the symbol can cross the Objective-C
+   bridge without needing a Swift-typed entry point.
    */
   @objc
-  public func setRuntime(_ runtimePointer: UnsafeMutableRawPointer) {
-    _runtime = ExpoRuntime(unsafePointer: runtimePointer)
+  public func setRuntime(
+    _ runtimePointer: UnsafeMutableRawPointer,
+    scheduler: UnsafeMutableRawPointer?,
+    dispatch: UnsafeRawPointer?
+  ) {
+    if let scheduler, let dispatch {
+      _runtime = ExpoRuntime(
+        unsafePointer: runtimePointer,
+        scheduler: scheduler,
+        dispatch: dispatch
+      )
+    } else {
+      _runtime = ExpoRuntime(unsafePointer: runtimePointer)
+    }
   }
 
   @JavaScriptActor

package/ios/Core/Conversions.swift

@@ -138,13 +138,20 @@ public struct Conversions {
    `unknownToJavaScriptValue` which handles type-erased values through `NSNumber`/`NSDictionary` matching.
    */
   static func anyToJavaScriptValue<ValueType>(_ value: ValueType, appContext: AppContext) throws -> JavaScriptValue {
+    return try anyToJavaScriptValue(value, appContext: appContext, in: appContext.runtime)
+  }
+
+  /**
+   Variant that creates JS values in the given `runtime`, used by the worklet conversion.
+   */
+  static func anyToJavaScriptValue<ValueType>(_ value: ValueType, appContext: AppContext, in runtime: JavaScriptRuntime) throws -> JavaScriptValue {
     if ValueType.self is AnyOptional.Type, Optional.isNil(value) {
       return .null
     }
     if let value = value as? AnyArgument {
-      return try type(of: value).getDynamicType().castToJS(value, appContext: appContext)
+      return try type(of: value).getDynamicType().castToJS(value, appContext: appContext, in: runtime)
     }
-    return try unknownToJavaScriptValue(value, appContext: appContext)
+    return try unknownToJavaScriptValue(value, appContext: appContext, in: runtime)
   }
 
   /**
@@ -153,12 +160,18 @@ public struct Conversions {
    can call this without re-entering the `AnyArgument` check and causing infinite recursion.
    */
   static func unknownToJavaScriptValue(_ value: Any, appContext: AppContext) throws -> JavaScriptValue {
+    return try unknownToJavaScriptValue(value, appContext: appContext, in: appContext.runtime)
+  }
+
+  /**
+   Variant that creates JS values in the given `runtime` — used by the worklet conversion
+   path so produced dicts/arrays live in the calling runtime, not the main runtime.
+   */
+  static func unknownToJavaScriptValue(_ value: Any, appContext: AppContext, in runtime: JavaScriptRuntime) throws -> JavaScriptValue {
     if let value = value as? JavaScriptRepresentable {
-      return .representing(value: value, in: try appContext.runtime)
+      return .representing(value: value, in: runtime)
     }
 
-    let runtime = try appContext.runtime
-
     switch value {
     case is Void:
       return .undefined
@@ -179,14 +192,14 @@ public struct Conversions {
     case let array as NSArray:
       let jsArray = runtime.createArray(length: array.count)
       for (index, element) in array.enumerated() {
-        try jsArray.set(value: anyToJavaScriptValue(element, appContext: appContext), at: index)
+        try jsArray.set(value: anyToJavaScriptValue(element, appContext: appContext, in: runtime), at: index)
       }
       return jsArray.asValue()
     case let dict as NSDictionary:
       let jsObject = runtime.createObject()
       for (key, element) in dict {
         guard let key = key as? String else { continue }
-        jsObject.setProperty(key, value: try anyToJavaScriptValue(element, appContext: appContext))
+        jsObject.setProperty(key, value: try anyToJavaScriptValue(element, appContext: appContext, in: runtime))
       }
       return jsObject.asValue()
     default: