Refactor rover dev for use with rover lsp

Cargo.toml

@@ -11,7 +11,7 @@ license-file = "./LICENSE"
 name = "rover"
 readme = "README.md"
 repository = "https://github.com/apollographql/rover/"
-version = "0.26.2"
+version = "0.27.0-preview.0"
 default-run = "rover"
 
 publish = false
@@ -71,6 +71,8 @@ apollo-encoder = "0.8"
 # https://github.com/apollographql/federation-rs
 apollo-federation-types = "0.14.1"
 
+apollo-language-server = { version = "0.3.0", default-features = false, features = ["tokio"] }
+
 # crates.io dependencies
 anyhow = "1"
 ariadne = "0.4"
@@ -92,7 +94,6 @@ chrono = "0.4"
 ci_info = "0.14"
 console = "0.15"
 crossbeam-channel = "0.5"
-ctrlc = "3"
 derive-getters = "0.5.0"
 dialoguer = "0.11"
 directories-next = "2.0"
@@ -108,13 +109,12 @@ http-body = "1.0.1"
 http-body-util = "0.1.2"
 httpmock = "0.7"
 hyper = "1.0"
-interprocess = { version = "2", default-features = false }
 indoc = "2"
 itertools = "0.13.0"
 lazycell = "1"
 lazy_static = "1.4"
 notify = { version = "6", default-features = false, features = [
-    "macos_kqueue",
+    "macos_fsevent",
 ] }
 notify-debouncer-full = "0.3.1"
 opener = "0.7"
@@ -165,10 +165,11 @@ zip = "2.0"
 ### rover specific dependencies
 [dependencies]
 anyhow = { workspace = true }
-assert_fs = { workspace = true }
-async-trait = { workspace = true }
 apollo-federation-types = { workspace = true }
+apollo-language-server = { workspace = true }
 apollo-parser = { workspace = true }
+assert_fs = { workspace = true }
+async-trait = { workspace = true }
 billboard = { workspace = true }
 binstall = { workspace = true }
 buildstructor = { workspace = true }
@@ -178,7 +179,6 @@ clap = { workspace = true, features = ["color", "derive", "env"] }
 chrono = { workspace = true }
 console = { workspace = true }
 crossbeam-channel = { workspace = true }
-ctrlc = { workspace = true }
 derive-getters = { workspace = true }
 dialoguer = { workspace = true }
 flate2 = { workspace = true }
@@ -187,7 +187,6 @@ graphql_client = { workspace = true }
 heck = { workspace = true }
 http = { workspace = true }
 houston = { workspace = true }
-interprocess = { workspace = true }
 itertools = { workspace = true }
 prettytable-rs = { workspace = true }
 lazycell = { workspace = true }
@@ -217,6 +216,7 @@ tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros", "proc
 tokio-stream = { workspace = true }
 toml = { workspace = true }
 tower = { workspace = true }
+tower-lsp = { version = "0.20.0" }
 tracing = { workspace = true }
 which = { workspace = true }
 uuid = { workspace = true }

crates/rover-client/src/error.rs

@@ -103,10 +103,7 @@ pub enum RoverClientError {
     },
 
     #[error("Encountered {} while trying to build a supergraph.", .source.length_string())]
-    BuildErrors {
-        source: BuildErrors,
-        num_subgraphs: usize,
-    },
+    BuildErrors { source: BuildErrors },
 
     #[error("Encountered {} while trying to build subgraph \"{subgraph}\" into supergraph \"{graph_ref}\".", .source.length_string())]
     SubgraphBuildErrors {

crates/rover-std/src/fs.rs

@@ -7,7 +7,7 @@ use std::{
     time::Duration,
 };
 
-use crate::{errln, infoln, RoverStdError};
+use crate::{errln, RoverStdError};
 use anyhow::{anyhow, Context};
 use camino::{ReadDirUtf8, Utf8Path, Utf8PathBuf};
 use notify::event::ModifyKind;
@@ -258,13 +258,12 @@ impl Fs {
     {
         let path = path.as_ref().to_path_buf();
         tokio::task::spawn_blocking(move || {
-            infoln!("Watching {} for changes", path.as_std_path().display());
             let path = path.as_std_path();
             let (fs_tx, fs_rx) = channel();
             // Spawn a debouncer so we don't detect single rather than multiple writes in quick succession,
             // use the None parameter to allow it to calculate the tick_rate, in line with previous
             // notify implementations.
-            let mut debouncer = match new_debouncer(Duration::from_secs(1), None, fs_tx) {
+            let mut debouncer = match new_debouncer(Duration::from_millis(100), None, fs_tx) {
                 Ok(debouncer) => debouncer,
                 Err(err) => {
                     handle_notify_error(&tx, path, err);
@@ -328,12 +327,6 @@ fn handle_notify_error(tx: &WatchSender, path: &Path, err: notify::Error) {
             path.display()
         ),
     }
-
-    tracing::debug!(
-        "an unexpected error occured while watching {} for changes: {err:?}",
-        path.display()
-    );
-
     tx.send(Err(err.into())).ok();
 }
 

deny.toml

@@ -58,6 +58,24 @@ version = "*"
 expression = "(Apache-2.0 OR MIT) AND BSD-3-Clause"
 license-files = [{ path = "COPYRIGHT", hash = 0x39f8ad31 }]
 
+[[licenses.clarify]]
+name = "apollo-language-server"
+version = "*"
+expression = "Elastic-2.0"
+license-files = [{ path = "LICENSE.md", hash = 0x5fc4a573 }]
+
+[[licenses.exceptions]]
+name = "apollo-language-server"
+allow = ["Elastic-2.0"]
+
+[[licenses.exceptions]]
+name = "apollo-federation"
+allow = ["Elastic-2.0"]
+
+[[licenses.exceptions]]
+name = "apollo-composition"
+allow = ["Elastic-2.0"]
+
 # This section is considered when running `cargo deny check bans`.
 # More documentation about the 'bans' section can be found here:
 # https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html

installers/binstall/scripts/nix/install.sh

@@ -20,7 +20,7 @@ BINARY_DOWNLOAD_PREFIX="https://github.com/apollographql/rover/releases/download
 # Rover version defined in root cargo.toml
 # Note: this line is built automatically
 # in build.rs. Don't touch it!
-PACKAGE_VERSION="v0.26.2"
+PACKAGE_VERSION="v0.27.0-preview.0"
 
 download_binary_and_run_installer() {
     downloader --check

installers/binstall/scripts/windows/install.ps1

@@ -14,7 +14,7 @@
 # version found in Rover's Cargo.toml
 # Note: this line is built automatically
 # in build.rs. Don't touch it!
-$package_version = 'v0.26.2'
+$package_version = 'v0.27.0-preview.0'
 
 function Install-Binary($rover_install_args) {
   $old_erroractionpreference = $ErrorActionPreference