wip: initial commit for rover subgraph dev

Cargo.toml

@@ -59,8 +59,8 @@ timber = { path = "./crates/timber" }
 
 # git dependencies
 billboard = { git = "https://github.com/EverlastingBugstopper/billboard.git", branch = "main" }
-saucer = { git = "https://github.com/EverlastingBugstopper/awc.git", branch = "main" }
-# saucer = { path = "../awc/saucer" }
+# saucer = { git = "https://github.com/EverlastingBugstopper/awc.git", branch = "main" }
+saucer = { path = "../awc/saucer" }
 
 # crates.io dependencies
 ansi_term = "0.12"
@@ -74,6 +74,7 @@ dialoguer = "0.10"
 heck = "0.4"
 humantime = "2.1.0"
 lazycell = "1"
+notify = "4"
 opener = "0.5"
 os_info = "3.4"
 prettytable-rs = "0.8"

crates/rover-client/src/shared/graph_ref.rs

@@ -12,6 +12,17 @@ pub struct GraphRef {
     pub variant: String,
 }
 
+impl GraphRef {
+    pub fn new(name: String, variant: Option<String>) -> Result<Self, RoverClientError> {
+        let mut s = name;
+        if let Some(variant) = variant {
+            s.push('@');
+            s.push_str(&variant);
+        };
+        Ok(Self::from_str(&s)?)
+    }
+}
+
 impl fmt::Display for GraphRef {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}@{}", self.name, self.variant)

src/cli.rs

@@ -181,6 +181,9 @@ impl Rover {
 
         match &self.command {
             Command::Config(command) => command.run(self.get_client_config()?),
+            Command::Dev(command) => {
+                command.run(self.get_install_override_path()?, self.get_client_config()?)
+            }
             Command::Fed2(command) => command.run(self.get_client_config()?),
             Command::Supergraph(command) => {
                 command.run(self.get_install_override_path()?, self.get_client_config()?)
@@ -190,9 +193,11 @@ impl Rover {
                 command.run(self.get_client_config()?, self.get_git_context()?)
             }
             Command::Readme(command) => command.run(self.get_client_config()?),
-            Command::Subgraph(command) => {
-                command.run(self.get_client_config()?, self.get_git_context()?)
-            }
+            Command::Subgraph(command) => command.run(
+                self.get_install_override_path().ok().flatten(),
+                self.get_client_config()?,
+                self.get_git_context()?,
+            ),
             Command::Update(command) => {
                 command.run(self.get_rover_config()?, self.get_reqwest_client())
             }
@@ -303,6 +308,9 @@ pub enum Command {
     /// Configuration profile commands
     Config(command::Config),
 
+    /// Develop a GraphQL API
+    Dev(command::Dev),
+
     /// (deprecated) Federation 2 Alpha commands
     #[clap(setting(AppSettings::Hidden))]
     Fed2(command::Fed2),

src/command/config/whoami.rs

@@ -30,7 +30,7 @@ pub struct WhoAmI {
 
 impl WhoAmI {
     pub fn run(&self, client_config: StudioClientConfig) -> Result<RoverOutput> {
-        let client = client_config.get_authenticated_client(&self.profile.profile_name)?;
+        let client = client_config.get_authenticated_client(&self.profile)?;
         eprintln!("Checking identity of your API key against the registry.");
 
         let identity = who_am_i::run(ConfigWhoAmIInput {}, &client)?;

src/command/dev.rs

@@ -0,0 +1,42 @@
+use crate::command::subgraph::{Dev as SubgraphDev, SubgraphDevOpts};
+use crate::command::{subgraph, RoverOutput};
+use crate::utils::client::StudioClientConfig;
+use crate::{Result, PKG_VERSION};
+use saucer::{clap, ArgEnum, Parser, Utf8PathBuf};
+
+use calm_io::stderrln;
+use serde::Serialize;
+use std::env;
+
+#[derive(Debug, Serialize, Clone, Parser)]
+pub struct Dev {
+    #[clap(flatten)]
+    opts: SubgraphDevOpts,
+}
+
+impl Dev {
+    #[cfg(feature = "composition-js")]
+    pub fn run(
+        &self,
+        override_install_path: Option<Utf8PathBuf>,
+        client_config: StudioClientConfig,
+    ) -> Result<RoverOutput> {
+        // TODO: ensure project is subgraph type before running
+        SubgraphDev {
+            opts: self.opts.clone(),
+        }
+        .run(override_install_path, client_config)
+    }
+
+    #[cfg(not(feature = "composition-js"))]
+    pub fn run(
+        &self,
+        override_install_path: Option<Utf8PathBuf>,
+        client_config: StudioClientConfig,
+    ) -> Result<RoverOutput> {
+        SubgraphDev {
+            opts: self.opts.clone(),
+        }
+        .run(override_install_path, client_config)
+    }
+}

src/command/graph/check.rs

@@ -31,7 +31,7 @@ impl Check {
         client_config: StudioClientConfig,
         git_context: GitContext,
     ) -> Result<RoverOutput> {
-        let client = client_config.get_authenticated_client(&self.profile.profile_name)?;
+        let client = client_config.get_authenticated_client(&self.profile)?;
         let proposed_schema = self
             .schema
             .read_file_descriptor("SDL", &mut std::io::stdin())?;

src/command/graph/delete.rs

@@ -25,7 +25,7 @@ pub struct Delete {
 
 impl Delete {
     pub fn run(&self, client_config: StudioClientConfig) -> Result<RoverOutput> {
-        let client = client_config.get_authenticated_client(&self.profile.profile_name)?;
+        let client = client_config.get_authenticated_client(&self.profile)?;
         let graph_ref = self.graph.graph_ref.to_string();
 
         eprintln!(

src/command/graph/fetch.rs

@@ -20,7 +20,7 @@ pub struct Fetch {
 
 impl Fetch {
     pub fn run(&self, client_config: StudioClientConfig) -> Result<RoverOutput> {
-        let client = client_config.get_authenticated_client(&self.profile.profile_name)?;
+        let client = client_config.get_authenticated_client(&self.profile)?;
         let graph_ref = self.graph.graph_ref.to_string();
         eprintln!(
             "Fetching SDL from {} using credentials from the {} profile.",

src/command/graph/publish.rs

@@ -29,7 +29,7 @@ impl Publish {
         client_config: StudioClientConfig,
         git_context: GitContext,
     ) -> Result<RoverOutput> {
-        let client = client_config.get_authenticated_client(&self.profile.profile_name)?;
+        let client = client_config.get_authenticated_client(&self.profile)?;
         let graph_ref = self.graph.graph_ref.to_string();
         eprintln!(
             "Publishing SDL to {} using credentials from the {} profile.",

src/command/mod.rs

@@ -1,18 +1,20 @@
 mod config;
+mod dev;
 mod docs;
 mod explain;
 mod fed2;
 mod graph;
 mod info;
-mod install;
+pub(crate) mod install;
 mod readme;
-mod subgraph;
+pub(crate) mod subgraph;
 mod supergraph;
 mod update;
 
 pub(crate) mod output;
 
 pub use config::Config;
+pub use dev::Dev;
 pub use docs::Docs;
 pub use explain::Explain;
 pub use fed2::Fed2;

src/command/readme/fetch.rs

@@ -21,7 +21,7 @@ pub struct Fetch {
 
 impl Fetch {
     pub fn run(&self, client_config: StudioClientConfig) -> Result<RoverOutput> {
-        let client = client_config.get_authenticated_client(&self.profile.profile_name)?;
+        let client = client_config.get_authenticated_client(&self.profile)?;
         let graph_ref = self.graph.graph_ref.to_string();
 
         eprintln!(

src/command/readme/publish.rs

@@ -27,7 +27,7 @@ pub struct Publish {
 
 impl Publish {
     pub fn run(&self, client_config: StudioClientConfig) -> Result<RoverOutput> {
-        let client = client_config.get_authenticated_client(&self.profile.profile_name)?;
+        let client = client_config.get_authenticated_client(&self.profile)?;
         let graph_ref = self.graph.graph_ref.to_string();
         eprintln!(
             "Publishing README for {} using credentials from the {} profile.",

src/command/subgraph/check.rs

@@ -34,7 +34,7 @@ impl Check {
         client_config: StudioClientConfig,
         git_context: GitContext,
     ) -> Result<RoverOutput> {
-        let client = client_config.get_authenticated_client(&self.profile.profile_name)?;
+        let client = client_config.get_authenticated_client(&self.profile)?;
 
         let proposed_schema = self
             .schema

src/command/subgraph/delete.rs

@@ -29,7 +29,7 @@ pub struct Delete {
 
 impl Delete {
     pub fn run(&self, client_config: StudioClientConfig) -> Result<RoverOutput> {
-        let client = client_config.get_authenticated_client(&self.profile.profile_name)?;
+        let client = client_config.get_authenticated_client(&self.profile)?;
         eprintln!(
             "Checking for build errors resulting from deleting subgraph {} from {} using credentials from the {} profile.",
             Cyan.normal().paint(&self.subgraph.subgraph_name),