expo-modules-core 0.6.5 → 0.9.0

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/index.ts

@@ -9,6 +9,8 @@ import SyntheticPlatformEmitter from './SyntheticPlatformEmitter';
 import { CodedError } from './errors/CodedError';
 import { UnavailabilityError } from './errors/UnavailabilityError';
 
+import './sweet/setUpErrorManager.fx';
+
 export { default as deprecate } from './deprecate';
 
 export {
@@ -25,6 +27,8 @@ export {
   UnavailabilityError,
 };
 
+export * from './requireNativeModule';
+
 /**
  * @deprecated renamed to `DeviceEventEmitter`
  */

package/src/requireNativeModule.ts

@@ -0,0 +1,29 @@
+import NativeModulesProxy from './NativeModulesProxy';
+
+declare global {
+  // eslint-disable-next-line no-var
+  var ExpoModules:
+    | undefined
+    | {
+        [key: string]: any;
+      };
+}
+
+/**
+ * Imports the native module registered with given name. In the first place it tries to load
+ * the module installed through the JSI host object and then falls back to the bridge proxy module.
+ * Notice that the modules loaded from the proxy may not support some features like synchronous functions.
+ *
+ * @param moduleName Name of the requested native module.
+ * @returns Object representing the native module.
+ * @throws Error when there is no native module with given name.
+ */
+export function requireNativeModule<ModuleType = any>(moduleName: string): ModuleType {
+  const nativeModule: ModuleType =
+    global.ExpoModules?.[moduleName] ?? NativeModulesProxy[moduleName];
+
+  if (!nativeModule) {
+    throw new Error(`Cannot find native module '${moduleName}'`);
+  }
+  return nativeModule;
+}

package/src/sweet/NativeErrorManager.ts

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

package/src/sweet/setUpErrorManager.fx.ts

@@ -0,0 +1,12 @@
+import { EventEmitter } from '../EventEmitter';
+import Platform from '../Platform';
+import NativeErrorManager from './NativeErrorManager';
+
+if (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {
+  const onNewException = 'ExpoModulesCoreErrorManager.onNewException';
+  const eventEmitter = new EventEmitter(NativeErrorManager);
+
+  eventEmitter.addListener(onNewException, ({ message }: { message: string }) => {
+    console.error(message);
+  });
+}

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/ExpoModulesProxySpec.h

@@ -1,24 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#ifdef __cplusplus
-
-#import <jsi/jsi.h>
-#import <ReactCommon/RCTTurboModule.h>
-
-#import <ExpoModulesCore/EXNativeModulesProxy.h>
-
-using namespace facebook;
-using namespace react;
-
-namespace expo {
-
-class JSI_EXPORT ExpoModulesProxySpec : public TurboModule {
-public:
-  ExpoModulesProxySpec(std::shared_ptr<CallInvoker> callInvoker, EXNativeModulesProxy *nativeModulesProxy);
-
-  EXNativeModulesProxy *nativeModulesProxy;
-};
-
-} // namespace expo
-
-#endif

package/ios/JSI/ExpoModulesProxySpec.mm

@@ -1,135 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <React/RCTUtils.h>
-
-#import <ExpoModulesCore/JSIConversions.h>
-#import <ExpoModulesCore/ExpoModulesProxySpec.h>
-
-namespace expo {
-
-using PromiseInvocationBlock = void (^)(RCTPromiseResolveBlock resolveWrapper, RCTPromiseRejectBlock rejectWrapper);
-
-static void callPromiseSetupWithBlock(jsi::Runtime &runtime, std::shared_ptr<CallInvoker> jsInvoker, std::shared_ptr<Promise> promise, PromiseInvocationBlock setupBlock)
-{
-  auto weakResolveWrapper = CallbackWrapper::createWeak(promise->resolve_.getFunction(runtime), runtime, jsInvoker);
-  auto weakRejectWrapper = CallbackWrapper::createWeak(promise->reject_.getFunction(runtime), runtime, jsInvoker);
-
-  __block BOOL resolveWasCalled = NO;
-  __block BOOL rejectWasCalled = NO;
-
-  RCTPromiseResolveBlock resolveBlock = ^(id result) {
-    if (rejectWasCalled) {
-      throw std::runtime_error("Tried to resolve a promise after it's already been rejected.");
-    }
-
-    if (resolveWasCalled) {
-      throw std::runtime_error("Tried to resolve a promise more than once.");
-    }
-
-    auto strongResolveWrapper = weakResolveWrapper.lock();
-    auto strongRejectWrapper = weakRejectWrapper.lock();
-    if (!strongResolveWrapper || !strongRejectWrapper) {
-      return;
-    }
-
-    strongResolveWrapper->jsInvoker().invokeAsync([weakResolveWrapper, weakRejectWrapper, result]() {
-      auto strongResolveWrapper2 = weakResolveWrapper.lock();
-      auto strongRejectWrapper2 = weakRejectWrapper.lock();
-      if (!strongResolveWrapper2 || !strongRejectWrapper2) {
-        return;
-      }
-
-      jsi::Runtime &rt = strongResolveWrapper2->runtime();
-      jsi::Value arg = convertObjCObjectToJSIValue(rt, result);
-      strongResolveWrapper2->callback().call(rt, arg);
-
-      strongResolveWrapper2->destroy();
-      strongRejectWrapper2->destroy();
-    });
-
-    resolveWasCalled = YES;
-  };
-
-  RCTPromiseRejectBlock rejectBlock = ^(NSString *code, NSString *message, NSError *error) {
-    if (resolveWasCalled) {
-      throw std::runtime_error("Tried to reject a promise after it's already been resolved.");
-    }
-
-    if (rejectWasCalled) {
-      throw std::runtime_error("Tried to reject a promise more than once.");
-    }
-
-    auto strongResolveWrapper = weakResolveWrapper.lock();
-    auto strongRejectWrapper = weakRejectWrapper.lock();
-    if (!strongResolveWrapper || !strongRejectWrapper) {
-      return;
-    }
-
-    NSDictionary *jsError = RCTJSErrorFromCodeMessageAndNSError(code, message, error);
-    strongRejectWrapper->jsInvoker().invokeAsync([weakResolveWrapper, weakRejectWrapper, jsError]() {
-      auto strongResolveWrapper2 = weakResolveWrapper.lock();
-      auto strongRejectWrapper2 = weakRejectWrapper.lock();
-      if (!strongResolveWrapper2 || !strongRejectWrapper2) {
-        return;
-      }
-
-      jsi::Runtime &rt = strongRejectWrapper2->runtime();
-      jsi::Value arg = convertNSDictionaryToJSIObject(rt, jsError);
-      strongRejectWrapper2->callback().call(rt, arg);
-
-      strongResolveWrapper2->destroy();
-      strongRejectWrapper2->destroy();
-    });
-
-    rejectWasCalled = YES;
-  };
-
-  setupBlock(resolveBlock, rejectBlock);
-}
-
-static jsi::Value __hostFunction_ExpoModulesProxySpec_callMethodAsync(jsi::Runtime &runtime, TurboModule &turboModule, const jsi::Value *args, size_t count)
-{
-  auto expoModulesProxy = static_cast<ExpoModulesProxySpec *>(&turboModule);
-
-  // The function that is invoked as a setup of the JS `Promise`.
-  auto promiseSetupFunc = [expoModulesProxy, args](jsi::Runtime &runtime, std::shared_ptr<Promise> promise) {
-    callPromiseSetupWithBlock(runtime, expoModulesProxy->jsInvoker_, promise, ^(RCTPromiseResolveBlock resolver, RCTPromiseRejectBlock rejecter) {
-      NSString *moduleName = convertJSIStringToNSString(runtime, args[0].getString(runtime));
-      NSString *methodName = convertJSIStringToNSString(runtime, args[1].getString(runtime));
-      NSArray *arguments = convertJSIArrayToNSArray(runtime, args[2].getObject(runtime).asArray(runtime), expoModulesProxy->jsInvoker_);
-
-      [expoModulesProxy->nativeModulesProxy callMethod:moduleName
-                                       methodNameOrKey:methodName
-                                             arguments:arguments
-                                              resolver:resolver
-                                              rejecter:rejecter];
-    });
-  };
-
-  return createPromiseAsJSIValue(runtime, promiseSetupFunc);
-}
-
-static jsi::Value __hostFunction_ExpoModulesProxySpec_callMethodSync(jsi::Runtime &runtime, TurboModule &turboModule, const jsi::Value *args, size_t count)
-{
-  auto expoModulesProxy = static_cast<ExpoModulesProxySpec *>(&turboModule);
-  NSString *moduleName = convertJSIStringToNSString(runtime, args[0].getString(runtime));
-  NSString *methodName = convertJSIStringToNSString(runtime, args[1].getString(runtime));
-  NSArray *arguments = convertJSIArrayToNSArray(runtime, args[2].getObject(runtime).asArray(runtime), expoModulesProxy->jsInvoker_);
-
-  id result = [expoModulesProxy->nativeModulesProxy callMethodSync:moduleName
-                                                        methodName:methodName
-                                                         arguments:arguments];
-
-  return convertObjCObjectToJSIValue(runtime, result);
-}
-
-ExpoModulesProxySpec::ExpoModulesProxySpec(std::shared_ptr<CallInvoker> callInvoker, EXNativeModulesProxy *nativeModulesProxy) :
-  TurboModule("ExpoModulesProxy", callInvoker),
-  nativeModulesProxy(nativeModulesProxy)
-{
-  methodMap_["callMethodAsync"] = MethodMetadata {3, __hostFunction_ExpoModulesProxySpec_callMethodAsync};
-
-  methodMap_["callMethodSync"] = MethodMetadata {3, __hostFunction_ExpoModulesProxySpec_callMethodSync};
-}
-
-} // namespace expo

package/ios/JSI/JSIInstaller.mm

@@ -1,22 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/JSIInstaller.h>
-#import <ExpoModulesCore/ExpoModulesProxySpec.h>
-
-using namespace facebook;
-using namespace react;
-
-//using PromiseInvocationBlock = void (^)(RCTPromiseResolveBlock resolveWrapper, RCTPromiseRejectBlock rejectWrapper);
-
-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