expo-modules-core 1.2.4 → 1.2.5

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 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
 
 ### 🐛 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.4'
+version = '1.2.5'
 
 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.4"
+    versionName "1.2.5"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/android/src/main/java/expo/modules/kotlin/exception/CodedException.kt

@@ -148,7 +148,7 @@ internal class PropSetException(
 internal class ArgumentCastException(
   argDesiredType: KType,
   argIndex: Int,
-  providedType: ReadableType,
+  providedType: String,
   cause: CodedException,
 ) : DecoratedException(
   message = "The ${formatOrdinalNumber(argIndex + 1)} argument cannot be cast to type $argDesiredType (received $providedType)",

package/android/src/main/java/expo/modules/kotlin/functions/AnyFunction.kt

@@ -54,7 +54,7 @@ abstract class AnyFunction(
       val desiredType = desiredArgsTypes[index]
       argIterator.next().recycle {
         exceptionDecorator({ cause ->
-          ArgumentCastException(desiredType.kType, index, type, cause)
+          ArgumentCastException(desiredType.kType, index, type.toString(), cause)
         }) {
           finalArgs[index] = desiredType.convert(this)
         }
@@ -81,7 +81,7 @@ abstract class AnyFunction(
       val element = argIterator.next()
       val desiredType = desiredArgsTypes[index]
       exceptionDecorator({ cause ->
-        ArgumentCastException(desiredType.kType, index, ReadableType.String, cause)
+        ArgumentCastException(desiredType.kType, index, element?.javaClass.toString(), cause)
       }) {
         finalArgs[index] = desiredType.convert(element)
       }

package/android/src/main/java/expo/modules/kotlin/functions/AsyncFunctionBuilder.kt

@@ -23,43 +23,43 @@ class AsyncFunctionBuilder(@PublishedApi internal val name: String) {
   }
 
   inline fun <reified R, reified P0, reified P1> SuspendBody(crossinline block: suspend (p0: P0, p1: P1) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType())) { block(it[0] as P0, it[0] as P1) }.also {
+    return SuspendFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType())) { block(it[0] as P0, it[1] as P1) }.also {
       suspendFunctionComponent = it
     }
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2> SuspendBody(crossinline block: suspend (p0: P0, p1: P1, p2: P2) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2) }.also {
+    return SuspendFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2) }.also {
       suspendFunctionComponent = it
     }
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3> SuspendBody(crossinline block: suspend (p0: P0, p1: P1, p2: P2, p3: P3) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3) }.also {
+    return SuspendFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3) }.also {
       suspendFunctionComponent = it
     }
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> SuspendBody(crossinline block: suspend (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4) }.also {
+    return SuspendFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4) }.also {
       suspendFunctionComponent = it
     }
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> SuspendBody(crossinline block: suspend (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5) }.also {
+    return SuspendFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5) }.also {
       suspendFunctionComponent = it
     }
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> SuspendBody(crossinline block: suspend (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5, it[6] as P6) }.also {
+    return SuspendFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType(), typeOf<P6>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5, it[6] as P6) }.also {
       suspendFunctionComponent = it
     }
   }
 
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6, reified P7> SuspendBody(crossinline block: suspend (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7) -> R): SuspendFunctionComponent {
-    return SuspendFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5, it[6] as P6, it[7] as P7) }.also {
+    return SuspendFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType(), typeOf<P6>().toAnyType(), typeOf<P7>().toAnyType())) { block(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5, it[6] as P6, it[7] as P7) }.also {
       suspendFunctionComponent = it
     }
   }

package/ios/Swift/Arguments/Convertibles.swift

@@ -13,12 +13,34 @@ import CoreGraphics
 
 extension URL: Convertible {
   public static func convert(from value: Any?) throws -> Self {
-    if let value = value as? String, let encodedValue = percentEncodeUrlString(value), let url = URL(string: encodedValue) {
+    guard let value = value as? String else {
+      throw Conversions.ConvertingException<URL>(value)
+    }
+
+    // Try to construct the URL object from the string as it came in.
+    if let url = URL(string: value) {
       // 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)
+
+    // File path doesn't need to be percent-encoded.
+    if isFileUrlPath(value) {
+      return URL(fileURLWithPath: value)
+    }
+
+    // If we get here, the string is not the file url and may require percent-encoding characters that are not URL-safe according to RFC 3986.
+    if let encodedValue = percentEncodeUrlString(value), let url = URL(string: encodedValue) {
+      return url.scheme != nil ? url : URL(fileURLWithPath: value)
+    }
+
+    // If it still fails to create the URL object, the string possibly contains characters that must be explicitly percent-encoded beforehand.
+    throw UrlContainsInvalidCharactersException()
+  }
+}
+
+internal class UrlContainsInvalidCharactersException: Exception {
+  override var reason: String {
+    return "Unable to create a URL object from the given string, make sure to percent-encode these characters: \(urlAllowedCharacters)"
   }
 }
 

package/ios/Swift/Utilities.swift

@@ -27,34 +27,34 @@ internal func toNSError(_ error: Error) -> NSError {
   return error as NSError
 }
 
+// MARK: - URLs
+
 /**
- 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.
+ A string with non-alphanumeric url-safe characters according to RFC 3986.
+ These characters might have to be explicitly percent-encoded when used in URL components other than intended.
  */
-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: "#")
+internal let urlAllowedCharacters = "-._~:/?#[]@!$&'()*+,;="
 
-    // 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]
-  }
+/**
+ A `CharacterSet` instance containing all alphanumerics and characters allowed in at least one part of a URL.
+ */
+internal let urlAllowedCharactersSet = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: urlAllowedCharacters))
 
-  return percentEncodeUrlStringWithoutFragment(url)
+/**
+ Returns the given string with percent-encoded characters that are not allowed in any of the URL components as defined by RFC 3986.
+ This is useful for auto-encoding unicode characters.
+ */
+internal func percentEncodeUrlString(_ url: String) -> String? {
+  let encodedString = url.addingPercentEncoding(withAllowedCharacters: urlAllowedCharactersSet)
+  return encodedString?.replacingOccurrences(of: "%25", with: "%")
 }
 
-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)
+/**
+ Checks whether the given string is a file URL path (URL string without the scheme).
+ */
+internal func isFileUrlPath(_ path: String) -> Bool {
+  guard let encodedPath = path.addingPercentEncoding(withAllowedCharacters: urlAllowedCharactersSet) else {
+    return false
+  }
+  return URL(string: encodedPath)?.scheme == nil
 }

package/ios/Tests/ConvertiblesSpec.swift

@@ -55,19 +55,25 @@ class ConvertiblesSpec: ExpoSpec {
         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)"
+      it("converts from url with encoded path") {
+        let path = "/expo/%2F%25%3F%5E%26/test" // -> /expo//%?^&/test
+        let urlString = "https://expo.dev\(path)"
         let url = try URL.convert(from: urlString)
 
+        expect(url.absoluteString) == urlString
+        expect(url.path) == path.removingPercentEncoding
+
         if #available(iOS 16.0, *) {
-          expect(url.query(percentEncoded: true)) == "param=%25"
-          expect(url.query(percentEncoded: false)) == query
+          expect(url.path(percentEncoded: true)) == path
+          expect(url.path(percentEncoded: false)) == path.removingPercentEncoding
         }
-        expect(url.query) == "param=%25"
-        expect(url.absoluteString) == "https://expo.dev/?param=%25"
-        expect(url.absoluteString.removingPercentEncoding) == urlString
+      }
+
+      it("throws when url contains percent alone") {
+        // The percent character alone must be percent-encoded to `%25` beforehand, otherwise it should throw an exception.
+        let urlString = "https://expo.dev/?param=%"
+
+        expect({ try URL.convert(from: urlString) }).to(throwError(errorType: UrlContainsInvalidCharactersException.self))
       }
 
       it("converts from url containing the anchor") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "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": "129986cd78fd83642786df331e8ba9e1451c5ee0"
+  "gitHead": "0c634d78ce349fc74721c2d19b7b34592857e7f1"
 }

package/android-annotation/build/.transforms/089e97b72acecf254a7d247d0baa2b7e/results.bin

@@ -1 +0,0 @@
-i/

package/android-annotation/build/.transforms/2616ff895b4ff961ab12e41d084d4957/results.bin

@@ -1 +0,0 @@
-o/jetified-expo-modules-core$android-annotation-1.1.1.jar

package/android-annotation/build/.transforms/2a6ad9f4fa618fee007ec2bbdffb4bb2/results.bin

@@ -1 +0,0 @@
-o/empty

package/android-annotation/build/.transforms/2ef7beada3b4b7308a24a9e1468f9b93/results.bin

@@ -1 +0,0 @@
-o/jetified-expo-modules-core$android-annotation-1.1.1.jar

package/android-annotation/build/.transforms/5b89b7b449c6508d789f5cf475894cbb/results.bin

@@ -1 +0,0 @@
-i/

package/android-annotation/build/.transforms/688d8dd558fefc981eb974d4c54f16ef/results.bin

@@ -1 +0,0 @@
-i/

package/android-annotation/build/.transforms/715648c2d059959be6cd3af7d99c4c7e/results.bin

@@ -1 +0,0 @@
-i/

package/android-annotation/build/.transforms/85278cc8594ac806f87680e864bdd2f4/results.bin

@@ -1 +0,0 @@
-o/empty

package/android-annotation/build/.transforms/91ca6d3ca3ca6e8a582ef457e7f86cdd/results.bin

@@ -1 +0,0 @@
-o/jetified-expo-modules-core$android-annotation-1.1.1.jar

package/android-annotation/build/.transforms/9aa6b8e553bae310602aa72eb3a3dd8e/results.bin

@@ -1 +0,0 @@
-o/main

package/android-annotation/build/.transforms/a344fee0bc9be96b2223502b5fd955e6/results.bin

@@ -1 +0,0 @@
-o/empty

package/android-annotation/build/.transforms/c7decdc04d88f99e80e39d6ad72ed175/results.bin

@@ -1 +0,0 @@
-o/main

package/android-annotation/build/.transforms/d6e0b4a3dab569f6af5c234097084769/results.bin

@@ -1 +0,0 @@
-o/jetified-expo-modules-core$android-annotation-1.1.1.jar

package/android-annotation/build/.transforms/d854c8cab253539def8cccd6e9fe3b36/results.bin

@@ -1 +0,0 @@
-o/empty

package/android-annotation/build/.transforms/ec098f74c10da5b275a6ccb8876f666f/results.bin

@@ -1 +0,0 @@
-i/

package/android-annotation/build/.transforms/eda7b3de83481e8164e6ae402044d5da/results.bin

@@ -1 +0,0 @@
-o/jetified-expo-modules-core$android-annotation-1.1.1

package/android-annotation/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +0,0 @@
-2
-0