expo-modules-core 2.3.13 → 2.4.0

package/ios/DevTools/ModuleDefinitionEncoder.swift

@@ -0,0 +1,182 @@
+class ModuleDefinitionEncoder: Encodable {
+  private let definition: ModuleDefinition
+
+  init(_ definition: ModuleDefinition) {
+    self.definition = definition
+  }
+
+  enum CodingKeys: String, CodingKey {
+    case name
+    case functions
+    case properties
+    case constants
+    case views
+  }
+
+  func encode(to encoder: Encoder) throws {
+    var container = encoder.container(keyedBy: CodingKeys.self)
+    try container.encode(definition.name, forKey: .name)
+    try container.encode(definition.legacyConstants.map({ LegacyConstantsDefinitionEncoder($0) }), forKey: .constants)
+    try container.encode(definition.properties.values.map({ PropertyDefinitionEncoder($0) }), forKey: .properties)
+    try container.encode(definition.functions.values.map({ FunctionDefinitionEncoder($0) }), forKey: .functions)
+    try container.encode(definition.views.values.map({ ViewDefinitionEncoder($0) }), forKey: .views)
+  }
+}
+
+public class ModuleRegistryEncoder: Encodable {
+  private let registry: ModuleRegistry
+
+  public init(_ registry: ModuleRegistry) {
+    self.registry = registry
+  }
+
+  public func encode(to encoder: Encoder) throws {
+    var container = encoder.unkeyedContainer()
+    registry.getModuleNames().forEach {
+      guard let definition = registry.get(moduleWithName: $0)?.definition() else {
+        return
+      }
+      try? container.encode(ModuleDefinitionEncoder(definition))
+    }
+  }
+}
+
+class FunctionDefinitionEncoder: Encodable {
+  private let definition: any AnyFunctionDefinition
+
+  init(_ definition: any AnyFunctionDefinition) {
+    self.definition = definition
+  }
+
+  enum CodingKeys: String, CodingKey {
+    case name
+    case argumentsCount
+  }
+
+  func encode(to encoder: Encoder) throws {
+    var container = encoder.container(keyedBy: CodingKeys.self)
+    try container.encode(definition.name, forKey: .name)
+    try container.encode(definition.argumentsCount, forKey: .argumentsCount)
+  }
+}
+
+class ViewDefinitionEncoder: Encodable {
+  private let definition: any AnyViewDefinition
+
+  init(_ definition: any AnyViewDefinition) {
+    self.definition = definition
+  }
+
+  enum CodingKeys: String, CodingKey {
+    case name
+    case props
+  }
+
+  func encode(to encoder: Encoder) throws {
+    var container = encoder.container(keyedBy: CodingKeys.self)
+    try container.encode(definition.name, forKey: .name)
+    try container.encode(definition.props.map({ ViewPropEncoder($0) }), forKey: .props)
+  }
+}
+
+class ViewPropEncoder: Encodable {
+  private let definition: AnyViewProp
+
+  init(_ definition: AnyViewProp) {
+    self.definition = definition
+  }
+
+  enum CodingKeys: String, CodingKey {
+    case name
+  }
+
+  func encode(to encoder: Encoder) throws {
+    var container = encoder.container(keyedBy: CodingKeys.self)
+    try container.encode(definition.name, forKey: .name)
+  }
+}
+
+class ConstantEncoder: Encodable {
+  private let key: String
+  private let value: Any?
+
+  init(_ key: String, value: Any?) {
+    self.key = key
+    self.value = value
+  }
+
+  enum CodingKeys: String, CodingKey {
+    case name
+    case value
+    case type
+  }
+
+  func encode(to encoder: Encoder) throws {
+    var container = encoder.container(keyedBy: CodingKeys.self)
+    try container.encode(key, forKey: .name)
+    switch value {
+    case let value as String:
+      try container.encode(value, forKey: .value)
+      try container.encode("string", forKey: .type)
+    case let value as Bool:
+      try container.encode(value, forKey: .value)
+      try container.encode("boolean", forKey: .type)
+    case let value as Int:
+      try container.encode(value, forKey: .value)
+      try container.encode("number", forKey: .type)
+    case let value as Double:
+      try container.encode(value, forKey: .value)
+      try container.encode("number", forKey: .type)
+    case nil:
+      try container.encodeNil(forKey: .value)
+      try container.encode("null", forKey: .type)
+    case let value as Dictionary<String, Any>:
+      try container.encodeNil(forKey: .value)
+      try container.encode("object", forKey: .type)
+    case let value as Array<Any>:
+      try container.encodeNil(forKey: .value)
+      try container.encode("array", forKey: .type)
+    default:
+      try container.encodeNil(forKey: .value)
+      try container.encode("unknown", forKey: .type)
+    }
+  }
+}
+
+class LegacyConstantsDefinitionEncoder: Encodable {
+  private let definition: ConstantsDefinition
+
+  init(_ definition: ConstantsDefinition) {
+    self.definition = definition
+  }
+
+  enum CodingKeys: String, CodingKey {
+    case name
+    case value
+  }
+
+  func encode(to encoder: Encoder) throws {
+    var container = encoder.unkeyedContainer()
+    let constants = definition.body()
+    for (key, value) in constants {
+      try container.encode(ConstantEncoder(key, value: value))
+    }
+  }
+}
+
+class PropertyDefinitionEncoder: Encodable {
+  private let definition: any AnyPropertyDefinition
+
+  init(_ definition: any AnyPropertyDefinition) {
+    self.definition = definition
+  }
+
+  enum CodingKeys: String, CodingKey {
+    case name
+  }
+
+  func encode(to encoder: Encoder) throws {
+    var container = encoder.container(keyedBy: CodingKeys.self)
+    try container.encode(definition.name, forKey: .name)
+  }
+}

package/ios/ReactDelegates/ExpoReactDelegate.swift

@@ -17,7 +17,7 @@ public class ExpoReactDelegate: NSObject {
     initialProperties: [AnyHashable: Any]?,
     launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> UIView {
-    return self.handlers.lazy
+    return self.handlers
       .compactMap { $0.createReactRootView(reactDelegate: self, moduleName: moduleName, initialProperties: initialProperties, launchOptions: launchOptions) }
       .first(where: { _ in true })
       ?? {
@@ -45,7 +45,7 @@ public class ExpoReactDelegate: NSObject {
   @objc
   public func createRootViewController() -> UIViewController {
     return self.handlers.lazy
-      .compactMap { $0.createRootViewController(reactDelegate: self) }
+      .compactMap { $0.createRootViewController() }
       .first(where: { _ in true }) ?? UIViewController()
   }
 }

package/ios/ReactDelegates/ExpoReactDelegateHandler.swift

@@ -35,7 +35,7 @@ open class ExpoReactDelegateHandler: NSObject {
    Otherwise return nil.
    */
   @objc
-  open func createRootViewController(reactDelegate: ExpoReactDelegate) -> UIViewController? {
+  open func createRootViewController() -> UIViewController? {
     return nil
   }
 }

package/ios/Tests/FunctionSpec.swift

@@ -297,7 +297,11 @@ class FunctionSpec: ExpoSpec {
           AsyncFunction("withSharedObjectAsync") {
             return SharedString("Test")
           }
-          
+
+          AsyncFunction("withArrayOfSharedObjectsAsync") {
+            return [SharedString("Test1"), SharedString("Test2"), SharedString("Test3")]
+          }
+
           AsyncFunction("withSharedObjectPromise") { (p: Promise) in
             p.resolve(SharedString("Test with Promise"))
           }
@@ -382,6 +386,28 @@ class FunctionSpec: ExpoSpec {
         expect(result.getString()) == "Test"
       }
       
+      it("returns an Array of SharedObjects (async)") {
+        try runtime
+          .eval(
+            "expo.modules.TestModule.withArrayOfSharedObjectsAsync().then((result) => { globalThis.resultArray = result; })"
+          )
+
+        expect(safeBoolEval("globalThis.resultArray != null")).toEventually(beTrue(), timeout: .milliseconds(2000))
+        let object = try runtime.eval("object = globalThis.resultArray")
+        
+        expect(object.kind) == .object
+        expect(object.getObject().hasProperty("length")) == true
+
+        let result = object.getArray()
+        try result.enumerated().forEach { index, element in
+          expect(element.kind) == .object
+          expect(element.getObject().hasProperty("value")) == true
+          let value = try runtime.eval("object[\(index)].value")
+          expect(value.kind) == .string
+          expect(value.getString()) == "Test\(index + 1)"
+        }
+      }
+      
       it("returns a SharedObject with Promise") {
         try runtime
           .eval(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "2.3.13",
+  "version": "2.4.0",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
     "@testing-library/react-native": "^13.1.0",
     "expo-module-scripts": "^4.1.7"
   },
-  "gitHead": "49c9d53cf0a9fc8179d1c8f5268beadd141f70ca"
+  "gitHead": "7638c800b57fe78f57cc7f129022f58e84a523c5"
 }