[expo-updates] Support discriminated unions for JS API method result …

…types (expo#23173)
mojavad · Jun 28, 2023 · b1418cb · b1418cb
1 parent ff095da
commit b1418cb
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 42 deletions.
diff --git a/...ned-abis/expoview-abi49_0_0/src/main/java/abi49_0_0/expo/modules/updates/UpdatesModule.kt b/...ned-abis/expoview-abi49_0_0/src/main/java/abi49_0_0/expo/modules/updates/UpdatesModule.kt
@@ -173,6 +173,7 @@ class UpdatesModule(
               if (updateDirective != null) {
                 if (updateDirective is UpdateDirective.RollBackToEmbeddedUpdateDirective) {
                   updateInfo.putBoolean("isRollBackToEmbedded", true)
+                  updateInfo.putBoolean("isAvailable", false)
                   promise.resolve(updateInfo)
                   updatesServiceLocal.stateMachine?.processEvent(
                     UpdatesStateEvent.CheckCompleteWithRollback()
@@ -182,6 +183,7 @@ class UpdatesModule(
               }
 
               if (updateManifest == null) {
+                updateInfo.putBoolean("isRollBackToEmbedded", false)
                 updateInfo.putBoolean("isAvailable", false)
                 promise.resolve(updateInfo)
                 updatesServiceLocal.stateMachine?.processEvent(
@@ -194,6 +196,7 @@ class UpdatesModule(
               if (launchedUpdate == null) {
                 // this shouldn't ever happen, but if we don't have anything to compare
                 // the new manifest to, let the user know an update is available
+                updateInfo.putBoolean("isRollBackToEmbedded", false)
                 updateInfo.putBoolean("isAvailable", true)
                 updateInfo.putString("manifestString", updateManifest.manifest.toString())
                 promise.resolve(updateInfo)
@@ -211,6 +214,7 @@ class UpdatesModule(
                   updateResponse.responseHeaderData?.manifestFilters
                 )
               ) {
+                updateInfo.putBoolean("isRollBackToEmbedded", false)
                 updateInfo.putBoolean("isAvailable", true)
                 updateInfo.putString("manifestString", updateManifest.manifest.toString())
                 promise.resolve(updateInfo)
@@ -220,6 +224,7 @@ class UpdatesModule(
                   )
                 )
               } else {
+                updateInfo.putBoolean("isRollBackToEmbedded", false)
                 updateInfo.putBoolean("isAvailable", false)
                 promise.resolve(updateInfo)
                 updatesServiceLocal.stateMachine?.processEvent(
@@ -306,10 +311,14 @@ class UpdatesModule(
 
                 if (loaderResult.updateDirective is UpdateDirective.RollBackToEmbeddedUpdateDirective) {
                   updateInfo.putBoolean("isRollBackToEmbedded", true)
+                  updateInfo.putBoolean("isNew", false)
+
                   updatesServiceLocal.stateMachine?.processEvent(
                     UpdatesStateEvent.DownloadCompleteWithRollback()
                   )
                 } else {
+                  updateInfo.putBoolean("isRollBackToEmbedded", false)
+
                   if (loaderResult.updateEntity == null) {
                     updateInfo.putBoolean("isNew", false)
                     updatesServiceLocal.stateMachine?.processEvent(

diff --git a/ios/versioned/sdk49/EXUpdates/EXUpdates/UpdatesModule.swift b/ios/versioned/sdk49/EXUpdates/EXUpdates/UpdatesModule.swift
@@ -101,7 +101,8 @@ public final class UpdatesModule: Module {
         if result["manifest"] != nil {
           promise.resolve([
             "isAvailable": true,
-            "manifest": result["manifest"]
+            "manifest": result["manifest"],
+            "isRollBackToEmbedded": false
           ])
           return
         }
@@ -112,7 +113,7 @@ public final class UpdatesModule: Module {
           ])
           return
         }
-        promise.resolve(["isAvailable": false])
+        promise.resolve(["isAvailable": false, "isRollBackToEmbedded": false])
       }
     }
 

diff --git a/packages/expo-updates/CHANGELOG.md b/packages/expo-updates/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ### 🐛 Bug fixes
 
+- Support discriminated unions for JS API method result types. ([#23173](https://github.com/expo/expo/pull/23173) by [@wschurman](https://github.com/wschurman))
+
 ### 💡 Others
 
 ## 0.18.5 — 2023-06-28

diff --git a/packages/expo-updates/android/src/main/java/expo/modules/updates/UpdatesModule.kt b/packages/expo-updates/android/src/main/java/expo/modules/updates/UpdatesModule.kt
@@ -173,6 +173,7 @@ class UpdatesModule(
               if (updateDirective != null) {
                 if (updateDirective is UpdateDirective.RollBackToEmbeddedUpdateDirective) {
                   updateInfo.putBoolean("isRollBackToEmbedded", true)
+                  updateInfo.putBoolean("isAvailable", false)
                   promise.resolve(updateInfo)
                   updatesServiceLocal.stateMachine?.processEvent(
                     UpdatesStateEvent.CheckCompleteWithRollback()
@@ -182,6 +183,7 @@ class UpdatesModule(
               }
 
               if (updateManifest == null) {
+                updateInfo.putBoolean("isRollBackToEmbedded", false)
                 updateInfo.putBoolean("isAvailable", false)
                 promise.resolve(updateInfo)
                 updatesServiceLocal.stateMachine?.processEvent(
@@ -194,6 +196,7 @@ class UpdatesModule(
               if (launchedUpdate == null) {
                 // this shouldn't ever happen, but if we don't have anything to compare
                 // the new manifest to, let the user know an update is available
+                updateInfo.putBoolean("isRollBackToEmbedded", false)
                 updateInfo.putBoolean("isAvailable", true)
                 updateInfo.putString("manifestString", updateManifest.manifest.toString())
                 promise.resolve(updateInfo)
@@ -211,6 +214,7 @@ class UpdatesModule(
                   updateResponse.responseHeaderData?.manifestFilters
                 )
               ) {
+                updateInfo.putBoolean("isRollBackToEmbedded", false)
                 updateInfo.putBoolean("isAvailable", true)
                 updateInfo.putString("manifestString", updateManifest.manifest.toString())
                 promise.resolve(updateInfo)
@@ -220,6 +224,7 @@ class UpdatesModule(
                   )
                 )
               } else {
+                updateInfo.putBoolean("isRollBackToEmbedded", false)
                 updateInfo.putBoolean("isAvailable", false)
                 promise.resolve(updateInfo)
                 updatesServiceLocal.stateMachine?.processEvent(
@@ -306,10 +311,14 @@ class UpdatesModule(
 
                 if (loaderResult.updateDirective is UpdateDirective.RollBackToEmbeddedUpdateDirective) {
                   updateInfo.putBoolean("isRollBackToEmbedded", true)
+                  updateInfo.putBoolean("isNew", false)
+
                   updatesServiceLocal.stateMachine?.processEvent(
                     UpdatesStateEvent.DownloadCompleteWithRollback()
                   )
                 } else {
+                  updateInfo.putBoolean("isRollBackToEmbedded", false)
+
                   if (loaderResult.updateEntity == null) {
                     updateInfo.putBoolean("isNew", false)
                     updatesServiceLocal.stateMachine?.processEvent(

diff --git a/packages/expo-updates/build/Updates.types.d.ts b/packages/expo-updates/build/Updates.types.d.ts
diff --git a/packages/expo-updates/build/Updates.types.d.ts.map b/packages/expo-updates/build/Updates.types.d.ts.map