expo-modules-core 1.2.1 → 1.2.3

package/CHANGELOG.md

@@ -10,6 +10,20 @@
 
 ### 💡 Others
 
+## 1.2.3 — 2023-02-21
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed URI with encoded `#` getting cut off. ([#21326](https://github.com/expo/expo/pull/21326) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Fail gracefully when the view cannot be constructed due to the missing activity. ([#21328](https://github.com/expo/expo/pull/21328) by [@lukmccall](https://github.com/lukmccall))
+
+## 1.2.2 — 2023-02-14
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed convertible implementation for `URL` type to support unencoded UTF8 urls and file paths. ([#21139](https://github.com/expo/expo/pull/21139) by [@tsapeta](https://github.com/tsapeta))
+- Fixed AppDelegateSubscriber broken when running on iOS dynamic framework or static framework mode. ([#21206](https://github.com/expo/expo/pull/21206) by [@kudo](https://github.com/kudo))
+
 ## 1.2.1 — 2023-02-09
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.2.1'
+version = '1.2.3'
 
 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.1"
+    versionName "1.2.3"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/android/src/main/java/expo/modules/kotlin/views/ViewDefinitionBuilder.kt

@@ -4,9 +4,12 @@
 package expo.modules.kotlin.views
 
 import android.content.Context
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.exception.CodedException
+import expo.modules.kotlin.exception.UnexpectedException
 import expo.modules.kotlin.modules.DefinitionMarker
 import expo.modules.kotlin.types.toAnyType
 import kotlin.reflect.KClass
@@ -147,7 +150,11 @@ class ViewDefinitionBuilder<T : View>(@PublishedApi internal val viewType: KClas
 
     // Backward compatibility
     if (args.size == 1) {
-      return@viewFactory primaryConstructor.call(context)
+      return@viewFactory try {
+        primaryConstructor.call(context)
+      } catch (e: Throwable) {
+        handleFailureDuringViewCreation(context, appContext, e)
+      }
     }
 
     val secondArgType = args[1].type
@@ -159,7 +166,24 @@ class ViewDefinitionBuilder<T : View>(@PublishedApi internal val viewType: KClas
       throw IllegalStateException("Android view has more constructor arguments than expected.")
     }
 
-    return@viewFactory primaryConstructor.call(context, appContext)
+    return@viewFactory try {
+      primaryConstructor.call(context, appContext)
+    } catch (e: Throwable) {
+      handleFailureDuringViewCreation(context, appContext, e)
+    }
+  }
+
+  private fun handleFailureDuringViewCreation(context: Context, appContext: AppContext, e: Throwable): View {
+    Log.e("ExpoModulesCore", "Couldn't create view of type $viewType", e)
+
+    appContext.errorManager?.reportExceptionToLogBox(
+      if (e is CodedException) {
+        e
+      } else {
+        UnexpectedException(e)
+      }
+    )
+    return View(context)
   }
 
   private fun getPrimaryConstructor(): KFunction<T>? {

package/ios/AppDelegates/EXAppDelegateWrapper.mm

@@ -42,7 +42,7 @@
   return _expoAppDelegate;
 }
 
-#if __has_include(<React-RCTAppDelegate/RCTAppDelegate.h>)
+#if __has_include(<React-RCTAppDelegate/RCTAppDelegate.h>) || __has_include(<React_RCTAppDelegate/RCTAppDelegate.h>)
 
 - (UIView *)findRootView:(UIApplication *)application
 {

package/ios/Swift/Arguments/Convertibles.swift

@@ -13,11 +13,10 @@ import CoreGraphics
 
 extension URL: Convertible {
   public static func convert(from value: Any?) throws -> Self {
-    if let uri = value as? String, let url = URL(string: uri) {
-      // `URL(string:)` is an optional init but it doesn't imply it's a valid URL,
-      // so here we don't check for the correctness of the URL.
-      // If it has no scheme, we assume it was the file path.
-      return url.scheme != nil ? url : URL(fileURLWithPath: uri)
+    if let value = value as? String, let encodedValue = percentEncodeUrlString(value), let url = URL(string: encodedValue) {
+      // If it has no scheme, we assume it was the file path which needs to be recreated to be recognized as the file url.
+      // Notice that it uses the decoded value as the file path doesn't have to be percent-encoded.
+      return url.scheme != nil ? url : URL(fileURLWithPath: value)
     }
     throw Conversions.ConvertingException<URL>(value)
   }

package/ios/Swift/Utilities.swift

@@ -26,3 +26,35 @@ internal func toNSError(_ error: Error) -> NSError {
   }
   return error as NSError
 }
+
+/**
+ Makes sure the url string is percent encoded. If the given string is already encoded, it's decoded first.
+ Note that it encodes only characters that are not allowed in the url query and '#' that indicates the fragment part.
+ */
+internal func percentEncodeUrlString(_ url: String) -> String? {
+  // URL contains '#' so it has a fragment part.
+  // We know that because that is the only allowed use case of the undecoded '#' symbol inside of the URL.
+  if url.contains("#") {
+    let urlParts = url.split(separator: "#")
+
+    // Encodes the url without the fragment part. It'll leave the fragment part untounched.
+    guard let parsed = percentEncodeUrlStringWithoutFragment(String(urlParts[0])) else {
+      return nil
+    }
+
+    // Concatenate encoded path with fragment.
+    return parsed + "#" + urlParts[1]
+  }
+
+  return percentEncodeUrlStringWithoutFragment(url)
+}
+
+private func percentEncodeUrlStringWithoutFragment(_ url: String) -> String? {
+  // The value may come unencoded or already encoded, so first we try to decode it.
+  // `removingPercentEncoding` returns nil when the string contains an invalid percent-encoded sequence,
+  // but that usually means the value came unencoded, so it falls back to the given string.
+  let decodedString = url.removingPercentEncoding ?? url
+
+  // Do the percent encoding, but note that it may still return nil when it's not possible to encode for some reason.
+  return decodedString.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)
+}

package/ios/Tests/ConvertiblesSpec.swift

@@ -16,6 +16,73 @@ class ConvertiblesSpec: ExpoSpec {
         expect(url.absoluteString) == remoteUrlString
       }
 
+      it("converts from url with unencoded query") {
+        let query = "param=🥓"
+        let urlString = "https://expo.dev/?\(query)"
+        let url = try URL.convert(from: urlString)
+
+        if #available(iOS 16.0, *) {
+          expect(url.query(percentEncoded: true)) == "param=%F0%9F%A5%93"
+          expect(url.query(percentEncoded: false)) == query
+        }
+        expect(url.query) == "param=%F0%9F%A5%93"
+        expect(url.absoluteString) == "https://expo.dev/?param=%F0%9F%A5%93"
+        expect(url.absoluteString.removingPercentEncoding) == urlString
+      }
+
+      it("converts from url with encoded query") {
+        let query = "param=%F0%9F%A5%93"
+        let urlString = "https://expo.dev/?\(query)"
+        let url = try URL.convert(from: urlString)
+
+        if #available(iOS 16.0, *) {
+          expect(url.query(percentEncoded: true)) == query
+          expect(url.query(percentEncoded: false)) == "param=🥓"
+        }
+        expect(url.query) == query
+        expect(url.absoluteString) == urlString
+        expect(url.absoluteString.removingPercentEncoding) == "https://expo.dev/?param=🥓"
+      }
+      
+      it("converts from url with encoded query containg the anchor") {
+        let query = "color=%230000ff"
+        let urlString = "https://expo.dev/?\(query)#anchor"
+        let url = try URL.convert(from: urlString)
+
+        expect(url.query) == query
+        expect(url.absoluteString) == urlString
+        expect(url.absoluteString.removingPercentEncoding) == "https://expo.dev/?color=#0000ff#anchor"
+        expect(url.fragment) == "anchor"
+      }
+
+      it("converts from url containing percent character") {
+        // The percent character alone requires percent-encoding to `%25`.
+        let query = "param=%"
+        let urlString = "https://expo.dev/?\(query)"
+        let url = try URL.convert(from: urlString)
+
+        if #available(iOS 16.0, *) {
+          expect(url.query(percentEncoded: true)) == "param=%25"
+          expect(url.query(percentEncoded: false)) == query
+        }
+        expect(url.query) == "param=%25"
+        expect(url.absoluteString) == "https://expo.dev/?param=%25"
+        expect(url.absoluteString.removingPercentEncoding) == urlString
+      }
+
+      it("converts from url containing the anchor") {
+        // The hash is not allowed in the query (requires percent-encoding),
+        // but we want it to be recognized as the beginning of the fragment,
+        // thus it cannot be percent-encoded.
+        let query = "param=#expo"
+        let urlString = "https://expo.dev/?\(query)"
+        let url = try URL.convert(from: urlString)
+
+        expect(url.query) == "param="
+        expect(url.fragment) == "expo"
+        expect(url.absoluteString) == urlString
+      }
+
       it("converts from file url") {
         let fileUrlString = "file:///expo/tmp"
         let url = try URL.convert(from: fileUrlString)
@@ -29,11 +96,30 @@ class ConvertiblesSpec: ExpoSpec {
         let filePath = "/expo/image.png"
         let url = try URL.convert(from: filePath)
 
+        expect(url.scheme) == "file"
         expect(url.path) == filePath
         expect(url.absoluteString) == "file://\(filePath)"
         expect(url.isFileURL) == true
       }
 
+      it("converts from file path with UTF8 characters") {
+        let filePath = "/中文ÅÄÖąÓśĆñ.gif"
+        let url = try URL.convert(from: filePath)
+
+        expect(url.scheme) == "file"
+        expect(url.path) == filePath
+        expect(url.isFileURL) == true
+      }
+
+      it("converts from file path containing percent character") {
+        let filePath = "/%.png"
+        let url = try URL.convert(from: filePath)
+
+        expect(url.scheme) == "file"
+        expect(url.path) == filePath
+        expect(url.isFileURL) == true
+      }
+
       it("throws when no string") {
         expect { try URL.convert(from: 29.5) }.to(
           throwError(errorType: Conversions.ConvertingException<URL>.self)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "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": "^3.0.0"
   },
-  "gitHead": "1f8a6a09570fd451378565ca34933018ce48454e"
+  "gitHead": "40dcd1732b69f09798a28691f6b17b820a2bbbf5"
 }