Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implementing scip output #8288

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 130 additions & 49 deletions Cargo.lock

Large diffs are not rendered by default.

150 changes: 76 additions & 74 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,58 @@
resolver = "2"

members = [
"crates/node-file-trace",
"crates/tower-uds",
"crates/turbo-static",
"crates/turbo-tasks*",
"crates/turbo-prehash",
"crates/turbopack*",
"crates/turborepo*",
"packages/turbo-repository/rust",
"xtask",
"crates/node-file-trace",
"crates/tower-uds",
"crates/turbo-static",
"crates/turbo-tasks*",
"crates/turbo-prehash",
"crates/turbopack*",
"crates/turborepo*",
"packages/turbo-repository/rust",
"xtask",
]

default-members = [
"crates/node-file-trace",
"crates/turbo-tasks",
"crates/turbo-tasks-auto-hash-map",
"crates/turbo-tasks-build",
"crates/turbo-tasks-bytes",
"crates/turbo-tasks-env",
"crates/turbo-tasks-fetch",
"crates/turbo-tasks-fs",
"crates/turbo-tasks-hash",
"crates/turbo-tasks-macros-shared",
"crates/turbo-tasks-macros-tests",
"crates/turbo-tasks-malloc",
"crates/turbo-tasks-memory",
"crates/turbo-tasks-signposter",
"crates/turbo-tasks-signposter-sys",
"crates/turbo-tasks-testing",
"crates/turbo-tasks-tracing-signpost",
"crates/turbopack",
"crates/turbopack-bench",
"crates/turbopack-cli-utils",
"crates/turbopack-core",
"crates/turbopack-create-test-app",
"crates/turbopack-css",
"crates/turbopack-browser",
"crates/turbopack-dev-server",
"crates/turbopack-ecmascript",
"crates/turbopack-env",
"crates/turbopack-json",
"crates/turbopack-mdx",
"crates/turbopack-node",
"crates/turbopack-resolve",
"crates/turbopack-static",
"crates/turbopack-swc-ast-explorer",
"crates/turbopack-swc-utils",
"crates/turbopack-test-utils",
"crates/turbopack-tests",
"crates/turbopack-trace-server",
"crates/turbopack-trace-utils",
"crates/turbopack-wasm",
"xtask",
"crates/node-file-trace",
"crates/turbo-tasks",
"crates/turbo-tasks-auto-hash-map",
"crates/turbo-tasks-build",
"crates/turbo-tasks-bytes",
"crates/turbo-tasks-env",
"crates/turbo-tasks-fetch",
"crates/turbo-tasks-fs",
"crates/turbo-tasks-hash",
"crates/turbo-tasks-macros-shared",
"crates/turbo-tasks-macros-tests",
"crates/turbo-tasks-malloc",
"crates/turbo-tasks-memory",
"crates/turbo-tasks-signposter",
"crates/turbo-tasks-signposter-sys",
"crates/turbo-tasks-testing",
"crates/turbo-tasks-tracing-signpost",
"crates/turbopack",
"crates/turbopack-bench",
"crates/turbopack-cli-utils",
"crates/turbopack-core",
"crates/turbopack-create-test-app",
"crates/turbopack-css",
"crates/turbopack-browser",
"crates/turbopack-dev-server",
"crates/turbopack-ecmascript",
"crates/turbopack-env",
"crates/turbopack-json",
"crates/turbopack-mdx",
"crates/turbopack-node",
"crates/turbopack-resolve",
"crates/turbopack-static",
"crates/turbopack-swc-ast-explorer",
"crates/turbopack-swc-utils",
"crates/turbopack-test-utils",
"crates/turbopack-tests",
"crates/turbopack-trace-server",
"crates/turbopack-trace-utils",
"crates/turbopack-wasm",
"xtask",
]

[workspace.metadata.groups]
Expand All @@ -62,18 +62,18 @@ default-members = [
turborepo-libraries = ["path:crates/turborepo-*"]
turborepo = ["path:crates/turborepo*"]
turbopack = [
"path:crates/turbopack*",
"path:crates/turbo-tasks*",
"path:crates/node-file-trace",
"path:crates/turbopack*",
"path:crates/turbo-tasks*",
"path:crates/node-file-trace",
]

# List of the packages can be compiled against wasm32-wasi target.
turbopack-wasi = [
"path:crates/turbo-tasks-auto-hash-map",
"path:crates/turbo-tasks-hash",
"path:crates/turbo-tasks-macro",
"path:crates/turbo-tasks-macros-shared",
"path:crates/turbo-tasks-build",
"path:crates/turbo-tasks-auto-hash-map",
"path:crates/turbo-tasks-hash",
"path:crates/turbo-tasks-macro",
"path:crates/turbo-tasks-macros-shared",
"path:crates/turbo-tasks-build",
]

[workspace.lints.clippy]
Expand Down Expand Up @@ -115,8 +115,8 @@ modularize_imports = { version = "0.68.14" }
styled_components = { version = "0.96.15" }
styled_jsx = { version = "0.73.22" }
swc_core = { version = "0.92.10", features = [
"ecma_loader_lru",
"ecma_loader_parking_lot",
"ecma_loader_lru",
"ecma_loader_parking_lot",
] }
swc_emotion = { version = "0.72.13" }
swc_relay = { version = "0.44.14" }
Expand Down Expand Up @@ -185,6 +185,7 @@ turborepo-lib = { path = "crates/turborepo-lib", default-features = false }
turborepo-lockfiles = { path = "crates/turborepo-lockfiles" }
turborepo-repository = { path = "crates/turborepo-repository" }
turborepo-ui = { path = "crates/turborepo-ui" }
turborepo-unescape = { path = "crates/turborepo-unescape" }
turborepo-scm = { path = "crates/turborepo-scm" }
wax = { path = "crates/turborepo-wax" }
turborepo-vercel-api = { path = "crates/turborepo-vercel-api" }
Expand All @@ -198,7 +199,7 @@ turborepo-vt100 = { path = "crates/turborepo-vt100" }
reqwest = { version = "=0.11.17", default-features = false }

chromiumoxide = { version = "0.5.0", features = [
"tokio-runtime",
"tokio-runtime",
], default-features = false }
# For matching on errors from chromiumoxide. Keep in
# sync with chromiumoxide's tungstenite requirement.
Expand All @@ -207,18 +208,19 @@ tungstenite = "0.18.0"
anyhow = "1.0.69"
assert_cmd = "2.0.8"
async-compression = { version = "0.3.13", default-features = false, features = [
"gzip",
"tokio",
"gzip",
"tokio",
] }
async-trait = "0.1.64"
atty = "0.2.14"
axum = "0.6.2"
axum-server = "0.4.4"
biome_console = "0.5.7"
biome_deserialize = "0.5.7"
biome_diagnostics = "0.5.7"
biome_json_parser = "0.5.7"
biome_json_syntax = "0.5.7"
biome_console = { version = "0.5.7" }
biome_deserialize = { version = "0.6.0", features = ["serde"] }
biome_deserialize_macros = { version = "0.6.0" }
biome_diagnostics = { version = "0.5.7" }
biome_json_parser = { version = "0.5.7" }
biome_json_syntax = { version = "0.5.7" }
bytes = "1.1.0"
camino = { version = "1.1.4", features = ["serde1"] }
chrono = "0.4.23"
Expand All @@ -244,9 +246,9 @@ indoc = "2.0.0"
itertools = "0.10.5"
lazy_static = "1.4.0"
lightningcss = { version = "1.0.0-alpha.57", features = [
"serde",
"visitor",
"into_owned",
"serde",
"visitor",
"into_owned",
] }
mime = "0.3.16"
nohash-hasher = "0.2.0"
Expand Down Expand Up @@ -282,10 +284,10 @@ serde_with = "2.3.2"
serde_yaml = "0.9.17"
sha2 = "0.10.6"
smallvec = { version = "1.13.1", features = [
"serde",
"const_generics",
"union",
"const_new",
"serde",
"const_generics",
"union",
"const_new",
] }
sourcemap = "8.0.1"
syn = "1.0.107"
Expand Down
3 changes: 2 additions & 1 deletion crates/turborepo-errors/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[package]
name = "turborepo-errors"
version = "0.1.0"
Expand All @@ -9,8 +8,10 @@ license = "MIT"

[dependencies]
biome_deserialize = { workspace = true }
biome_diagnostics = { workspace = true }
miette = { workspace = true }
serde = { workspace = true, features = ["derive"] }
thiserror = { workspace = true }

[dev-dependencies]
serde_json = { workspace = true }
Expand Down
42 changes: 41 additions & 1 deletion crates/turborepo-errors/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,54 @@
use std::{
fmt::Display,
ops::{Deref, Range},
sync::Arc,
};

use biome_deserialize::{Deserializable, DeserializableValue, DeserializationDiagnostic};
use miette::{NamedSource, SourceSpan};
use miette::{Diagnostic, NamedSource, SourceSpan};
use serde::{Deserialize, Serialize};
use thiserror::Error;

pub const TURBO_SITE: &str = "https://turbo.build";

/// A little helper to convert from biome's syntax errors to miette.
#[derive(Debug, Error, Diagnostic)]
#[error("{message}")]
pub struct ParseDiagnostic {
message: String,
#[source_code]
source_code: String,
#[label]
label: Option<SourceSpan>,
}

struct BiomeMessage<'a>(&'a biome_diagnostics::Error);

impl Display for BiomeMessage<'_> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
self.0.description(f)
}
}

impl From<biome_diagnostics::Error> for ParseDiagnostic {
fn from(diagnostic: biome_diagnostics::Error) -> Self {
let location = diagnostic.location();
let message = BiomeMessage(&diagnostic).to_string();
Self {
message,
source_code: location
.source_code
.map(|s| s.text.to_string())
.unwrap_or_default(),
label: location.span.map(|span| {
let start: usize = span.start().into();
let len: usize = span.len().into();
(start, len).into()
}),
}
}
}

#[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize, Eq)]
#[serde(transparent)]
pub struct Spanned<T> {
Expand Down
4 changes: 3 additions & 1 deletion crates/turborepo-lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ workspace = true
atty = { workspace = true }
axum = { workspace = true }
biome_deserialize = { workspace = true }
biome_deserialize_macros = "0.5.7"
biome_deserialize_macros = { workspace = true }
biome_diagnostics = { workspace = true }
biome_json_parser = { workspace = true }
biome_json_syntax = { workspace = true }
Expand Down Expand Up @@ -87,6 +87,7 @@ rand = { workspace = true }
rayon = "1.7.0"
regex.workspace = true
reqwest = { workspace = true, default-features = false, features = ["json"] }
scip = "0.3.3"
semver = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
Expand Down Expand Up @@ -127,6 +128,7 @@ turborepo-repository = { path = "../turborepo-repository" }
turborepo-scm = { workspace = true }
turborepo-telemetry = { path = "../turborepo-telemetry" }
turborepo-ui = { workspace = true }
turborepo-unescape = { workspace = true }
turborepo-vercel-api = { path = "../turborepo-vercel-api" }
twox-hash = "1.6.3"
uds_windows = "1.0.2"
Expand Down
3 changes: 3 additions & 0 deletions crates/turborepo-lib/src/cli/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ pub enum Error {
Generate(#[from] generate::Error),
#[error(transparent)]
#[diagnostic(transparent)]
Info(#[from] crate::info::Error),
#[error(transparent)]
#[diagnostic(transparent)]
Prune(#[from] prune::Error),
#[error(transparent)]
PackageJson(#[from] turborepo_repository::package_json::Error),
Expand Down
36 changes: 31 additions & 5 deletions crates/turborepo-lib/src/cli/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -481,9 +481,10 @@ pub enum Command {
#[clap(hide = true)]
Info {
workspace: Option<String>,
// We output turbo info as json. Currently just for internal testing
#[clap(long, value_enum, default_value_t = InfoFormat::Text)]
format: InfoFormat,
#[clap(long)]
json: bool,
out: Option<Utf8PathBuf>,
},
/// Link your local directory to a Vercel organization and enable remote
/// caching.
Expand Down Expand Up @@ -553,6 +554,23 @@ pub enum Command {
},
}

#[derive(Copy, Clone, Debug, PartialEq, Serialize, ValueEnum)]
pub enum InfoFormat {
Text,
Json,
Scip,
}

impl InfoFormat {
fn ext(&self) -> &'static str {
match self {
InfoFormat::Text => "txt",
InfoFormat::Json => "json",
InfoFormat::Scip => "scip",
}
}
}

#[derive(Parser, Clone, Debug, Default, Serialize, PartialEq)]
pub struct GenerateWorkspaceArgs {
/// Name for the new workspace
Expand Down Expand Up @@ -1118,14 +1136,22 @@ pub async fn run(
Ok(1)
}
}
Command::Info { workspace, json } => {
Command::Info {
workspace,
format,
out,
} => {
CommandEventBuilder::new("info")
.with_parent(&root_telemetry)
.track_call();
let json = *json;

let out = out
.as_ref()
.map(|out| AbsoluteSystemPathBuf::from_unknown(&repo_root, out));
let workspace = workspace.clone();
let format = *format;
let mut base = CommandBase::new(cli_args, repo_root, version, ui);
info::run(&mut base, workspace.as_deref(), json).await?;
info::run(&mut base, workspace.as_deref(), format, out).await?;

Ok(0)
}
Expand Down
Loading
Loading