expo-modules-core 1.2.7 → 1.3.1

package/CHANGELOG.md

@@ -10,32 +10,59 @@
 
 ### 💡 Others
 
-## 1.2.7 — 2023-05-03
+## 1.3.1 — 2023-05-08
+
+_This version does not introduce any user-facing changes._
+
+## 1.3.0 — 2023-05-08
+
+### 🎉 New features
+
+- [iOS] Introduced native functions on the native component instances. ([#21746](https://github.com/expo/expo/pull/21746) by [@tsapeta](https://github.com/tsapeta))
+- View tag and React component ref can now be converted to an instance of the native view when used as a function's argument. ([#21816](https://github.com/expo/expo/pull/21816) by [@lukmccall](https://github.com/lukmccall), [#21829](https://github.com/expo/expo/pull/21829) by [@tsapeta](https://github.com/tsapeta))
+- JavaScript functions can now be passed as an argument to a module method. ([#21976](https://github.com/expo/expo/pull/21976) by [@lukmccall](https://github.com/lukmccall), [#22245](https://github.com/expo/expo/pull/22245) by [@tsapeta](https://github.com/tsapeta))
+- [iOS] Initializing and returning shared objects from the native side. ([#22195](https://github.com/expo/expo/pull/22195) by [@tsapeta](https://github.com/tsapeta))
+
+### 🐛 Bug fixes
+
+- Fixed build errors on React Native 0.72.x. ([#22170](https://github.com/expo/expo/pull/22170), [#22189](https://github.com/expo/expo/pull/22189) by [@kudo](https://github.com/kudo))
+- [Android] Fixed argument trailing not working correctly when all parameters are optional. ([#22293](https://github.com/expo/expo/pull/22293) by [@lukmccall](https://github.com/lukmccall))
+
+### 💡 Others
+
+- [Android] Made `fallbackCallback` optional in the `registerForActivityResult` method. ([#21661](https://github.com/expo/expo/pull/21661) by [@lukmccall](https://github.com/lukmccall))
+- [iOS] Removed the legacy implementation of view managers. ([#21760](https://github.com/expo/expo/pull/21760) by [@tsapeta](https://github.com/tsapeta))
+- [iOS] Passed the app context instance down to dynamic types, object builders and convertibles. ([#21819](https://github.com/expo/expo/pull/21819) by [@tsapeta](https://github.com/tsapeta))
+- [iOS] Use `jsi::WeakObject` for weak objects on Hermes. ([#21986](https://github.com/expo/expo/pull/21986) by [@tsapeta](https://github.com/tsapeta))
+- [iOS] Removed legacyViewManager references from ExpoFabricView. ([#22089](https://github.com/expo/expo/pull/22089) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- [iOS] Dropped `proxiedProperties` prop. ([#22280](https://github.com/expo/expo/pull/22280) by [@tsapeta](https://github.com/tsapeta))
+
+## 1.2.7 - 2023-05-03
 
 ### 🐛 Bug fixes
 
 - [Android] Improve the initial loading speed of the native view. ([#22153](https://github.com/expo/expo/pull/22153) by [@lukmccall](https://github.com/lukmccall))
 
-## 1.2.6 — 2023-03-20
+## 1.2.6 - 2023-03-20
 
 ### 🐛 Bug fixes
 
 - [Android] Fixed `ReadableNativeMap` cannot be cast to the `Record`. ([#21773](https://github.com/expo/expo/pull/21773) by [@lukmccall](https://github.com/lukmccall))
 
-## 1.2.5 — 2023-03-14
+## 1.2.5 - 2023-03-14
 
 ### 🐛 Bug fixes
 
 - [Android] Fixed coroutine functions crashing when invoked with more than 1 argument. ([#21635](https://github.com/expo/expo/pull/21635) by [@lukmccall](https://github.com/lukmccall))
 - [iOS] Fix automatic percent-encoding when converting to the `URL` object. ([#21569](https://github.com/expo/expo/pull/21569) by [@tsapeta](https://github.com/tsapeta))
 
-## 1.2.4 — 2023-03-03
+## 1.2.4 - 2023-03-03
 
 ### 🐛 Bug fixes
 
 - [iOS] Fixed jsc import when using use_frameworks ([#21479](https://github.com/expo/expo/pull/21479) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 
-## 1.2.3 — 2023-02-21
+## 1.2.3 - 2023-02-21
 
 ### 🐛 Bug fixes
 

package/ExpoModulesCore.podspec

@@ -68,6 +68,7 @@ Pod::Spec.new do |s|
   s.dependency 'React-Core'
   s.dependency 'ReactCommon/turbomodule/core'
   s.dependency 'React-RCTAppDelegate' if REACT_NATIVE_MINOR_VERSION >= 71
+  s.dependency 'React-NativeModulesApple' if REACT_NATIVE_MINOR_VERSION >= 72
 
   if fabric_enabled
     compiler_flags << ' ' << fabric_compiler_flags

package/README.md

@@ -11,7 +11,7 @@ The core of Expo Modules architecture.
 
 # Installation in managed Expo projects
 
-For [managed](https://docs.expo.dev/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](#api-documentation). If you follow the link and there is no documentation available then this library is not yet usable within managed projects — it is likely to be included in an upcoming Expo SDK release.
+For [managed](https://docs.expo.dev/archive/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](#api-documentation). If you follow the link and there is no documentation available then this library is not yet usable within managed projects — it is likely to be included in an upcoming Expo SDK release.
 
 # Installation in bare React Native projects
 

package/android/ExpoModulesCorePlugin.gradle

@@ -6,6 +6,22 @@ class KotlinExpoModulesCorePlugin implements Plugin<Project> {
             ? project.rootProject.ext.get("kotlinVersion")
             : "1.8.10"
       }
+
+      project.ext.kspVersion = {
+        def kspVersionsMap = [
+          "1.6.10": "1.6.10-1.0.4",
+          "1.6.21": "1.6.21-1.0.6",
+          "1.7.22": "1.7.22-1.0.8",
+          "1.8.0": "1.8.0-1.0.9",
+          "1.8.10": "1.8.10-1.0.9"
+        ]
+
+        project.rootProject.ext.has("kspVersion")
+          ? project.rootProject.ext.get("kspVersion")
+          : kspVersionsMap.containsKey(project.ext.kotlinVersion())
+          ? kspVersionsMap.get(project.ext.kotlinVersion())
+          : "1.8.10-1.0.9"
+      }
     }
   }
 }

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.2.7'
+version = '1.3.1'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -173,7 +173,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.2.7"
+    versionName "1.3.1"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"
@@ -274,6 +274,7 @@ dependencies {
   api "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0"
   api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0"
   api "androidx.core:core-ktx:1.6.0"
+  api project(':expo-modules-core$android-annotation')
 
   /**
    * ReactActivity (the base activity for every React Native application) is subclassing AndroidX classes.

package/android/src/main/cpp/Exceptions.cpp

@@ -46,6 +46,14 @@ jni::local_ref<UnexpectedException> UnexpectedException::create(const std::strin
   );
 }
 
+jni::local_ref<InvalidArgsNumberException> InvalidArgsNumberException::create(int received, int expected) {
+  return InvalidArgsNumberException::newInstance(
+    received,
+    expected,
+    expected // number of required arguments
+  );
+}
+
 jsi::Value makeCodedError(
   jsi::Runtime &rt,
   jsi::String code,

package/android/src/main/cpp/Exceptions.h

@@ -60,6 +60,17 @@ public:
   );
 };
 
+class InvalidArgsNumberException
+: public jni::JavaClass<InvalidArgsNumberException, CodedException> {
+public:
+  static auto constexpr kJavaDescriptor = "Lexpo/modules/kotlin/exception/InvalidArgsNumberException;";
+
+  static jni::local_ref<InvalidArgsNumberException> create(
+    int received,
+    int expected
+  );
+};
+
 /**
  * Tries to rethrow an jni::JniException as a js version of the CodedException
  */

package/android/src/main/cpp/ExpoModulesHostObject.cpp

@@ -1,9 +1,11 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
 #include "ExpoModulesHostObject.h"
+#include "LazyObject.h"
 
 #include <folly/dynamic.h>
 #include <jsi/JSIDynamic.h>
+#include <react/bridging/LongLivedObject.h>
 
 namespace jsi = facebook::jsi;
 
@@ -16,20 +18,35 @@ ExpoModulesHostObject::ExpoModulesHostObject(JSIInteropModuleRegistry *installer
  * Clears jsi references held by JSRegistry and JavaScriptRuntime. 
  */
 ExpoModulesHostObject::~ExpoModulesHostObject() {
+  facebook::react::LongLivedObjectCollection::get().clear();
   installer->jsRegistry.reset();
   installer->runtimeHolder.reset();
 }
 
 jsi::Value ExpoModulesHostObject::get(jsi::Runtime &runtime, const jsi::PropNameID &name) {
   auto cName = name.utf8(runtime);
-  auto module = installer->getModule(cName);
-  if (module == nullptr) {
+
+  if (!installer->hasModule(cName)) {
+    modulesCache.erase(cName);
     return jsi::Value::undefined();
   }
+  if (UniqueJSIObject &cachedObject = modulesCache[cName]) {
+    return jsi::Value(runtime, *cachedObject);
+  }
+
+  // Create a lazy object for the specific module. It defers initialization of the final module object.
+  LazyObject::Shared moduleLazyObject = std::make_shared<LazyObject>(
+    [this, cName](jsi::Runtime &rt) {
+      auto module = installer->getModule(cName);
+      module->cthis()->jsiInteropModuleRegistry = installer;
+      return module->cthis()->getJSIObject(rt);
+    });
+
+  // Save the module's lazy host object for later use.
+  modulesCache[cName] = std::make_unique<jsi::Object>(
+    jsi::Object::createFromHostObject(runtime, moduleLazyObject));
 
-  module->cthis()->jsiInteropModuleRegistry = installer;
-  auto jsiObject = module->cthis()->getJSIObject(runtime);
-  return jsi::Value(runtime, *jsiObject);
+  return jsi::Value(runtime, *modulesCache[cName]);
 }
 
 void ExpoModulesHostObject::set(jsi::Runtime &runtime, const jsi::PropNameID &name,

package/android/src/main/cpp/ExpoModulesHostObject.h

@@ -7,10 +7,14 @@
 #include <jsi/jsi.h>
 
 #include <vector>
+#import <unordered_map>
 
 namespace jsi = facebook::jsi;
 
 namespace expo {
+
+using UniqueJSIObject = std::unique_ptr<jsi::Object>;
+
 /**
  * An entry point to all exported functionalities like modules.
  *
@@ -30,5 +34,6 @@ public:
 
 private:
   JSIInteropModuleRegistry *installer;
+  std::unordered_map<std::string, UniqueJSIObject> modulesCache;
 };
 } // namespace expo

package/android/src/main/cpp/JNIInjector.cpp

@@ -4,6 +4,7 @@
 #include "JavaScriptModuleObject.h"
 #include "JavaScriptValue.h"
 #include "JavaScriptObject.h"
+#include "JavaScriptFunction.h"
 #include "JavaScriptTypedArray.h"
 #include "JavaReferencesCache.h"
 #include "JavaCallback.h"
@@ -27,6 +28,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
     expo::JavaScriptModuleObject::registerNatives();
     expo::JavaScriptValue::registerNatives();
     expo::JavaScriptObject::registerNatives();
+    expo::JavaScriptFunction::registerNatives();
     expo::JavaScriptTypedArray::registerNatives();
     expo::JavaCallback::registerNatives();
 #if RN_FABRIC_ENABLED

package/android/src/main/cpp/JSIInteropModuleRegistry.cpp

@@ -45,6 +45,7 @@ void JSIInteropModuleRegistry::installJSI(
   jsRegistry = std::make_unique<JSReferencesCache>(*runtime);
 
   runtimeHolder = std::make_shared<JavaScriptRuntime>(
+    this,
     runtime,
     jsInvokerHolder->cthis()->getCallInvoker(),
     nativeInvokerHolder->cthis()->getCallInvoker()
@@ -76,7 +77,7 @@ void JSIInteropModuleRegistry::installJSIForTests() {
 #if !UNIT_TEST
   throw std::logic_error("The function is only available when UNIT_TEST is defined.");
 #else
-  runtimeHolder = std::make_shared<JavaScriptRuntime>();
+  runtimeHolder = std::make_shared<JavaScriptRuntime>(this);
   jsi::Runtime &jsiRuntime = runtimeHolder->get();
 
   jsRegistry = std::make_unique<JSReferencesCache>(jsiRuntime);
@@ -114,11 +115,23 @@ JSIInteropModuleRegistry::callGetJavaScriptModulesNames() const {
   return method(javaPart_);
 }
 
+bool JSIInteropModuleRegistry::callHasModule(const std::string &moduleName) const {
+  const static auto method = expo::JSIInteropModuleRegistry::javaClassLocal()
+    ->getMethod<jboolean(std::string)>(
+      "hasModule"
+    );
+  return (bool) method(javaPart_, moduleName);
+}
+
 jni::local_ref<JavaScriptModuleObject::javaobject>
 JSIInteropModuleRegistry::getModule(const std::string &moduleName) const {
   return callGetJavaScriptModuleObjectMethod(moduleName);
 }
 
+bool JSIInteropModuleRegistry::hasModule(const std::string &moduleName) const {
+  return callHasModule(moduleName);
+}
+
 jni::local_ref<jni::JArrayClass<jni::JString>> JSIInteropModuleRegistry::getModulesName() const {
   return callGetJavaScriptModulesNames();
 }
@@ -140,4 +153,15 @@ jni::local_ref<JavaScriptObject::javaobject> JSIInteropModuleRegistry::createObj
 void JSIInteropModuleRegistry::drainJSEventLoop() {
   runtimeHolder->drainJSEventLoop();
 }
+
+void JSIInteropModuleRegistry::registerSharedObject(
+  jni::local_ref<jobject> native,
+  jni::local_ref<JavaScriptObject::javaobject> js
+) {
+  const static auto method = expo::JSIInteropModuleRegistry::javaClassLocal()
+    ->getMethod<void(jni::local_ref<jobject>, jni::local_ref<JavaScriptObject::javaobject>)>(
+      "registerSharedObject"
+    );
+  method(javaPart_, std::move(native), std::move(js));
+}
 } // namespace expo

package/android/src/main/cpp/JSIInteropModuleRegistry.h

@@ -56,6 +56,8 @@ public:
    */
   jni::local_ref<JavaScriptModuleObject::javaobject> getModule(const std::string &moduleName) const;
 
+  bool hasModule(const std::string &moduleName) const;
+
   /**
    * Gets names of all available modules.
    */
@@ -76,6 +78,16 @@ public:
    */
   jni::local_ref<JavaScriptObject::javaobject> createObject();
 
+  /**
+   * Adds a shared object to the internal registry
+   * @param native part of the shared object
+   * @param js part of the shared object
+   */
+  void registerSharedObject(
+    jni::local_ref<jobject> native,
+    jni::local_ref<JavaScriptObject::javaobject> js
+  );
+
   /**
    * Exposes a `JavaScriptRuntime::drainJSEventLoop` function to Kotlin
    */
@@ -95,5 +107,7 @@ private:
   callGetJavaScriptModuleObjectMethod(const std::string &moduleName) const;
 
   inline jni::local_ref<jni::JArrayClass<jni::JString>> callGetJavaScriptModulesNames() const;
+
+  inline bool callHasModule(const std::string &moduleName) const;
 };
 } // namespace expo

package/android/src/main/cpp/JSIObjectWrapper.h

@@ -10,24 +10,35 @@ namespace jsi = facebook::jsi;
 
 namespace expo {
 /**
- * An interface for classes which wrap jsi::Object.
+ * An interface for classes which wrap `jsi::Object`.
  */
 class JSIObjectWrapper {
 public:
   /**
-   * @return a pointer to the underlying jsi::Object.
+   * @return a pointer to the underlying `jsi::Object`.
    */
   virtual std::shared_ptr<jsi::Object> get() = 0;
 };
 
 /**
- * An interface for classes which wrap jsi::Value.
+ * An interface for classes which wrap `jsi::Value`.
  */
 class JSIValueWrapper {
 public:
   /**
-   * @return a pointer to the underlying jsi::Value.
+   * @return a pointer to the underlying `jsi::Value`.
    */
   virtual std::shared_ptr<jsi::Value> get() = 0;
 };
+
+/**
+ * An interface for classes which wrap `jsi::Function`.
+ */
+class JSIFunctionWrapper {
+public:
+  /**
+   * @return a pointer to the underlying `jsi::Function`.
+   */
+  virtual std::shared_ptr<jsi::Function> get() = 0;
+};
 } // namespace expo

package/android/src/main/cpp/JSITypeConverter.h

@@ -23,7 +23,7 @@ struct jsi_type_converter {
 };
 
 /**
- * Conversion from jni::alias_ref<T::javaobject> to jsi::Value where T extends JSIValueWrapper or JSIObjectWrapper.
+ * Conversion from jni::alias_ref<T::javaobject> to jsi::Value where T extends JSIValueWrapper, JSIObjectWrapper or JSIFunctionWrapper.
  */
 template<class T>
 struct jsi_type_converter<
@@ -31,7 +31,8 @@ struct jsi_type_converter<
   std::enable_if_t<
     // jni::ReprType<T>::HybridType>::value if T looks like `R::javaobject`, it will return R
     std::is_base_of<JSIValueWrapper, typename jni::ReprType<T>::HybridType>::value ||
-    std::is_base_of<JSIObjectWrapper, typename jni::ReprType<T>::HybridType>::value
+    std::is_base_of<JSIObjectWrapper, typename jni::ReprType<T>::HybridType>::value ||
+    std::is_base_of<JSIValueWrapper, typename jni::ReprType<T>::HybridType>::value
   >
 > {
   static const bool isDefined = true;

package/android/src/main/cpp/JavaReferencesCache.cpp

@@ -48,6 +48,8 @@ void JavaReferencesCache::loadJClasses(JNIEnv *env) {
   loadJClass(env, "com/facebook/react/bridge/ReadableNativeMap", {});
   loadJClass(env, "com/facebook/react/bridge/WritableNativeArray", {});
   loadJClass(env, "com/facebook/react/bridge/WritableNativeMap", {});
+
+  loadJClass(env, "expo/modules/kotlin/sharedobjects/SharedObject", {});
 }
 
 void JavaReferencesCache::loadJClass(

package/android/src/main/cpp/JavaScriptFunction.cpp

@@ -0,0 +1,56 @@
+// Copyright © 2021-present 650 Industries, Inc. (aka Expo)
+
+#include "JavaScriptFunction.h"
+#include "types/JNIToJSIConverter.h"
+#include "types/AnyType.h"
+
+namespace expo {
+
+void JavaScriptFunction::registerNatives() {
+  registerHybrid({
+                   makeNativeMethod("invoke", JavaScriptFunction::invoke),
+                 });
+}
+
+JavaScriptFunction::JavaScriptFunction(
+  std::weak_ptr<JavaScriptRuntime> runtime,
+  std::shared_ptr<jsi::Function> jsFunction
+) : runtimeHolder(std::move(runtime)), jsFunction(std::move(jsFunction)) {
+  runtimeHolder.ensureRuntimeIsValid();
+}
+
+JavaScriptFunction::JavaScriptFunction(
+  WeakRuntimeHolder runtime,
+  std::shared_ptr<jsi::Function> jsFunction
+) : runtimeHolder(std::move(runtime)), jsFunction(std::move(jsFunction)) {
+  runtimeHolder.ensureRuntimeIsValid();
+}
+
+std::shared_ptr<jsi::Function> JavaScriptFunction::get() {
+  return jsFunction;
+}
+
+jobject JavaScriptFunction::invoke(
+  jni::alias_ref<jni::JArrayClass<jni::JObject>> args,
+  jni::alias_ref<ExpectedType::javaobject> expectedReturnType
+) {
+  auto &rt = runtimeHolder.getJSRuntime();
+  auto moduleRegistry = runtimeHolder.getModuleRegistry();
+  JNIEnv *env = jni::Environment::current();
+
+  size_t size = args->size();
+  std::vector<jsi::Value> convertedArgs;
+  convertedArgs.reserve(size);
+
+  for (size_t i = 0; i < size; i++) {
+    jni::local_ref<jni::JObject> arg = args->getElement(i);
+    convertedArgs.push_back(convert(moduleRegistry, env, rt, std::move(arg)));
+  }
+
+  // TODO(@lukmccall): add better error handling
+  jsi::Value result = jsFunction->call(rt, (const jsi::Value *) convertedArgs.data(), size);
+  auto converter = AnyType(jni::make_local(expectedReturnType)).converter;
+  auto convertedResult = converter->convert(rt, env, moduleRegistry, result);
+  return convertedResult;
+}
+} // namespace expo

package/android/src/main/cpp/JavaScriptFunction.h

@@ -0,0 +1,54 @@
+// Copyright © 2021-present 650 Industries, Inc. (aka Expo)
+
+#pragma once
+
+#include "JSIObjectWrapper.h"
+#include "JavaScriptRuntime.h"
+#include "WeakRuntimeHolder.h"
+#include "types/ExpectedType.h"
+
+#include <fbjni/fbjni.h>
+#include <jsi/jsi.h>
+
+namespace jni = facebook::jni;
+namespace jsi = facebook::jsi;
+
+namespace expo {
+
+/**
+ * Represents any JavaScript function. Its purpose is to expose the `jsi::Function` API back to Kotlin.
+ */
+class JavaScriptFunction : public jni::HybridClass<JavaScriptFunction>, JSIFunctionWrapper {
+public:
+  static auto constexpr
+    kJavaDescriptor = "Lexpo/modules/kotlin/jni/JavaScriptFunction;";
+  static auto constexpr TAG = "JavaScriptFunction";
+
+  static void registerNatives();
+
+  JavaScriptFunction(
+    std::weak_ptr<JavaScriptRuntime> runtime,
+    std::shared_ptr<jsi::Function> jsFunction
+  );
+
+  JavaScriptFunction(
+    WeakRuntimeHolder runtime,
+    std::shared_ptr<jsi::Function> jsFunction
+  );
+
+  std::shared_ptr<jsi::Function> get() override;
+
+
+private:
+  friend HybridBase;
+
+  WeakRuntimeHolder runtimeHolder;
+  std::shared_ptr<jsi::Function> jsFunction;
+
+  jobject invoke(
+    jni::alias_ref<jni::JArrayClass<jni::JObject>> args,
+    jni::alias_ref<ExpectedType::javaobject> expectedReturnType
+  );
+};
+
+} // namespace expo