expo-modules-core 0.8.0 → 0.9.2

package/ios/Swift/JavaScriptUtils.swift

@@ -36,17 +36,62 @@ internal func createSyncFunctionBlock(holder: ModuleHolder, name functionName: S
   }
 }
 
+// MARK: - Arguments
+
 /**
- If given argument is a JavaScriptValue, it's unpacked and converted to corresponding Foundation type.
- Otherwise, the argument is returned as is.
+ Tries to cast given argument to the type that is wrapped by the argument type.
+ - Parameters:
+  - argument: A value to be cast. If it's a ``JavaScriptValue``, it's first unpacked to the raw value.
+  - argumentType: Something that implements ``AnyArgumentType`` and knows how to cast the argument.
+ - Returns: A new value converted according to the argument type.
+ - Throws: Rethrows various exceptions that could be thrown by the argument type wrappers.
  */
-internal func unpackIfJavaScriptValue(_ value: Any) -> Any {
-  if let value = value as? JavaScriptValue {
-    return value.getRaw() as Any
+internal func castArgument(_ argument: Any, toType argumentType: AnyArgumentType) throws -> Any {
+  // TODO: Accept JavaScriptValue and JavaScriptObject as argument types.
+  if let argument = argument as? JavaScriptValue {
+    return try argumentType.cast(argument.getRaw())
+  }
+  return try argumentType.cast(argument)
+}
+
+/**
+ Same as ``castArgument(_:argumentType:)`` but for an array of arguments.
+ - Parameters:
+   - arguments: An array of arguments to be cast.
+   - argumentTypes: An array of argument types in the same order as the array of arguments.
+ - Returns: An array of arguments after casting. Its size is the same as the input arrays.
+ - Throws: ``InvalidArgsNumberException`` when the sizes of arrays passed as parameters are not equal.
+   Rethrows exceptions thrown by ``castArgument(_:argumentType:)``.
+ */
+internal func castArguments(_ arguments: [Any], toTypes argumentTypes: [AnyArgumentType]) throws -> [Any] {
+  if arguments.count != argumentTypes.count {
+    throw InvalidArgsNumberException((received: arguments.count, expected: argumentTypes.count))
+  }
+  return try arguments.enumerated().map { index, argument in
+    let argumentType = argumentTypes[index]
+
+    do {
+      return try castArgument(argument, toType: argumentType)
+    } catch {
+      throw ArgumentCastException((index: index, type: argumentType)).causedBy(error)
+    }
   }
-  return value
 }
 
+internal class InvalidArgsNumberException: GenericException<(received: Int, expected: Int)> {
+  override var reason: String {
+    "Received \(param.received) arguments, but \(param.expected) was expected"
+  }
+}
+
+internal class ArgumentCastException: GenericException<(index: Int, type: AnyArgumentType)> {
+  override var reason: String {
+    "Argument at index '\(param.index)' couldn't be cast to type \(param.type.description)"
+  }
+}
+
+// MARK: - Exceptions
+
 private class ModuleUnavailableException: GenericException<String> {
   override var reason: String {
     "Module '\(param)' is no longer available"

package/ios/Swift/ModuleHolder.swift

@@ -74,12 +74,11 @@ public final class ModuleHolder {
       // - Swift primitives when invoked through the bridge and in unit tests
       // - `JavaScriptValue`s when the function is called through the JSI
       // The latter need to be unpacked to Swift primitives on the JS thread,
-      // so before the function call is scheduled on the queue.
-      // TODO: Move arguments conversion mechanism to JS thread and allow JS types as function arguments.
-      let unpackedArgs = args.map { arg in unpackIfJavaScriptValue(arg) }
+      // so we do the casting before the function call is scheduled on the queue.
+      let arguments = try castArguments(args, toTypes: function.argumentTypes)
 
       queue.async {
-        function.call(args: unpackedArgs, promise: promise)
+        function.call(args: arguments, promise: promise)
       }
     } catch let error as CodedError {
       promise.reject(error)
@@ -99,13 +98,15 @@ public final class ModuleHolder {
 
   @discardableResult
   func callSync(function functionName: String, args: [Any]) -> Any? {
-    if let function = definition.functions[functionName] {
-      // The comment in `call(function:args:promise)` is partially applicable here as well.
-      // TODO: Move unpacking JS values to `callSync` in function's instance
-      let unpackedArgs = args.map { arg in unpackIfJavaScriptValue(arg) }
-      return function.callSync(args: unpackedArgs)
+    guard let function = definition.functions[functionName] else {
+      return nil
+    }
+    do {
+      let arguments = try castArguments(args, toTypes: function.argumentTypes)
+      return function.callSync(args: arguments)
+    } catch {
+      return error
     }
-    return nil
   }
 
   // MARK: JavaScript Module Object

package/ios/Swift/Modules/ModuleDefinitionComponents.swift

@@ -12,6 +12,7 @@ extension AnyModule {
   /**
    Sets the name of the module that is exported to the JavaScript world.
    */
+  @available(*, deprecated, renamed: "Name")
   public func name(_ name: String) -> AnyDefinition {
     return ModuleNameDefinition(name: name)
   }
@@ -21,6 +22,7 @@ extension AnyModule {
   /**
    Creates module's lifecycle listener that is called right after module initialization.
    */
+  @available(*, deprecated, renamed: "OnCreate")
   public func onCreate(_ closure: @escaping () -> Void) -> AnyDefinition {
     return EventListener(.moduleCreate, closure)
   }
@@ -28,6 +30,7 @@ extension AnyModule {
   /**
    Creates module's lifecycle listener that is called when the module is about to be deallocated.
    */
+  @available(*, deprecated, renamed: "OnDestroy")
   public func onDestroy(_ closure: @escaping () -> Void) -> AnyDefinition {
     return EventListener(.moduleDestroy, closure)
   }
@@ -35,6 +38,7 @@ extension AnyModule {
   /**
    Creates module's lifecycle listener that is called when the app context owning the module is about to be deallocated.
    */
+  @available(*, deprecated, renamed: "OnAppContextDestroys")
   public func onAppContextDestroys(_ closure: @escaping () -> Void) -> AnyDefinition {
     return EventListener(.appContextDestroys, closure)
   }
@@ -42,6 +46,7 @@ extension AnyModule {
   /**
    Creates a listener that is called when the app is about to enter the foreground mode.
    */
+  @available(*, deprecated, renamed: "OnAppEntersBackground")
   public func onAppEntersForeground(_ closure: @escaping () -> Void) -> AnyDefinition {
     return EventListener(.appEntersForeground, closure)
   }
@@ -49,6 +54,7 @@ extension AnyModule {
   /**
    Creates a listener that is called when the app becomes active again.
    */
+  @available(*, deprecated, renamed: "OnAppBecomesActive")
   public func onAppBecomesActive(_ closure: @escaping () -> Void) -> AnyDefinition {
     return EventListener(.appBecomesActive, closure)
   }
@@ -56,6 +62,7 @@ extension AnyModule {
   /**
    Creates a listener that is called when the app enters the background mode.
    */
+  @available(*, deprecated, renamed: "OnAppEntersBackground")
   public func onAppEntersBackground(_ closure: @escaping () -> Void) -> AnyDefinition {
     return EventListener(.appEntersBackground, closure)
   }
@@ -65,55 +72,70 @@ extension AnyModule {
   /**
    Creates the view manager definition that scopes other view-related definitions.
    */
+  @available(*, deprecated, renamed: "ViewManager")
   public func viewManager(@ViewManagerDefinitionBuilder _ closure: @escaping () -> ViewManagerDefinition) -> AnyDefinition {
     return closure()
   }
 }
 
-// TODO: - Remove deprecated `method` component once SDK44 is out.
-public extension AnyModule {
-  /**
-   Function without arguments.
-   */
-  @available(*, deprecated, renamed: "function")
-  func method<R>(
-    _ name: String,
-    _ closure: @escaping () -> R
-  ) -> AnyFunction {
-    return ConcreteFunction(
-      name,
-      argTypes: [],
-      closure
-    )
-  }
+// MARK: - Module name
 
-  /**
-   Function with one argument.
-   */
-  @available(*, deprecated, renamed: "function")
-  func method<R, A0: AnyArgument>(
-    _ name: String,
-    _ closure: @escaping (A0) -> R
-  ) -> AnyFunction {
-    return ConcreteFunction(
-      name,
-      argTypes: [ArgumentType(A0.self)],
-      closure
-    )
-  }
+/**
+ Sets the name of the module that is exported to the JavaScript world.
+ */
+public func Name(_ name: String) -> AnyDefinition {
+  return ModuleNameDefinition(name: name)
+}
 
-  /**
-   Function with two arguments.
-   */
-  @available(*, deprecated, renamed: "function")
-  func method<R, A0: AnyArgument, A1: AnyArgument>(
-    _ name: String,
-    _ closure: @escaping (A0, A1) -> R
-  ) -> AnyFunction {
-    return ConcreteFunction(
-      name,
-      argTypes: [ArgumentType(A0.self), ArgumentType(A1.self)],
-      closure
-    )
-  }
+// MARK: - Module's lifecycle
+
+/**
+ Creates module's lifecycle listener that is called right after module initialization.
+ */
+public func OnCreate(_ closure: @escaping () -> Void) -> AnyDefinition {
+  return EventListener(.moduleCreate, closure)
+}
+
+/**
+ Creates module's lifecycle listener that is called when the module is about to be deallocated.
+ */
+public func OnDestroy(_ closure: @escaping () -> Void) -> AnyDefinition {
+  return EventListener(.moduleDestroy, closure)
+}
+
+/**
+ Creates module's lifecycle listener that is called when the app context owning the module is about to be deallocated.
+ */
+public func OnAppContextDestroys(_ closure: @escaping () -> Void) -> AnyDefinition {
+  return EventListener(.appContextDestroys, closure)
+}
+
+/**
+ Creates a listener that is called when the app is about to enter the foreground mode.
+ */
+public func OnAppEntersForeground(_ closure: @escaping () -> Void) -> AnyDefinition {
+  return EventListener(.appEntersForeground, closure)
+}
+
+/**
+ Creates a listener that is called when the app becomes active again.
+ */
+public func OnAppBecomesActive(_ closure: @escaping () -> Void) -> AnyDefinition {
+  return EventListener(.appBecomesActive, closure)
+}
+
+/**
+ Creates a listener that is called when the app enters the background mode.
+ */
+public func OnAppEntersBackground(_ closure: @escaping () -> Void) -> AnyDefinition {
+  return EventListener(.appEntersBackground, closure)
+}
+
+// MARK: - View Manager
+
+/**
+ Creates the view manager definition that scopes other view-related definitions.
+ */
+public func ViewManager(@ViewManagerDefinitionBuilder _ closure: @escaping () -> ViewManagerDefinition) -> AnyDefinition {
+  return closure()
 }

package/ios/Swift/Objects/ObjectDefinitionComponents.swift

@@ -6,6 +6,7 @@
 /**
  Definition function setting the module's constants to export.
  */
+@available(*, deprecated, renamed: "Constants")
 public func constants(_ body: @escaping () -> [String: Any?]) -> AnyDefinition {
   return ConstantsDefinition(body: body)
 }
@@ -13,16 +14,31 @@ public func constants(_ body: @escaping () -> [String: Any?]) -> AnyDefinition {
 /**
  Definition function setting the module's constants to export.
  */
+public func Constants(_ body: @escaping () -> [String: Any?]) -> AnyDefinition {
+  return ConstantsDefinition(body: body)
+}
+
+/**
+ Definition function setting the module's constants to export.
+ */
+@available(*, deprecated, renamed: "Constants")
 public func constants(_ body: @autoclosure @escaping () -> [String: Any?]) -> AnyDefinition {
   return ConstantsDefinition(body: body)
 }
 
+/**
+ Definition function setting the module's constants to export.
+ */
+public func Constants(_ body: @autoclosure @escaping () -> [String: Any?]) -> AnyDefinition {
+  return ConstantsDefinition(body: body)
+}
+
 // MARK: - Functions
 
 /**
  Function without arguments.
  */
-@available(*, deprecated, renamed: "asyncFunction")
+@available(*, deprecated, renamed: "AsyncFunction")
 public func function<R>(
   _ name: String,
   _ closure: @escaping () throws -> R
@@ -37,7 +53,7 @@ public func function<R>(
 /**
  Function with one argument.
  */
-@available(*, deprecated, renamed: "asyncFunction")
+@available(*, deprecated, renamed: "AsyncFunction")
 public func function<R, A0: AnyArgument>(
   _ name: String,
   _ closure: @escaping (A0) throws -> R
@@ -52,7 +68,7 @@ public func function<R, A0: AnyArgument>(
 /**
  Function with two arguments.
  */
-@available(*, deprecated, renamed: "asyncFunction")
+@available(*, deprecated, renamed: "AsyncFunction")
 public func function<R, A0: AnyArgument, A1: AnyArgument>(
   _ name: String,
   _ closure: @escaping (A0, A1) throws -> R
@@ -67,7 +83,7 @@ public func function<R, A0: AnyArgument, A1: AnyArgument>(
 /**
  Function with three arguments.
  */
-@available(*, deprecated, renamed: "asyncFunction")
+@available(*, deprecated, renamed: "AsyncFunction")
 public func function<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument>(
   _ name: String,
   _ closure: @escaping (A0, A1, A2) throws -> R
@@ -86,7 +102,7 @@ public func function<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument>(
 /**
  Function with four arguments.
  */
-@available(*, deprecated, renamed: "asyncFunction")
+@available(*, deprecated, renamed: "AsyncFunction")
 public func function<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: AnyArgument>(
   _ name: String,
   _ closure: @escaping (A0, A1, A2, A3) throws -> R
@@ -106,7 +122,7 @@ public func function<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: A
 /**
  Function with five arguments.
  */
-@available(*, deprecated, renamed: "asyncFunction")
+@available(*, deprecated, renamed: "AsyncFunction")
 public func function<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: AnyArgument, A4: AnyArgument>(
   _ name: String,
   _ closure: @escaping (A0, A1, A2, A3, A4) throws -> R
@@ -127,7 +143,7 @@ public func function<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: A
 /**
  Function with six arguments.
  */
-@available(*, deprecated, renamed: "asyncFunction")
+@available(*, deprecated, renamed: "AsyncFunction")
 public func function<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: AnyArgument, A4: AnyArgument, A5: AnyArgument>(
   _ name: String,
   _ closure: @escaping (A0, A1, A2, A3, A4, A5) throws -> R
@@ -149,7 +165,7 @@ public func function<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: A
 /**
  Function with seven arguments.
  */
-@available(*, deprecated, renamed: "asyncFunction")
+@available(*, deprecated, renamed: "AsyncFunction")
 public func function<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: AnyArgument, A4: AnyArgument, A5: AnyArgument, A6: AnyArgument>(
   _ name: String,
   _ closure: @escaping (A0, A1, A2, A3, A4, A5, A6) throws -> R
@@ -172,7 +188,7 @@ public func function<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: A
 /**
  Function with eight arguments.
  */
-@available(*, deprecated, renamed: "asyncFunction")
+@available(*, deprecated, renamed: "AsyncFunction")
 public func function<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: AnyArgument, A4: AnyArgument, A5: AnyArgument, A6: AnyArgument, A7: AnyArgument>(
   _ name: String,
   _ closure: @escaping (A0, A1, A2, A3, A4, A5, A6, A7) throws -> R
@@ -193,192 +209,49 @@ public func function<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: A
   )
 }
 
-// MARK: - Asynchronous functions
-
-/**
- Asynchronous function without arguments.
- */
-public func asyncFunction<R>(
-  _ name: String,
-  _ closure: @escaping () throws -> R
-) -> AnyFunction {
-  return AsyncFunction(
-    name,
-    argTypes: [],
-    closure
-  )
-}
-
-/**
- Asynchronous function with one argument.
- */
-public func asyncFunction<R, A0: AnyArgument>(
-  _ name: String,
-  _ closure: @escaping (A0) throws -> R
-) -> AnyFunction {
-  return AsyncFunction(
-    name,
-    argTypes: [ArgumentType(A0.self)],
-    closure
-  )
-}
-
-/**
- Asynchronous function with two arguments.
- */
-public func asyncFunction<R, A0: AnyArgument, A1: AnyArgument>(
-  _ name: String,
-  _ closure: @escaping (A0, A1) throws -> R
-) -> AnyFunction {
-  return AsyncFunction(
-    name,
-    argTypes: [ArgumentType(A0.self), ArgumentType(A1.self)],
-    closure
-  )
-}
-
-/**
- Asynchronous function with three arguments.
- */
-public func asyncFunction<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument>(
-  _ name: String,
-  _ closure: @escaping (A0, A1, A2) throws -> R
-) -> AnyFunction {
-  return AsyncFunction(
-    name,
-    argTypes: [
-      ArgumentType(A0.self),
-      ArgumentType(A1.self),
-      ArgumentType(A2.self)
-    ],
-    closure
-  )
-}
-
-/**
- Asynchronous function with four arguments.
- */
-public func asyncFunction<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: AnyArgument>(
-  _ name: String,
-  _ closure: @escaping (A0, A1, A2, A3) throws -> R
-) -> AnyFunction {
-  return AsyncFunction(
-    name,
-    argTypes: [
-      ArgumentType(A0.self),
-      ArgumentType(A1.self),
-      ArgumentType(A2.self),
-      ArgumentType(A3.self)
-    ],
-    closure
-  )
-}
-
-/**
- Asynchronous function with five arguments.
- */
-public func asyncFunction<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: AnyArgument, A4: AnyArgument>(
-  _ name: String,
-  _ closure: @escaping (A0, A1, A2, A3, A4) throws -> R
-) -> AnyFunction {
-  return AsyncFunction(
-    name,
-    argTypes: [
-      ArgumentType(A0.self),
-      ArgumentType(A1.self),
-      ArgumentType(A2.self),
-      ArgumentType(A3.self),
-      ArgumentType(A4.self)
-    ],
-    closure
-  )
-}
+// MARK: - Events
 
 /**
- Asynchronous function with six arguments.
+ Defines event names that the object can send to JavaScript.
  */
-public func asyncFunction<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: AnyArgument, A4: AnyArgument, A5: AnyArgument>(
-  _ name: String,
-  _ closure: @escaping (A0, A1, A2, A3, A4, A5) throws -> R
-) -> AnyFunction {
-  return AsyncFunction(
-    name,
-    argTypes: [
-      ArgumentType(A0.self),
-      ArgumentType(A1.self),
-      ArgumentType(A2.self),
-      ArgumentType(A3.self),
-      ArgumentType(A4.self),
-      ArgumentType(A5.self)
-    ],
-    closure
-  )
+@available(*, deprecated, renamed: "Events")
+public func events(_ names: String...) -> AnyDefinition {
+  return EventsDefinition(names: names)
 }
 
 /**
- Asynchronous function with seven arguments.
+ Defines event names that the object can send to JavaScript.
  */
-public func asyncFunction<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: AnyArgument, A4: AnyArgument, A5: AnyArgument, A6: AnyArgument>(
-  _ name: String,
-  _ closure: @escaping (A0, A1, A2, A3, A4, A5, A6) throws -> R
-) -> AnyFunction {
-  return AsyncFunction(
-    name,
-    argTypes: [
-      ArgumentType(A0.self),
-      ArgumentType(A1.self),
-      ArgumentType(A2.self),
-      ArgumentType(A3.self),
-      ArgumentType(A4.self),
-      ArgumentType(A5.self),
-      ArgumentType(A6.self)
-    ],
-    closure
-  )
+public func Events(_ names: String...) -> AnyDefinition {
+  return EventsDefinition(names: names)
 }
 
 /**
- Asynchronous function with eight arguments.
+ Function that is invoked when the first event listener is added.
  */
-public func asyncFunction<R, A0: AnyArgument, A1: AnyArgument, A2: AnyArgument, A3: AnyArgument, A4: AnyArgument, A5: AnyArgument, A6: AnyArgument, A7: AnyArgument>(
-  _ name: String,
-  _ closure: @escaping (A0, A1, A2, A3, A4, A5, A6, A7) throws -> R
-) -> AnyFunction {
-  return AsyncFunction(
-    name,
-    argTypes: [
-      ArgumentType(A0.self),
-      ArgumentType(A1.self),
-      ArgumentType(A2.self),
-      ArgumentType(A3.self),
-      ArgumentType(A4.self),
-      ArgumentType(A5.self),
-      ArgumentType(A6.self),
-      ArgumentType(A7.self)
-    ],
-    closure
-  )
+@available(*, deprecated, renamed: "OnStartObserving")
+public func onStartObserving(_ body: @escaping () -> Void) -> AnyFunction {
+  return ConcreteFunction("startObserving", argTypes: [], body)
 }
 
-// MARK: - Events
-
 /**
- Defines event names that the object can send to JavaScript.
+ Function that is invoked when the first event listener is added.
  */
-public func events(_ names: String...) -> AnyDefinition {
-  return EventsDefinition(names: names)
+public func OnStartObserving(_ body: @escaping () -> Void) -> AnyFunction {
+  return ConcreteFunction("startObserving", argTypes: [], body)
 }
 
 /**
- Function that is invoked when the first event listener is added.
+ Function that is invoked when all event listeners are removed.
  */
-public func onStartObserving(_ body: @escaping () -> Void) -> AnyFunction {
-  return ConcreteFunction("startObserving", argTypes: [], body)
+@available(*, deprecated, renamed: "OnStopObserving")
+public func onStopObserving(_ body: @escaping () -> Void) -> AnyFunction {
+  return ConcreteFunction("stopObserving", argTypes: [], body)
 }
 
 /**
  Function that is invoked when all event listeners are removed.
  */
-public func onStopObserving(_ body: @escaping () -> Void) -> AnyFunction {
+public func OnStopObserving(_ body: @escaping () -> Void) -> AnyFunction {
   return ConcreteFunction("stopObserving", argTypes: [], body)
 }

package/ios/Swift/Views/ViewManagerDefinitionComponents.swift

@@ -5,15 +5,24 @@
 /**
  Defines the factory creating a native view when the module is used as a view.
  */
+@available(*, deprecated, renamed: "View")
 public func view(_ closure: @escaping () -> UIView) -> ViewManagerDefinitionComponent {
   return ViewFactory(closure)
 }
 
+/**
+ Defines the factory creating a native view when the module is used as a view.
+ */
+public func View(_ closure: @escaping () -> UIView) -> ViewManagerDefinitionComponent {
+  return ViewFactory(closure)
+}
+
 // MARK: Props
 
 /**
  Creates a view prop that defines its name and setter.
  */
+@available(*, deprecated, renamed: "Prop")
 public func prop<ViewType: UIView, PropType: AnyArgument>(
   _ name: String,
   _ setter: @escaping (ViewType, PropType) -> Void
@@ -24,3 +33,17 @@ public func prop<ViewType: UIView, PropType: AnyArgument>(
     setter: setter
   )
 }
+
+/**
+ Creates a view prop that defines its name and setter.
+ */
+public func Prop<ViewType: UIView, PropType: AnyArgument>(
+  _ name: String,
+  _ setter: @escaping (ViewType, PropType) -> Void
+) -> ViewManagerDefinitionComponent {
+  return ConcreteViewProp(
+    name: name,
+    propType: ArgumentType(PropType.self),
+    setter: setter
+  )
+}

package/ios/Tests/ConstantsSpec.swift

@@ -8,7 +8,7 @@ class ConstantsSpec: ExpoSpec {
 
     it("takes closure resolving to dictionary") {
       let holder = mockModuleHolder(appContext) {
-        constants {
+        Constants {
           return ["test": 123]
         }
       }
@@ -17,15 +17,15 @@ class ConstantsSpec: ExpoSpec {
 
     it("takes the dictionary") {
       let holder = mockModuleHolder(appContext) {
-        constants(["test": 123])
+        Constants(["test": 123])
       }
       expect(holder.getConstants()["test"] as? Int) == 123
     }
 
     it("merges multiple constants definitions") {
       let holder = mockModuleHolder(appContext) {
-        constants(["test": 456, "test2": 789])
-        constants(["test": 123])
+        Constants(["test": 456, "test2": 789])
+        Constants(["test": 123])
       }
       let consts = holder.getConstants()
       expect(consts["test"] as? Int) == 123

package/ios/Tests/ExpoModulesSpec.swift

@@ -20,12 +20,11 @@ class ExpoModulesSpec: ExpoSpec {
       try! appContext.installExpoModulesHostObject(interopBridge)
 
       appContext.moduleRegistry.register(holder: mockModuleHolder(appContext) {
-        $0.name(testModuleName)
+        Name(testModuleName)
 
-        constants(constantsDict)
+        Constants(constantsDict)
 
-        function(testFunctionName) { Double.pi }
-          .runSynchronously()
+        Function(testFunctionName) { Double.pi }
       })
     }