expo-modules-core 0.10.0 → 0.11.2

package/ios/JSI/EXJSIInstaller.mm

@@ -1,6 +1,7 @@
 // Copyright 2018-present 650 Industries. All rights reserved.
 
 #import <ExpoModulesCore/EXJSIInstaller.h>
+#import <ExpoModulesCore/EXJavaScriptRuntime.h>
 #import <ExpoModulesCore/ExpoModulesHostObject.h>
 #import <ExpoModulesCore/Swift.h>
 
@@ -14,6 +15,7 @@ static NSString *expoModulesHostObjectPropertyName = @"ExpoModules";
 @interface RCTBridge (ExpoBridgeWithRuntime)
 
 - (void *)runtime;
+- (std::shared_ptr<facebook::react::CallInvoker>)jsCallInvoker;
 
 @end
 

package/ios/JSI/EXJSIUtils.h

@@ -6,6 +6,7 @@
 
 #import <jsi/jsi.h>
 #import <ReactCommon/RCTTurboModule.h>
+#import <ReactCommon/TurboModuleUtils.h>
 #import <ExpoModulesCore/EXObjectDeallocator.h>
 
 namespace jsi = facebook::jsi;

package/ios/NativeModulesProxy/EXNativeModulesProxy.mm

@@ -201,9 +201,10 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
 
 - (void)setBridge:(RCTBridge *)bridge
 {
-  _appContext = [(ExpoBridgeModule *)[bridge moduleForClass:ExpoBridgeModule.class] appContext];
-  [_appContext setLegacyModuleRegistry:_exModuleRegistry];
-  [_appContext setLegacyModulesProxy:self];
+  ExpoBridgeModule* expoBridgeModule = [bridge moduleForClass:ExpoBridgeModule.class];
+  [expoBridgeModule legacyProxyDidSetBridgeWithLegacyModulesProxy:self
+                                             legacyModuleRegistry:_exModuleRegistry];
+  _appContext = [expoBridgeModule appContext];
 
   if (!_bridge) {
     // The `setBridge` can be called during module setup or after. Registering more modules

package/ios/Swift/AppContext.swift

@@ -28,11 +28,9 @@ public final class AppContext: NSObject {
   /**
    The legacy module registry with modules written in the old-fashioned way.
    */
-  @objc
-  public weak var legacyModuleRegistry: EXModuleRegistry?
+  internal weak var legacyModuleRegistry: EXModuleRegistry?
 
-  @objc
-  public weak var legacyModulesProxy: LegacyNativeModulesProxy?
+  internal weak var legacyModulesProxy: LegacyNativeModulesProxy?
 
   /**
    React bridge of the context's app. Can be `nil` when the bridge

package/ios/Swift/Classes/ClassComponentElementsBuilder.swift

@@ -12,7 +12,7 @@ public struct ClassComponentElementsBuilder<OwnerType> {
   /**
    Default implementation without any constraints that just returns type-erased element.
    */
-  static func buildExpression<ElementType: ClassComponentElement>(
+  public static func buildExpression<ElementType: ClassComponentElement>(
     _ element: ElementType
   ) -> AnyClassComponentElement {
     return element
@@ -23,7 +23,7 @@ public struct ClassComponentElementsBuilder<OwnerType> {
    we need to instruct the function to pass `this` to the closure
    as the first argument and deduct it from `argumentsCount`.
    */
-  static func buildExpression<ElementType: ClassComponentElement>(
+  public static func buildExpression<ElementType: ClassComponentElement>(
     _ element: ElementType
   ) -> AnyClassComponentElement where ElementType.OwnerType == OwnerType {
     if var function = element as? AnyFunction {

package/ios/Swift/Exceptions/ChainableException.swift

@@ -17,7 +17,7 @@ public protocol ChainableException: Error, AnyObject {
   /**
    Sets the direct cause of the exception and returns itself.
    */
-  func causedBy(_ error: Error) -> Self
+  func causedBy(_ error: Error?) -> Self
 
   /**
    Tells whether any of the cause in chain is of given type.
@@ -34,8 +34,8 @@ public extension ChainableException {
   }
 
   @discardableResult
-  func causedBy(_ error: Error) -> Self {
-    cause = error
+  func causedBy(_ error: Error?) -> Self {
+    cause = error ?? cause
     return self
   }
 

package/ios/Swift/ExpoBridgeModule.swift

@@ -20,8 +20,7 @@ public final class ExpoBridgeModule: NSObject, RCTBridgeModule {
    architecture of Expo modules and the app itself.
    */
   override init() {
-    appContext = AppContext().useModulesProvider("ExpoModulesProvider")
-    appContext.moduleRegistry.register(moduleType: NativeModulesProxyModule.self)
+    appContext = AppContext()
     super.init()
 
     // Listen to React Native notifications posted just before the JS is executed.
@@ -50,6 +49,21 @@ public final class ExpoBridgeModule: NSObject, RCTBridgeModule {
       appContext.reactBridge = bridge
     }
   }
+  
+  /**
+   This should be called inside EXNativeModulesProxy.setBridge()
+   */
+  @objc
+  public func legacyProxyDidSetBridge(legacyModulesProxy: LegacyNativeModulesProxy,
+                                      legacyModuleRegistry: EXModuleRegistry) {
+    appContext.legacyModuleRegistry = legacyModuleRegistry
+    appContext.legacyModulesProxy = legacyModulesProxy
+    
+    // we need to register all the modules after the legacy module registry is set
+    // otherwise legacy modules (e.g. permissions) won't be available in OnCreate { }
+    appContext.useModulesProvider("ExpoModulesProvider")
+    appContext.moduleRegistry.register(moduleType: NativeModulesProxyModule.self)
+  }
 
   // MARK: - Notifications
 

package/ios/Swift/Logging/Logger.swift

@@ -188,6 +188,9 @@ fileprivate func reformatStackSymbol(_ symbol: String) -> String {
 }
 
 fileprivate func describe(value: Any) -> String {
+  if let value = value as? String {
+    return value
+  }
   if let value = value as? CustomDebugStringConvertible {
     return value.debugDescription
   }

package/ios/Swift/Promise.swift

@@ -22,7 +22,11 @@ public struct Promise: AnyArgument {
   }
 
   public func reject(_ error: Error) {
-    rejecter(UnexpectedException(error))
+    if let exception = error as? Exception {
+      rejecter(exception)
+    } else {
+      rejecter(UnexpectedException(error))
+    }
   }
 
   public func reject(_ error: Exception) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "0.10.0",
+  "version": "0.11.2",
   "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": "^2.0.0"
   },
-  "gitHead": "72253d4b18b62d329bbc6785d996e227f185d533"
+  "gitHead": "c6678c65b68e45062d49a2deea8e822f69388278"
 }

package/src/PermissionsInterface.ts

@@ -1,14 +1,43 @@
 export enum PermissionStatus {
+  /**
+   * User has granted the permission.
+   */
   GRANTED = 'granted',
+  /**
+   * User hasn't granted or denied the permission yet.
+   */
   UNDETERMINED = 'undetermined',
+  /**
+   * User has denied the permission.
+   */
   DENIED = 'denied',
 }
 
+/**
+ * Permission expiration time. Currently, all permissions are granted permamently.
+ */
 export type PermissionExpiration = 'never' | number;
 
+/**
+ * An object obtained by `getPermissionsAsync` and `requestPermissionsAsync` functions.
+ */
 export interface PermissionResponse {
+  /**
+   * Determines the status of the permission.
+   */
   status: PermissionStatus;
+  /**
+   * Determines time when the permission expires.
+   */
   expires: PermissionExpiration;
+  /**
+   * A convenience boolean that indicates if the permission is granted.
+   */
   granted: boolean;
+  /**
+   * Indicates if user can be asked again for specific permission.
+   * If not, one should be directed to the Settings app
+   * in order to enable/disable the permission.
+   */
   canAskAgain: boolean;
 }