From a4e269b5204c0477fd8ae8dd183320528c2f3230 Mon Sep 17 00:00:00 2001 From: Jeff Charles Date: Wed, 2 Sep 2026 11:19:51 -0400 Subject: [PATCH] Update bluejay --- Cargo.lock | 101 ++++++++++++++++++--------------- Cargo.toml | 6 +- src/bluejay_schema_analyzer.rs | 2 + 3 files changed, 59 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6e055a3c..df38b48c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -198,12 +198,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "beef" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" - [[package]] name = "bitflags" version = "2.10.0" @@ -230,39 +224,39 @@ dependencies = [ [[package]] name = "bluejay-core" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07afe9ba762beafa49ab71ac7c618b30990a2c92baa1721bfb8e2a8f9a3558ed" +checksum = "50aa6831e7fed962546653a284439a7cc65d24aa91a0a733249c2a2306ae18b3" dependencies = [ "enum-as-inner", - "itertools", + "itertools 0.15.0", "serde_json", - "strum", + "strum 0.28.0", ] [[package]] name = "bluejay-parser" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0da789f22068fb4ae1afb52f2ab41bc4fcb8b90776221c9d84715a317d0a77" +checksum = "1cfca647f161b017b222bc18b889436f058d00161fccdaa88ab20bb1400875f8" dependencies = [ "ariadne", "bluejay-core", "enum-as-inner", - "itertools", + "itertools 0.15.0", "logos", - "strum", + "strum 0.28.0", ] [[package]] name = "bluejay-validator" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd11b3e709609e56ba1c4833fba041be2a47dd94569775b0bb7250ffe56f3538" +checksum = "1e72c362c99a7ef4760cd9c07bebb69698cd63e89cad21c268f756a1f61b1c6c" dependencies = [ "bluejay-core", "bluejay-parser", - "itertools", + "itertools 0.15.0", "paste", "seq-macro", "serde_json", @@ -871,9 +865,9 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +checksum = "0359ee92f81184d7985519e474bda2a5738476334edd3746c9b1265c067afe70" dependencies = [ "heck", "proc-macro2", @@ -1590,6 +1584,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.14" @@ -1657,12 +1660,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - [[package]] name = "leb128" version = "0.2.5" @@ -1731,34 +1728,32 @@ dependencies = [ [[package]] name = "logos" -version = "0.15.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab6f536c1af4c7cc81edf73da1f8029896e7e1e16a219ef09b184e76a296f3db" +checksum = "eb2c55a318a87600ea870ff8c2012148b44bf18b74fad48d0f835c38c7d07c5f" dependencies = [ "logos-derive", ] [[package]] name = "logos-codegen" -version = "0.15.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "189bbfd0b61330abea797e5e9276408f2edbe4f822d7ad08685d67419aafb34e" +checksum = "58b3ffaa284e1350d017a57d04ada118c4583cf260c8fb01e0fe28a2e9cf8970" dependencies = [ - "beef", "fnv", - "lazy_static", "proc-macro2", "quote", + "regex-automata", "regex-syntax", - "rustc_version", "syn 2.0.111", ] [[package]] name = "logos-derive" -version = "0.15.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfe8e1a19049ddbfccbd14ac834b215e11b85b90bab0c2dba7c7b92fb5d5cba" +checksum = "52d3a9855747c17eaf4383823f135220716ab49bea5fbea7dd42cc9a92f8aa31" dependencies = [ "logos-codegen", ] @@ -2378,15 +2373,6 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" -[[package]] -name = "rustc_version" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" -dependencies = [ - "semver", -] - [[package]] name = "rustix" version = "0.38.44" @@ -2697,7 +2683,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4842376f01b3abe6c78596085f29ea0d1b605873d2855f812738072c38e32c34" dependencies = [ - "strum", + "strum 0.27.2", ] [[package]] @@ -2706,7 +2692,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7367c758d2ec5644f78f662e3748564dd71c50462ad7eec679f0af139984948" dependencies = [ - "strum", + "strum 0.27.2", ] [[package]] @@ -2767,7 +2753,16 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" dependencies = [ - "strum_macros", + "strum_macros 0.27.1", +] + +[[package]] +name = "strum" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd" +dependencies = [ + "strum_macros 0.28.0", ] [[package]] @@ -2783,6 +2778,18 @@ dependencies = [ "syn 2.0.111", ] +[[package]] +name = "strum_macros" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.111", +] + [[package]] name = "subtle" version = "2.6.1" @@ -3555,7 +3562,7 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "gimli", - "itertools", + "itertools 0.14.0", "log", "object", "pulley-interpreter", diff --git a/Cargo.toml b/Cargo.toml index 6d13f8b8..e9770735 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,9 +60,9 @@ rust-embed = "8.11.0" rmp-serde = "1.3" is-terminal = "0.4.17" wasmprof = "=0.12.0" -bluejay-core = { version = "=0.3.0" } -bluejay-parser = { version = "=0.3.0", features = ["format-errors"] } -bluejay-validator = { version = "=0.3.0" } +bluejay-core = { version = "=0.4.0" } +bluejay-parser = { version = "=0.4.0", features = ["format-errors"] } +bluejay-validator = { version = "=0.4.0" } [dev-dependencies] assert_cmd = "2.1" diff --git a/src/bluejay_schema_analyzer.rs b/src/bluejay_schema_analyzer.rs index fc25190a..548dda96 100644 --- a/src/bluejay_schema_analyzer.rs +++ b/src/bluejay_schema_analyzer.rs @@ -20,12 +20,14 @@ impl BluejaySchemaAnalyzer { input: &serde_json::Value, ) -> Result { let document_definition = DefinitionDocument::parse(schema_string) + .result .map_err(|errors| anyhow!(Error::format_errors(schema_string, schema_path, errors)))?; let schema_definition = SchemaDefinition::try_from(&document_definition) .map_err(|errors| anyhow!(Error::format_errors(schema_string, schema_path, errors)))?; let executable_document = ExecutableDocument::parse(query) + .result .map_err(|errors| anyhow!(Error::format_errors(query, query_path, errors)))?; let cache =