expo-modules-core 3.0.5 → 3.0.6

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 3.0.6 — 2025-08-25
+
+### 🎉 New features
+
+- [Android] Add new type - `ValueOrUndefined`. ([#39116](https://github.com/expo/expo/pull/39116) by [@lukmccall](https://github.com/lukmccall))
+
 ## 3.0.5 — 2025-08-21
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

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

package/android/src/main/cpp/JavaReferencesCache.cpp

@@ -54,6 +54,8 @@ JCache::JCache(JNIEnv *env) {
   jJavaScriptModuleObject = REGISTER_CLASS("expo/modules/kotlin/jni/JavaScriptModuleObject");
 
 #undef REGISTER_CLASS
+
+  jUndefined = getJUndefined(env);
 }
 
 std::shared_ptr<JCache> JCacheHolder::jCache = nullptr;
@@ -106,4 +108,11 @@ void JCache::unLoad(JNIEnv *env) {
   env->DeleteGlobalRef(jJavaScriptModuleObject);
 }
 
+jobject JCache::getJUndefined(JNIEnv *env) {
+  jclass clazz = env->FindClass("expo/modules/kotlin/types/ValueOrUndefined");
+  jmethodID methodId = env->GetStaticMethodID(clazz, "getUndefined", "()Ljava/lang/Object;");
+  return env->NewGlobalRef(
+    env->CallStaticObjectMethod(clazz, methodId)
+  );
+}
 } // namespace expo

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

@@ -57,8 +57,12 @@ public:
   jclass jSharedObject;
   jclass jJavaScriptModuleObject;
 
+  jobject jUndefined;
+
   void unLoad(JNIEnv *env);
 private:
+  static jobject getJUndefined(JNIEnv *env);
+
   std::unordered_map<std::string, jclass> jClassRegistry;
 };
 

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

@@ -30,5 +30,6 @@ enum CppType {
   JS_FUNCTION = 1 << 18,
   ANY = 1 << 19,
   NULLABLE = 1 << 20,
+  VALUE_OR_UNDEFINED = 1 << 21,
 };
 } // namespace expo

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

@@ -648,4 +648,32 @@ jobject NullableFrontendConverter::convert(
   return parameterConverter->convert(rt, env, value);
 }
 
+ValueOrUndefinedFrontendConverter::ValueOrUndefinedFrontendConverter(
+  jni::local_ref<SingleType::javaobject> expectedType
+) : parameterConverter(
+  FrontendConverterProvider::instance()->obtainConverter(
+    expectedType->getFirstParameterType()
+  )
+) {}
+
+bool ValueOrUndefinedFrontendConverter::canConvert(
+  jsi::Runtime &rt,
+  const jsi::Value &value
+) const {
+  return value.isUndefined() ||
+         parameterConverter->canConvert(rt, value);
+}
+
+jobject ValueOrUndefinedFrontendConverter::convert(
+  jsi::Runtime &rt,
+  JNIEnv *env,
+  const jsi::Value &value
+) const {
+  if (value.isUndefined()) {
+    return env->NewLocalRef(JCacheHolder::get().jUndefined);
+  }
+
+  return parameterConverter->convert(rt, env, value);
+}
+
 } // namespace expo

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

@@ -438,4 +438,21 @@ public:
 private:
   std::shared_ptr<FrontendConverter> parameterConverter;
 };
+
+class ValueOrUndefinedFrontendConverter : public FrontendConverter {
+public:
+  ValueOrUndefinedFrontendConverter(
+    jni::local_ref<jni::JavaClass<SingleType>::javaobject> expectedType
+  );
+
+  jobject convert(
+    jsi::Runtime &rt,
+    JNIEnv *env,
+    const jsi::Value &value
+  ) const override;
+
+  bool canConvert(jsi::Runtime &rt, const jsi::Value &value) const override;
+private:
+  std::shared_ptr<FrontendConverter> parameterConverter;
+};
 } // namespace expo

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

@@ -74,6 +74,10 @@ std::shared_ptr<FrontendConverter> FrontendConverterProvider::obtainConverter(
     return std::make_shared<MapFrontendConverter>(expectedType->getFirstType());
   }
 
+  if (combinedType == CppType::VALUE_OR_UNDEFINED) {
+    return std::make_shared<ValueOrUndefinedFrontendConverter>(expectedType->getFirstType());
+  }
+
   std::vector<std::shared_ptr<FrontendConverter>> converters;
   auto singleTypes = expectedType->getPossibleTypes();
   size_t size = singleTypes->size();

package/android/src/main/java/expo/modules/kotlin/jni/CppType.kt

@@ -3,6 +3,7 @@ package expo.modules.kotlin.jni
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import expo.modules.kotlin.typedarray.TypedArray
+import expo.modules.kotlin.types.ValueOrUndefined
 import kotlin.reflect.KClass
 
 private var nextValue = 0
@@ -34,5 +35,6 @@ enum class CppType(val clazz: KClass<*>, val value: Int = nextValue()) {
   SHARED_OBJECT_ID(Int::class),
   JS_FUNCTION(JavaScriptFunction::class),
   ANY(Any::class),
-  NULLABLE(Any::class)
+  NULLABLE(Any::class),
+  VALUE_OR_UNDEFINED(ValueOrUndefined::class)
 }

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

@@ -159,6 +159,10 @@ object TypeConverterProviderImpl : TypeConverterProvider {
       return JavaScriptFunctionTypeConverter<Any>(type)
     }
 
+    if (ValueOrUndefined::class.java.isAssignableFrom(jClass)) {
+      return ValueOrUndefinedTypeConverter(this, type)
+    }
+
     return handelEither(type, jClass)
       ?: throw MissingTypeConverter(type)
   }

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

@@ -0,0 +1,25 @@
+package expo.modules.kotlin.types
+
+import expo.modules.core.interfaces.DoNotStrip
+
+@DoNotStrip
+sealed interface ValueOrUndefined<T> {
+  val isUndefined: Boolean
+    get() = this is Undefined
+
+  val optional: T?
+    get() = when (this) {
+      is Value -> value
+      is Undefined -> null
+    }
+
+  data class Value<T>(val value: T) : ValueOrUndefined<T>
+  object Undefined : ValueOrUndefined<Nothing>
+
+  companion object {
+    // helper function that can be used from C++ to get the instance of Undefined
+    @JvmStatic
+    @DoNotStrip
+    fun getUndefined(): Any = Undefined
+  }
+}

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

@@ -0,0 +1,38 @@
+package expo.modules.kotlin.types
+
+import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.jni.CppType
+import expo.modules.kotlin.jni.ExpectedType
+import expo.modules.kotlin.jni.SingleType
+import kotlin.reflect.KType
+
+class ValueOrUndefinedTypeConverter(
+  converterProvider: TypeConverterProvider,
+  innerType: KType
+) : TypeConverter<ValueOrUndefined<*>> {
+  private val innerTypeConverter = converterProvider.obtainTypeConverter(
+    requireNotNull(innerType.arguments.first().type) {
+      "The ValueOrUndefined type should contain the argument type."
+    }
+  )
+
+  override fun convert(value: Any?, context: AppContext?, forceConversion: Boolean): ValueOrUndefined<*>? {
+    return if (value is ValueOrUndefined.Undefined) {
+      ValueOrUndefined.Undefined
+    } else {
+      val converterValue = innerTypeConverter.convert(value, context)
+      ValueOrUndefined.Value(converterValue)
+    }
+  }
+
+  override fun getCppRequiredTypes(): ExpectedType {
+    return ExpectedType(
+      SingleType(
+        CppType.VALUE_OR_UNDEFINED,
+        arrayOf(innerTypeConverter.getCppRequiredTypes())
+      )
+    )
+  }
+
+  override fun isTrivial() = false
+}

package/ios/Core/Views/SwiftUI/SwiftUIVirtualViewObjC.mm

@@ -181,7 +181,7 @@ static std::unordered_map<std::string, expo::ExpoViewComponentDescriptor::Flavor
   // when a VirtualView inserted to a standard UIView.
   // We use this call point here for sanity check.
   @throw [NSException exceptionWithName:@"SwiftUIVirtualViewException"
-                                 reason:@"A SwiftUI view is inserted as a child of a standard UIView. Please check that you have wrapped the SwiftUI view in an WithHostingView."
+                                 reason:@"A SwiftUI view is inserted as a child of a standard UIView. Double check that in JSX you have wrapped your component with `<Host>` from '@expo/ui/swift-ui'."
                                userInfo:nil];
   return NO;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@testing-library/react-native": "^13.2.0",
-    "expo-module-scripts": "^5.0.2"
+    "expo-module-scripts": "^5.0.3"
   },
-  "gitHead": "3275774c9286477adba9bc226d3923a996217ee4"
+  "gitHead": "ef0b9ecf9645d3e93587d5ee5030dbfcbf735bbd"
 }