expo-modules-core 3.0.0 → 3.0.1

package/CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ### 💡 Others
 
+## 3.0.1 — 2025-08-15
+
+_This version does not introduce any user-facing changes._
+
 ## 3.0.0 — 2025-08-13
 
 ### 🎉 New features
@@ -22,6 +26,7 @@
 - [Android] Add VRUtilities for VR-related values and utils ([#37744](https://github.com/expo/expo/pull/37744) by [@behenate](https://github.com/behenate))
 - [Andorid] Start using experimental converters in properties. ([#38597](https://github.com/expo/expo/pull/38597) by [@lukmccall](https://github.com/lukmccall))
 - [Android] Rethrow pending Jni exceptions. ([#38625](https://github.com/expo/expo/pull/38625) by [@jakex7](https://github.com/jakex7))
+- [iOS] Add new type - `ValueOrUndefined`. ([#38620](https://github.com/expo/expo/pull/38620) by [@lukmccall](https://github.com/lukmccall))
 
 ### 🐛 Bug fixes
 
@@ -48,6 +53,7 @@
 - Add missing peer dependencies for `react` and `react-native` ([#38528](https://github.com/expo/expo/pull/38528) by [@kitten](https://github.com/kitten))
 - Deprecate `Constants` in favor of `Constant` and `Property`. ([#38748](https://github.com/expo/expo/pull/38748) by [@jakex7](https://github.com/jakex7))
 - Refactor typings to replace `ExpoGlobal` with namespace and to preserve type+value overlay on re-exported core globals ([#38649](https://github.com/expo/expo/pull/38649) by [@kitten](https://github.com/kitten))
+- Fixed internal `JavaScriptValue` and added `props.globalEventDispatcher` for expo-ui. ([#38542](https://github.com/expo/expo/pull/38542) by [@kudo](https://github.com/kudo))
 
 ## 2.5.0 - 2025-07-17
 

package/ValueOrUndefinedSpec.swift

@@ -0,0 +1,132 @@
+// Copyright 2022-present 650 Industries. All rights reserved.
+
+import ExpoModulesTestCore
+
+@testable import ExpoModulesCore
+
+final class ValueOrUndefinedSpec: ExpoSpec {
+  override class func spec() {
+    describe("operators") {
+      it("==") {
+        expect(
+          ValueOrUndefined<Int>.undefined == ValueOrUndefined<Int>.undefined
+        ).to(beTrue())
+        expect(
+          ValueOrUndefined<Int>.value(unwrapped: 10) == ValueOrUndefined<Int>.value(unwrapped: 10)
+        ).to(beTrue())
+        expect(
+          ValueOrUndefined<Int>.value(unwrapped: 10) == ValueOrUndefined<Int>.undefined
+        ).to(beFalse())
+        expect(
+          ValueOrUndefined<Int>.undefined == ValueOrUndefined<Int>.value(unwrapped: 10)
+        ).to(beFalse())
+      }
+      
+      it("<") {
+        expect(
+          ValueOrUndefined<Int>.undefined < ValueOrUndefined<Int>.undefined
+        ).to(beFalse())
+        expect(
+          ValueOrUndefined<Int>.value(unwrapped: 10) < ValueOrUndefined<Int>.value(unwrapped: 10)
+        ).to(beFalse())
+        expect(
+          ValueOrUndefined<Int>.value(unwrapped: 10) < ValueOrUndefined<Int>.value(unwrapped: 20)
+        ).to(beTrue())
+        expect(
+          ValueOrUndefined<Int>.value(unwrapped: 10) < ValueOrUndefined<Int>.undefined
+        ).to(beFalse())
+        expect(
+          ValueOrUndefined<Int>.undefined == ValueOrUndefined<Int>.value(unwrapped: 10)
+        ).to(beFalse())
+      }
+    }
+    describe("module") {
+      let appContext = AppContext.create()
+      let runtime = try! appContext.runtime
+      
+      beforeSuite {
+        appContext.moduleRegistry.register(moduleType: UndefinedSpecModule.self)
+      }
+      
+      it("converts from undefined to ValueOrUndefinedSpec<Int>") {
+        let wasUndefinded = try runtime
+          .eval("expo.modules.ValueOrUndefinedModule.undefined_of_int(undefined)")
+          .asBool()
+        
+        expect(wasUndefinded).to(beTrue())
+      }
+      
+      it("converts from int to ValueOrUndefinedSpec<Int>") {
+        let wasUndefinded = try runtime
+          .eval("expo.modules.ValueOrUndefinedModule.undefined_of_int(10)")
+          .asBool()
+        
+        expect(wasUndefinded).to(beFalse())
+      }
+      
+      it("converts from undefined to ValueOrUndefinedSpec<Int?>") {
+        let wasUndefinded = try runtime
+          .eval("expo.modules.ValueOrUndefinedModule.undefined_of_optional_int(undefined, null)")
+          .asBool()
+        
+        expect(wasUndefinded).to(beTrue())
+      }
+      
+      it("converts from int to ValueOrUndefinedSpec<Int?>") {
+        let wasUndefinded = try runtime
+          .eval("expo.modules.ValueOrUndefinedModule.undefined_of_optional_int(10, 10)")
+          .asBool()
+        
+        expect(wasUndefinded).to(beFalse())
+      }
+      
+      it("converts from null to ValueOrUndefinedSpec<Int?>") {
+        let wasUndefinded = try runtime
+          .eval("expo.modules.ValueOrUndefinedModule.undefined_of_optional_int(null, null)")
+          .asBool()
+        
+        expect(wasUndefinded).to(beFalse())
+      }
+      
+      it("converts from array to [ValueOrUndefinedSpec<Int>]") {
+        let wereUndefinded = try runtime
+          .eval("expo.modules.ValueOrUndefinedModule.array_of_undefined_of_int([1, undefined, 2, undefined, 3])")
+          .asArray().map { try $0!.asBool() }
+        
+        expect(wereUndefinded).to(equal([false, true, false, true, false]))
+      }
+      
+      it("converts from array to [ValueOrUndefinedSpec<Int?>]") {
+        let wereUndefinded = try runtime
+          .eval("expo.modules.ValueOrUndefinedModule.array_of_undefined_of_optional_int([1, undefined, null, 2, undefined, null], [1, null, null, 2, null, null])")
+          .asArray().map { try $0!.asBool() }
+        
+        expect(wereUndefinded).to(equal([false, true, false, false, true, false]))
+      }
+    }
+  }
+}
+
+fileprivate final class UndefinedSpecModule: Module {
+  func definition() -> ModuleDefinition {
+    Name("ValueOrUndefinedModule")
+    
+    Function("undefined_of_int") { (value: ValueOrUndefined<Int>) in
+      return value.isUndefinded
+    }
+    
+    Function("undefined_of_optional_int") { (value: ValueOrUndefined<Int?>, expectedValue: Int?) in
+      expect(value.optional).to(expectedValue == nil ? beNil() : equal(expectedValue))
+      return value.isUndefinded
+    }
+    
+    Function("array_of_undefined_of_int") { (values: [ValueOrUndefined<Int>]) in
+      return values.map { $0.isUndefinded }
+    }
+    
+    Function("array_of_undefined_of_optional_int") { (values: [ValueOrUndefined<Int?>], expectedValues: [Int?]) in
+      expect(values.map{ $0.optional} ).to(equal(expectedValues))
+      return values.map { $0.isUndefinded }
+    }
+  }
+}

package/android/build.gradle

@@ -25,7 +25,7 @@ if (shouldIncludeCompose) {
 }
 
 group = 'host.exp.exponent'
-version = '3.0.0'
+version = '3.0.1'
 
 def isExpoModulesCoreTests = {
   Gradle gradle = getGradle()
@@ -75,7 +75,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "3.0.0"
+    versionName "3.0.1"
     buildConfigField "String", "EXPO_MODULES_CORE_VERSION", "\"${versionName}\""
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 

package/ios/Core/Arguments/ValueOrUndefined.swift

@@ -0,0 +1,62 @@
+// Copyright 2021-present 650 Industries. All rights reserved.
+
+protocol AnyValueOrUndefined: AnyArgument {}
+
+public enum ValueOrUndefined<InnerType: AnyArgument>: AnyValueOrUndefined {
+  public static func getDynamicType() -> any AnyDynamicType {
+    return DynamicValueOrUndefinedType<InnerType>()
+  }
+
+  case undefined
+  case value(unwrapped: InnerType)
+
+  var optional: InnerType? {
+    switch self {
+    // We want to produce Optional(nil) instead of nil - that's what DynamicOptionalType does
+    case .undefined: return Any??.some(nil) as Any?? as! InnerType?
+    case .value(let value): return value
+    }
+  }
+
+  var isUndefinded: Bool {
+    if case .undefined = self {
+      return true
+    }
+
+    return false
+  }
+}
+
+extension ValueOrUndefined: Equatable where InnerType: Equatable {
+  public static func == (lhs: ValueOrUndefined, rhs: ValueOrUndefined) -> Bool {
+    switch (lhs, rhs) {
+    case (.undefined, .undefined):
+      return true
+    case (.value(let lhsValue), .value(let rhsValue)):
+      return lhsValue == rhsValue
+    default:
+      return false
+    }
+  }
+}
+
+extension ValueOrUndefined: Comparable where InnerType: Comparable {
+  public static func < (lhs: ValueOrUndefined, rhs: ValueOrUndefined) -> Bool {
+    switch (lhs, rhs) {
+    case (.undefined, .undefined):
+      return false // undefined is considered equal to another undefined
+    case (.undefined, _):
+      return false
+    case (_, .undefined):
+      return false
+    case (.value(let lhsValue), .value(let rhsValue)):
+      return lhsValue < rhsValue
+    }
+  }
+}
+
+extension ValueOrUndefined {
+  public static func ?? <T>(valueOrUndefined: consuming ValueOrUndefined<T>, defaultValue: @autoclosure () -> T) -> T {
+    return valueOrUndefined.optional ?? defaultValue()
+  }
+}

package/ios/Core/Classes/ClassDefinition.swift

@@ -123,7 +123,7 @@ internal protocol ClassAssociatedObject {}
 
 // Basically we only need these two
 extension JavaScriptObject: ClassAssociatedObject, AnyArgument, AnyJavaScriptValue {
-  internal static func convert(from value: JavaScriptValue, appContext: AppContext) throws -> Self {
+  public static func convert(from value: JavaScriptValue, appContext: AppContext) throws -> Self {
     guard value.kind == .object else {
       throw Conversions.ConvertingException<JavaScriptObject>(value)
     }

package/ios/Core/DynamicTypes/DynamicType.swift

@@ -53,6 +53,9 @@ private func DynamicType<T>(_ type: T.Type) -> AnyDynamicType {
   if let AnyEitherType = T.self as? AnyEither.Type {
     return AnyEitherType.getDynamicType()
   }
+  if let AnyValueOrUndefinedType = T.self as? AnyValueOrUndefined.Type {
+    return AnyValueOrUndefinedType.getDynamicType()
+  }
   return DynamicRawType(innerType: T.self)
 }
 

package/ios/Core/DynamicTypes/DynamicValueOrUndefinedType.swift

@@ -0,0 +1,34 @@
+// Copyright 2021-present 650 Industries. All rights reserved.
+
+internal struct DynamicValueOrUndefinedType<InnerType: AnyArgument>: AnyDynamicType {
+  let innerType: InnerType.Type = InnerType.self
+  let dynamicInnerType: AnyDynamicType = InnerType.getDynamicType()
+
+  func wraps<InnerType>(_ type: InnerType.Type) -> Bool {
+    return innerType == type
+  }
+
+  func equals(_ type: any AnyDynamicType) -> Bool {
+    return type is Self
+  }
+
+  func cast(jsValue: JavaScriptValue, appContext: AppContext) throws -> Any {
+    if jsValue.isUndefined() {
+      return ValueOrUndefined<InnerType>.undefined
+    }
+
+    return try dynamicInnerType.cast(jsValue: jsValue, appContext: appContext)
+  }
+
+  func cast<ValueType>(_ value: ValueType, appContext: AppContext) throws -> Any {
+    if value is ValueOrUndefined<InnerType> {
+      return value
+    }
+
+    return ValueOrUndefined<InnerType>.value(unwrapped: try dynamicInnerType.cast(value, appContext: appContext) as! InnerType)
+  }
+
+  var description: String {
+    return "ValueOrUndefined<\(dynamicInnerType)>"
+  }
+}

package/ios/Core/JavaScriptFunction.swift

@@ -53,7 +53,7 @@ public final class JavaScriptFunction<ReturnType>: AnyArgument, AnyJavaScriptVal
 
   // MARK: - AnyJavaScriptValue
 
-  internal static func convert(from value: JavaScriptValue, appContext: AppContext) throws -> Self {
+  public static func convert(from value: JavaScriptValue, appContext: AppContext) throws -> Self {
     guard value.kind == .function else {
       throw Conversions.ConvertingException<JavaScriptFunction<ReturnType>>(value)
     }

package/ios/Core/Views/SwiftUI/SwiftUIViewDefinition.swift

@@ -117,12 +117,14 @@ extension ExpoSwiftUI {
     }
 
     public override func getSupportedEventNames() -> [String] {
-      return dummyPropsMirror.children.compactMap { (label: String?, value: Any) in
+      let builtInEventNames = [GLOBAL_EVENT_NAME]
+      let propEventNames: [String] = dummyPropsMirror.children.compactMap { (label: String?, value: Any) in
         guard let event = value as? EventDispatcher else {
           return nil
         }
         return event.customName ?? convertLabelToKey(label)
       }
+      return builtInEventNames + propEventNames
     }
   }
 }

package/ios/Core/Views/SwiftUI/SwiftUIViewProps.swift

@@ -2,6 +2,8 @@
 
 import SwiftUI
 
+internal let GLOBAL_EVENT_NAME = "onGlobalEvent"
+
 extension ExpoSwiftUI {
   /**
    Base implementation of the view props object for SwiftUI views.
@@ -15,6 +17,11 @@ extension ExpoSwiftUI {
      */
     @Field public var children: [any AnyChild]?
 
+    /**
+     A global event dispatcher that allows views to call `view.dispatchEvent(_:payload)` directly
+     */
+    public let globalEventDispatcher = EventDispatcher(GLOBAL_EVENT_NAME)
+
     internal func updateRawProps(_ rawProps: [String: Any], appContext: AppContext) throws {
       // Update the props just like the records
       try update(withDict: rawProps, appContext: appContext)
@@ -24,6 +31,10 @@ extension ExpoSwiftUI {
     }
 
     internal func setUpEvents(_ dispatcher: @escaping (_ eventName: String, _ payload: Any) -> Void) {
+      globalEventDispatcher.handler = { payload in
+        dispatcher(GLOBAL_EVENT_NAME, payload)
+      }
+
       Mirror(reflecting: self).children.forEach { (label: String?, value: Any) in
         guard let event = value as? EventDispatcher else {
           return

package/ios/JSI/JavaScriptValue.swift

@@ -18,7 +18,7 @@ public enum JavaScriptValueKind: String {
 /**
  A protocol that JavaScript values, objects and functions can conform to.
  */
-protocol AnyJavaScriptValue: AnyArgument {
+public protocol AnyJavaScriptValue: AnyArgument {
   /**
    Tries to convert a raw JavaScript value to the conforming type.
    */
@@ -118,7 +118,7 @@ extension JavaScriptValue: AnyJavaScriptValue, AnyArgument {
 
   // MARK: - AnyJavaScriptValue
 
-  internal static func convert(from value: JavaScriptValue, appContext: AppContext) throws -> Self {
+  public static func convert(from value: JavaScriptValue, appContext: AppContext) throws -> Self {
     // It's already a `JavaScriptValue` so it should always pass through.
     if let value = value as? Self {
       return value

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -46,8 +46,8 @@
     "react-native": "*"
   },
   "devDependencies": {
-    "@testing-library/react-native": "^13.1.0",
-    "expo-module-scripts": "^5.0.0"
+    "@testing-library/react-native": "^13.2.0",
+    "expo-module-scripts": "^5.0.1"
   },
-  "gitHead": "cb7062e2c17d1fb09522834aaaac0e19b766df62"
+  "gitHead": "2f7f90d0736af48cb542ccbc8addb836e330693a"
 }