expo-modules-core 1.3.0 → 1.3.1

package/CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ### 💡 Others
 
+## 1.3.1 — 2023-05-08
+
+_This version does not introduce any user-facing changes._
+
 ## 1.3.0 — 2023-05-08
 
 ### 🎉 New features

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.3.0'
+version = '1.3.1'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -173,7 +173,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.3.0"
+    versionName "1.3.1"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

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

@@ -40,6 +40,13 @@ open class JavaScriptObject @DoNotStrip internal constructor(@DoNotStrip private
   external fun hasProperty(name: String): Boolean
   external fun getProperty(name: String): JavaScriptValue
 
+  operator fun get(name: String): JavaScriptValue? {
+    if (hasProperty(name)) {
+      return getProperty(name)
+    }
+    return null
+  }
+
   external fun getPropertyNames(): Array<String>
   private external fun setBoolProperty(name: String, value: Boolean)
   private external fun setDoubleProperty(name: String, value: Double)
@@ -64,15 +71,27 @@ open class JavaScriptObject @DoNotStrip internal constructor(@DoNotStrip private
   }
 
   fun setProperty(name: String, value: Boolean) = setBoolProperty(name, value)
+  operator fun set(name: String, value: Boolean) = setBoolProperty(name, value)
+
   fun setProperty(name: String, value: Int) = setDoubleProperty(name, value.toDouble())
+  operator fun set(name: String, value: Int) = setDoubleProperty(name, value.toDouble())
+
   fun setProperty(name: String, value: Double) = setDoubleProperty(name, value)
+  operator fun set(name: String, value: Double) = setDoubleProperty(name, value)
+
   fun setProperty(name: String, value: String?) = setStringProperty(name, value)
+  operator fun set(name: String, value: String?) = setStringProperty(name, value)
+
   fun setProperty(name: String, value: JavaScriptValue?) = setJSValueProperty(name, value)
+  operator fun set(name: String, value: JavaScriptValue?) = setJSValueProperty(name, value)
+
   fun setProperty(name: String, value: JavaScriptObject?) = setJSObjectProperty(name, value)
+  operator fun set(name: String, value: JavaScriptObject?) = setJSObjectProperty(name, value)
 
   // Needed to handle untyped null value
   // Without it setProperty(name, null) won't work
   fun setProperty(name: String, `null`: Nothing?) = unsetProperty(name)
+  operator fun set(name: String, `null`: Nothing?) = unsetProperty(name)
 
   fun defineProperty(
     name: String,

package/ios/JSI/JavaScriptValue.swift

@@ -25,8 +25,8 @@ protocol AnyJavaScriptValue {
   static func convert(from value: JavaScriptValue, appContext: AppContext) throws -> Self
 }
 
-extension JavaScriptValue: AnyJavaScriptValue {
-  var kind: JavaScriptValueKind {
+extension JavaScriptValue: AnyJavaScriptValue, AnyArgument {
+  public var kind: JavaScriptValueKind {
     switch true {
     case isUndefined():
       return .undefined

package/ios/Swift/Classes/ClassComponent.swift

@@ -83,7 +83,14 @@ public final class ClassComponent: ObjectDefinition {
 internal protocol ClassAssociatedObject {}
 
 // Basically we only need these two
-extension JavaScriptObject: ClassAssociatedObject {}
+extension JavaScriptObject: ClassAssociatedObject, AnyArgument {
+  internal static func convert(from value: JavaScriptValue, appContext: AppContext) throws -> Self {
+    guard value.kind == .object else {
+      throw Conversions.ConvertingException<JavaScriptObject>(value)
+    }
+    return value.getObject() as! Self
+  }
+}
 extension SharedObject: ClassAssociatedObject {}
 
 // MARK: - Privates

package/ios/Swift/JavaScriptUtils.swift

@@ -11,7 +11,9 @@
  - Throws: Rethrows various exceptions that could be thrown by the dynamic types.
  */
 internal func cast(_ value: Any, toType type: AnyDynamicType, appContext: AppContext) throws -> Any {
-  // TODO: Accept JavaScriptValue and JavaScriptObject as argument types.
+  if let dynamicJSType = type as? DynamicJavaScriptType, dynamicJSType.equals(~JavaScriptValue.self)  {
+    return value
+  }
   if !(type is DynamicTypedArrayType), let value = value as? JavaScriptValue {
     return try type.cast(value.getRaw(), appContext: appContext)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "4ba50c428c8369bb6b3a51a860d4898ad4ccbe78"
+  "gitHead": "51f434ef271cece0aadf07f73912eaf11356865c"
 }