expo-dev-menu-interface 0.3.4 → 0.5.0

package/Info-generated.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>expo.dev.menu.interface</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>EXDevMenuInterface</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.3.2</string>
+	<key>CFBundleVersion</key>
+	<string>0</string>
+</dict>
+</plist>

package/README.md

@@ -4,11 +4,11 @@ Interface for `expo-dev-menu`.
 
 # Installation in managed Expo projects
 
-For managed [managed](https://docs.expo.io/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.io/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.
 
 # Installation in bare React Native projects
 
-For bare React Native projects, you must ensure that you have [installed and configured the `react-native-unimodules` package](https://github.com/expo/expo/tree/master/packages/react-native-unimodules) before continuing.
+For bare React Native projects, you must ensure that you have [installed and configured the `expo` package](https://docs.expo.dev/bare/installing-expo-modules/) before continuing.
 
 ### Add the package to your npm dependencies
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '0.3.4'
+version = '0.5.0'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -57,7 +57,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 6
-    versionName '0.3.4'
+    versionName '0.5.0'
   }
   lintOptions {
     abortOnError false
@@ -71,4 +71,5 @@ dependencies {
   implementation 'com.squareup.okhttp3:okhttp:3.14.9'
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3"
 }

package/android/src/main/java/expo/interfaces/devmenu/DevMenuManagerInterface.kt

@@ -8,6 +8,7 @@ import com.facebook.react.ReactNativeHost
 import com.facebook.react.bridge.ReadableMap
 import expo.interfaces.devmenu.expoapi.DevMenuExpoApiClientInterface
 import expo.interfaces.devmenu.items.DevMenuDataSourceItem
+import kotlinx.coroutines.CoroutineScope
 
 interface DevMenuManagerInterface {
   /**
@@ -110,5 +111,12 @@ interface DevMenuManagerInterface {
    */
   fun isInitialized(): Boolean
 
+  /**
+   * Whether to automatically show the dev menu on app load. Defaults to true if not set.
+   */
+  fun setCanLaunchDevMenuOnStart(shouldAutoLaunch: Boolean)
+
   suspend fun fetchDataSource(id: String): List<DevMenuDataSourceItem>
+
+  val coroutineScope: CoroutineScope
 }

package/android/src/main/java/expo/interfaces/devmenu/expoapi/DevMenuExpoApiClientInterface.kt

@@ -14,7 +14,7 @@ interface DevMenuExpoApiClientInterface {
   fun isLoggedIn(): Boolean
   fun setSessionSecret(newSessionSecret: String?)
   suspend fun queryMyProjects(options: DevMenuGraphQLOptions = DevMenuGraphQLOptions()): okhttp3.Response
-  suspend fun queryDevSessions(): okhttp3.Response
+  suspend fun queryDevSessions(deviceID: String?): okhttp3.Response
   suspend fun queryUpdateChannels(
     appId: String,
     options: DevMenuGraphQLOptions = DevMenuGraphQLOptions()

package/expo-module.config.json

@@ -0,0 +1,4 @@
+{
+  "name": "expo-dev-menu-interface",
+  "platforms": ["ios", "android"]
+}

package/ios/ExpoApiClient/DevMenuExpoApiClientProtocol.swift

@@ -32,7 +32,7 @@ public protocol DevMenuExpoApiClientProtocol {
   func setSessionSecret(_ sessionSecret: String?)
   
   @objc
-  func queryDevSessionsAsync(_ completionHandler: @escaping HTTPCompletionHandler)
+  func queryDevSessionsAsync(_ installationID: String?, completionHandler: @escaping HTTPCompletionHandler)
   
   @objc
   func queryUpdateChannels(

package/ios/MenuItems/DevMenuAction.swift

@@ -48,6 +48,11 @@ open class DevMenuAction: DevMenuScreenItem, DevMenuCallableProvider {
     self.callable.action = action
   }
   
+  @objc
+  public convenience init(withId id: String, _ action: @escaping () -> ()) {
+    self.init(withId: id, action: action)
+  }
+  
   public func registerCallable() -> DevMenuExportedCallable? {
     return self.callable
   }

package/ios/Tests/DevMenuActionTest.swift

@@ -0,0 +1,42 @@
+import Quick
+import Nimble
+
+@testable import EXDevMenuInterface
+
+class DevMenuActionTest: QuickSpec {
+  override func spec() {
+    it("Action should be serializable") {
+      let action = DevMenuAction(withId: "action-1", {})
+      action.isAvailable = { true }
+      action.isEnabled = { true }
+      action.label = { "action-1-label" }
+      action.detail = { "action-1-details" }
+      action.glyphName = { "action-1-glyphname" }
+      action.registerKeyCommand(input: "r", modifiers: .command)
+      
+      let serilizedData = action.serialize()
+      
+      expect(serilizedData["type"] as? Int).to(equal(ItemType.action.rawValue))
+      expect(serilizedData["actionId"] as? String).to(equal("action-1"))
+      expect(serilizedData["isAvailable"] as? Bool).to(beTrue())
+      expect(serilizedData["isEnabled"] as? Bool).to(beTrue())
+      expect(serilizedData["label"] as? String).to(equal("action-1-label"))
+      expect(serilizedData["detail"] as? String).to(equal("action-1-details"))
+      expect(serilizedData["glyphName"] as? String).to(equal("action-1-glyphname"))
+      
+      let keyCommand = serilizedData["keyCommand"] as! [String: Any]
+      
+      expect(keyCommand["input"] as? String).to(equal("r"))
+      expect(keyCommand["modifiers"] as? Int).to(equal(1 << 2))
+    }
+    
+    it("Action callable should be contain passed action") {
+      var wasCalled = false
+      let action = DevMenuAction(withId: "action-1", { wasCalled = true })
+      
+      action.callable.call()
+      
+      expect(wasCalled).to(beTrue())
+    }
+  }
+}

package/ios/Tests/DevMenuEASUpdatesTest.swift

@@ -0,0 +1,86 @@
+import Quick
+import Nimble
+
+@testable import EXDevMenuInterface
+
+class DevMenuEASUpdatesTest: QuickSpec {
+  override func spec() {
+    it("Channel constructor should populate all fields") {
+      let seeder = [
+        "id": "1234",
+        "name": "channel-1",
+        "createdAt": "1635508863",
+        "updatedAt": "1635508873"
+      ]
+      
+      let channel = DevMenuEASUpdates.Channel(dictionary: seeder)
+      
+      expect(channel.id).to(equal("1234"))
+      expect(channel.name).to(equal("channel-1"))
+      expect(channel.createdAt).to(equal("1635508863"))
+      expect(channel.updatedAt).to(equal("1635508873"))
+    }
+    
+    it("Update constructor should populate all fields") {
+      let seeder = [
+        "id": "1234",
+        "message": "update-1",
+        "platform": "ios",
+        "runtimeVersion": "1",
+        "createdAt": "1635508863",
+        "updatedAt": "1635508873"
+      ]
+      
+      let update = DevMenuEASUpdates.Update(dictionary: seeder)
+      
+      expect(update.id).to(equal("1234"))
+      expect(update.message).to(equal("update-1"))
+      expect(update.platform).to(equal("ios"))
+      expect(update.runtimeVersion).to(equal("1"))
+      expect(update.createdAt).to(equal("1635508863"))
+      expect(update.updatedAt).to(equal("1635508873"))
+    }
+    
+    it("Branch constructor should populate all fields") {
+      let seeder = [
+        "id": "1",
+        "updates": [
+          [
+            "id": "1234",
+            "message": "update-1",
+            "platform": "ios",
+            "runtimeVersion": "1",
+            "createdAt": "1635508863",
+            "updatedAt": "1635508873"
+          ],
+          [
+            "id": "9876",
+            "message": "update-2",
+            "platform": "ios",
+            "runtimeVersion": "2",
+            "createdAt": "1635508863",
+            "updatedAt": "1635508873"
+          ]
+        ]
+      ] as [String : Any]
+      
+      let branch = DevMenuEASUpdates.Branch(dictionary: seeder)
+      let update1 = branch.updates[0]
+      let update2 = branch.updates[1]
+      
+      expect(branch.id).to(equal("1"))
+      expect(update1.id).to(equal("1234"))
+      expect(update1.message).to(equal("update-1"))
+      expect(update1.platform).to(equal("ios"))
+      expect(update1.runtimeVersion).to(equal("1"))
+      expect(update1.createdAt).to(equal("1635508863"))
+      expect(update1.updatedAt).to(equal("1635508873"))
+      expect(update2.id).to(equal("9876"))
+      expect(update2.message).to(equal("update-2"))
+      expect(update2.platform).to(equal("ios"))
+      expect(update2.runtimeVersion).to(equal("2"))
+      expect(update2.createdAt).to(equal("1635508863"))
+      expect(update2.updatedAt).to(equal("1635508873"))
+    }
+  }
+}

package/ios/Tests/DevMenuItemsContainerTest.swift

@@ -0,0 +1,63 @@
+import Quick
+import Nimble
+
+@testable import EXDevMenuInterface
+
+class DevMenuItemsContainerTest: QuickSpec {
+  override func spec() {
+    it("should respect importance") {
+      let container = DevMenuItemsContainer()
+      
+      let seeder = [("action-1", ItemImportance.lowest), ("action-2", ItemImportance.medium), ("action-3", ItemImportance.highest)]
+      
+      seeder.forEach { actionDate in
+        let action = DevMenuAction(withId: actionDate.0)
+        action.label = { actionDate.0 }
+        action.importance = actionDate.1.rawValue
+        
+        container.addItem(action)
+      }
+      let items = container.getRootItems()
+      
+      expect(items.count).to(equal(3))
+      expect((items[0] as! DevMenuAction).label()).to(equal("action-3"))
+      expect((items[1] as! DevMenuAction).label()).to(equal("action-2"))
+      expect((items[2] as! DevMenuAction).label()).to(equal("action-1"))
+    }
+   
+    it("should unwrap other containers") {
+      let container = DevMenuItemsContainer()
+      container.addItem(DevMenuAction(withId: "action-1"))
+      let innerContainer = DevMenuGroup()
+      innerContainer.addItem(DevMenuAction(withId: "action-2"))
+      container.addItem(innerContainer)
+      
+      let items = container.getAllItems()
+      
+      expect(items.count).to(equal(3))
+      expect(items[0] as? DevMenuAction).toNot(beNil())
+      expect(items[1] as? DevMenuGroup).toNot(beNil())
+      expect(items[2] as? DevMenuAction).toNot(beNil())
+    }
+    
+    it("should serilize items") {
+      let container = DevMenuItemsContainer()
+      container.addItem(DevMenuAction(withId: "action-1"))
+      let innerContainer = DevMenuGroup()
+      innerContainer.addItem(DevMenuAction(withId: "action-2"))
+      container.addItem(innerContainer)
+       
+      let items = container.serializeItems()
+       
+      expect(items.count).to(equal(2))
+      expect(items[0]["type"] as? Int).to(equal(ItemType.action.rawValue))
+      expect(items[0]["actionId"] as? String).to(equal("action-1"))
+      
+      expect(items[1]["type"] as? Int).to(equal(ItemType.group.rawValue))
+      
+      let innerItem = (items[1]["items"] as! [[String: Any]])[0]
+      expect(innerItem["type"] as? Int).to(equal(ItemType.action.rawValue))
+      expect(innerItem["actionId"] as? String).to(equal("action-2"))
+    }
+  }
+}

package/ios/Tests/DevMenuLinkTest.swift

@@ -0,0 +1,20 @@
+import Quick
+import Nimble
+
+@testable import EXDevMenuInterface
+
+class DevMenuLinkTest: QuickSpec {
+  override func spec() {
+    it("Link should be serializable") {
+      let link = DevMenuLink(withTarget: "target-1")
+      link.glyphName = { "link-1-glyph" }
+      link.label = { "link-1-label" }
+      
+      let serilizedData = link.serialize()
+      
+      expect(serilizedData["type"] as? Int).to(equal(ItemType.link.rawValue))
+      expect(serilizedData["label"] as? String).to(equal("link-1-label"))
+      expect(serilizedData["glyphName"] as? String).to(equal("link-1-glyph"))
+    }
+  }
+}

package/ios/Tests/DevMenuScreenTest.swift

@@ -0,0 +1,17 @@
+import Quick
+import Nimble
+
+@testable import EXDevMenuInterface
+
+class DevMenuScreenTest: QuickSpec {
+  override func spec() {
+    it("Screen should be serializable") {
+      let screen = DevMenuScreen("screen-1")
+      
+      let serilizedData = screen.serialize()
+      
+      expect(serilizedData["type"] as? Int).to(equal(ItemType.screen.rawValue))
+      expect(serilizedData["screenName"] as? String).to(equal("screen-1"))
+    }
+  }
+}

package/ios/Tests/DevMenuSelectionListTest.swift

@@ -0,0 +1,17 @@
+import Quick
+import Nimble
+
+@testable import EXDevMenuInterface
+
+class DevMenuSelectionListTest: QuickSpec {
+  override func spec() {
+    it("List should be serializable") {
+      let list = DevMenuSelectionList()
+      
+      let serilizedData = list.serialize()
+      
+      expect(serilizedData["type"] as? Int).to(equal(ItemType.selectionList.rawValue))
+      expect(serilizedData["actionId"] as? String).toNot(beNil())
+    }
+  }
+}

package/{expo-dev-menu-interface.podspec → ios/expo-dev-menu-interface.podspec}

@@ -1,6 +1,6 @@
 require 'json'
 
-package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+package = JSON.parse(File.read(File.join(__dir__, '../package.json')))
 
 Pod::Spec.new do |s|
   s.name           = 'expo-dev-menu-interface'
@@ -13,11 +13,20 @@ Pod::Spec.new do |s|
   s.platform       = :ios, '11.0'
   s.swift_version  = '5.2'
   s.source         = { git: 'https://github.com/expo/expo.git' }
-  s.source_files   = 'ios/**/*.{h,m,swift}'
-  s.preserve_paths = 'ios/**/*.{h,m,swift}'
+  s.static_framework = true
+  s.source_files   = '**/*.{h,m,swift}'
+  s.preserve_paths = '**/*.{h,m,swift}'
+  s.exclude_files  = 'Tests/**/*.{h,m,swift}'
   s.requires_arc   = true
   s.header_dir     = 'EXDevMenuInterface'
 
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = { "DEFINES_MODULE" => "YES" }
+
+  s.test_spec 'Tests' do |test_spec|
+    test_spec.platform     = :ios, '12.0'
+    test_spec.source_files = 'Tests/**/*.{h,m,swift}'
+    test_spec.dependency 'Quick'
+    test_spec.dependency 'Nimble'
+  end
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu-interface",
-  "version": "0.3.4",
+  "version": "0.5.0",
   "description": "Interface for expo-dev-menu",
   "main": "index.js",
   "keywords": [
@@ -21,6 +21,9 @@
   },
   "author": "650 Industries, Inc.",
   "license": "MIT",
-  "homepage": "https://docs.expo.io",
-  "gitHead": "b588610e02acf18f338a3187882e139fd031a9b6"
+  "homepage": "https://docs.expo.dev",
+  "peerDependencies": {
+    "expo": "*"
+  },
+  "gitHead": "db3c974468338f22450238dc273b343a76e2c347"
 }

package/react-native.config.js

@@ -1,13 +0,0 @@
-module.exports = {
-  dependency: {
-    platforms: {
-      ios: {
-        /**
-         * We need this property to trick `react-native-cli`. Normally, this tool looks for the XCode project.
-         * We can generate it using `XcodeGen` but we don't want to add the project file to this library.
-         */
-        project: 'ios/EXDevMenuInterface.xcodeproj/project.pbxproj',
-      },
-    },
-  },
-};