diff --git a/Cargo.lock b/Cargo.lock index 74210c0..1e6f9b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -612,9 +612,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.5" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8" +checksum = "c376d08ea6aa96aafe61237c7200d1241cb177b7d3a542d791f2d118e9cbb955" dependencies = [ "darling_core", "darling_macro", @@ -622,9 +622,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.5" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3" +checksum = "33043dcd19068b8192064c704b3f83eb464f91f1ff527b44a4e2b08d9cdb8855" dependencies = [ "fnv", "ident_case", @@ -636,9 +636,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.5" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" +checksum = "c5a91391accf613803c2a9bf9abccdbaa07c54b4244a5b64883f9c3c137c86be" dependencies = [ "darling_core", "quote", @@ -802,7 +802,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "toml 0.8.8", + "toml 0.8.10", "tracing", "tracing-subscriber", "ureq", @@ -1029,9 +1029,9 @@ dependencies = [ [[package]] name = "garde" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237d668ccb63fd96dff6a81c5f37b7d984872f9584794dc1d1a62472d2c7b57" +checksum = "d5fa8fb3ffe035745c6194540b2064b2fe275f32367fbb4eb026024b7921e2e5" dependencies = [ "compact_str", "garde_derive", @@ -1043,9 +1043,9 @@ dependencies = [ [[package]] name = "garde_derive" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a42efb40be9de1926cfd15881ff08adb7a70c6cedacced425537c8b1f96ac4f" +checksum = "9cf62650515830c41553b72bd49ec20fb120226f9277c7f2847f071cf998325b" dependencies = [ "proc-macro2", "quote", @@ -1081,7 +1081,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator", - "indexmap 2.2.2", + "indexmap 2.2.3", "stable_deref_trait", ] @@ -1127,7 +1127,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.2.2", + "indexmap 2.2.3", "slab", "tokio", "tokio-util", @@ -1321,9 +1321,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -1365,22 +1365,11 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" -[[package]] -name = "is-terminal" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.52.0", -] - [[package]] name = "is_ci" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" +checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" [[package]] name = "itertools" @@ -1450,12 +1439,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d129799327c8f80861e467c59b825ba24c277dba6ad0d71a141dc98f9e04ee" -[[package]] -name = "json_comments" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbbfed4e59ba9750e15ba154fdfd9329cee16ff3df539c2666b70f58cc32105" - [[package]] name = "lazy_static" version = "1.4.0" @@ -1574,21 +1557,20 @@ dependencies = [ [[package]] name = "miette" -version = "5.10.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" +checksum = "98a72adfa0c7ae88ba0abcbd00047a476616c66b831d628b8ac7f1e9de0cfd67" dependencies = [ "miette-derive", - "once_cell", "thiserror", "unicode-width", ] [[package]] name = "miette-derive" -version = "5.10.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" +checksum = "279def6bf114a34b3cf887489eb440d4dfcf709ab3ce9955e4a6f957ce5cce77" dependencies = [ "proc-macro2", "quote", @@ -1629,9 +1611,9 @@ dependencies = [ [[package]] name = "moon_common" -version = "0.0.2" +version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea04e66bf164c50032a04c499e127503f598ed34036f62c60c532c35b792c1f" +checksum = "47304424ee7d5101b92d5c61bc7dee396a366edd428dfb4602b34426d9bfef22" dependencies = [ "miette", "once_cell", @@ -1639,15 +1621,15 @@ dependencies = [ "relative-path", "schematic", "serde", - "starbase_styles 0.1.18", + "starbase_styles", "thiserror", ] [[package]] name = "moon_config" -version = "0.0.2" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b52381885017ccb8b8fc1f479f9f1c05006473c188dc3d1f158be934a01fd4c" +checksum = "703a2ddda8019c74a27ea3fc97b8dc6c2c7a6b65a95e19fa9bd4fe5d4f6b2320" dependencies = [ "miette", "moon_common", @@ -1685,7 +1667,7 @@ dependencies = [ "moon_pdk", "rustc-hash", "serde", - "starbase_utils 0.4.2", + "starbase_utils", ] [[package]] @@ -1702,7 +1684,7 @@ dependencies = [ "rustc-hash", "serde", "starbase_sandbox", - "starbase_utils 0.4.2", + "starbase_utils", ] [[package]] @@ -1719,14 +1701,14 @@ dependencies = [ "rustc-hash", "serde", "starbase_sandbox", - "starbase_utils 0.4.2", + "starbase_utils", ] [[package]] name = "moon_pdk" -version = "0.0.2" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4d970850ce91cd05054665d3c224a88c32c2df83d88ce1f3e554a981f6acce0" +checksum = "27b5569bf679993530de12a3f888e3dda07a40a580971c900a1fcfa05a710ff3" dependencies = [ "clap", "extism-pdk", @@ -1737,19 +1719,22 @@ dependencies = [ [[package]] name = "moon_pdk_api" -version = "0.0.2" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f69f60f33c4468928233a373453846b60a1451b95f6c19c78407f6e70a365d68" +checksum = "2c5a61d2079358fbccb6fd5ef07e7648f15e31d9a3216ca29ba5ae50a67fad20" dependencies = [ + "moon_common", + "moon_config", + "rustc-hash", "serde", "warpgate_api", ] [[package]] name = "moon_pdk_test_utils" -version = "0.0.2" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f18854bfac047d2862a9e2e08e27ba3b5f361ec22641b4a6ae96fd758753ae" +checksum = "3923661f1ffeca8e35b04f8b787d30657bb53472e4610cc7ad13d9f9fed19d26" dependencies = [ "extism", "moon_pdk_api", @@ -1760,9 +1745,9 @@ dependencies = [ [[package]] name = "moon_target" -version = "0.0.1" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b4b72af2d699ad732039b55322d0b7bd1a2072872186c733d9ed140dfe0ea02" +checksum = "661b856b51afdac5845af49c68b491c73bf585d35603649808512731e533f19f" dependencies = [ "miette", "moon_common", @@ -1781,7 +1766,7 @@ dependencies = [ "moon_extension_common", "moon_pdk", "moon_pdk_test_utils", - "starbase_archive 0.4.0", + "starbase_archive", "starbase_sandbox", ] @@ -1838,7 +1823,7 @@ checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "crc32fast", "hashbrown 0.14.3", - "indexmap 2.2.2", + "indexmap 2.2.3", "memchr", ] @@ -1880,9 +1865,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" -version = "3.5.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" [[package]] name = "parking_lot" @@ -1994,9 +1979,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -2177,9 +2162,9 @@ checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ "base64", "bytes", @@ -2204,6 +2189,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-rustls", @@ -2364,12 +2350,12 @@ dependencies = [ [[package]] name = "schematic" -version = "0.13.5" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b264774063bdc7a16fe1158426b5a29604478d1c64da0b73cba396505329116" +checksum = "7c5189a1d2e72a2b2be3f72638816efe7cc1005d7a39b59e2b80d3bc35f0f53a" dependencies = [ "garde", - "indexmap 2.2.2", + "indexmap 2.2.3", "miette", "schemars", "schematic_macros", @@ -2378,16 +2364,16 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_yaml", - "starbase_styles 0.1.18", + "starbase_styles", "thiserror", "tracing", ] [[package]] name = "schematic_macros" -version = "0.13.4" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5362f20a1e2346fb9a7878261b27c8e1adf7872bf4201b7c018dfd3cd88e26a7" +checksum = "31af7347544d97d00870a5865d2077dac07c069a5290c26215ddd1138b302590" dependencies = [ "convert_case", "darling", @@ -2398,9 +2384,9 @@ dependencies = [ [[package]] name = "schematic_types" -version = "0.5.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c90769caea1c16e71c756f7afe77a35620d61f77d3db4b834d246203f4ea44b" +checksum = "8f3adfbe1c90a6a9643433e490ef1605c6a99f93be37e4c83fe5149fca9698c6" dependencies = [ "semver", "serde_json", @@ -2522,7 +2508,7 @@ version = "0.9.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" dependencies = [ - "indexmap 2.2.2", + "indexmap 2.2.3", "itoa", "ryu", "serde", @@ -2621,15 +2607,15 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "starbase_archive" -version = "0.2.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a0d1c404d4e987597b018bee76fb8e79937f3b2ab0cf5963ce043031092694" +checksum = "a99a24e91bf823d46d04d520fb87c02ab0c3cac75bfdcf3c7671505681fd9f29" dependencies = [ "flate2", "miette", "rustc-hash", - "starbase_styles 0.1.18", - "starbase_utils 0.3.11", + "starbase_styles", + "starbase_utils", "tar", "thiserror", "tracing", @@ -2638,27 +2624,11 @@ dependencies = [ "zstd 0.13.0", ] -[[package]] -name = "starbase_archive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39376078a44e9da7d20bc9eab61f0afff7d94299f56d3b79e10ace55b5b3913d" -dependencies = [ - "flate2", - "rustc-hash", - "starbase_styles 0.2.0", - "starbase_utils 0.4.2", - "tar", - "thiserror", - "tracing", - "zip", -] - [[package]] name = "starbase_sandbox" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "748e774a71b67ddc32cf643c362532cc89b3d8bdb1664810054621b1222254b0" +checksum = "46c13185a91009f058c1649eb9692957e3e78398d98a89ed5fc9c3e24844e9c7" dependencies = [ "assert_cmd", "assert_fs", @@ -2667,14 +2637,14 @@ dependencies = [ "once_cell", "predicates", "pretty_assertions", - "starbase_utils 0.4.2", + "starbase_utils", ] [[package]] name = "starbase_styles" -version = "0.1.18" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aadf4bb3f99ac3782017aa75123781dd64de38b543469c6b9e96ca9f29fc4868" +checksum = "0e06fa37c027e48ef341787d8c3d26cfbe8507aa4e2e8c61fcba82fe931bb598" dependencies = [ "dirs 5.0.1", "owo-colors", @@ -2682,54 +2652,24 @@ dependencies = [ "supports-color", ] -[[package]] -name = "starbase_styles" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e27efc120aa8c888aff0f996a7adb8cf0d686e4839af033c324e2f3d4955f70" -dependencies = [ - "dirs 5.0.1", - "owo-colors", - "supports-color", -] - -[[package]] -name = "starbase_utils" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9af464d976956393070880234f8d9f3509f04555266174abfd9b11386cdce4bc" -dependencies = [ - "dirs 5.0.1", - "json_comments", - "miette", - "once_cell", - "regex", - "relative-path", - "serde", - "serde_json", - "starbase_styles 0.1.18", - "thiserror", - "toml 0.8.8", - "tracing", - "wax", -] - [[package]] name = "starbase_utils" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f8f5278795a3a700dff9c6af197fb1c81d69f7b9e0d12dda5d2f4bea03766a3" +checksum = "f23570a8fa500ad7ccb3bbfed7d9dc759b657ed536fb9b10eec729ad9de1b60e" dependencies = [ "dirs 5.0.1", "json-strip-comments", + "miette", "once_cell", "regex", "relative-path", "serde", "serde_json", "serde_yaml", - "starbase_styles 0.2.0", + "starbase_styles", "thiserror", + "toml 0.8.10", "tracing", "wax", ] @@ -2748,11 +2688,10 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "supports-color" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" +checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f" dependencies = [ - "is-terminal", "is_ci", ] @@ -2778,6 +2717,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "system-configuration" version = "0.5.1" @@ -2817,9 +2762,9 @@ dependencies = [ [[package]] name = "system_env" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dbaf08f70781cb6543bb0cce3d6b63a50cce05f4b071db833d78426f072ef7b" +checksum = "cedd96678522ba576fed0a1b1c558166dc6e690b5c325937e4ee63d5c7f6ecfa" dependencies = [ "serde", "serde_json", @@ -2838,16 +2783,6 @@ dependencies = [ "xattr", ] -[[package]] -name = "tardar" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900c942f83b6a8b9998cc8f74ad3ffa24b7ff3c4279ea1c1c52d95dced9f3516" -dependencies = [ - "miette", - "vec1", -] - [[package]] name = "target-lexicon" version = "0.12.13" @@ -2875,18 +2810,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", @@ -2969,9 +2904,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", @@ -2990,11 +2925,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "99e68c159e8f5ba8a28c4eb7b0c0c190d77bb479047ca713270048145a9ad28a" dependencies = [ - "indexmap 2.2.2", + "indexmap 2.2.3", "serde", "serde_spanned", "toml_datetime", @@ -3174,12 +3109,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "vec1" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c" - [[package]] name = "version_check" version = "0.9.4" @@ -3188,9 +3117,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "version_spec" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28f9327e7b3c0554ec9291491b8e16bf693d35ea18ba4173efbcf2e76078c91f" +checksum = "a81a98a1dd2c4d6f994f4e217029fcc64f3811769ed8e8b9edaabb0cd0c31f3d" dependencies = [ "human-sort", "regex", @@ -3229,9 +3158,9 @@ dependencies = [ [[package]] name = "warpgate" -version = "0.10.5" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b7164a23f2561bbfecb7a304ca83d0381742fd8aa02da2bebfbb623cce5f1d" +checksum = "554faf76dd19fa28d1c9d2f9f560d513cfe3790584f44ba886757a16c945db27" dependencies = [ "extism", "miette", @@ -3243,9 +3172,9 @@ dependencies = [ "serde", "serde_json", "sha2", - "starbase_archive 0.2.5", - "starbase_styles 0.1.18", - "starbase_utils 0.3.11", + "starbase_archive", + "starbase_styles", + "starbase_utils", "system_env", "thiserror", "tracing", @@ -3254,9 +3183,9 @@ dependencies = [ [[package]] name = "warpgate_api" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8447cf00028d12898929b70a9ed8e3e6f5975f0cfde155dd1f5ef2b96aef80d5" +checksum = "87a6990804d00cad9072bfc9d030a2e629997e12b76caa2600f9de392e7277f9" dependencies = [ "anyhow", "rustc-hash", @@ -3269,9 +3198,9 @@ dependencies = [ [[package]] name = "warpgate_pdk" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e54d60b8fe7d4d20f74cea816ee5d761c3bedd796bc00a87c19828b85802b5e" +checksum = "14dc35a3ada370c65a41dffd5b685dd758253d537762e1d2e047264bec8cba5e" dependencies = [ "extism-pdk", "serde", @@ -3417,7 +3346,7 @@ version = "0.118.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9" dependencies = [ - "indexmap 2.2.2", + "indexmap 2.2.3", "semver", ] @@ -3428,7 +3357,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c35daf77afb4f9b14016625144a391085ec2ca99ca9cc53ed291bb53ab5278d" dependencies = [ "bitflags 2.4.2", - "indexmap 2.2.2", + "indexmap 2.2.3", "semver", ] @@ -3455,7 +3384,7 @@ dependencies = [ "cfg-if", "encoding_rs", "fxprof-processed-profile", - "indexmap 2.2.2", + "indexmap 2.2.3", "libc", "log", "object", @@ -3581,7 +3510,7 @@ dependencies = [ "anyhow", "cranelift-entity", "gimli", - "indexmap 2.2.2", + "indexmap 2.2.3", "log", "object", "serde", @@ -3670,7 +3599,7 @@ dependencies = [ "cc", "cfg-if", "encoding_rs", - "indexmap 2.2.2", + "indexmap 2.2.3", "libc", "log", "mach", @@ -3774,7 +3703,7 @@ checksum = "f328b2d4a690270324756e886ed5be3a4da4c00be0eea48253f4595ad068062b" dependencies = [ "anyhow", "heck", - "indexmap 2.2.2", + "indexmap 2.2.3", "wit-parser", ] @@ -3822,11 +3751,9 @@ checksum = "8d12a78aa0bab22d2f26ed1a96df7ab58e8a93506a3e20adb47c51a93b4e1357" dependencies = [ "const_format", "itertools 0.11.0", - "miette", "nom", "pori", "regex", - "tardar", "thiserror", "walkdir", ] @@ -4079,9 +4006,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.34" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401" dependencies = [ "memchr", ] @@ -4114,7 +4041,7 @@ checksum = "df4913a2219096373fd6512adead1fb77ecdaa59d7fc517972a7d30b12f625be" dependencies = [ "anyhow", "id-arena", - "indexmap 2.2.2", + "indexmap 2.2.3", "log", "semver", "serde", diff --git a/Cargo.toml b/Cargo.toml index 657c2bc..383f438 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,17 +4,17 @@ members = ["crates/*"] [workspace.dependencies] extism-pdk = "1.0.1" -moon_common = "0.0.2" -moon_config = "0.0.2" -moon_pdk = "0.0.2" -moon_pdk_test_utils = "0.0.2" -moon_target = "0.0.1" +moon_common = "0.0.3" +moon_config = "0.0.4" +moon_pdk = "0.0.4" +moon_pdk_test_utils = "0.0.4" +moon_target = "0.0.2" rustc-hash = "1.1.0" serde = { version = "1.0.196", features = ["derive"] } serde_json = "1.0.113" serde_yaml = "0.9.31" -starbase_utils = { version = "0.4.2", default-features = false } -starbase_sandbox = "0.3.0" +starbase_utils = { version = "0.5.0", default-features = false } +starbase_sandbox = "0.4.0" # moon_common = { path = "../moon/nextgen/common" } # moon_config = { path = "../moon/nextgen/config" } diff --git a/crates/common/src/download.rs b/crates/common/src/download.rs index a041f96..4aa7c4a 100644 --- a/crates/common/src/download.rs +++ b/crates/common/src/download.rs @@ -1,3 +1,4 @@ +use crate::format_virtual_path; use extism_pdk::debug; use moon_pdk::{fetch_url_bytes, AnyResult, VirtualPath}; use std::fs; @@ -24,7 +25,7 @@ pub fn download_from_url, P: AsRef>( fs::create_dir_all(dir)?; fs::write(&file, bytes)?; - debug!("Downloaded to {}", file.real_path().display()); + debug!("Downloaded to {}", format_virtual_path(&file)); Ok(file) } diff --git a/crates/common/src/lib.rs b/crates/common/src/lib.rs index 51b23de..3aeeb89 100644 --- a/crates/common/src/lib.rs +++ b/crates/common/src/lib.rs @@ -1,3 +1,16 @@ pub mod download; pub mod migrator; pub mod project_graph; + +use moon_pdk::VirtualPath; +use std::borrow::Cow; + +pub fn format_virtual_path(path: &VirtualPath) -> Cow<'_, str> { + if let Some(real) = path.real_path() { + Cow::Owned(real.to_string_lossy().into_owned()) + } else if let Some(rel) = path.without_prefix() { + rel.to_string_lossy() + } else { + path.virtual_path().to_string_lossy() + } +} diff --git a/crates/download/src/download_ext.rs b/crates/download/src/download_ext.rs index 28823bd..c8a9130 100644 --- a/crates/download/src/download_ext.rs +++ b/crates/download/src/download_ext.rs @@ -1,5 +1,6 @@ use extism_pdk::*; use moon_extension_common::download::download_from_url; +use moon_extension_common::format_virtual_path; use moon_pdk::*; #[host_fn] @@ -41,13 +42,13 @@ pub fn execute_extension(Json(input): Json) -> FnResult<( if dest_dir.exists() && dest_dir.is_file() { return Err(plugin_err!( "Destination {} must be a directory, found a file.", - dest_dir.real_path().display(), + format_virtual_path(&dest_dir), )); } debug!( "Destination {} will be used", - dest_dir.real_path().display(), + format_virtual_path(&dest_dir), ); // Attempt to download the file @@ -58,7 +59,7 @@ pub fn execute_extension(Json(input): Json) -> FnResult<( host_log!( stdout, "Downloaded to {}", - dest_file.real_path().display() + format_virtual_path(&dest_file), ); Ok(()) diff --git a/crates/migrate-nx/tests/snapshots/migrate_nx_test__migrate_nx__projects__converts_project_json-3.snap b/crates/migrate-nx/tests/snapshots/migrate_nx_test__migrate_nx__projects__converts_project_json-3.snap index c3edffb..9195140 100644 --- a/crates/migrate-nx/tests/snapshots/migrate_nx_test__migrate_nx__projects__converts_project_json-3.snap +++ b/crates/migrate-nx/tests/snapshots/migrate_nx_test__migrate_nx__projects__converts_project_json-3.snap @@ -23,5 +23,5 @@ tasks: extends: e2e args: - --baseUrl - - $workspaceRoot/https://some-internal-url.example.com + - https://some-internal-url.example.com diff --git a/crates/unpack/Cargo.toml b/crates/unpack/Cargo.toml index c19dcd1..ba843a3 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.4.0", default-features = false, features = [ +starbase_archive = { version = "0.5.0", default-features = false, features = [ "tar-gz", "zip", ] } diff --git a/crates/unpack/src/unpack_ext.rs b/crates/unpack/src/unpack_ext.rs index d34e3f0..eb017da 100644 --- a/crates/unpack/src/unpack_ext.rs +++ b/crates/unpack/src/unpack_ext.rs @@ -1,5 +1,6 @@ use extism_pdk::*; use moon_extension_common::download::download_from_url; +use moon_extension_common::format_virtual_path; use moon_pdk::*; use starbase_archive::Archiver; use std::fs; @@ -53,14 +54,14 @@ pub fn execute_extension(Json(input): Json) -> FnResult<( if !src_file.exists() || !src_file.is_file() { return Err(plugin_err!( "Source {} must be a valid file.", - src_file.real_path().display(), + format_virtual_path(&src_file), )); } host_log!( stdout, "Opening archive {}", - src_file.real_path().display() + format_virtual_path(&src_file), ); // Convert the provided output into a virtual file path. @@ -74,7 +75,7 @@ pub fn execute_extension(Json(input): Json) -> FnResult<( if dest_dir.exists() && dest_dir.is_file() { return Err(plugin_err!( "Destination {} must be a directory, found a file.", - dest_dir.real_path().display(), + format_virtual_path(&dest_dir), )); } @@ -83,7 +84,7 @@ pub fn execute_extension(Json(input): Json) -> FnResult<( host_log!( stdout, "Unpacking archive to {}", - dest_dir.real_path().display() + format_virtual_path(&dest_dir), ); // Attempt to unpack the archive!