chore(bun): properly handle invalid JSON parsing issues

vercel · Jan 24, 2025 · d3a0b51 · d3a0b51
1 parent d750a02
commit d3a0b51
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/turborepo-lockfiles/Cargo.toml b/crates/turborepo-lockfiles/Cargo.toml
@@ -13,6 +13,7 @@ workspace = true
 biome_formatter = { workspace = true }
 biome_json_formatter = { workspace = true }
 biome_json_parser = { workspace = true }
+itertools = { workspace = true }
 nom = "7"
 pest = "2.7.9"
 pest_derive = "2.7.9"
@@ -25,8 +26,8 @@ serde_yaml = "0.9.27"
 thiserror = "1.0.38"
 tracing.workspace = true
 turbopath = { path = "../turborepo-paths" }
+turborepo-errors = { workspace = true }
 
 [dev-dependencies]
-itertools = { workspace = true }
 pretty_assertions = "1.3"
 test-case = "3.1.0"
diff --git a/crates/turborepo-lockfiles/src/bun/mod.rs b/crates/turborepo-lockfiles/src/bun/mod.rs
@@ -3,8 +3,10 @@ use std::{any::Any, collections::HashMap, str::FromStr};
 use biome_json_formatter::context::JsonFormatOptions;
 use biome_json_parser::JsonParserOptions;
 use id::PossibleKeyIter;
+use itertools::Itertools as _;
 use serde::Deserialize;
 use serde_json::Value;
+use turborepo_errors::ParseDiagnostic;
 
 use crate::Lockfile;
 
@@ -200,7 +202,12 @@ impl FromStr for BunLockfile {
             JsonParserOptions::default().with_allow_trailing_commas(),
         );
         if parsed_json.has_errors() {
-            // TODO
+            let diags = parsed_json
+                .into_diagnostics()
+                .into_iter()
+                .map(|diagnostic| ParseDiagnostic::from(&diagnostic).to_string())
+                .join("\n");
+            return Err(super::Error::BiomeJsonError(diags));
         }
         let syntax_tree = parsed_json.syntax();
         let format = biome_json_formatter::format_node(

diff --git a/crates/turborepo-lockfiles/src/error.rs b/crates/turborepo-lockfiles/src/error.rs
@@ -10,6 +10,8 @@ pub enum Error {
     MissingVersion(String),
     #[error("Unable to convert from json: {0}")]
     JsonError(#[from] serde_json::Error),
+    #[error("Unable to convert from json: {0}")]
+    BiomeJsonError(String),
     #[error("Unable to convert to yaml: {0}")]
     Yaml(#[from] serde_yaml::Error),
     #[error("Turborepo doesn't support npm lockfiles without a 'packages' field")]