expo-modules-core 0.7.0 → 0.8.0

package/ios/JSI/JavaScriptValue.swift

@@ -0,0 +1,94 @@
+// Copyright 2022-present 650 Industries. All rights reserved.
+
+/**
+ Enum with available kinds of values. It's almost the same as a result of "typeof"
+ in JavaScript, however `null` has its own kind (typeof null == "object").
+ */
+public enum JavaScriptValueKind: String {
+  case undefined
+  case null
+  case bool
+  case number
+  case symbol
+  case string
+  case function
+  case object
+}
+
+public extension JavaScriptValue {
+  var kind: JavaScriptValueKind {
+    switch true {
+    case isUndefined():
+      return .undefined
+    case isNull():
+      return .null
+    case isBool():
+      return .bool
+    case isNumber():
+      return .number
+    case isSymbol():
+      return .symbol
+    case isString():
+      return .string
+    case isFunction():
+      return .function
+    default:
+      return .object
+    }
+  }
+
+  func asBool() throws -> Bool {
+    if isBool() {
+      return getBool()
+    }
+    throw JavaScriptValueConversionException((kind: kind, target: "Bool"))
+  }
+
+  func asInt() throws -> Int {
+    if isNumber() {
+      return getInt()
+    }
+    throw JavaScriptValueConversionException((kind: kind, target: "Int"))
+  }
+
+  func asDouble() throws -> Double {
+    if isNumber() {
+      return getDouble()
+    }
+    throw JavaScriptValueConversionException((kind: kind, target: "Double"))
+  }
+
+  func asString() throws -> String {
+    if isString() {
+      return getString()
+    }
+    throw JavaScriptValueConversionException((kind: kind, target: "String"))
+  }
+
+  func asArray() throws -> [JavaScriptValue?] {
+    if isObject() {
+      return getArray()
+    }
+    throw JavaScriptValueConversionException((kind: kind, target: "Array"))
+  }
+
+  func asDict() throws -> [String: Any] {
+    if isObject() {
+      return getDictionary()
+    }
+    throw JavaScriptValueConversionException((kind: kind, target: "Dict"))
+  }
+
+  func asObject() throws -> JavaScriptObject {
+    if isObject() {
+      return getObject()
+    }
+    throw JavaScriptValueConversionException((kind: kind, target: "Object"))
+  }
+}
+
+internal final class JavaScriptValueConversionException: GenericException<(kind: JavaScriptValueKind, target: String)> {
+  override var reason: String {
+    "Cannot represent a value of kind '\(param.kind)' as \(param.target)"
+  }
+}

package/ios/ModuleRegistryAdapter/EXModuleRegistryAdapter.m

@@ -13,7 +13,7 @@
 
 @property (nonatomic, strong) EXModuleRegistryProvider *moduleRegistryProvider;
 @property (nonatomic, strong) EXViewManagerAdapterClassesRegistry *viewManagersClassesRegistry;
-@property (nonatomic, strong, nullable) id<ModulesProviderObjCProtocol> swiftModulesProvider;
+@property (nonatomic, strong, nullable) ModulesProvider *swiftModulesProvider;
 
 @end
 
@@ -28,16 +28,6 @@
   return self;
 }
 
-- (instancetype)initWithModuleRegistryProvider:(EXModuleRegistryProvider *)moduleRegistryProvider swiftModulesProviderClass:(nullable Class)swiftModulesProviderClass
-{
-  if (self = [self initWithModuleRegistryProvider:moduleRegistryProvider]) {
-    if ([swiftModulesProviderClass conformsToProtocol:@protocol(ModulesProviderObjCProtocol)]) {
-      _swiftModulesProvider = [swiftModulesProviderClass new];
-    }
-  }
-  return self;
-}
-
 - (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge
 {
   return [self extraModulesForModuleRegistry:[_moduleRegistryProvider moduleRegistry]];

package/ios/NativeModulesProxy/EXNativeModulesProxy.h

@@ -12,7 +12,7 @@
 // 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;
-@protocol ModulesProviderObjCProtocol;
+@class ModulesProvider;
 
 NS_SWIFT_NAME(NativeModulesProxy)
 @interface EXNativeModulesProxy : NSObject <RCTBridgeModule>
@@ -25,6 +25,6 @@ NS_SWIFT_NAME(NativeModulesProxy)
 - (void)callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNameOrKey arguments:(NSArray *)arguments resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject;
 - (id)callMethodSync:(NSString *)moduleName methodName:(NSString *)methodName arguments:(NSArray *)arguments;
 
-+ (id<ModulesProviderObjCProtocol>)getExpoModulesProvider;
++ (ModulesProvider *)getExpoModulesProvider;
 
 @end

package/ios/NativeModulesProxy/EXNativeModulesProxy.mm

@@ -10,7 +10,6 @@
 
 #import <jsi/jsi.h>
 
-#import <ExpoModulesCore/EXComponentDataCompatibleWrapper.h>
 #import <ExpoModulesCore/EXNativeModulesProxy.h>
 #import <ExpoModulesCore/EXEventEmitter.h>
 #import <ExpoModulesCore/EXViewManager.h>
@@ -18,11 +17,11 @@
 #import <ExpoModulesCore/EXViewManagerAdapterClassesRegistry.h>
 #import <ExpoModulesCore/EXModuleRegistryProvider.h>
 #import <ExpoModulesCore/EXReactNativeEventEmitter.h>
-#import <ExpoModulesCore/JSIInstaller.h>
+#import <ExpoModulesCore/EXJSIInstaller.h>
 #import <ExpoModulesCore/Swift.h>
 
 static const NSString *exportedMethodsNamesKeyPath = @"exportedMethods";
-static const NSString *viewManagersNamesKeyPath = @"viewManagersNames";
+static const NSString *viewManagersMetadataKeyPath = @"viewManagersMetadata";
 static const NSString *exportedConstantsKeyPath = @"modulesConstants";
 
 static const NSString *methodInfoKeyKey = @"key";
@@ -91,8 +90,9 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
 
 - (NSDictionary *)constantsToExport
 {
-  // Install the TurboModule implementation of the proxy.
-  [self installExpoTurboModules];
+  // 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];
 
   NSMutableDictionary <NSString *, id> *exportedModulesConstants = [NSMutableDictionary dictionary];
   // Grab all the constants exported by modules
@@ -124,17 +124,21 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
   // Add entries from Swift modules
   [exportedMethodsNamesAccumulator addEntriesFromDictionary:[_swiftInteropBridge exportedFunctionNames]];
 
-  // Also, add `viewManagersNames` for sanity check and testing purposes -- with names we know what managers to mock on UIManager
+  // Also, add `viewManagersMetadata` for sanity check and testing purposes -- with names we know what managers to mock on UIManager
   NSArray<EXViewManager *> *viewManagers = [_exModuleRegistry getAllViewManagers];
-  NSMutableArray<NSString *> *viewManagersNames = [NSMutableArray arrayWithCapacity:[viewManagers count]];
+  NSMutableDictionary<NSString *, NSDictionary *> *viewManagersMetadata = [[NSMutableDictionary alloc] initWithCapacity:[viewManagers count]];
+
   for (EXViewManager *viewManager in viewManagers) {
-    [viewManagersNames addObject:[viewManager viewName]];
+    viewManagersMetadata[viewManager.viewName] = @{
+      @"propsNames": [[viewManager getPropsNames] allKeys]
+    };
   }
 
-  [viewManagersNames addObjectsFromArray:[_swiftInteropBridge exportedViewManagersNames]];
+  // Add entries from Swift view managers
+  [viewManagersMetadata addEntriesFromDictionary:[_swiftInteropBridge viewManagersMetadata]];
 
   NSMutableDictionary <NSString *, id> *constantsAccumulator = [NSMutableDictionary dictionary];
-  constantsAccumulator[viewManagersNamesKeyPath] = viewManagersNames;
+  constantsAccumulator[viewManagersMetadataKeyPath] = viewManagersMetadata;
   constantsAccumulator[exportedConstantsKeyPath] = exportedModulesConstants;
   constantsAccumulator[exportedMethodsNamesKeyPath] = exportedMethodsNamesAccumulator;
 
@@ -207,7 +211,7 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
 
 #pragma mark - Statics
 
-+ (id<ModulesProviderObjCProtocol>)getExpoModulesProvider
++ (ModulesProvider *)getExpoModulesProvider
 {
   // Dynamically gets the modules provider class.
   // NOTE: This needs to be versioned in Expo Go.
@@ -291,13 +295,13 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
   // Register the view managers as additional modules.
   [self registerAdditionalModuleClasses:additionalModuleClasses inBridge:bridge];
 
+  // Get the instance of `EXReactEventEmitter` bridge module and give it access to the interop bridge.
+  EXReactNativeEventEmitter *eventEmitter = [bridge moduleForClass:[EXReactNativeEventEmitter class]];
+  [eventEmitter setSwiftInteropBridge:_swiftInteropBridge];
+
   // As the last step, when the registry is owned,
   // register the event emitter and initialize the registry.
   if (ownsModuleRegistry) {
-    // Get the newly created instance of `EXReactEventEmitter` bridge module,
-    // pass event names supported by Swift modules and register it in legacy modules registry.
-    EXReactNativeEventEmitter *eventEmitter = [bridge moduleForClass:[EXReactNativeEventEmitter class]];
-    [eventEmitter setSwiftInteropBridge:_swiftInteropBridge];
     [_exModuleRegistry registerInternalModule:eventEmitter];
 
     // Let the modules consume the registry :)
@@ -362,7 +366,7 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
   NSString *className = NSStringFromClass(moduleClass);
 
   if ([moduleClass isSubclassOfClass:[RCTViewManager class]] && !componentDataByName[className]) {
-    RCTComponentData *componentData = [[EXComponentDataCompatibleWrapper alloc] initWithManagerClass:moduleClass bridge:bridge eventDispatcher:bridge.eventDispatcher];
+    RCTComponentData *componentData = [[RCTComponentData alloc] initWithManagerClass:moduleClass bridge:bridge eventDispatcher:bridge.eventDispatcher];
     componentDataByName[className] = componentData;
   }
 }
@@ -399,19 +403,17 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
 }
 
 /**
- Installs expo modules in JSI runtime.
+ Installs ExpoModules host object in the runtime that the current bridge operates on.
  */
-- (void)installExpoTurboModules
+- (void)installExpoModulesHostObject
 {
   facebook::jsi::Runtime *jsiRuntime = [_bridge respondsToSelector:@selector(runtime)] ? reinterpret_cast<facebook::jsi::Runtime *>(_bridge.runtime) : nullptr;
 
   if (jsiRuntime) {
-    JavaScriptRuntime *runtime = [[JavaScriptRuntime alloc] initWithRuntime:*jsiRuntime callInvoker:_bridge.jsCallInvoker];
+    EXJavaScriptRuntime *runtime = [[EXJavaScriptRuntime alloc] initWithRuntime:jsiRuntime callInvoker:_bridge.jsCallInvoker];
 
-    [JavaScriptRuntimeManager installExpoModulesToRuntime:runtime withSwiftInterop:_swiftInteropBridge];
+    [EXJavaScriptRuntimeManager installExpoModulesToRuntime:runtime withSwiftInterop:_swiftInteropBridge];
     [_swiftInteropBridge setRuntime:runtime];
-
-    expo::installRuntimeObjects(*jsiRuntime, _bridge.jsCallInvoker, self);
   }
 }
 

package/ios/ReactDelegates/EXReactCompatibleHelpers.h

@@ -0,0 +1,18 @@
+// Copyright 2018-present 650 Industries. All rights reserved.
+
+#import <UIKit/UIKit.h>
+
+#import <ExpoModulesCore/EXDefines.h>
+#import <React/RCTBridge.h>
+
+
+EX_EXTERN_C_BEGIN
+
+/**
+ * Backward compatible version of `RCTAppSetupDefaultRootView`.
+ *
+ * `RCTAppSetupDefaultRootView` is introduced in react-native 0.68. To make `expo-modules-core` compatible with older react-native,  introduces this compatible helper.
+ */
+UIView *EXAppSetupDefaultRootView(RCTBridge *bridge, NSString *moduleName, NSDictionary *initialProperties);
+
+EX_EXTERN_C_END

package/ios/ReactDelegates/EXReactCompatibleHelpers.m

@@ -0,0 +1,19 @@
+// Copyright 2018-present 650 Industries. All rights reserved.
+
+#import <ExpoModulesCore/EXReactCompatibleHelpers.h>
+
+#import <React/RCTRootView.h>
+
+#if __has_include(<React/RCTAppSetupUtils.h>)
+#import <React/RCTAppSetupUtils.h>
+#endif
+
+UIView *EXAppSetupDefaultRootView(RCTBridge *bridge, NSString *moduleName, NSDictionary *initialProperties)
+{
+#if __has_include(<React/RCTAppSetupUtils.h>)
+  return RCTAppSetupDefaultRootView(bridge, moduleName, initialProperties);
+#else
+  return [[RCTRootView alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
+#endif
+}
+

package/ios/ReactDelegates/ExpoReactDelegate.swift

@@ -22,10 +22,10 @@ public class ExpoReactDelegate: NSObject {
   }
 
   @objc
-  public func createRootView(bridge: RCTBridge, moduleName: String, initialProperties: [AnyHashable: Any]?) -> RCTRootView {
+  public func createRootView(bridge: RCTBridge, moduleName: String, initialProperties: [AnyHashable: Any]?) -> UIView {
     return self.handlers.lazy
       .compactMap { $0.createRootView(reactDelegate: self, bridge: bridge, moduleName: moduleName, initialProperties: initialProperties) }
-      .first(where: { _ in true }) ?? RCTRootView(bridge: bridge, moduleName: moduleName, initialProperties: initialProperties)
+      .first(where: { _ in true }) ?? EXAppSetupDefaultRootView(bridge, moduleName, initialProperties)
   }
 
   @objc

package/ios/ReactDelegates/ExpoReactDelegateHandler.swift

@@ -1,6 +1,6 @@
 // Copyright 2018-present 650 Industries. All rights reserved.
 
-import Foundation
+import React
 
 /**
  The handler for `ExpoReactDelegate`. A module can implement a handler to process react instance creation.

package/ios/Swift/AppContext.swift

@@ -3,6 +3,13 @@ import UIKit
  The app context is an interface to a single Expo app.
  */
 public final class AppContext {
+  internal static func create() -> AppContext {
+    let appContext = AppContext()
+
+    appContext.runtime = JavaScriptRuntime()
+    return appContext
+  }
+
   /**
    The module registry for the app context.
    */
@@ -97,6 +104,13 @@ public final class AppContext {
     return legacyModule(implementing: EXEventEmitterService.self)
   }
 
+  /**
+   Provides access to the logger from legacy module registry.
+   */
+  public var logger: EXLogManager? {
+    return legacyModuleRegistry?.getSingletonModule(forName: EXLogManager.name()) as? EXLogManager
+  }
+
   /**
    Starts listening to `UIApplication` notifications.
    */
@@ -129,6 +143,12 @@ public final class AppContext {
 
   // MARK: - Runtime
 
+  internal func installExpoModulesHostObject(_ interopBridge: SwiftInteropBridge) throws {
+    guard let runtime = runtime else {
+      throw UndefinedRuntimeException()
+    }
+    EXJavaScriptRuntimeManager.installExpoModules(to: runtime, withSwiftInterop: interopBridge)
+  }
   /**
    Unsets runtime objects that we hold for each module.
    */
@@ -152,7 +172,13 @@ public final class AppContext {
 
   class DeallocatedAppContextException: Exception {
     override var reason: String {
-      "The app context has been deallocated"
+      "The AppContext has been deallocated"
+    }
+  }
+
+  class UndefinedRuntimeException: Exception {
+    override var reason: String {
+      "The AppContext has undefined runtime"
     }
   }
 }

package/ios/Swift/Functions/AsyncFunction.swift

@@ -0,0 +1,17 @@
+// Copyright 2022-present 650 Industries. All rights reserved.
+
+/**
+ Represents a function that can only be called asynchronously, thus its JavaScript equivalent returns a Promise.
+
+ - ToDo: Move some asynchronous logic from `ConcreteFunction` (like `call(args:promise:)`) to this class and drop the `isAsync` property.
+ */
+public final class AsyncFunction<Args, ReturnType>: ConcreteFunction<Args, ReturnType> {
+  override init(
+    _ name: String,
+    argTypes: [AnyArgumentType],
+    _ closure: @escaping ConcreteFunction<Args, ReturnType>.ClosureType
+  ) {
+    super.init(name, argTypes: argTypes, closure)
+    self.isAsync = true
+  }
+}

package/ios/Swift/Functions/ConcreteFunction.swift

@@ -1,6 +1,6 @@
 import Dispatch
 
-public final class ConcreteFunction<Args, ReturnType>: AnyFunction {
+public class ConcreteFunction<Args, ReturnType>: AnyFunction {
   public typealias ClosureType = (Args) throws -> ReturnType
 
   public let name: String
@@ -29,6 +29,11 @@ public final class ConcreteFunction<Args, ReturnType>: AnyFunction {
     self.name = name
     self.argTypes = argTypes
     self.closure = closure
+
+    // This is temporary solution to keep backwards compatibility for existing functions — they all end with "Async".
+    // `function` component that we've used so far was async by default, but we decided to replace it with `asyncFunction`
+    // and make `function`s synchronous. Introduced in SDK45, can be removed in SDK46 after migrating all modules.
+    self.isAsync = name.hasSuffix("Async")
   }
 
   public func call(args: [Any], promise: Promise) {

package/ios/Swift/JavaScriptUtils.swift

@@ -36,6 +36,17 @@ internal func createSyncFunctionBlock(holder: ModuleHolder, name functionName: S
   }
 }
 
+/**
+ If given argument is a JavaScriptValue, it's unpacked and converted to corresponding Foundation type.
+ Otherwise, the argument is returned as is.
+ */
+internal func unpackIfJavaScriptValue(_ value: Any) -> Any {
+  if let value = value as? JavaScriptValue {
+    return value.getRaw() as Any
+  }
+  return value
+}
+
 private class ModuleUnavailableException: GenericException<String> {
   override var reason: String {
     "Module '\(param)' is no longer available"

package/ios/Swift/ModuleHolder.swift

@@ -70,8 +70,16 @@ public final class ModuleHolder {
       }
       let queue = function.queue ?? DispatchQueue.global(qos: .default)
 
+      // Given arguments can be:
+      // - 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) }
+
       queue.async {
-        function.call(args: args, promise: promise)
+        function.call(args: unpackedArgs, promise: promise)
       }
     } catch let error as CodedError {
       promise.reject(error)
@@ -92,7 +100,10 @@ public final class ModuleHolder {
   @discardableResult
   func callSync(function functionName: String, args: [Any]) -> Any? {
     if let function = definition.functions[functionName] {
-      return function.callSync(args: args)
+      // 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)
     }
     return nil
   }
@@ -113,7 +124,7 @@ public final class ModuleHolder {
 
     // Fill in with constants
     for (key, value) in getConstants() {
-      object[key] = value
+      object.setProperty(key, value: value)
     }
 
     // Fill in with functions

package/ios/Swift/ModulesProvider.swift

@@ -1,16 +1,9 @@
 import Foundation
 
 /**
- An empty protocol that Objective-C can refer to as a type of the modules provider.
- In Objective-C code we do not do anything with it except passing it back to the Swift light side.
+ Swift protocol defining the requirements for modules providers.
  */
-@objc
-public protocol ModulesProviderObjCProtocol {}
-
-/**
- Swift protocol defining the requirements for modules providers. Extends its Objective-C counterpart `ModulesProviderObjCProtocol`.
- */
-public protocol ModulesProviderProtocol: ModulesProviderObjCProtocol {
+public protocol ModulesProviderProtocol {
   func getModuleClasses() -> [AnyModule.Type]
 
   /**
@@ -30,7 +23,7 @@ public protocol ModulesProviderProtocol: ModulesProviderObjCProtocol {
  The proper implementation is generated by autolinking as part of `pod install` command.
  */
 @objc
-open class ModulesProvider: NSObject, ModulesProviderProtocol, ModulesProviderObjCProtocol {
+open class ModulesProvider: NSObject, ModulesProviderProtocol {
   open func getModuleClasses() -> [AnyModule.Type] {
     return []
   }