diff --git a/Cargo.lock b/Cargo.lock index e52e7200d4e47..c1e3143f8fe10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -202,7 +202,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -260,7 +260,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -386,7 +386,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -452,7 +452,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -628,7 +628,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -759,7 +759,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.32", + "syn 2.0.57", "which", ] @@ -786,9 +786,9 @@ dependencies = [ [[package]] name = "biome_console" -version = "0.3.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bff6dcd31afe7872430d10b3b79d66ba01e090c3a000ba826e91830bca95d0c" +checksum = "c672a9e31e47f8df74549a570ea3245a93ce3404115c724bb16762fcbbfe17e1" dependencies = [ "biome_markup", "biome_text_size", @@ -801,11 +801,12 @@ dependencies = [ [[package]] name = "biome_deserialize" -version = "0.3.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9969c2b032155b05dc837c71337149800bdc56b07ecc3cfd7c2d963db07f049" +checksum = "5b4443260d505148169f5fb35634c2a60d8489882f8c9c3f1db8b7cf0cb57632" dependencies = [ "biome_console", + "biome_deserialize_macros", "biome_diagnostics", "biome_json_parser", "biome_json_syntax", @@ -817,11 +818,24 @@ dependencies = [ "tracing", ] +[[package]] +name = "biome_deserialize_macros" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fc1244cc5f0cc267bd26b601e9ccd6851c6a4d395bba07e27c2de641dc84479" +dependencies = [ + "convert_case 0.6.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "biome_diagnostics" -version = "0.3.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92eeba94d7926178e59511b85cdcd0398ba1cc54a9f658ec261184e20028dd0e" +checksum = "fe1317b6d610541c4e6a0e1f803a946f153ace3468bbc77a8f273dcb04ee526f" dependencies = [ "backtrace", "biome_console", @@ -832,6 +846,7 @@ dependencies = [ "biome_text_size", "bitflags 2.4.0", "bpaf", + "oxc_resolver", "serde", "termcolor", "unicode-width", @@ -839,9 +854,9 @@ dependencies = [ [[package]] name = "biome_diagnostics_categories" -version = "0.3.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e8ef1f8a683438b2c6e68c996d66ceeb4764c3672e1eb20c9e6b404056a3d4" +checksum = "832080d68a2ee2f198d98ff5d26fc0f5c2566907f773d105a4a049ee07664d19" dependencies = [ "quote", "serde", @@ -849,9 +864,9 @@ dependencies = [ [[package]] name = "biome_diagnostics_macros" -version = "0.3.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9a4eeb40457bd8ed3ea91d2b48ad12e80dc92eb083f909a8b5ad1d1b71d5c4" +checksum = "540fec04d2e789fb992128c63d111b650733274afffff1cb3f26c8dff5167d3b" dependencies = [ "proc-macro-error", "proc-macro2", @@ -859,17 +874,11 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "biome_js_unicode_table" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b174dd2a0e5d74e1763045a9eb021bf89c38e3bf48f5852653635688a8675b9" - [[package]] name = "biome_json_factory" -version = "0.3.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ec30f94381f11b6c4f2cb49492cf02b34dec74fd8cf01b7b1b10138d2f6b41e" +checksum = "e409eb289040f3660689dad178b00b6ac8cfa9a7fffd8225f35cb6b3d36437cf" dependencies = [ "biome_json_syntax", "biome_rowan", @@ -877,35 +886,36 @@ dependencies = [ [[package]] name = "biome_json_parser" -version = "0.3.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baddbd7fee954d8b20b6db922e77c70db8d73fadeb43bae254e7fb2e0364a553" +checksum = "9c6d23fb9b683e6356c094b4a0cb38f8aa0acee60ce9c3ef24628d21a204de4d" dependencies = [ "biome_console", "biome_diagnostics", - "biome_js_unicode_table", "biome_json_factory", "biome_json_syntax", "biome_parser", "biome_rowan", + "biome_unicode_table", "tracing", "unicode-bom", ] [[package]] name = "biome_json_syntax" -version = "0.3.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97bb81952034ac0a4e5100d939c4286862193361a687c21aa0c15da388b29b32" +checksum = "f2645ca57f75680d3d390b2482c35db5850b1d849e1f96151a12f15f4abdb097" dependencies = [ "biome_rowan", + "serde", ] [[package]] name = "biome_markup" -version = "0.3.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b75b241c9346a7a55968398e51502333c18e200bec5d72b08d448084045e02" +checksum = "4a7f11cf91599594528e97d216044ef4e410a103327212d909f215cbafe2fd9c" dependencies = [ "proc-macro-error", "proc-macro2", @@ -914,9 +924,9 @@ dependencies = [ [[package]] name = "biome_parser" -version = "0.3.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33531b8a29ce80cfd320f3278a167ec41985d9b4701013184d95aef9642bf761" +checksum = "955dd999f32c086371d5c0e64b4ea1a50f50c98f1f31a3b9fe17ef47198de19b" dependencies = [ "biome_console", "biome_diagnostics", @@ -927,9 +937,9 @@ dependencies = [ [[package]] name = "biome_rowan" -version = "0.3.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e46e82f8245181cdf45794f3025db1daa4865e8730214345e540eae570957aa" +checksum = "d3c2dc25a7ba6ae89526340034abed6c89fac35b79060786771e32ed4aac77e7" dependencies = [ "biome_text_edit", "biome_text_size", @@ -942,9 +952,9 @@ dependencies = [ [[package]] name = "biome_text_edit" -version = "0.3.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ff84924f11cc4d9a5ee2a3b59630aa9f2c2c359f7623ac541b1ff82390d80b" +checksum = "d486fdd96d5dad6428213ce64e6b9eb5bfb2fce6387fe901e844d386283de509" dependencies = [ "biome_text_size", "serde", @@ -953,13 +963,19 @@ dependencies = [ [[package]] name = "biome_text_size" -version = "0.3.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e945f7da7f14dd66563ca6be0133014e6a1cbe935247f7b5ee8e28b2b8282f6" +checksum = "5ec604d15cefdced636255400359aeacfdea5d1e79445efc7aa32a0de7f0319b" dependencies = [ "serde", ] +[[package]] +name = "biome_unicode_table" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e8604d34b02180a58af1dbdaac166f1805f27f5370934142a3246f83870952" + [[package]] name = "bitflags" version = "1.3.2" @@ -1065,7 +1081,7 @@ checksum = "efeab2975f8102de445dcf898856a638332403c50216144653a89aec22fd79e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -1526,7 +1542,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -2233,7 +2249,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -2243,7 +2259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b" dependencies = [ "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -2337,7 +2353,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -2359,7 +2375,7 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core 0.20.1", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -2649,9 +2665,9 @@ dependencies = [ [[package]] name = "dunce" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "dwrote" @@ -2736,7 +2752,7 @@ dependencies = [ "darling 0.20.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -2975,7 +2991,7 @@ checksum = "3a0b11eeb173ce52f84ebd943d42e58813a2ebb78a6a3ff0a243b71c5199cd7b" dependencies = [ "proc-macro2", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -3104,7 +3120,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -3952,7 +3968,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -4009,7 +4025,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -4144,6 +4160,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "json-strip-comments" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d129799327c8f80861e467c59b825ba24c277dba6ad0d71a141dc98f9e04ee" + [[package]] name = "json_comments" version = "0.2.1" @@ -4792,7 +4814,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -4986,7 +5008,7 @@ dependencies = [ "napi-derive-backend", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -5001,7 +5023,7 @@ dependencies = [ "quote", "regex", "semver 1.0.18", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -5257,7 +5279,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -5473,6 +5495,24 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +[[package]] +name = "oxc_resolver" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2033cc3b0e72446d3321866db0954804b9ca559ad692480205053f6aea4bfc15" +dependencies = [ + "dashmap", + "dunce", + "indexmap 2.2.3", + "json-strip-comments", + "once_cell", + "rustc-hash", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "papergrid" version = "0.7.1" @@ -5763,7 +5803,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -5813,7 +5853,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -5894,7 +5934,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -6103,7 +6143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" dependencies = [ "proc-macro2", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -6224,7 +6264,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -6313,9 +6353,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -6654,7 +6694,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -7235,9 +7275,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -7274,13 +7314,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -7296,9 +7336,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.106" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "indexmap 2.2.3", "itoa", @@ -7344,7 +7384,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -7819,7 +7859,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -7902,7 +7942,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -7937,7 +7977,7 @@ dependencies = [ "proc-macro2", "quote", "struct_iterable_internal", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -7965,7 +8005,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -8295,7 +8335,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -8379,7 +8419,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -8535,7 +8575,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -8883,7 +8923,7 @@ dependencies = [ "swc_ecma_ast", "swc_ecma_parser", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -9003,7 +9043,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -9229,7 +9269,7 @@ checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -9278,7 +9318,7 @@ checksum = "50176cfc1cbc8bb22f41c6fe9d1ec53fbe057001219b5954961b8ad0f336fce9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -9324,7 +9364,7 @@ checksum = "3232db481484070637b20a155c064096c0ea1ba04fa2247b89b618661b3574f4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -9400,7 +9440,7 @@ checksum = "ff9719b6085dd2824fd61938a881937be14b08f95e2d27c64c825a9f65e052ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -9423,7 +9463,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -9462,9 +9502,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" dependencies = [ "proc-macro2", "quote", @@ -9737,7 +9777,7 @@ dependencies = [ "quote", "regex", "relative-path", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -9765,22 +9805,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -9966,7 +10006,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -10313,7 +10353,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -10366,7 +10406,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] @@ -11684,6 +11724,7 @@ dependencies = [ "axum-server", "biome_console", "biome_deserialize", + "biome_deserialize_macros", "biome_diagnostics", "biome_json_parser", "biome_json_syntax", @@ -12615,7 +12656,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", "wasm-bindgen-shared", ] @@ -12649,7 +12690,7 @@ checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -13566,7 +13607,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.57", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 7212ae43214b9..35fde5f4ce867 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -203,11 +203,11 @@ async-trait = "0.1.64" atty = "0.2.14" axum = "0.6.2" axum-server = "0.4.4" -biome_console = "0.3.1" -biome_deserialize = "0.3.1" -biome_diagnostics = "0.3.1" -biome_json_parser = "0.3.1" -biome_json_syntax = "0.3.1" +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" bytes = "1.1.0" camino = { version = "1.1.4", features = ["serde1"] } chrono = "0.4.23" diff --git a/crates/turborepo-lib/Cargo.toml b/crates/turborepo-lib/Cargo.toml index 5571b118518c5..8fda695146c61 100644 --- a/crates/turborepo-lib/Cargo.toml +++ b/crates/turborepo-lib/Cargo.toml @@ -100,6 +100,7 @@ url = "2.3.1" biome_console = { workspace = true } biome_deserialize = { workspace = true } +biome_deserialize_macros = "0.5.7" biome_diagnostics = { workspace = true } biome_json_parser = { workspace = true } biome_json_syntax = { workspace = true } diff --git a/crates/turborepo-lib/src/turbo_json/mod.rs b/crates/turborepo-lib/src/turbo_json/mod.rs index 87ca2a89b4706..67c30727009ce 100644 --- a/crates/turborepo-lib/src/turbo_json/mod.rs +++ b/crates/turborepo-lib/src/turbo_json/mod.rs @@ -4,6 +4,7 @@ use std::{ sync::Arc, }; +use biome_deserialize_macros::Deserializable; use camino::Utf8Path; use miette::{NamedSource, SourceSpan}; use serde::{Deserialize, Serialize}; @@ -94,15 +95,11 @@ impl From<&RawRemoteCacheOptions> for ConfigurationOptions { } } -#[derive(Serialize, Default, Debug, Clone, Iterable)] +#[derive(Serialize, Default, Debug, Clone, Iterable, Deserializable)] #[serde(rename_all = "camelCase")] // The raw deserialized turbo.json file. pub struct RawTurboJson { - #[serde(skip)] - // The raw text of the turbo.json file. - text: Option>, - #[serde(skip)] - path: Option>, + span: Spanned<()>, #[serde(rename = "$schema", skip_serializing_if = "Option::is_none")] schema: Option, @@ -484,8 +481,8 @@ impl TryFrom for TurboJson { } Ok(TurboJson { - text: raw_turbo.text, - path: raw_turbo.path, + text: raw_turbo.span.text, + path: raw_turbo.span.path, global_env: { let mut global_env: Vec<_> = global_env.into_iter().collect(); global_env.sort(); diff --git a/crates/turborepo-lib/src/turbo_json/parser.rs b/crates/turborepo-lib/src/turbo_json/parser.rs index 7930d66d24be9..3111cd2fa5800 100644 --- a/crates/turborepo-lib/src/turbo_json/parser.rs +++ b/crates/turborepo-lib/src/turbo_json/parser.rs @@ -512,15 +512,15 @@ impl DeserializationVisitor for ConfigurationOptionsVisitor { } } -impl Deserializable for RawTurboJson { - fn deserialize( - value: &impl DeserializableValue, - name: &str, - diagnostics: &mut Vec, - ) -> Option { - value.deserialize(RawTurboJsonVisitor, name, diagnostics) - } -} +// impl Deserializable for RawTurboJson { +// fn deserialize( +// value: &impl DeserializableValue, +// name: &str, +// diagnostics: &mut Vec, +// ) -> Option { +// value.deserialize(RawTurboJsonVisitor, name, diagnostics) +// } +// } struct RawTurboJsonVisitor; @@ -623,7 +623,7 @@ impl DeserializationVisitor for RawTurboJsonVisitor { impl WithMetadata for RawTurboJson { fn add_text(&mut self, text: Arc) { - self.text = Some(text.clone()); + self.span.add_text(text.clone()); self.extends.add_text(text.clone()); self.global_dependencies.add_text(text.clone()); self.global_env.add_text(text.clone()); @@ -632,7 +632,7 @@ impl WithMetadata for RawTurboJson { } fn add_path(&mut self, path: Arc) { - self.path = Some(path.clone()); + self.span.add_path(path.clone()); self.extends.add_path(path.clone()); self.global_dependencies.add_path(path.clone()); self.global_env.add_path(path.clone()); @@ -710,6 +710,7 @@ impl RawTurboJson { let result = deserialize_from_json_str::( text, JsonParserOptions::default().with_allow_comments(), + file_path.as_str(), ); if !result.diagnostics().is_empty() {