expo-manifests 0.7.0 → 0.7.2

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 0.7.2 — 2023-08-22
+
+### 🐛 Bug fixes
+
+- [iOS] Fix error in handling nested array. ([#23562](https://github.com/expo/expo/pull/23562) by [@douglowder](https://github.com/douglowder))
+
+## 0.7.1 — 2023-06-30
+
+### 🐛 Bug fixes
+
+- Fixed iOS build errors in `use_frameworks!` mode. ([#23218](https://github.com/expo/expo/pull/23218) by [@kudo](https://github.com/kudo))
+
 ## 0.7.0 — 2023-06-21
 
 ### 📚 3rd party library updates

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.7.0'
+version = '0.7.2'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -67,7 +67,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 31
-    versionName '0.7.0'
+    versionName '0.7.2'
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   lintOptions {

package/android/src/main/java/expo/modules/manifests/core/Manifest.kt

@@ -270,12 +270,19 @@ internal sealed class PluginType {
     private fun fromRawValue(value: Any): PluginType? {
       return when (value) {
         is JSONArray -> {
-          if (value.length() != 2) {
+          if (value.length() == 0) {
             throw IllegalArgumentException("Value for (key = plugins) has incorrect type")
           }
           val name = value.get(0) as? String ?: return null
-          val props = value.get(1) as? JSONObject ?: return null
-          WithProps(name to props.toMap())
+          when (value.length()) {
+            2 -> {
+              val props = value.get(1) as? JSONObject ?: return null
+              WithProps(name to props.toMap())
+            }
+            else -> {
+              WithoutProps(name)
+            }
+          }
         }
         is String -> {
           WithoutProps(value)

package/android/src/test/java/expo/modules/manifests/core/ManifestTest.kt

@@ -9,28 +9,35 @@ import org.junit.Test
 class ManifestTest {
   @Test
   fun getPluginProperties_emptyManifest_returnsNull() {
-    val manifestJson = JSONObject(emptyMap<String, Any>())
+    val manifestJson = JSONObject("{}")
     val manifest = Manifest.fromManifestJson(manifestJson)
     Truth.assertThat(manifest.getPluginProperties("test")).isNull()
   }
 
   @Test
   fun getPluginProperties_emptyPlugins_returnsNull() {
-    val manifestJson = JSONObject(mapOf<String, Any>("plugins" to emptyArray<Any>()))
+    val manifestJson = JSONObject("{\"plugins\": []}")
     val manifest = Manifest.fromManifestJson(manifestJson)
     Truth.assertThat(manifest.getPluginProperties("test")).isNull()
   }
 
   @Test
   fun getPluginProperties_nonMatchedPlugins_returnsNull() {
-    val manifestJson = JSONObject(mapOf<String, Any>("plugins" to arrayOf("hello")))
+    val manifestJson = JSONObject("{\"plugins\": [\"hello\"]}")
     val manifest = Manifest.fromManifestJson(manifestJson)
     Truth.assertThat(manifest.getPluginProperties("test")).isNull()
   }
 
   @Test
   fun getPluginProperties_matchedPluginWithoutProps_returnsNull() {
-    val manifestJson = JSONObject(mapOf<String, Any>("plugins" to arrayOf("test")))
+    val manifestJson = JSONObject("{\"plugins\": [\"test\"]}")
+    val manifest = Manifest.fromManifestJson(manifestJson)
+    Truth.assertThat(manifest.getPluginProperties("test")).isNull()
+  }
+
+  @Test
+  fun getPluginProperties_matchedPluginWithoutPropsAsNestedArray_returnsNull() {
+    val manifestJson = JSONObject("{\"plugins\": [[\"test\"]]}")
     val manifest = Manifest.fromManifestJson(manifestJson)
     Truth.assertThat(manifest.getPluginProperties("test")).isNull()
   }
@@ -38,8 +45,7 @@ class ManifestTest {
   @Test
   fun getPluginProperties_matchedPluginWithProps_returnsProps() {
     val props = mapOf<String, Any>("foo" to "bar")
-    val pluginWithProp = arrayOf("test", props)
-    val manifestJson = JSONObject(mapOf<String, Any>("plugins" to arrayOf(pluginWithProp)))
+    val manifestJson = JSONObject("{\"plugins\": [ [\"test\", {\"foo\":\"bar\"}] ]}")
     val manifest = Manifest.fromManifestJson(manifestJson)
     val result = manifest.getPluginProperties("test")
     Truth.assertThat(result).isNotNull()
@@ -49,8 +55,7 @@ class ManifestTest {
   @Test
   fun getPluginProperties_matchedPluginWithNestedProps_returnsNestedProps() {
     val props = mapOf<String, Any>("nested" to mapOf<String, Any>("insideNested" to true))
-    val pluginWithProp = arrayOf("test", props)
-    val manifestJson = JSONObject(mapOf<String, Any>("plugins" to arrayOf(pluginWithProp)))
+    val manifestJson = JSONObject("{\"plugins\":[[\"test\",{\"nested\":{\"insideNested\":true}}]]}")
     val manifest = Manifest.fromManifestJson(manifestJson)
     val result = manifest.getPluginProperties("test")
     Truth.assertThat(result).isNotNull()

package/ios/EXManifests/Manifest.swift

@@ -3,8 +3,6 @@
 // this uses abstract class patterns
 // swiftlint:disable unavailable_function
 
-// swiftlint:disable type_body_length file_length
-
 import Foundation
 import UIKit
 
@@ -315,9 +313,8 @@ public class Manifest: NSObject {
       let sdkMajorVersion = expoGoSDKMajorVersion()
       if sdkMajorVersion > 0 && sdkMajorVersion < 48 {
         return "jsc"
-      } else {
-        return "hermes"
       }
+      return "hermes"
     }
     return jsEngine
   }
@@ -337,8 +334,14 @@ public class Manifest: NSObject {
           return nil
         }
         if let valueArray = value as? [Any],
-          let name = valueArray[0] as? String, let props = valueArray[1] as? [String: Any] {
-          return .withProps((name, props))
+          let name = valueArray[0] as? String {
+          if valueArray.count > 1 {
+            guard let props = valueArray[1] as? [String: Any] else {
+              return .withoutProps((name))
+            }
+            return .withProps((name, props))
+          }
+          return .withoutProps((name))
         }
         if let value = value as? String {
           return .withoutProps(value)
@@ -411,3 +414,5 @@ public class Manifest: NSObject {
     return nil
   }
 }
+
+// swiftlint:enable unavailable_function

package/ios/EXManifests.podspec

@@ -24,11 +24,8 @@ Pod::Spec.new do |s|
     'DEFINES_MODULE' => 'YES',
     'SWIFT_COMPILATION_MODE' => 'wholemodule'
   }
-
-  s.script_phase = {
-    :name => 'Copy Swift Header',
-    :script => 'COMPATIBILITY_HEADER_PATH="${BUILT_PRODUCTS_DIR}/Swift Compatibility Header/${PRODUCT_MODULE_NAME}-Swift.h"; ditto "${COMPATIBILITY_HEADER_PATH}" "${PODS_ROOT}/Headers/Public/${PRODUCT_MODULE_NAME}/${PRODUCT_MODULE_NAME}-Swift.h"',
-    :execution_position => :after_compile
+  s.user_target_xcconfig = {
+    'HEADER_SEARCH_PATHS' => '"${PODS_CONFIGURATION_BUILD_DIR}/EXManifests/Swift Compatibility Header"',
   }
 
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')

package/ios/Tests/ManifestSpec.swift

@@ -12,7 +12,7 @@ final class ManifestSpec: ExpoSpec {
         var manifest = ManifestFactory.manifest(forManifestJSON: manifestJson)
         expect(manifest.getPluginProperties(packageName: "test")).to(beNil())
 
-        manifestJson = ["plugins": []]
+        manifestJson = ["plugins": [] as [Any]]
         manifest = ManifestFactory.manifest(forManifestJSON: manifestJson)
         expect(manifest.getPluginProperties(packageName: "test")).to(beNil())
 
@@ -28,11 +28,17 @@ final class ManifestSpec: ExpoSpec {
       }
 
       it("should return matched plugin properties") {
-        let manifestJson = ["plugins": [["test", ["foo": "bar"]]]]
+        let manifestJson = ["plugins": [["test", ["foo": "bar"]] as [Any]]]
         let manifest = ManifestFactory.manifest(forManifestJSON: manifestJson)
         let props = manifest.getPluginProperties(packageName: "test")
         expect(props as? [String: String]) == ["foo": "bar"]
       }
+
+      it("should not crash with array with name and no props") {
+        let manifestJson = ["plugins": [["test"]]]
+        let manifest = ManifestFactory.manifest(forManifestJSON: manifestJson)
+        expect(manifest.getPluginProperties(packageName: "test")).to(beNil())
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-manifests",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Code to parse and use Expo and Expo Updates manifests.",
   "main": "index.js",
   "keywords": [
@@ -22,5 +22,5 @@
   "dependencies": {
     "expo-json-utils": "~0.7.0"
   },
-  "gitHead": "fa5ecca8251986b9f197cc14074eec0ab6dfb6db"
+  "gitHead": "ca6e2711477ff273a7a91a81947f933dba2935b0"
 }