expo-modules-core 0.7.0 → 0.8.0

package/ios/Tests/ModuleRegistrySpec.swift

@@ -1,9 +1,8 @@
-import Quick
-import Nimble
+import ExpoModulesTestCore
 
 @testable import ExpoModulesCore
 
-class ModuleRegistrySpec: QuickSpec {
+class ModuleRegistrySpec: ExpoSpec {
   override func spec() {
     let appContext = AppContext()
 

package/ios/Tests/RecordSpec.swift

@@ -1,9 +1,8 @@
-import Quick
-import Nimble
+import ExpoModulesTestCore
 
 @testable import ExpoModulesCore
 
-class RecordSpec: QuickSpec {
+class RecordSpec: ExpoSpec {
   override func spec() {
     it("initializes with empty dictionary") {
       struct TestRecord: Record { }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "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": "e1ff1a3d6bc62f374e6947a5e81428a1bb7cfa34"
+  "gitHead": "22dce752354bb429c84851bc4389abe47a766b1f"
 }

package/src/NativeModulesProxy.native.ts

@@ -1,11 +1,6 @@
 import { NativeModules } from 'react-native';
 
-import { ProxyNativeModule, TurboNativeModuleProxy } from './NativeModulesProxy.types';
-
-// `ExpoModulesProxy` is not declared in TypeScript yet. It's installed via JSI.
-declare namespace global {
-  const ExpoModulesProxy: TurboNativeModuleProxy;
-}
+import { ProxyNativeModule } from './NativeModulesProxy.types';
 
 const NativeProxy = NativeModules.NativeUnimoduleProxy;
 const modulesConstantsKey = 'modulesConstants';
@@ -13,16 +8,6 @@ const exportedMethodsKey = 'exportedMethods';
 
 const NativeModulesProxy: { [moduleName: string]: ProxyNativeModule } = {};
 
-// Keep it opt-in for now. It's too risky without proper and thorough testing.
-let canUseExpoTurboModules = false;
-
-/**
- * Sets whether to use a TurboModule version of the proxy.
- */
-export function useExpoTurboModules(state: boolean = true) {
-  canUseExpoTurboModules = state;
-}
-
 if (NativeProxy) {
   Object.keys(NativeProxy[exportedMethodsKey]).forEach((moduleName) => {
     NativeModulesProxy[moduleName] = NativeProxy[modulesConstantsKey][moduleName] || {};
@@ -38,12 +23,7 @@ if (NativeProxy) {
             )
           );
         }
-
-        if (canUseExpoTurboModules && global.ExpoModulesProxy) {
-          return global.ExpoModulesProxy.callMethodAsync(moduleName, methodInfo.name, args);
-        } else {
-          return NativeProxy.callMethod(moduleName, key, args);
-        }
+        return NativeProxy.callMethod(moduleName, key, args);
       };
     });
 

package/src/NativeModulesProxy.types.ts

@@ -3,11 +3,3 @@ export type ProxyNativeModule = {
   addListener: (eventName: string) => void;
   removeListeners: (count: number) => void;
 };
-
-export type TurboNativeModuleProxy = {
-  callMethodAsync: <ReturnType>(
-    moduleName: string,
-    methodName: string,
-    args: any[]
-  ) => Promise<ReturnType>;
-};

package/src/NativeViewManagerAdapter.native.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { NativeModules, UIManager, ViewPropTypes, requireNativeComponent } from 'react-native';
+import { NativeModules, requireNativeComponent } from 'react-native';
 
 // To make the transition from React Native's `requireNativeComponent` to Expo's
 // `requireNativeViewManager` as easy as possible, `requireNativeViewManager` is a drop-in
@@ -10,11 +10,6 @@ import { NativeModules, UIManager, ViewPropTypes, requireNativeComponent } from
 // passed to React Native's View (ex: style, testID) and custom view props, which are passed to the
 // adapter view component in a prop called `proxiedProperties`.
 
-// NOTE: React Native is moving away from runtime PropTypes and may remove ViewPropTypes, in which
-// case we will need another way to separate standard React Native view props from other props,
-// which we proxy through the adapter
-const ViewPropTypesKeys = Object.keys(ViewPropTypes);
-
 type NativeExpoComponentProps = {
   proxiedProperties: object;
 };
@@ -23,14 +18,14 @@ type NativeExpoComponentProps = {
  * A drop-in replacement for `requireNativeComponent`.
  */
 export function requireNativeViewManager<P = any>(viewName: string): React.ComponentType<P> {
-  if (__DEV__) {
-    const { NativeUnimoduleProxy } = NativeModules;
-    if (!NativeUnimoduleProxy.viewManagersNames.includes(viewName)) {
-      const exportedViewManagerNames = NativeUnimoduleProxy.viewManagersNames.join(', ');
-      console.warn(
-        `The native view manager required by name (${viewName}) from NativeViewManagerAdapter isn't exported by expo-modules-core. Views of this type may not render correctly. Exported view managers: [${exportedViewManagerNames}].`
-      );
-    }
+  const { viewManagersMetadata } = NativeModules.NativeUnimoduleProxy;
+  const viewManagerConfig = viewManagersMetadata?.[viewName];
+
+  if (__DEV__ && !viewManagerConfig) {
+    const exportedViewManagerNames = Object.keys(viewManagersMetadata).join(', ');
+    console.warn(
+      `The native view manager required by name (${viewName}) from NativeViewManagerAdapter isn't exported by expo-modules-core. Views of this type may not render correctly. Exported view managers: [${exportedViewManagerNames}].`
+    );
   }
 
   // Set up the React Native native component, which is an adapter to the universal module's view
@@ -38,23 +33,12 @@ export function requireNativeViewManager<P = any>(viewName: string): React.Compo
   const reactNativeViewName = `ViewManagerAdapter_${viewName}`;
   const ReactNativeComponent =
     requireNativeComponent<NativeExpoComponentProps>(reactNativeViewName);
-  const reactNativeUIConfiguration = (UIManager.getViewManagerConfig
-    ? UIManager.getViewManagerConfig(reactNativeViewName)
-    : UIManager[reactNativeViewName]) || {
-    NativeProps: {},
-    directEventTypes: {},
-  };
-  const reactNativeComponentPropNames = [
-    'children',
-    ...ViewPropTypesKeys,
-    ...Object.keys(reactNativeUIConfiguration.NativeProps),
-    ...Object.keys(reactNativeUIConfiguration.directEventTypes),
-  ];
+  const proxiedPropsNames = viewManagerConfig?.propsNames ?? [];
 
   // Define a component for universal-module authors to access their native view manager
   function NativeComponentAdapter(props, ref) {
-    const nativeProps = pick(props, reactNativeComponentPropNames);
-    const proxiedProps = omit(props, reactNativeComponentPropNames);
+    const nativeProps = omit(props, proxiedPropsNames);
+    const proxiedProps = pick(props, proxiedPropsNames);
     return <ReactNativeComponent {...nativeProps} proxiedProperties={proxiedProps} ref={ref} />;
   }
   NativeComponentAdapter.displayName = `Adapter<${viewName}>`;

package/src/sweet/NativeErrorManager.ts

@@ -1,2 +1,2 @@
-import { NativeModulesProxy } from '..';
+import NativeModulesProxy from '../NativeModulesProxy';
 export default NativeModulesProxy.ExpoModulesCoreErrorManager;

package/android/src/main/java/expo/modules/kotlin/events/KEventEmitterWrapper.kt

@@ -1,26 +0,0 @@
-package expo.modules.kotlin.events
-
-import android.os.Bundle
-import expo.modules.core.interfaces.services.EventEmitter
-import expo.modules.kotlin.ModuleHolder
-
-/**
- * In Swift, we check if the event is supported. Otherwise, we can't send such event through the bridge.
- * However, in Kotlin this is unnecessary, but to make our API consistent, we added similar check.
- * But because of that, we had to create a wrapper for EventEmitter.
- */
-class KEventEmitterWrapper(
-  private val moduleHolder: ModuleHolder,
-  private val legacyEventEmitter: EventEmitter
-) : EventEmitter by legacyEventEmitter {
-  override fun emit(eventName: String, eventBody: Bundle?) {
-    require(
-      moduleHolder
-        .definition
-        .eventsDefinition
-        ?.names
-        ?.contains(eventName) == true
-    ) { "Unsupported event: $eventName." }
-    legacyEventEmitter.emit(eventName, eventBody)
-  }
-}

package/android/src/main/java/expo/modules/kotlin/methods/Method.kt

@@ -1,14 +0,0 @@
-package expo.modules.kotlin.methods
-
-import expo.modules.kotlin.Promise
-import expo.modules.kotlin.types.AnyType
-
-class Method(
-  name: String,
-  argsType: Array<AnyType>,
-  private val body: (args: Array<out Any?>) -> Any?
-) : AnyMethod(name, argsType) {
-  override fun callImplementation(args: Array<out Any?>, promise: Promise) {
-    promise.resolve(body(args))
-  }
-}

package/android/src/main/java/expo/modules/kotlin/methods/PromiseMethod.kt

@@ -1,15 +0,0 @@
-package expo.modules.kotlin.methods
-
-import expo.modules.kotlin.Promise
-import expo.modules.kotlin.types.AnyType
-
-class PromiseMethod(
-  name: String,
-  argsType: Array<AnyType>,
-  private val body: (args: Array<out Any?>, promise: Promise) -> Unit
-) : AnyMethod(name, argsType) {
-
-  override fun callImplementation(args: Array<out Any?>, promise: Promise) {
-    body(args, promise)
-  }
-}

package/ios/JSI/JSIInstaller.mm

@@ -1,34 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/JSIInstaller.h>
-#import <ExpoModulesCore/ExpoModulesProxySpec.h>
-#import <ExpoModulesCore/ExpoModulesHostObject.h>
-#import <ExpoModulesCore/Swift.h>
-
-using namespace facebook;
-using namespace react;
-
-namespace expo {
-
-void installRuntimeObjects(jsi::Runtime &runtime, std::shared_ptr<CallInvoker> callInvoker, EXNativeModulesProxy *nativeModulesProxy)
-{
-  auto expoModulesProxyModule = std::make_shared<ExpoModulesProxySpec>(callInvoker, nativeModulesProxy);
-
-  runtime
-    .global()
-    .setProperty(runtime, "ExpoModulesProxy", jsi::Object::createFromHostObject(runtime, expoModulesProxyModule));
-}
-
-} // namespace expo
-
-@implementation JavaScriptRuntimeManager
-
-+ (void)installExpoModulesToRuntime:(nonnull JavaScriptRuntime *)runtime withSwiftInterop:(nonnull SwiftInteropBridge *)swiftInterop
-{
-  std::shared_ptr<expo::ExpoModulesHostObject> hostObjectPtr = std::make_shared<expo::ExpoModulesHostObject>(swiftInterop);
-  JavaScriptObject *global = [runtime global];
-
-  global[@"ExpoModules"] = [runtime createHostObject:hostObjectPtr];
-}
-
-@end

package/ios/JSI/JavaScriptObject.h

@@ -1,60 +0,0 @@
-// Copyright 2022-present 650 Industries. All rights reserved.
-
-#import <Foundation/Foundation.h>
-#import <React/RCTBridgeModule.h>
-
-#ifdef __cplusplus
-#import <jsi/jsi.h>
-#import <ReactCommon/CallInvoker.h>
-
-namespace jsi = facebook::jsi;
-#endif // __cplusplus
-
-typedef void (^JSAsyncFunctionBlock)(NSArray * _Nonnull, RCTPromiseResolveBlock _Nonnull, RCTPromiseRejectBlock _Nonnull);
-typedef id _Nullable (^JSSyncFunctionBlock)(NSArray * _Nonnull);
-
-@class JavaScriptRuntime;
-
-@interface JavaScriptObject : NSObject
-
-// Some parts of the interface must be hidden for Swift – it can't import any C++ code.
-#ifdef __cplusplus
-- (nonnull instancetype)initWith:(std::shared_ptr<jsi::Object>)jsObjectPtr
-                         runtime:(nonnull JavaScriptRuntime *)runtime;
-
-/**
- Returns the pointer to the underlying object.
- */
-- (nonnull jsi::Object *)get;
-#endif // __cplusplus
-
-#pragma mark - Subscripting
-
-/**
- Subscript getter. Supports only values convertible to Foundation types, otherwise `nil` is returned.
- */
-- (nullable id)objectForKeyedSubscript:(nonnull NSString *)key;
-
-/**
- Subscript setter. Only `JavaScriptObject` and Foundation object convertible to JSI values can be used as a value,
- otherwise the property is set to `undefined`.
- */
-- (void)setObject:(nullable id)obj forKeyedSubscript:(nonnull NSString *)key;
-
-#pragma mark - Functions
-
-/**
- Sets given function block on the object as a host function returning a promise.
- */
-- (void)setAsyncFunction:(nonnull NSString *)key
-               argsCount:(NSInteger)argsCount
-                   block:(nonnull JSAsyncFunctionBlock)block;
-
-/**
- Sets given synchronous function block as a host function on the object.
- */
-- (void)setSyncFunction:(nonnull NSString *)name
-              argsCount:(NSInteger)argsCount
-                  block:(nonnull JSSyncFunctionBlock)block;
-
-@end

package/ios/JSI/JavaScriptObject.mm

@@ -1,93 +0,0 @@
-// Copyright 2022-present 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/JSIConversions.h>
-#import <ExpoModulesCore/JavaScriptObject.h>
-#import <ExpoModulesCore/JavaScriptRuntime.h>
-#import <ExpoModulesCore/ExpoModulesProxySpec.h>
-
-@implementation JavaScriptObject {
-  /**
-   Pointer to the `JavaScriptRuntime` wrapper.
-
-   \note It must be weak because only then the original runtime can be safely deallocated
-   when the JS engine wants to without unsetting it on each created object.
-   */
-  __weak JavaScriptRuntime *_runtime;
-
-  /**
-   Shared pointer to the original JSI object that is being wrapped by `JavaScriptObject` class.
-   */
-  std::shared_ptr<jsi::Object> _jsObjectPtr;
-}
-
-- (nonnull instancetype)initWith:(std::shared_ptr<jsi::Object>)jsObjectPtr
-                         runtime:(nonnull JavaScriptRuntime *)runtime
-{
-  if (self = [super init]) {
-    _runtime = runtime;
-    _jsObjectPtr = jsObjectPtr;
-  }
-  return self;
-}
-
-- (nonnull jsi::Object *)get
-{
-  return _jsObjectPtr.get();
-}
-
-#pragma mark - Subscripting
-
-- (nullable id)objectForKeyedSubscript:(nonnull NSString *)key
-{
-  auto runtime = [_runtime get];
-  auto callInvoker = [_runtime callInvoker];
-
-  if (runtime && callInvoker) {
-    auto value = _jsObjectPtr->getProperty(*runtime, [key UTF8String]);
-    return expo::convertJSIValueToObjCObject(*runtime, value, callInvoker);
-  }
-  return nil;
-}
-
-- (void)setObject:(nullable id)obj forKeyedSubscript:(nonnull NSString *)key
-{
-  auto runtime = [_runtime get];
-
-  if (!runtime) {
-    NSLog(@"Cannot set '%@' property when the JavaScript runtime is no longer available.", key);
-    return;
-  }
-  if ([obj isKindOfClass:[JavaScriptObject class]]) {
-    _jsObjectPtr->setProperty(*runtime, [key UTF8String], *[obj get]);
-  } else {
-    _jsObjectPtr->setProperty(*runtime, [key UTF8String], expo::convertObjCObjectToJSIValue(*runtime, obj));
-  }
-}
-
-#pragma mark - Functions
-
-- (void)setAsyncFunction:(nonnull NSString *)name
-               argsCount:(NSInteger)argsCount
-                   block:(nonnull JSAsyncFunctionBlock)block
-{
-  if (!_runtime) {
-    NSLog(@"Cannot set '%@' async function when the JavaScript runtime is no longer available.", name);
-    return;
-  }
-  jsi::Function function = [_runtime createAsyncFunction:name argsCount:argsCount block:block];
-  _jsObjectPtr->setProperty(*[_runtime get], [name UTF8String], function);
-}
-
-- (void)setSyncFunction:(nonnull NSString *)name
-              argsCount:(NSInteger)argsCount
-                  block:(nonnull JSSyncFunctionBlock)block
-{
-  if (!_runtime) {
-    NSLog(@"Cannot set '%@' sync function when the JavaScript runtime is no longer available.", name);
-    return;
-  }
-  jsi::Function function = [_runtime createSyncFunction:name argsCount:argsCount block:block];
-  _jsObjectPtr->setProperty(*[_runtime get], [name UTF8String], function);
-}
-
-@end

package/ios/JSI/JavaScriptRuntime.mm

@@ -1,102 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <jsi/jsi.h>
-
-#import <ExpoModulesCore/JavaScriptRuntime.h>
-#import <ExpoModulesCore/ExpoModulesHostObject.h>
-#import <ExpoModulesCore/Swift.h>
-
-using namespace facebook;
-
-@implementation JavaScriptRuntime {
-  jsi::Runtime *_runtime;
-  std::shared_ptr<react::CallInvoker> _jsCallInvoker;
-
-  JavaScriptObject *_global;
-}
-
-- (nonnull instancetype)initWithRuntime:(jsi::Runtime &)runtime callInvoker:(std::shared_ptr<react::CallInvoker>)callInvoker
-{
-  if (self = [super init]) {
-    _runtime = &runtime;
-    _jsCallInvoker = callInvoker;
-
-    auto jsGlobalPtr = std::make_shared<jsi::Object>(_runtime->global());
-    _global = [[JavaScriptObject alloc] initWith:jsGlobalPtr runtime:self];
-  }
-  return self;
-}
-
-- (nonnull jsi::Runtime *)get
-{
-  return _runtime;
-}
-
-- (std::shared_ptr<react::CallInvoker>)callInvoker
-{
-  return _jsCallInvoker;
-}
-
-- (nonnull JavaScriptObject *)createObject
-{
-  auto jsObjectPtr = std::make_shared<jsi::Object>(*_runtime);
-  return [[JavaScriptObject alloc] initWith:jsObjectPtr runtime:self];
-}
-
-- (nonnull JavaScriptObject *)createHostObject:(std::shared_ptr<jsi::HostObject>)jsiHostObjectPtr
-{
-  auto jsObjectPtr = std::make_shared<jsi::Object>(jsi::Object::createFromHostObject(*_runtime, jsiHostObjectPtr));
-  return [[JavaScriptObject alloc] initWith:jsObjectPtr runtime:self];
-}
-
-- (nonnull JavaScriptObject *)global
-{
-  return _global;
-}
-
-- (jsi::Function)createSyncFunction:(nonnull NSString *)name
-                          argsCount:(NSInteger)argsCount
-                              block:(nonnull JSSyncFunctionBlock)block
-{
-  return [self createHostFunction:name argsCount:argsCount block:^jsi::Value(jsi::Runtime &runtime, std::shared_ptr<react::CallInvoker> callInvoker, NSArray * _Nonnull arguments) {
-    return expo::convertObjCObjectToJSIValue(runtime, block(arguments));
-  }];
-}
-
-- (jsi::Function)createAsyncFunction:(nonnull NSString *)name
-                           argsCount:(NSInteger)argsCount
-                               block:(nonnull JSAsyncFunctionBlock)block
-{
-  return [self createHostFunction:name argsCount:argsCount block:^jsi::Value(jsi::Runtime &runtime, std::shared_ptr<react::CallInvoker> callInvoker, NSArray *arguments) {
-    // The function that is invoked as a setup of the JavaScript `Promise`.
-    auto promiseSetup = [callInvoker, block, arguments](jsi::Runtime &runtime, std::shared_ptr<Promise> promise) {
-      expo::callPromiseSetupWithBlock(runtime, callInvoker, promise, ^(RCTPromiseResolveBlock resolver, RCTPromiseRejectBlock rejecter) {
-        block(arguments, resolver, rejecter);
-      });
-    };
-    return createPromiseAsJSIValue(runtime, promiseSetup);
-  }];
-}
-
-#pragma mark - Private
-
-typedef jsi::Value (^JSHostFunctionBlock)(jsi::Runtime &runtime, std::shared_ptr<react::CallInvoker> callInvoker, NSArray * _Nonnull arguments);
-
-- (jsi::Function)createHostFunction:(nonnull NSString *)name
-                          argsCount:(NSInteger)argsCount
-                              block:(nonnull JSHostFunctionBlock)block
-{
-  jsi::PropNameID propNameId = jsi::PropNameID::forAscii(*_runtime, [name UTF8String], [name length]);
-  std::weak_ptr<react::CallInvoker> weakCallInvoker = _jsCallInvoker;
-  jsi::HostFunctionType function = [weakCallInvoker, block](jsi::Runtime &runtime, const jsi::Value &thisVal, const jsi::Value *args, size_t count) -> jsi::Value {
-    if (auto callInvoker = weakCallInvoker.lock()) {
-      NSArray *arguments = expo::convertJSIValuesToNSArray(runtime, args, count, callInvoker);
-      return block(runtime, callInvoker, arguments);
-    }
-    // TODO: We should throw some kind of error.
-    return jsi::Value::undefined();
-  };
-  return jsi::Function::createFromHostFunction(*_runtime, propNameId, (unsigned int)argsCount, function);
-}
-
-@end

package/ios/NativeModulesProxy/EXComponentDataCompatibleWrapper.h

@@ -1,16 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <React/RCTComponentData.h>
-
-/**
- * A compatible wrapper for `RCTComponentData` which has different designated initializers between different react-native versions.
- * This class unifies the interface to make react-native <= 0.64 backward compatible.
- * Remove when we drop support for SDK 44
- */
-@interface EXComponentDataCompatibleWrapper : RCTComponentData
-
-- (instancetype)initWithManagerClass:(Class)managerClass
-                              bridge:(RCTBridge *)bridge
-                     eventDispatcher:(id<RCTEventDispatcherProtocol>)eventDispatcher NS_DESIGNATED_INITIALIZER;
-
-@end

package/ios/NativeModulesProxy/EXComponentDataCompatibleWrapper.m

@@ -1,28 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXComponentDataCompatibleWrapper.h>
-
-@interface RCTComponentData (EXComponentDataCompatibleWrapper)
-
-// available in RN 0.65+
-- (instancetype)initWithManagerClass:(Class)managerClass
-                              bridge:(RCTBridge *)bridge
-                     eventDispatcher:(id<RCTEventDispatcherProtocol>) eventDispatcher;
-
-- (instancetype)initWithManagerClass:(Class)managerClass bridge:(RCTBridge *)bridge;
-
-@end
-
-@implementation EXComponentDataCompatibleWrapper
-
-- (instancetype)initWithManagerClass:(Class)managerClass
-                              bridge:(RCTBridge *)bridge
-                     eventDispatcher:(id<RCTEventDispatcherProtocol>)eventDispatcher
-{
-  if ([self respondsToSelector:@selector(initWithManagerClass:bridge:)]) {
-    return [super initWithManagerClass:managerClass bridge:bridge];
-  }
-  return [super initWithManagerClass:managerClass bridge:bridge eventDispatcher:eventDispatcher];
-}
-
-@end