expo-modules-core 1.2.6 → 1.3.0

package/ios/Swift/Records/Record.swift

@@ -15,7 +15,7 @@ public protocol Record: Convertible {
   /**
    Initializes a record from given dictionary. Only members wrapped by `@Field` will be set in the object.
    */
-  init(from: Dict) throws
+  init(from: Dict, appContext: AppContext) throws
 
   /**
    Converts the record back to the dictionary. Only members wrapped by `@Field` will be set in the dictionary.
@@ -27,14 +27,14 @@ public protocol Record: Convertible {
  Provides the default implementation of `Record` protocol.
  */
 public extension Record {
-  static func convert(from value: Any?) throws -> Self {
+  static func convert(from value: Any?, appContext: AppContext) throws -> Self {
     if let value = value as? Dict {
-      return try Self(from: value)
+      return try Self(from: value, appContext: appContext)
     }
     throw Conversions.ConvertingException<Self>(value)
   }
 
-  init(from dict: Dict) throws {
+  init(from dict: Dict, appContext: AppContext) throws {
     self.init()
 
     let dictKeys = dict.keys
@@ -45,7 +45,7 @@ public extension Record {
         return
       }
       if dictKeys.contains(key) || field.isRequired {
-        try field.set(dict[key])
+        try field.set(dict[key], appContext: appContext)
       }
     }
   }

package/ios/Swift/SharedObjects/SharedObjectRegistry.swift

@@ -126,4 +126,8 @@ public final class SharedObjectRegistry {
     }
     return createSharedJavaScriptObject(runtime: runtime, nativeObject: nativeObject)
   }
+
+  internal static func clear() {
+    pairs.removeAll()
+  }
 }

package/ios/Swift/Views/AnyViewProp.swift

@@ -12,5 +12,5 @@ public protocol AnyViewProp: ViewManagerDefinitionComponent {
   /**
    Function that sets the underlying prop value for given view.
    */
-  func set(value: Any, onView: UIView) throws
+  func set(value: Any, onView: UIView, appContext: AppContext) throws
 }

package/ios/Swift/Views/ComponentData.swift

@@ -43,6 +43,37 @@ public final class ComponentData: RCTComponentData {
     return super.createPropBlock(propName, isShadowView: isShadowView)
   }
 
+  public override func setProps(_ props: [String: Any], forView view: RCTComponent) {
+    guard let view = view as? UIView else {
+      log.warn("Given view is not an UIView")
+      return
+    }
+    guard let viewManager = moduleHolder?.viewManager else {
+      log.warn("View manager '\(self.name)' not found")
+      return
+    }
+    guard let appContext = moduleHolder?.appContext else {
+      log.warn("App context has been lost")
+      return
+    }
+    let propsDict = viewManager.propsDict()
+    var remainingProps = props
+
+    for (key, prop) in propsDict {
+      let newValue = props[key] as Any
+
+      // TODO: @tsapeta: Figure out better way to rethrow errors from here.
+      try? prop.set(value: Conversions.fromNSObject(newValue), onView: view, appContext: appContext)
+
+      remainingProps.removeValue(forKey: key)
+    }
+
+    // Let the base class `RCTComponentData` handle all remaining props.
+    super.setProps(remainingProps, forView: view)
+
+    viewManager.callLifecycleMethods(withType: .didUpdateProps, forView: view)
+  }
+
   /**
    The base `RCTComponentData` class does some Objective-C dynamic calls in this function, but we don't
    need to do these slow operations since the Sweet API gives us necessary details without reflections.
@@ -52,8 +83,12 @@ public final class ComponentData: RCTComponentData {
     var directEvents: [String] = []
     let superClass: AnyClass? = managerClass.superclass()
 
-    if let eventNames = moduleHolder?.viewManager?.eventNames {
-      for eventName in eventNames {
+    if let viewManager = moduleHolder?.viewManager {
+      for prop in viewManager.props {
+        // `id` allows every type to be passed in
+        propTypes[prop.name] = "id"
+      }
+      for eventName in viewManager.eventNames {
         directEvents.append(RCTNormalizeInputEventName(eventName))
         propTypes[eventName] = "BOOL"
       }

package/ios/Swift/Views/ConcreteViewProp.swift

@@ -32,13 +32,13 @@ public final class ConcreteViewProp<ViewType: UIView, PropType: AnyArgument>: An
   /**
    Function that sets the underlying prop value for given view.
    */
-  public func set(value: Any, onView view: UIView) throws {
+  public func set(value: Any, onView view: UIView, appContext: AppContext) throws {
     // Method's signature must be type-erased to conform to `AnyViewProp` protocol.
     // Given view must be castable to the generic `ViewType` type.
     guard let view = view as? ViewType else {
       throw IncompatibleViewException((propName: name, viewType: ViewType.self))
     }
-    guard let value = try propType.cast(value) as? PropType else {
+    guard let value = try propType.cast(value, appContext: appContext) as? PropType else {
       throw Conversions.CastingException<PropType>(value)
     }
     setter(view, value)

package/ios/Swift/Views/ViewDefinition.swift

@@ -52,14 +52,53 @@ public final class ViewDefinition<ViewType: UIView>: ViewManagerDefinition {
     public static func buildExpression(_ element: ViewLifecycleMethod<ViewType>) -> AnyViewDefinitionElement {
       return element
     }
+
+    /**
+     Accepts functions as a view definition elements.
+     */
+    public static func buildExpression<ElementType: ViewDefinitionFunctionElement>(
+      _ element: ElementType
+    ) -> AnyViewDefinitionElement {
+      return element
+    }
+
+    /**
+     Accepts functions that take the owner as a view definition elements.
+     */
+    public static func buildExpression<ElementType: ViewDefinitionFunctionElement>(
+      _ element: ElementType
+    ) -> AnyViewDefinitionElement where ElementType.ViewType == ViewType {
+      // Enforce async functions to run on the main queue
+      if var function = element as? AnyAsyncFunctionComponent {
+        function.runOnQueue(.main)
+        function.takesOwner = true
+      }
+      return element
+    }
   }
 }
 
+// MARK: - AnyViewDefinitionElement
+
 public protocol AnyViewDefinitionElement: AnyDefinition {}
 extension ConcreteViewProp: AnyViewDefinitionElement {}
 extension EventsDefinition: AnyViewDefinitionElement {}
 extension ViewLifecycleMethod: AnyViewDefinitionElement {}
 
+// MARK: - ViewDefinitionFunctionElement
+
+public protocol ViewDefinitionFunctionElement: AnyViewDefinitionElement {
+  associatedtype ViewType
+}
+extension AsyncFunctionComponent: ViewDefinitionFunctionElement {
+  public typealias ViewType = FirstArgType
+}
+extension ConcurrentFunctionDefinition: ViewDefinitionFunctionElement {
+  public typealias ViewType = FirstArgType
+}
+
+extension UIView: AnyArgument {}
+
 /**
  Creates a view definition describing the native view exported to React.
  */

package/ios/Swift/Views/ViewModuleWrapper.swift

@@ -91,35 +91,6 @@ public final class ViewModuleWrapper: RCTViewManager, DynamicModuleWrapperProtoc
     return view
   }
 
-  /**
-   The config for `proxiedProperties` prop. In Objective-C style, this function is generated by `RCT_CUSTOM_VIEW_PROPERTY` macro.
-   */
-  @objc
-  public class func propConfig_proxiedProperties() -> [String] {
-    return ["NSDictionary", "__custom__"]
-  }
-
-  /**
-   The setter for `proxiedProperties` prop. In Objective-C style, this function is generated by `RCT_CUSTOM_VIEW_PROPERTY` macro.
-   */
-  @objc
-  public func set_proxiedProperties(_ json: Any, forView view: UIView, withDefaultView defaultView: UIView) {
-    guard let json = json as? [String: Any], let viewManager = wrappedModuleHolder.definition.viewManager else {
-      return
-    }
-    let props = viewManager.propsDict()
-
-    for (key, prop) in props {
-      let newValue = json[key] as Any
-
-      // TODO: @tsapeta: Figure out better way to rethrow errors from here.
-      // Adding `throws` keyword to the function results in different
-      // method signature in Objective-C. Maybe just call `RCTLogError`?
-      try? prop.set(value: Conversions.fromNSObject(newValue), onView: view)
-    }
-    viewManager.callLifecycleMethods(withType: .didUpdateProps, forView: view)
-  }
-
   public static let viewManagerAdapterPrefix = "ViewManagerAdapter_"
 
   /**

package/ios/Tests/ClassComponentSpec.swift

@@ -32,9 +32,9 @@ class ClassComponentSpec: ExpoSpec {
       }
 
       it("builds a class") {
-        let runtime = JavaScriptRuntime()
+        let appContext = AppContext.create()
         let klass = Class("") {}
-        let object = klass.build(inRuntime: runtime)
+        let object = try klass.build(appContext: appContext)
 
         expect(object.hasProperty("prototype")) == true
         expect(object.getProperty("prototype").kind) == .object
@@ -43,7 +43,7 @@ class ClassComponentSpec: ExpoSpec {
 
     describe("module") {
       let appContext = AppContext.create()
-      let runtime = appContext.runtime
+      let runtime = try! appContext.runtime
 
       beforeSuite {
         class ClassTestModule: Module {
@@ -67,72 +67,72 @@ class ClassComponentSpec: ExpoSpec {
       }
 
       it("is a function") {
-        let klass = try runtime?.eval("expo.modules.ClassTest.MyClass")
-        expect(klass?.isFunction()) == true
+        let klass = try runtime.eval("expo.modules.ClassTest.MyClass")
+        expect(klass.isFunction()) == true
       }
 
       it("has a name") {
-        let klass = try runtime?.eval("expo.modules.ClassTest.MyClass.name")
-        expect(klass?.getString()) == "MyClass"
+        let klass = try runtime.eval("expo.modules.ClassTest.MyClass.name")
+        expect(klass.getString()) == "MyClass"
       }
 
       it("has a prototype") {
-        let prototype = try runtime?.eval("expo.modules.ClassTest.MyClass.prototype")
-        expect(prototype?.isObject()) == true
+        let prototype = try runtime.eval("expo.modules.ClassTest.MyClass.prototype")
+        expect(prototype.isObject()) == true
       }
 
       it("has keys in prototype") {
-        let prototypeKeys = try runtime?.eval("Object.keys(expo.modules.ClassTest.MyClass.prototype)")
+        let prototypeKeys = try runtime.eval("Object.keys(expo.modules.ClassTest.MyClass.prototype)")
           .getArray()
-          .map { $0.getString() } ?? []
+          .map { $0.getString() }
 
         expect(prototypeKeys).to(contain("myFunction"))
         expect(prototypeKeys).notTo(contain("__native_constructor__"))
       }
 
       it("is an instance of") {
-        let isInstanceOf = try runtime?.eval([
+        let isInstanceOf = try runtime.eval([
           "myObject = new expo.modules.ClassTest.MyClass()",
           "myObject instanceof expo.modules.ClassTest.MyClass",
         ])
 
-        expect(isInstanceOf?.getBool()) == true
+        expect(isInstanceOf.getBool()) == true
       }
 
       it("defines properties on initialization") {
         // The properties are not specified in the prototype, but defined during initialization.
-        let object = try runtime?.eval("new expo.modules.ClassTest.MyClass()").asObject()
-        expect(object?.getPropertyNames()).to(contain("foo"))
-        expect(object?.getProperty("foo").getString()) == "bar"
+        let object = try runtime.eval("new expo.modules.ClassTest.MyClass()").asObject()
+        expect(object.getPropertyNames()).to(contain("foo"))
+        expect(object.getProperty("foo").getString()) == "bar"
       }
     }
 
     describe("class with associated type") {
       let appContext = AppContext.create()
-      let runtime = appContext.runtime
+      let runtime = try! appContext.runtime
 
       beforeSuite {
         appContext.moduleRegistry.register(moduleType: ModuleWithCounterClass.self)
       }
       it("is defined") {
-        let isDefined = try! runtime!.eval("'Counter' in expo.modules.TestModule")
+        let isDefined = try runtime.eval("'Counter' in expo.modules.TestModule")
 
         expect(isDefined.getBool()) == true
       }
       it("creates shared object") {
-        let jsObject = try! runtime!.eval("new expo.modules.TestModule.Counter(0)").getObject()
+        let jsObject = try runtime.eval("new expo.modules.TestModule.Counter(0)").getObject()
         let nativeObject = SharedObjectRegistry.toNativeObject(jsObject)
 
         expect(nativeObject).notTo(beNil())
       }
       it("registers shared object") {
         let oldSize = SharedObjectRegistry.size
-        try! runtime?.eval("object = new expo.modules.TestModule.Counter(0)")
+        try runtime.eval("object = new expo.modules.TestModule.Counter(0)")
 
         expect(SharedObjectRegistry.size) == oldSize + 1
       }
       it("calls function with owner") {
-        try runtime?.eval([
+        try runtime.eval([
           "object = new expo.modules.TestModule.Counter(0)",
           "object.increment(1)",
         ])
@@ -140,7 +140,7 @@ class ClassComponentSpec: ExpoSpec {
       }
       it("creates with initial value") {
         let initialValue = Int.random(in: 1..<100)
-        let value = try runtime!.eval([
+        let value = try runtime.eval([
           "object = new expo.modules.TestModule.Counter(\(initialValue))",
           "object.getValue()",
         ])
@@ -149,7 +149,7 @@ class ClassComponentSpec: ExpoSpec {
         expect(value.getInt()) == initialValue
       }
       it("gets shared object value") {
-        let value = try runtime!.eval([
+        let value = try runtime.eval([
           "object = new expo.modules.TestModule.Counter(0)",
           "object.getValue()",
         ])
@@ -158,10 +158,10 @@ class ClassComponentSpec: ExpoSpec {
         expect(value.isNumber()) == true
       }
       it("changes shared object") {
-        try! runtime?.eval("object = new expo.modules.TestModule.Counter(0)")
+        try runtime.eval("object = new expo.modules.TestModule.Counter(0)")
         let incrementBy = Int.random(in: 1..<100)
-        let value = try runtime!.eval("object.getValue()").asInt()
-        let newValue = try runtime!.eval([
+        let value = try runtime.eval("object.getValue()").asInt()
+        let newValue = try runtime.eval([
           "object.increment(\(incrementBy))",
           "object.getValue()",
         ])
@@ -172,7 +172,7 @@ class ClassComponentSpec: ExpoSpec {
 
       it("gets value from the dynamic property") {
         let initialValue = Int.random(in: 1..<100)
-        let value = try runtime!.eval([
+        let value = try runtime.eval([
           "object = new expo.modules.TestModule.Counter(\(initialValue))",
           "object.currentValue"
         ])
@@ -180,6 +180,14 @@ class ClassComponentSpec: ExpoSpec {
         expect(value.kind) == .number
         expect(value.getInt()) == initialValue
       }
+
+      it("initializes the shared object from native") {
+        let initialValue = Int.random(in: 1..<100)
+        let value = try runtime.eval("expo.modules.TestModule.newCounter(\(initialValue))")
+
+        expect(value.kind) == .object
+        expect(value.getObject().getProperty("currentValue").getInt()) == initialValue
+      }
     }
   }
 }
@@ -191,6 +199,10 @@ fileprivate final class ModuleWithCounterClass: Module {
   func definition() -> ModuleDefinition {
     Name("TestModule")
 
+    Function("newCounter") { (initialValue: Int) in
+      return Counter(initialValue: initialValue)
+    }
+
     Class(Counter.self) {
       Constructor { (initialValue: Int) in
         return Counter(initialValue: initialValue)