diff --git a/Cargo.lock b/Cargo.lock index 5765931..054d445 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,9 +62,9 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "arbitrary" @@ -74,9 +74,9 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "assert_cmd" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ad3f3a942eee60335ab4342358c161ee296829e0d16ff42fc1d6cb07815467" +checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" dependencies = [ "anstyle", "bstr", @@ -110,7 +110,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] @@ -140,6 +140,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "bincode" version = "1.3.3" @@ -149,6 +155,17 @@ dependencies = [ "serde", ] +[[package]] +name = "binstall-tar" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01db907e07c37309ea816c183ffe548daaa66ef640a291408f232d6ca4089dbb" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -297,7 +314,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" dependencies = [ - "heck", + "heck 0.4.1", "indexmap 1.9.3", "log", "proc-macro2", @@ -327,9 +344,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.18" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -337,9 +354,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstyle", "clap_lex", @@ -347,21 +364,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "clean-path" @@ -612,9 +629,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.6" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c376d08ea6aa96aafe61237c7200d1241cb177b7d3a542d791f2d118e9cbb955" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -622,27 +639,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.6" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33043dcd19068b8192064c704b3f83eb464f91f1ff527b44a4e2b08d9cdb8855" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] name = "darling_macro" -version = "0.20.6" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5a91391accf613803c2a9bf9abccdbaa07c54b4244a5b64883f9c3c137c86be" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] @@ -789,9 +806,9 @@ dependencies = [ [[package]] name = "extism" -version = "1.0.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5472dcd9d979ac3a094f1712dea48936a4ef7c35600184f89464c145c2e7dd1c" +checksum = "2687bfd28990a4725ddaf8a4374bff6d2debfd239d0fd6e55e2a7f476c5aec99" dependencies = [ "anyhow", "cbindgen", @@ -814,12 +831,12 @@ dependencies = [ [[package]] name = "extism-convert" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e78a2317936c20806cb60fa98c15dcc5ccf43458e4cbddad3c6cce17a05b31c" +checksum = "a63bfc6d371d3b51d6094fd96c4c32a084ceefece3b4f4b328f30067d29da064" dependencies = [ "anyhow", - "base64", + "base64 0.22.0", "bytemuck", "extism-convert-macros", "prost", @@ -830,24 +847,24 @@ dependencies = [ [[package]] name = "extism-convert-macros" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d190cc0c058346b7750868de96dab17e047e7588ec91691a29b6db4eafd51a7e" +checksum = "519ccf960500c87244bef99caf8e58222ac95bf1abb06a32f5217b4788857aa6" dependencies = [ "manyhow", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] name = "extism-manifest" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08af46dc0633e0874e6c1a66ac1226bf2fad6fa67568538238af8b316569d06" +checksum = "05c7d16695dc6b72418e23b58c943411a08264332af403ae9870997b4d495c3d" dependencies = [ - "base64", + "base64 0.22.0", "serde", "serde_json", ] @@ -859,7 +876,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f9a87d636d30b75e697642dd4f6cff2054db5a7a5d69d6601041a76265bb681" dependencies = [ "anyhow", - "base64", + "base64 0.21.7", "extism-convert", "extism-manifest", "extism-pdk-derive", @@ -875,7 +892,7 @@ checksum = "d83995c2023720a0fd5ef2a349c89c1670efb37a979228b0218705f5ddb50d4b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] @@ -1064,7 +1081,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] @@ -1095,7 +1112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator", - "indexmap 2.2.3", + "indexmap 2.2.6", "stable_deref_trait", ] @@ -1141,7 +1158,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.2.3", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -1178,6 +1195,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.4" @@ -1335,9 +1358,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.3" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -1346,15 +1369,14 @@ dependencies = [ [[package]] name = "insta" -version = "1.34.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "1718b3f2b85bb5054baf8ce406e36401f27c3169205f4175504c4b1d98252d3f" dependencies = [ "console", "lazy_static", "linked-hash-map", "similar", - "yaml-rust", ] [[package]] @@ -1539,7 +1561,7 @@ dependencies = [ "manyhow-macros", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] @@ -1553,6 +1575,15 @@ dependencies = [ "quote", ] +[[package]] +name = "markdown" +version = "1.0.0-alpha.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0f0025e8c0d89b84d6dc63e859475e40e8e82ab1a08be0a93ad5731513a508" +dependencies = [ + "unicode-id", +] + [[package]] name = "matchers" version = "0.1.0" @@ -1594,10 +1625,11 @@ dependencies = [ [[package]] name = "miette" -version = "7.0.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98a72adfa0c7ae88ba0abcbd00047a476616c66b831d628b8ac7f1e9de0cfd67" +checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" dependencies = [ + "cfg-if", "miette-derive", "thiserror", "unicode-width", @@ -1605,13 +1637,13 @@ dependencies = [ [[package]] name = "miette-derive" -version = "7.0.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279def6bf114a34b3cf887489eb440d4dfcf709ab3ce9955e4a6f957ce5cce77" +checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] @@ -1648,9 +1680,9 @@ dependencies = [ [[package]] name = "moon_common" -version = "0.0.3" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47304424ee7d5101b92d5c61bc7dee396a366edd428dfb4602b34426d9bfef22" +checksum = "c6d4587683886bfcac81d63a4500e566b221fa5d67290edd37661b436549b4c1" dependencies = [ "miette", "once_cell", @@ -1664,9 +1696,9 @@ dependencies = [ [[package]] name = "moon_config" -version = "0.0.4" +version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703a2ddda8019c74a27ea3fc97b8dc6c2c7a6b65a95e19fa9bd4fe5d4f6b2320" +checksum = "14cad4c9d767d4b93c6ae29675a6a8b19db586d65ee23c9f72018c904525e8ef" dependencies = [ "miette", "moon_common", @@ -1743,9 +1775,9 @@ dependencies = [ [[package]] name = "moon_pdk" -version = "0.0.4" +version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b5569bf679993530de12a3f888e3dda07a40a580971c900a1fcfa05a710ff3" +checksum = "bd3d86bac39ef18fa7052dd11c35539054dc5b7d01a8974af0a89219af870d6c" dependencies = [ "clap", "extism-pdk", @@ -1756,9 +1788,9 @@ dependencies = [ [[package]] name = "moon_pdk_api" -version = "0.0.4" +version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c5a61d2079358fbccb6fd5ef07e7648f15e31d9a3216ca29ba5ae50a67fad20" +checksum = "710cfe30940585ab1380b3bf767490906192e268ebef8f08d073b842b18c3fbc" dependencies = [ "moon_common", "moon_config", @@ -1769,9 +1801,9 @@ dependencies = [ [[package]] name = "moon_pdk_test_utils" -version = "0.0.5" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5286731e9f463c9da401ad37e451ddd86dbf7d74102c38ee2761c22a4115dee0" +checksum = "38bfbc36bf1ccfb994ec99be0018852808834107b52d33e041be66c95e517ceb" dependencies = [ "extism", "moon_pdk_api", @@ -1782,9 +1814,9 @@ dependencies = [ [[package]] name = "moon_target" -version = "0.0.2" +version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "661b856b51afdac5845af49c68b491c73bf585d35603649808512731e533f19f" +checksum = "ff5fd3b2ef1e62581f58f79c99ca53dd65a8e75c481d99be549be559a556baf4" dependencies = [ "miette", "moon_common", @@ -1860,7 +1892,7 @@ checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "crc32fast", "hashbrown 0.14.3", - "indexmap 2.2.3", + "indexmap 2.2.6", "memchr", ] @@ -1872,9 +1904,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "once_map" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f2d1d09016ea926b4a8c89938674322fca80bc139d605b21a574c0ce1000a19" +checksum = "0087372f82622a51024ad20d38a6901ba83d09de1e23ef15a621e4404dadbb7a" dependencies = [ "ahash", "hashbrown 0.14.3", @@ -2063,7 +2095,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] @@ -2169,9 +2201,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -2219,11 +2251,11 @@ checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" [[package]] name = "reqwest" -version = "0.11.24" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -2351,7 +2383,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64", + "base64 0.21.7", ] [[package]] @@ -2407,12 +2439,13 @@ dependencies = [ [[package]] name = "schematic" -version = "0.14.2" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5189a1d2e72a2b2be3f72638816efe7cc1005d7a39b59e2b80d3bc35f0f53a" +checksum = "ac09b4b9c9fe5068fb44ac5cdc6b282acb175ab39e8b0d1eef737df2aeec3a91" dependencies = [ "garde", - "indexmap 2.2.3", + "indexmap 2.2.6", + "markdown", "miette", "schemars", "schematic_macros", @@ -2428,15 +2461,15 @@ dependencies = [ [[package]] name = "schematic_macros" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31af7347544d97d00870a5865d2077dac07c069a5290c26215ddd1138b302590" +checksum = "910c561ff783c09af4e4a7a4f7d6d733aed0a0374333de7f0b39f474568ba937" dependencies = [ "convert_case", "darling", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] @@ -2490,9 +2523,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] @@ -2514,15 +2547,16 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -2561,11 +2595,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.31" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.3", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -2664,16 +2698,16 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "starbase_archive" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a99a24e91bf823d46d04d520fb87c02ab0c3cac75bfdcf3c7671505681fd9f29" +checksum = "56bf4ff22495fe4c8384f124f4955373ed9d5c50c0e9bca53d202975c820687f" dependencies = [ + "binstall-tar", "flate2", "miette", "rustc-hash", "starbase_styles", "starbase_utils", - "tar", "thiserror", "tracing", "xz2", @@ -2683,9 +2717,9 @@ dependencies = [ [[package]] name = "starbase_sandbox" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c13185a91009f058c1649eb9692957e3e78398d98a89ed5fc9c3e24844e9c7" +checksum = "46eb2113d05c21fea19742d5df590641a44373eaa75c9178e6c8888d9ab31286" dependencies = [ "assert_cmd", "assert_fs", @@ -2699,9 +2733,9 @@ dependencies = [ [[package]] name = "starbase_styles" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e06fa37c027e48ef341787d8c3d26cfbe8507aa4e2e8c61fcba82fe931bb598" +checksum = "a9e21769f0b11c591f655f8563217d92f55176f53c6e9224854b1f14801c6cee" dependencies = [ "dirs 5.0.1", "owo-colors", @@ -2711,9 +2745,9 @@ dependencies = [ [[package]] name = "starbase_utils" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23570a8fa500ad7ccb3bbfed7d9dc759b657ed536fb9b10eec729ad9de1b60e" +checksum = "602b821bd1b020210432bdc5152056defca02dab1f601e86093cb12e842d0fa5" dependencies = [ "dirs 5.0.1", "json-strip-comments", @@ -2721,6 +2755,7 @@ dependencies = [ "once_cell", "regex", "relative-path", + "reqwest", "serde", "serde_json", "serde_yaml", @@ -2728,6 +2763,7 @@ dependencies = [ "thiserror", "toml 0.8.10", "tracing", + "url", "wax", ] @@ -2765,9 +2801,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" dependencies = [ "proc-macro2", "quote", @@ -2819,9 +2855,9 @@ dependencies = [ [[package]] name = "system_env" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cedd96678522ba576fed0a1b1c558166dc6e690b5c325937e4ee63d5c7f6ecfa" +checksum = "967511d0f22b9de600ec03e25d9dacc5627f36d69e780d5d0b306903de88b714" dependencies = [ "serde", "serde_json", @@ -2829,17 +2865,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", - "xattr", -] - [[package]] name = "target-lexicon" version = "0.12.13" @@ -2867,22 +2892,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] @@ -2986,7 +3011,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.3", + "indexmap 2.2.6", "toml_datetime", "winnow 0.5.40", ] @@ -2997,7 +3022,7 @@ version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99e68c159e8f5ba8a28c4eb7b0c0c190d77bb479047ca713270048145a9ad28a" dependencies = [ - "indexmap 2.2.3", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -3030,7 +3055,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] @@ -3090,6 +3115,12 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +[[package]] +name = "unicode-id" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" + [[package]] name = "unicode-ident" version = "1.0.12" @@ -3125,9 +3156,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "untrusted" @@ -3141,7 +3172,7 @@ version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" dependencies = [ - "base64", + "base64 0.21.7", "flate2", "log", "once_cell", @@ -3226,9 +3257,9 @@ dependencies = [ [[package]] name = "warpgate" -version = "0.11.1" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "554faf76dd19fa28d1c9d2f9f560d513cfe3790584f44ba886757a16c945db27" +checksum = "f9f3a291841f84d077c092db81a0bdeb144f39865c6bff65ef3c6734959d7260" dependencies = [ "extism", "miette", @@ -3251,9 +3282,9 @@ dependencies = [ [[package]] name = "warpgate_api" -version = "0.4.1" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87a6990804d00cad9072bfc9d030a2e629997e12b76caa2600f9de392e7277f9" +checksum = "fb71be920bfea7dce93965ece5f79ed15222a2900a97b4b1039427d2641bf11e" dependencies = [ "anyhow", "rustc-hash", @@ -3266,9 +3297,9 @@ dependencies = [ [[package]] name = "warpgate_pdk" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dc35a3ada370c65a41dffd5b685dd758253d537762e1d2e047264bec8cba5e" +checksum = "1286c9c43a051463251deb81404b639a5bae5b6918fde781d75609d65a67520b" dependencies = [ "extism-pdk", "serde", @@ -3345,7 +3376,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", "wasm-bindgen-shared", ] @@ -3379,7 +3410,7 @@ checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3414,7 +3445,7 @@ version = "0.118.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9" dependencies = [ - "indexmap 2.2.3", + "indexmap 2.2.6", "semver", ] @@ -3425,7 +3456,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c35daf77afb4f9b14016625144a391085ec2ca99ca9cc53ed291bb53ab5278d" dependencies = [ "bitflags 2.4.2", - "indexmap 2.2.3", + "indexmap 2.2.6", "semver", ] @@ -3452,7 +3483,7 @@ dependencies = [ "cfg-if", "encoding_rs", "fxprof-processed-profile", - "indexmap 2.2.3", + "indexmap 2.2.6", "libc", "log", "object", @@ -3494,7 +3525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3ce373743892002f9391c6741ef0cb0335b55ec899d874f311222b7e36f4594" dependencies = [ "anyhow", - "base64", + "base64 0.21.7", "bincode", "directories-next", "log", @@ -3516,7 +3547,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -3578,7 +3609,7 @@ dependencies = [ "anyhow", "cranelift-entity", "gimli", - "indexmap 2.2.3", + "indexmap 2.2.6", "log", "object", "serde", @@ -3667,7 +3698,7 @@ dependencies = [ "cc", "cfg-if", "encoding_rs", - "indexmap 2.2.3", + "indexmap 2.2.6", "libc", "log", "mach", @@ -3708,7 +3739,7 @@ checksum = "f55c5565959287c21dd0f4277ae3518dd2ae62679f655ee2dbc4396e19d210db" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] @@ -3770,8 +3801,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f328b2d4a690270324756e886ed5be3a4da4c00be0eea48253f4595ad068062b" dependencies = [ "anyhow", - "heck", - "indexmap 2.2.3", + "heck 0.4.1", + "indexmap 2.2.6", "wit-parser", ] @@ -3864,11 +3895,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cef2868fed7584d2b552fa317104858ded80021d23b073b2d682d3c932a027bd" dependencies = [ "anyhow", - "heck", + "heck 0.4.1", "proc-macro2", "quote", "shellexpand", - "syn 2.0.48", + "syn 2.0.55", "witx", ] @@ -3880,7 +3911,7 @@ checksum = "31ae1ec11a17ea481539ee9a5719a278c9790d974060fbf71db4b2c05378780b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", "wiggle-generate", ] @@ -4118,7 +4149,7 @@ checksum = "df4913a2219096373fd6512adead1fb77ecdaa59d7fc517972a7d30b12f625be" dependencies = [ "anyhow", "id-arena", - "indexmap 2.2.3", + "indexmap 2.2.6", "log", "semver", "serde", @@ -4141,13 +4172,11 @@ dependencies = [ [[package]] name = "xattr" -version = "1.3.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" dependencies = [ "libc", - "linux-raw-sys", - "rustix", ] [[package]] @@ -4159,15 +4188,6 @@ dependencies = [ "lzma-sys", ] -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "yansi" version = "0.5.1" @@ -4191,7 +4211,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.55", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b24d466..805f025 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,17 +4,17 @@ members = ["crates/*"] [workspace.dependencies] extism-pdk = "1.1.0" -moon_common = "0.0.3" -moon_config = "0.0.4" -moon_pdk = "0.0.4" -moon_pdk_test_utils = "0.0.5" -moon_target = "0.0.2" +moon_common = "0.0.4" +moon_config = "0.0.5" +moon_pdk = "0.0.5" +moon_pdk_test_utils = "0.0.6" +moon_target = "0.0.3" rustc-hash = "1.1.0" serde = { version = "1.0.197", features = ["derive"] } -serde_json = "1.0.114" -serde_yaml = "0.9.32" -starbase_utils = { version = "0.5.0", default-features = false } -starbase_sandbox = "0.4.0" +serde_json = "1.0.115" +serde_yaml = "0.9.33" +starbase_utils = { version = "0.6.1", default-features = false } +starbase_sandbox = "0.5.0" # moon_common = { path = "../moon/nextgen/common" } # moon_config = { path = "../moon/nextgen/config" } diff --git a/crates/common/src/migrator.rs b/crates/common/src/migrator.rs index 94bdc1c..20986f1 100644 --- a/crates/common/src/migrator.rs +++ b/crates/common/src/migrator.rs @@ -136,5 +136,7 @@ impl Migrator { } pub fn create_id>(id: T) -> AnyResult { - Ok(Id::clean(id.as_ref().replace(':', "."))?) + Ok(Id::clean( + id.as_ref().replace(':', ".").trim_start_matches('@'), + )?) } diff --git a/crates/migrate-nx/CHANGELOG.md b/crates/migrate-nx/CHANGELOG.md index f331f1c..dae1ffc 100644 --- a/crates/migrate-nx/CHANGELOG.md +++ b/crates/migrate-nx/CHANGELOG.md @@ -1,3 +1,9 @@ +## Unreleased + +#### 🐞 Fixes + +- Fixed invalid IDs when converting `package.json` names. + ## 0.0.2 #### 🚀 Updates diff --git a/crates/migrate-nx/src/nx_migrator.rs b/crates/migrate-nx/src/nx_migrator.rs index 2f466f2..9d6a1ad 100644 --- a/crates/migrate-nx/src/nx_migrator.rs +++ b/crates/migrate-nx/src/nx_migrator.rs @@ -1,5 +1,6 @@ use crate::nx_json::*; use crate::nx_project_json::*; +use moon_common::Id; use moon_config::FilePath; use moon_config::PortablePath; use moon_config::TaskOptionEnvFile; @@ -43,17 +44,17 @@ impl NxMigrator { if !file_groups.contains_key("default") { file_groups.insert( - "default".into(), + Id::raw("default"), vec![InputPath::ProjectGlob("**/*".into())], ); } if !file_groups.contains_key("production") { - file_groups.insert("production".into(), vec![]); + file_groups.insert(Id::raw("production"), vec![]); } if !file_groups.contains_key("sharedGlobals") { - file_groups.insert("sharedGlobals".into(), vec![]); + file_groups.insert(Id::raw("sharedGlobals"), vec![]); } } @@ -381,9 +382,10 @@ fn inject_args_into_task(nx_target: &NxTargetOptions, config: &mut PartialTaskCo // https://nx.dev/nx-api/nx/executors/noop fn migrate_noop_task(nx_target: &NxTargetOptions) -> AnyResult { - let mut config = PartialTaskConfig::default(); - - config.command = Some(PartialTaskArgs::String("noop".into())); + let mut config = PartialTaskConfig { + command: Some(PartialTaskArgs::String("noop".into())), + ..PartialTaskConfig::default() + }; inject_args_into_task(nx_target, &mut config); @@ -392,9 +394,10 @@ fn migrate_noop_task(nx_target: &NxTargetOptions) -> AnyResult AnyResult { - let mut config = PartialTaskConfig::default(); - - config.platform = Some(PlatformType::System); + let mut config = PartialTaskConfig { + platform: Some(PlatformType::System), + ..PartialTaskConfig::default() + }; // https://nx.dev/nx-api/nx/executors/run-commands#options if let Some(options) = &nx_target.options { @@ -483,16 +486,16 @@ fn migrate_task( package = &package[index + 1..]; } - let mut config = PartialTaskConfig::default(); - - config.command = Some(PartialTaskArgs::String(if package == target { - target.to_owned() - } else { - format!("{package} {target}") - })); - inject_args = true; - config + + PartialTaskConfig { + command: Some(PartialTaskArgs::String(if package == target { + target.to_owned() + } else { + format!("{package} {target}") + })), + ..PartialTaskConfig::default() + } } } else { let mut config = PartialTaskConfig::default(); diff --git a/crates/migrate-nx/tests/snapshots/migrate_nx_test__migrate_nx__nx_json__converts_named_inputs.snap b/crates/migrate-nx/tests/snapshots/migrate_nx_test__migrate_nx__nx_json__converts_named_inputs.snap index ebaa34c..793287d 100644 --- a/crates/migrate-nx/tests/snapshots/migrate_nx_test__migrate_nx__nx_json__converts_named_inputs.snap +++ b/crates/migrate-nx/tests/snapshots/migrate_nx_test__migrate_nx__nx_json__converts_named_inputs.snap @@ -9,8 +9,7 @@ fileGroups: - '**/*' - '!**/*' - /**/* - - /!**/* + - '!/**/*' - ./src/file.ts - ./src/file.* - ./src - diff --git a/crates/migrate-nx/tests/snapshots/migrate_nx_test__migrate_nx__projects__converts_named_inputs.snap b/crates/migrate-nx/tests/snapshots/migrate_nx_test__migrate_nx__projects__converts_named_inputs.snap index 54c5a5d..08a1904 100644 --- a/crates/migrate-nx/tests/snapshots/migrate_nx_test__migrate_nx__projects__converts_named_inputs.snap +++ b/crates/migrate-nx/tests/snapshots/migrate_nx_test__migrate_nx__projects__converts_named_inputs.snap @@ -9,10 +9,9 @@ fileGroups: - '**/*' - '!**/*' - /**/* - - /!**/* + - '!/**/*' - ./src/file.ts - ./src/file.* - ./src language: javascript platform: node - diff --git a/crates/unpack/Cargo.toml b/crates/unpack/Cargo.toml index ba843a3..ea5aefa 100644 --- a/crates/unpack/Cargo.toml +++ b/crates/unpack/Cargo.toml @@ -17,7 +17,7 @@ pre-release-replacements = [ moon_extension_common = { path = "../common" } extism-pdk = { workspace = true } moon_pdk = { workspace = true } -starbase_archive = { version = "0.5.0", default-features = false, features = [ +starbase_archive = { version = "0.6.0", default-features = false, features = [ "tar-gz", "zip", ] } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 51b24ee..4f39a5c 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] profile = "default" -channel = "1.76.0" +channel = "1.77.0"