expo-modules-core 0.9.2 → 0.10.0

package/ios/NativeModulesProxy/EXNativeModulesProxy.mm

@@ -28,6 +28,46 @@ static const NSString *methodInfoKeyKey = @"key";
 static const NSString *methodInfoNameKey = @"name";
 static const NSString *methodInfoArgumentsCountKey = @"argumentsCount";
 
+@interface EXModulesProxyConfig ()
+
+@property (readonly) NSMutableDictionary *exportedConstants;
+@property (readonly) NSMutableDictionary *methodNames;
+@property (readonly) NSMutableDictionary *viewManagerMetadata;
+
+@end
+
+@implementation EXModulesProxyConfig
+
+- (instancetype)initWithConstants:(nonnull NSDictionary *)constants
+                      methodNames:(nonnull NSDictionary *)methodNames
+                     viewManagers:(nonnull NSDictionary *)viewManagerMetadata
+{
+  if (self = [super init]) {
+    _exportedConstants = constants;
+    _methodNames = methodNames;
+    _viewManagerMetadata = viewManagerMetadata;
+  }
+  return self;
+}
+
+- (void)addEntriesFromConfig:(nonnull const EXModulesProxyConfig*)config
+{
+  [_exportedConstants addEntriesFromDictionary:config.exportedConstants];
+  [_methodNames addEntriesFromDictionary:config.methodNames];
+  [_viewManagerMetadata addEntriesFromDictionary:config.viewManagerMetadata];
+}
+
+- (nonnull NSDictionary<NSString *, id> *)toDictionary
+{
+  NSMutableDictionary <NSString *, id> *constantsAccumulator = [NSMutableDictionary dictionary];
+  constantsAccumulator[viewManagersMetadataKeyPath] = _viewManagerMetadata;
+  constantsAccumulator[exportedConstantsKeyPath] = _exportedConstants;
+  constantsAccumulator[exportedMethodsNamesKeyPath] = _methodNames;
+  return constantsAccumulator;
+}
+
+@end
+
 @interface RCTBridge (RegisterAdditionalModuleClasses)
 
 - (NSArray<RCTModuleData *> *)registerModulesForClasses:(NSArray<Class> *)moduleClasses;
@@ -51,9 +91,12 @@ static const NSString *methodInfoArgumentsCountKey = @"argumentsCount";
 
 @end
 
-@implementation EXNativeModulesProxy
+@implementation EXNativeModulesProxy {
+  __weak EXAppContext * _Nullable _appContext;
+}
 
 @synthesize bridge = _bridge;
+@synthesize nativeModulesConfig = _nativeModulesConfig;
 
 RCT_EXPORT_MODULE(NativeUnimoduleProxy)
 
@@ -65,7 +108,6 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
 {
   if (self = [super init]) {
     _exModuleRegistry = moduleRegistry != nil ? moduleRegistry : [[EXModuleRegistryProvider new] moduleRegistry];
-    _swiftInteropBridge = [[SwiftInteropBridge alloc] initWithModulesProvider:[EXNativeModulesProxy getExpoModulesProvider] legacyModuleRegistry:_exModuleRegistry];
     _exportedMethodsKeys = [NSMutableDictionary dictionary];
     _exportedMethodsReverseKeys = [NSMutableDictionary dictionary];
     _ownsModuleRegistry = moduleRegistry == nil;
@@ -73,6 +115,18 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
   return self;
 }
 
+/**
+ The initializer for Expo Go to pass a custom `EXModuleRegistry`
+ other than the default one from `EXModuleRegistryProvider`.
+ The `EXModuleRegistry` is still owned by this class.
+ */
+- (instancetype)initWithCustomModuleRegistry:(nonnull EXModuleRegistry *)moduleRegistry
+{
+  self = [self initWithModuleRegistry:moduleRegistry];
+  self.ownsModuleRegistry = YES;
+  return self;
+}
+
 /**
  Convenience initializer used by React Native in the new setup, where the modules are registered automatically.
  */
@@ -88,12 +142,12 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
   return YES;
 }
 
-- (NSDictionary *)constantsToExport
+- (nonnull EXModulesProxyConfig *)nativeModulesConfig
 {
-  // Install ExpoModules host object in the runtime. It's probably not the right place,
-  // but it's the earliest moment in bridge's lifecycle when we have access to the runtime.
-  [self installExpoModulesHostObject];
-
+  if (_nativeModulesConfig) {
+    return _nativeModulesConfig;
+  }
+  
   NSMutableDictionary <NSString *, id> *exportedModulesConstants = [NSMutableDictionary dictionary];
   // Grab all the constants exported by modules
   for (EXExportedModule *exportedModule in [_exModuleRegistry getAllExportedModules]) {
@@ -103,7 +157,6 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
       continue;
     }
   }
-  [exportedModulesConstants addEntriesFromDictionary:[_swiftInteropBridge exportedModulesConstants]];
 
   // Also add `exportedMethodsNames`
   NSMutableDictionary<const NSString *, NSMutableArray<NSMutableDictionary<const NSString *, id> *> *> *exportedMethodsNamesAccumulator = [NSMutableDictionary dictionary];
@@ -120,10 +173,7 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
     }];
     [self assignExportedMethodsKeys:exportedMethodsNamesAccumulator[exportedModuleName] forModuleName:exportedModuleName];
   }
-
-  // Add entries from Swift modules
-  [exportedMethodsNamesAccumulator addEntriesFromDictionary:[_swiftInteropBridge exportedFunctionNames]];
-
+  
   // Also, add `viewManagersMetadata` for sanity check and testing purposes -- with names we know what managers to mock on UIManager
   NSArray<EXViewManager *> *viewManagers = [_exModuleRegistry getAllViewManagers];
   NSMutableDictionary<NSString *, NSDictionary *> *viewManagersMetadata = [[NSMutableDictionary alloc] initWithCapacity:[viewManagers count]];
@@ -133,20 +183,28 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
       @"propsNames": [[viewManager getPropsNames] allKeys]
     };
   }
+  
+  EXModulesProxyConfig *config = [[EXModulesProxyConfig alloc] initWithConstants:exportedModulesConstants
+                                                                     methodNames:exportedMethodsNamesAccumulator
+                                                                    viewManagers:viewManagersMetadata];
+  // decorate legacy config with sweet expo-modules config
+  [config addEntriesFromConfig:[_appContext expoModulesConfig]];
+  
+  _nativeModulesConfig = config;
+  return config;
+}
 
-  // Add entries from Swift view managers
-  [viewManagersMetadata addEntriesFromDictionary:[_swiftInteropBridge viewManagersMetadata]];
-
-  NSMutableDictionary <NSString *, id> *constantsAccumulator = [NSMutableDictionary dictionary];
-  constantsAccumulator[viewManagersMetadataKeyPath] = viewManagersMetadata;
-  constantsAccumulator[exportedConstantsKeyPath] = exportedModulesConstants;
-  constantsAccumulator[exportedMethodsNamesKeyPath] = exportedMethodsNamesAccumulator;
-
-  return constantsAccumulator;
+- (nonnull NSDictionary *)constantsToExport
+{
+  return [self.nativeModulesConfig toDictionary];
 }
 
 - (void)setBridge:(RCTBridge *)bridge
 {
+  _appContext = [(ExpoBridgeModule *)[bridge moduleForClass:ExpoBridgeModule.class] appContext];
+  [_appContext setLegacyModuleRegistry:_exModuleRegistry];
+  [_appContext setLegacyModulesProxy:self];
+
   if (!_bridge) {
     // The `setBridge` can be called during module setup or after. Registering more modules
     // during setup causes a crash due to mutating `_moduleDataByID` while it's being enumerated.
@@ -159,16 +217,17 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
       });
     }
   }
-  [_swiftInteropBridge setReactBridge:bridge];
   _bridge = bridge;
 }
 
 RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNameOrKey arguments:(NSArray *)arguments resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
-  if ([_swiftInteropBridge hasModule:moduleName]) {
-    [_swiftInteropBridge callFunction:methodNameOrKey onModule:moduleName withArgs:arguments resolve:resolve reject:reject];
+  // Backwards compatibility for the new architecture
+  if ([_appContext hasModule:moduleName]) {
+    [_appContext callFunction:methodNameOrKey onModule:moduleName withArgs:arguments resolve:resolve reject:reject];
     return;
   }
+
   EXExportedModule *module = [_exModuleRegistry getExportedModuleForName:moduleName];
   if (module == nil) {
     NSString *reason = [NSString stringWithFormat:@"No exported module was found for name '%@'. Are you sure all the packages are linked correctly?", moduleName];
@@ -201,42 +260,6 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
   });
 }
 
-- (id)callMethodSync:(NSString *)moduleName methodName:(NSString *)methodName arguments:(NSArray *)arguments
-{
-  if ([_swiftInteropBridge hasModule:moduleName]) {
-    return [_swiftInteropBridge callFunctionSync:methodName onModule:moduleName withArgs:arguments];
-  }
-  return (id)kCFNull;
-}
-
-#pragma mark - Statics
-
-+ (ModulesProvider *)getExpoModulesProvider
-{
-  // Dynamically gets the modules provider class.
-  // NOTE: This needs to be versioned in Expo Go.
-  Class generatedExpoModulesProvider;
-
-  // [0] When ExpoModulesCore is built as separated framework/module,
-  // we should explicitly load main bundle's `ExpoModulesProvider` class.
-  NSString *bundleName = NSBundle.mainBundle.infoDictionary[@"CFBundleName"];
-  if (bundleName != nil) {
-    generatedExpoModulesProvider = NSClassFromString([NSString stringWithFormat:@"%@.ExpoModulesProvider", bundleName]);
-    if (generatedExpoModulesProvider != nil) {
-      return [generatedExpoModulesProvider new];
-    }
-  }
-
-  // [1] Fallback to load `ExpoModulesProvider` class from the current module.
-  generatedExpoModulesProvider = NSClassFromString(@"ExpoModulesProvider");
-  if (generatedExpoModulesProvider != nil) {
-    return [generatedExpoModulesProvider new];
-  }
-
-  // [2] Fallback to load `ModulesProvider` if `ExpoModulesProvider` was not generated
-  return [ModulesProvider new];
-}
-
 #pragma mark - Privates
 
 - (void)registerExpoModulesInBridge:(RCTBridge *)bridge
@@ -250,7 +273,7 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
   NSMutableSet *visitedSweetModules = [NSMutableSet new];
 
   // Add dynamic wrappers for view modules written in Sweet API.
-  for (ViewModuleWrapper *swiftViewModule in [_swiftInteropBridge getViewManagers]) {
+  for (ViewModuleWrapper *swiftViewModule in [_appContext getViewManagers]) {
     Class wrappedViewModuleClass = [self registerComponentData:swiftViewModule inBridge:bridge];
     [additionalModuleClasses addObject:wrappedViewModuleClass];
     [visitedSweetModules addObject:swiftViewModule.name];
@@ -300,7 +323,7 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
 
   // Get the instance of `EXReactEventEmitter` bridge module and give it access to the interop bridge.
   EXReactNativeEventEmitter *eventEmitter = [bridge moduleForClass:[EXReactNativeEventEmitter class]];
-  [eventEmitter setSwiftInteropBridge:_swiftInteropBridge];
+  [eventEmitter setAppContext:_appContext];
 
   // As the last step, when the registry is owned,
   // register the event emitter and initialize the registry.
@@ -405,19 +428,4 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
   }
 }
 
-/**
- Installs ExpoModules host object in the runtime that the current bridge operates on.
- */
-- (void)installExpoModulesHostObject
-{
-  facebook::jsi::Runtime *jsiRuntime = [_bridge respondsToSelector:@selector(runtime)] ? reinterpret_cast<facebook::jsi::Runtime *>(_bridge.runtime) : nullptr;
-
-  if (jsiRuntime) {
-    EXJavaScriptRuntime *runtime = [[EXJavaScriptRuntime alloc] initWithRuntime:jsiRuntime callInvoker:_bridge.jsCallInvoker];
-
-    [EXJavaScriptRuntimeManager installExpoModulesToRuntime:runtime withSwiftInterop:_swiftInteropBridge];
-    [_swiftInteropBridge setRuntime:runtime];
-  }
-}
-
 @end

package/ios/NativeModulesProxy/NativeModulesProxyModule.swift

@@ -0,0 +1,17 @@
+import Foundation
+
+public class NativeModulesProxyModule: Module {
+  public static let moduleName = "NativeModulesProxy"
+
+  public func definition() -> ModuleDefinition {
+    Name(Self.moduleName)
+
+    Constants { () -> [String: Any?] in
+      guard let config = self.appContext?.legacyModulesProxy?.nativeModulesConfig else {
+        // TODO: Throw, but what?
+        return [:]
+      }
+      return config.toDictionary()
+    }
+  }
+}

package/ios/Services/EXReactNativeEventEmitter.h

@@ -9,10 +9,10 @@
 
 // Swift compatibility headers (e.g. `ExpoModulesCore-Swift.h`) are not available in headers,
 // so we use class forward declaration here. Swift header must be imported in the `.m` file.
-@class SwiftInteropBridge;
+@class EXAppContext;
 
 @interface EXReactNativeEventEmitter : RCTEventEmitter <EXInternalModule, EXBridgeModule, EXModuleRegistryConsumer, EXEventEmitterService>
 
-@property (nonatomic, strong) SwiftInteropBridge *swiftInteropBridge;
+@property (nonatomic, strong) EXAppContext *appContext;
 
 @end

package/ios/Services/EXReactNativeEventEmitter.m

@@ -44,8 +44,9 @@
 {
   NSMutableSet<NSString *> *eventsAccumulator = [NSMutableSet set];
 
-  if (_swiftInteropBridge) {
-    [eventsAccumulator addObjectsFromArray:[_swiftInteropBridge getSupportedEvents]];
+  // Backwards compatibility for the new architecture
+  if (_appContext) {
+    [eventsAccumulator addObjectsFromArray:[_appContext getSupportedEvents]];
   }
   for (EXExportedModule *exportedModule in [_exModuleRegistry getAllExportedModules]) {
     if ([exportedModule conformsToProtocol:@protocol(EXEventEmitter)]) {
@@ -60,10 +61,12 @@ RCT_EXPORT_METHOD(addProxiedListener:(NSString *)moduleName eventName:(NSString
 {
   [self addListener:eventName];
 
-  if ([_swiftInteropBridge hasModule:moduleName]) {
-    [_swiftInteropBridge modifyEventListenersCount:moduleName count:1];
+  // Backwards compatibility for the new architecture
+  if ([_appContext hasModule:moduleName]) {
+    [_appContext modifyEventListenersCount:moduleName count:1];
     return;
   }
+
   // Validate module
   EXExportedModule *module = [_exModuleRegistry getExportedModuleForName:moduleName];
 
@@ -101,10 +104,12 @@ RCT_EXPORT_METHOD(removeProxiedListeners:(NSString *)moduleName count:(double)co
 {
   [self removeListeners:count];
 
-  if ([_swiftInteropBridge hasModule:moduleName]) {
-    [_swiftInteropBridge modifyEventListenersCount:moduleName count:-count];
+  // Backwards compatibility for the new architecture
+  if ([_appContext hasModule:moduleName]) {
+    [_appContext modifyEventListenersCount:moduleName count:-count];
     return;
   }
+
   // Validate module
   EXExportedModule *module = [_exModuleRegistry getExportedModuleForName:moduleName];
 

package/ios/Swift/AppContext.swift

@@ -1,8 +1,10 @@
 import UIKit
+
 /**
  The app context is an interface to a single Expo app.
  */
-public final class AppContext {
+@objc(EXAppContext)
+public final class AppContext: NSObject {
   internal static func create() -> AppContext {
     let appContext = AppContext()
 
@@ -13,28 +15,48 @@ public final class AppContext {
   /**
    The module registry for the app context.
    */
-  public private(set) lazy var moduleRegistry: ModuleRegistry = ModuleRegistry(appContext: self)
+  public private(set) lazy var moduleRegistry: ModuleRegistry = {
+    isModuleRegistryInitialized = true
+    return ModuleRegistry(appContext: self)
+  }()
+
+  /**
+   Whether the module registry for this app context has already been initialized.
+   */
+  private var isModuleRegistryInitialized: Bool = false
 
   /**
    The legacy module registry with modules written in the old-fashioned way.
    */
-  public private(set) weak var legacyModuleRegistry: EXModuleRegistry?
+  @objc
+  public weak var legacyModuleRegistry: EXModuleRegistry?
+
+  @objc
+  public weak var legacyModulesProxy: LegacyNativeModulesProxy?
 
   /**
-   React bridge of the context's app.
+   React bridge of the context's app. Can be `nil` when the bridge
+   hasn't been propagated to the bridge modules yet (see ``ExpoBridgeModule``),
+   or when the app context is "bridgeless" (for example in native unit tests).
    */
+  @objc
   public internal(set) weak var reactBridge: RCTBridge?
 
   /**
    JSI runtime of the running app.
    */
-  public internal(set) var runtime: JavaScriptRuntime? {
+  @objc
+  public var runtime: JavaScriptRuntime? {
     didSet {
-      // When the runtime is unpinned from the context (e.g. deallocated),
-      // we should make sure to release all JS objects from the memory.
-      // Otherwise the JSCRuntime asserts may fail on deallocation.
       if runtime == nil {
+        // When the runtime is unpinned from the context (e.g. deallocated),
+        // we should make sure to release all JS objects from the memory.
+        // Otherwise the JSCRuntime asserts may fail on deallocation.
         releaseRuntimeObjects()
+      } else if runtime != oldValue {
+        // Try to install ExpoModules host object automatically when the runtime changes.
+        // TODO: Should we uninstall in the old runtime? (@tsapeta)
+        try? installExpoModulesHostObject()
       }
     }
   }
@@ -42,17 +64,20 @@ public final class AppContext {
   /**
    Designated initializer without modules provider.
    */
-  public init() {
+  public override init() {
+    super.init()
     listenToClientAppNotifications()
   }
 
-  /**
-   Initializes the app context and registers provided modules in the module registry.
-   */
-  public convenience init(withModulesProvider provider: ModulesProviderProtocol, legacyModuleRegistry: EXModuleRegistry?) {
-    self.init()
-    self.legacyModuleRegistry = legacyModuleRegistry
+  @discardableResult
+  public func useModulesProvider(_ providerName: String) -> Self {
+    return useModulesProvider(Self.modulesProvider(withName: providerName))
+  }
+
+  @discardableResult
+  public func useModulesProvider(_ provider: ModulesProvider) -> Self {
     moduleRegistry.register(fromProvider: provider)
+    return self
   }
 
   /**
@@ -134,14 +159,139 @@ public final class AppContext {
     }
   }
 
+  // MARK: - Interop with NativeModulesProxy
+
+  /**
+   Returns view modules wrapped by the base `ViewModuleWrapper` class.
+   */
+  @objc
+  public func getViewManagers() -> [ViewModuleWrapper] {
+    return moduleRegistry.compactMap { holder in
+      if holder.definition.viewManager != nil {
+        return ViewModuleWrapper(holder)
+      } else {
+        return nil
+      }
+    }
+  }
+
+  /**
+   Returns a bool whether the module with given name is registered in this context.
+   */
+  @objc
+  public func hasModule(_ moduleName: String) -> Bool {
+    return moduleRegistry.has(moduleWithName: moduleName)
+  }
+
+  /**
+   Returns an array of names of the modules registered in the module registry.
+   */
+  @objc
+  public func getModuleNames() -> [String] {
+    return moduleRegistry.getModuleNames()
+  }
+
+  /**
+   Returns a JavaScript object that represents a module with given name.
+   When remote debugging is enabled, this will always return `nil`.
+   */
+  @objc
+  public func getNativeModuleObject(_ moduleName: String) -> JavaScriptObject? {
+    return moduleRegistry.get(moduleHolderForName: moduleName)?.javaScriptObject
+  }
+
+  /**
+   Returns an array of event names supported by all Swift modules.
+   */
+  @objc
+  public func getSupportedEvents() -> [String] {
+    return moduleRegistry.reduce(into: [String]()) { events, holder in
+      events.append(contentsOf: holder.definition.eventNames)
+    }
+  }
+
+  /**
+   Modifies listeners count for module with given name. Depending on the listeners count,
+   `onStartObserving` and `onStopObserving` are called.
+   */
+  @objc
+  public func modifyEventListenersCount(_ moduleName: String, count: Int) {
+    moduleRegistry
+      .get(moduleHolderForName: moduleName)?
+      .modifyListenersCount(count)
+  }
+
+  /**
+   Asynchronously calls module's function with given arguments.
+   */
+  @objc
+  public func callFunction(
+    _ functionName: String,
+    onModule moduleName: String,
+    withArgs args: [Any],
+    resolve: @escaping EXPromiseResolveBlock,
+    reject: @escaping EXPromiseRejectBlock
+  ) {
+    moduleRegistry
+      .get(moduleHolderForName: moduleName)?
+      .call(function: functionName, args: args) { result in
+        switch result {
+        case .failure(let error):
+          reject(error.code, error.description, error)
+        case .success(let value):
+          resolve(value)
+        }
+      }
+  }
+
+  @objc
+  public final lazy var expoModulesConfig = ModulesProxyConfig(constants: self.exportedModulesConstants(),
+                                                               methodNames: self.exportedFunctionNames(),
+                                                               viewManagers: self.viewManagersMetadata())
+
+  private func exportedFunctionNames() -> [String: [[String: Any]]] {
+    var constants = [String: [[String: Any]]]()
+
+    for holder in moduleRegistry {
+      constants[holder.name] = holder.definition.functions.map({ functionName, function in
+        return [
+          "name": functionName,
+          "argumentsCount": function.argumentsCount,
+          "key": functionName
+        ]
+      })
+    }
+    return constants
+  }
+
+  private func exportedModulesConstants() -> [String: Any] {
+    return moduleRegistry
+      // prevent infinite recursion - exclude NativeProxyModule constants
+      .filter { $0.name != NativeModulesProxyModule.moduleName }
+      .reduce(into: [String: Any]()) { acc, holder in
+        acc[holder.name] = holder.getConstants()
+      }
+  }
+
+  private func viewManagersMetadata() -> [String: Any] {
+    return moduleRegistry.reduce(into: [String: Any]()) { acc, holder in
+      if let viewManager = holder.definition.viewManager {
+        acc[holder.name] = [
+          "propsNames": viewManager.props.map { $0.name }
+        ]
+      }
+    }
+  }
+
   // MARK: - Runtime
 
-  internal func installExpoModulesHostObject(_ interopBridge: SwiftInteropBridge) throws {
-    guard let runtime = runtime else {
-      throw UndefinedRuntimeException()
+  internal func installExpoModulesHostObject() throws {
+    guard runtime != nil else {
+      throw RuntimeLostException()
     }
-    EXJavaScriptRuntimeManager.installExpoModules(to: runtime, withSwiftInterop: interopBridge)
+    EXJavaScriptRuntimeManager.installExpoModulesHostObject(self)
   }
+
   /**
    Unsets runtime objects that we hold for each module.
    */
@@ -158,20 +308,50 @@ public final class AppContext {
    */
   deinit {
     NotificationCenter.default.removeObserver(self)
-    moduleRegistry.post(event: .appContextDestroys)
+
+    // Post an event to the registry only if it was already created.
+    // If we let it to lazy-load here, that would crash since the module registry
+    // has a weak reference to the app context which is being deallocated.
+    if isModuleRegistryInitialized {
+      moduleRegistry.post(event: .appContextDestroys)
+    }
   }
 
-  // MARK: - Exceptions
+  // MARK: - Statics
+
+  /**
+   Returns an instance of the generated Expo modules provider.
+   The provider is usually generated in application's `ExpoModulesProviders` files group.
+   */
+  @objc
+  public static func modulesProvider(withName providerName: String = "ExpoModulesProvider") -> ModulesProvider {
+    // [0] When ExpoModulesCore is built as separated framework/module,
+    // we should explicitly load main bundle's `ExpoModulesProvider` class.
+    if let bundleName = Bundle.main.infoDictionary?["CFBundleName"],
+       let providerClass = NSClassFromString("\(bundleName).\(providerName)") as? ModulesProvider.Type {
+      return providerClass.init()
+    }
 
-  class DeallocatedAppContextException: Exception {
-    override var reason: String {
-      "The AppContext has been deallocated"
+    // [1] Fallback to `ExpoModulesProvider` class from the current module.
+    if let providerClass = NSClassFromString(providerName) as? ModulesProvider.Type {
+      return providerClass.init()
     }
+
+    // [2] Fallback to an empty `ModulesProvider` if `ExpoModulesProvider` was not generated
+    return ModulesProvider()
+  }
+}
+
+// MARK: - Public exceptions
+
+public final class AppContextLostException: Exception {
+  override public var reason: String {
+    "The app context has been lost"
   }
+}
 
-  class UndefinedRuntimeException: Exception {
-    override var reason: String {
-      "The AppContext has undefined runtime"
-    }
+public final class RuntimeLostException: Exception {
+  override public var reason: String {
+    "The JavaScript runtime has been lost"
   }
 }

package/ios/Swift/Arguments/AnyArgument.swift

@@ -5,10 +5,28 @@
  */
 public protocol AnyArgument {}
 
+// Extend the optional type - this is required to support optional arguments.
+extension Optional: AnyArgument where Wrapped: AnyArgument {}
+
 // Extend the primitive types — these may come from React Native bridge.
 extension Bool: AnyArgument {}
+
 extension Int: AnyArgument {}
+extension Int8: AnyArgument {}
+extension Int16: AnyArgument {}
+extension Int32: AnyArgument {}
+extension Int64: AnyArgument {}
+
+extension UInt: AnyArgument {}
+extension UInt8: AnyArgument {}
+extension UInt16: AnyArgument {}
+extension UInt32: AnyArgument {}
+extension UInt64: AnyArgument {}
+
+extension Float32: AnyArgument {}
 extension Double: AnyArgument {}
+
 extension String: AnyArgument {}
 extension Array: AnyArgument {}
 extension Dictionary: AnyArgument {}
+