expo-modules-core 0.9.2 → 0.11.1

package/ios/JSI/TypedArray.h

@@ -0,0 +1,46 @@
+// Copyright 2022-present 650 Industries. All rights reserved.
+
+#ifdef __cplusplus
+
+#include <jsi/jsi.h>
+
+namespace jsi = facebook::jsi;
+
+namespace expo {
+
+// Please keep it in-sync with the `EXTypedArrayKind` in Objective-C.
+// We need to maintain two implementations to expose this enum to Swift.
+enum class TypedArrayKind {
+  Int8Array = 1,
+  Int16Array = 2,
+  Int32Array = 3,
+  Uint8Array = 4,
+  Uint8ClampedArray = 5,
+  Uint16Array = 6,
+  Uint32Array = 7,
+  Float32Array = 8,
+  Float64Array = 9,
+  BigInt64Array = 10,
+  BigUint64Array = 11,
+};
+
+class TypedArray : public jsi::Object {
+ public:
+  TypedArray(jsi::Runtime &, const jsi::Object &);
+  TypedArray(TypedArray &&) = default;
+  TypedArray &operator=(TypedArray &&) = default;
+
+  TypedArrayKind getKind(jsi::Runtime &runtime) const;
+
+  size_t byteOffset(jsi::Runtime &runtime) const;
+
+  jsi::ArrayBuffer getBuffer(jsi::Runtime &runtime) const;
+
+  void* getRawPointer(jsi::Runtime &runtime);
+};
+
+bool isTypedArray(jsi::Runtime &runtime, const jsi::Object &jsObj);
+
+} // namespace expo
+
+#endif // __cplusplus

package/ios/ModuleRegistryAdapter/EXModuleRegistryAdapter.m

@@ -7,13 +7,11 @@
 #import <ExpoModulesCore/EXViewManagerAdapterClassesRegistry.h>
 #import <ExpoModulesCore/EXModuleRegistryHolderReactModule.h>
 #import <ExpoModulesCore/EXReactNativeEventEmitter.h>
-#import <ExpoModulesCore/Swift.h>
 
 @interface EXModuleRegistryAdapter ()
 
 @property (nonatomic, strong) EXModuleRegistryProvider *moduleRegistryProvider;
 @property (nonatomic, strong) EXViewManagerAdapterClassesRegistry *viewManagersClassesRegistry;
-@property (nonatomic, strong, nullable) ModulesProvider *swiftModulesProvider;
 
 @end
 
@@ -75,13 +73,4 @@
   return extraModules;
 }
 
-- (nullable SwiftInteropBridge *)swiftInteropBridgeModulesRegistry:(EXModuleRegistry *)moduleRegistry
-{
-  if (_swiftModulesProvider) {
-    return [[SwiftInteropBridge alloc] initWithModulesProvider:_swiftModulesProvider legacyModuleRegistry:moduleRegistry];
-  } else {
-    return nil;
-  }
-}
-
 @end

package/ios/NativeModulesProxy/EXNativeModulesProxy.h

@@ -5,26 +5,33 @@
 #import <ExpoModulesCore/EXInternalModule.h>
 #import <ExpoModulesCore/EXModuleRegistry.h>
 
+// A convenience class, which acts as a store for the native modules proxy config
+
+NS_SWIFT_NAME(ModulesProxyConfig)
+@interface EXModulesProxyConfig : NSObject
+
+- (instancetype)initWithConstants:(nonnull NSDictionary *)constants
+                      methodNames:(nonnull NSDictionary *)methodNames
+                     viewManagers:(nonnull NSDictionary *)viewManagerMetadata;
+
+- (void)addEntriesFromConfig:(nonnull const EXModulesProxyConfig *)config;
+- (nonnull NSDictionary<NSString *, id> *)toDictionary;
+
+@end
+
 // RCTBridgeModule capable of receiving method calls from JS and forwarding them
 // to proper exported universal modules. Also, it exports important constants to JS, like
 // properties of exported methods and modules' constants.
 
-// 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 ModulesProvider;
-
-NS_SWIFT_NAME(NativeModulesProxy)
+NS_SWIFT_NAME(LegacyNativeModulesProxy)
 @interface EXNativeModulesProxy : NSObject <RCTBridgeModule>
 
-@property (nonatomic, strong) SwiftInteropBridge *swiftInteropBridge;
+@property (nonatomic, strong, readonly) EXModulesProxyConfig *nativeModulesConfig;
 
 - (nonnull instancetype)init;
 - (nonnull instancetype)initWithModuleRegistry:(nullable EXModuleRegistry *)moduleRegistry;
+- (nonnull instancetype)initWithCustomModuleRegistry:(nonnull EXModuleRegistry *)moduleRegistry;
 
 - (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;
-
-+ (ModulesProvider *)getExpoModulesProvider;
 
 @end

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,29 @@ 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
 {
+  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
     // during setup causes a crash due to mutating `_moduleDataByID` while it's being enumerated.
@@ -159,16 +218,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 +261,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 +274,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 +324,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 +429,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];