diff --git a/Cargo.lock b/Cargo.lock index c40251f7..e9a7e388 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -109,7 +109,9 @@ version = "0.0.26" dependencies = [ "aiken-lang", "askama", + "dirs", "fslock", + "futures", "hex", "ignore", "itertools", @@ -119,9 +121,11 @@ dependencies = [ "petgraph", "pulldown-cmark", "regex", + "reqwest", "serde", "serde_json", "thiserror", + "tokio", "toml", "uplc", "walkdir", @@ -223,6 +227,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + [[package]] name = "bech32" version = "0.9.1" @@ -271,12 +281,24 @@ dependencies = [ "memchr", ] +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" + [[package]] name = "byteorder" version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" + [[package]] name = "cc" version = "1.0.73" @@ -359,6 +381,22 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + [[package]] name = "crossbeam-channel" version = "0.5.6" @@ -406,12 +444,41 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + [[package]] name = "either" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if", +] + [[package]] name = "fastrand" version = "1.8.0" @@ -442,6 +509,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.1.0" @@ -467,6 +549,95 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +[[package]] +name = "futures" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-executor" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" + +[[package]] +name = "futures-macro" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-util" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + [[package]] name = "getrandom" version = "0.2.7" @@ -497,6 +668,25 @@ dependencies = [ "regex", ] +[[package]] +name = "h2" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "1.8.2" @@ -533,12 +723,83 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + [[package]] name = "humansize" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" +[[package]] +name = "hyper" +version = "0.14.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + [[package]] name = "idna" version = "0.3.0" @@ -592,6 +853,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "ipnet" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" + [[package]] name = "is_ci" version = "1.1.1" @@ -613,6 +880,15 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -638,6 +914,16 @@ version = "0.2.133" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.17" @@ -709,6 +995,12 @@ dependencies = [ "syn", ] +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + [[package]] name = "minicbor" version = "0.18.0" @@ -739,6 +1031,36 @@ dependencies = [ "adler", ] +[[package]] +name = "mio" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.42.0", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "nom" version = "6.1.2" @@ -761,6 +1083,16 @@ dependencies = [ "autocfg", ] +[[package]] +name = "num_cpus" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +dependencies = [ + "hermit-abi", + "libc", +] + [[package]] name = "object" version = "0.29.0" @@ -776,6 +1108,51 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +[[package]] +name = "openssl" +version = "0.10.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "os_str_bytes" version = "6.3.0" @@ -909,6 +1286,29 @@ dependencies = [ "thiserror", ] +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.42.0", +] + [[package]] name = "peg" version = "0.8.0" @@ -958,6 +1358,18 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + [[package]] name = "ppv-lite86" version = "0.2.16" @@ -1133,6 +1545,17 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + [[package]] name = "regex" version = "1.6.0" @@ -1159,6 +1582,43 @@ dependencies = [ "winapi", ] +[[package]] +name = "reqwest" +version = "0.11.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + [[package]] name = "rustc-demangle" version = "0.1.21" @@ -1198,6 +1658,45 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schannel" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static", + "windows-sys 0.36.1", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "security-framework" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "serde" version = "1.0.147" @@ -1241,12 +1740,58 @@ dependencies = [ "syn", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + [[package]] name = "smawk" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -1426,6 +1971,61 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +[[package]] +name = "tokio" +version = "1.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.42.0", +] + +[[package]] +name = "tokio-macros" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + [[package]] name = "toml" version = "0.5.9" @@ -1435,6 +2035,12 @@ dependencies = [ "serde", ] +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + [[package]] name = "tracing" version = "0.1.37" @@ -1467,6 +2073,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + [[package]] name = "typed-arena" version = "2.0.1" @@ -1561,6 +2173,12 @@ dependencies = [ "serde", ] +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "vec1" version = "1.8.0" @@ -1593,12 +2211,98 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "winapi" version = "0.3.9" @@ -1630,6 +2334,115 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + [[package]] name = "wyz" version = "0.2.0" diff --git a/crates/cli/src/lib.rs b/crates/cli/src/lib.rs index 10237abf..7fdd6301 100644 --- a/crates/cli/src/lib.rs +++ b/crates/cli/src/lib.rs @@ -153,6 +153,27 @@ impl telemetry::EventListener for Terminal { ); } } + telemetry::Event::DownloadingPackage { name: String } => { + println!( + "{} {}", + "...Downloading {}".bold().purple(), + name.bright_blue() + ) + } + telemetry::Event::PackagesDownloaded { start, count } => { + let elapsed = format!("{:.2}s", start.elapsed().as_millis() as f32 / 1000.); + + let msg = match count { + 1 => format!("1 package in {}", elapsed), + _ => format!("{} packages in {}", count, elapsed), + }; + + println!( + "{} {}", + "...Downloaded {}".bold().purple(), + msg.bright_blue() + ) + } } } } diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml index f2aa005c..35c6812a 100644 --- a/crates/project/Cargo.toml +++ b/crates/project/Cargo.toml @@ -11,7 +11,9 @@ authors = ["Lucas Rosa ", "Kasey White "] [dependencies] aiken-lang = { path = "../lang", version = "0.0.26" } askama = "0.10.5" +dirs = "4.0.0" fslock = "0.2.1" +futures = "0.3.25" hex = "0.4.3" ignore = "0.4.18" itertools = "0.10.1" @@ -21,9 +23,11 @@ pallas-traverse = "0.14.0" petgraph = "0.6.2" pulldown-cmark = { version = "0.8.0", default-features = false } regex = "1.6.0" +reqwest = "0.11.13" serde = { version = "1.0.144", features = ["derive"] } serde_json = { version = "1.0.85", features = ["preserve_order"] } thiserror = "1.0.37" +tokio = { version = "1.23.0", features = ["full"] } toml = "0.5.9" uplc = { path = '../uplc', version = "0.0.25" } walkdir = "2.3.2" diff --git a/crates/project/src/config.rs b/crates/project/src/config.rs index 1aaba868..f86296a4 100644 --- a/crates/project/src/config.rs +++ b/crates/project/src/config.rs @@ -1,14 +1,15 @@ use std::{fmt::Display, fs, io, path::PathBuf}; -use serde::Deserialize; +use serde::{de::Visitor, Deserialize, Serialize}; #[derive(Deserialize)] pub struct Config { - pub name: String, + pub name: PackageName, pub version: String, #[serde(default)] pub description: String, pub repository: Option, + pub dependencies: Vec, } #[derive(Deserialize)] @@ -18,13 +19,82 @@ pub struct Repository { pub platform: Platform, } -#[derive(Deserialize)] +#[derive(Deserialize, Serialize)] +#[serde(rename_all = "lowercase")] pub enum Platform { Github, Gitlab, Bitbucket, } +#[derive(Deserialize, Serialize)] +pub struct Dependency { + pub name: PackageName, + pub version: String, + pub source: Platform, +} + +#[derive(PartialEq, Eq, Hash, Clone)] +pub struct PackageName { + pub owner: String, + pub repo: String, +} + +impl Display for PackageName { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "{}/{}", self.owner, self.repo) + } +} + +impl Serialize for PackageName { + fn serialize(&self, serializer: S) -> Result + where + S: serde::Serializer, + { + serializer.serialize_str(&self.to_string()) + } +} + +impl<'de> Deserialize<'de> for PackageName { + fn deserialize(deserializer: D) -> Result + where + D: serde::Deserializer<'de>, + { + struct PackageNameVisitor; + + impl<'de> Visitor<'de> for PackageNameVisitor { + type Value = PackageName; + + fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { + formatter + .write_str("a string representing an owner and repo, ex: aiken-lang/stdlib") + } + + fn visit_str(self, v: &str) -> Result + where + E: serde::de::Error, + { + let mut name = v.split('/'); + + let owner = name.next().ok_or_else(|| { + serde::de::Error::invalid_value(serde::de::Unexpected::Str(v), &self) + })?; + + let repo = name.next().ok_or_else(|| { + serde::de::Error::invalid_value(serde::de::Unexpected::Str(v), &self) + })?; + + Ok(PackageName { + owner: owner.to_string(), + repo: repo.to_string(), + }) + } + } + + deserializer.deserialize_str(PackageNameVisitor) + } +} + impl Display for Platform { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::result::Result<(), ::std::fmt::Error> { match *self { diff --git a/crates/project/src/deps.rs b/crates/project/src/deps.rs index 3c91ce18..97deeaeb 100644 --- a/crates/project/src/deps.rs +++ b/crates/project/src/deps.rs @@ -1,13 +1,23 @@ -use std::path::Path; +use std::{collections::HashSet, fs, path::Path}; + +use aiken_lang::ast::Span; +use miette::NamedSource; +use serde::{Deserialize, Serialize}; +use tokio::time::Instant; use crate::{ + config::{Config, Dependency, PackageName}, error::Error, paths, telemetry::{Event, EventListener}, }; -use self::manifest::Manifest; +use self::{ + downloader::Downloader, + manifest::{Manifest, Package}, +}; +pub mod downloader; pub mod manifest; pub enum UseManifest { @@ -15,11 +25,113 @@ pub enum UseManifest { No, } +#[derive(Deserialize, Serialize)] +pub struct LocalPackages { + packages: Vec, +} + +impl LocalPackages { + pub fn load(root_path: &Path) -> Result { + let path = root_path.join(paths::packages_toml()); + + if !path.exists() { + return Ok(Self { + packages: Vec::new(), + }); + } + + let src = fs::read_to_string(&path)?; + + let result: Self = toml::from_str(&src).map_err(|e| Error::TomlLoading { + path: path.clone(), + src: src.clone(), + named: NamedSource::new(path.display().to_string(), src), + // this isn't actually a legit way to get the span + location: e.line_col().map(|(line, col)| Span { + start: line, + end: col, + }), + })?; + + Ok(result) + } + + pub fn save(&self, root_path: &Path) -> Result<(), Error> { + let path = root_path.join(paths::packages_toml()); + + let toml = toml::to_string(&self).expect("packages.toml serialization"); + + fs::write(&path, &toml)?; + + Ok(()) + } + + fn remove_extra_packages(&self, manifest: &Manifest, root_path: &Path) -> Result<(), Error> { + for (package, _version) in self.extra_local_packages(manifest) { + let path = root_path.join(paths::build_deps_package(&package)); + + if path.exists() { + fs::remove_dir_all(&path)?; + } + } + + Ok(()) + } + pub fn extra_local_packages(&self, manifest: &Manifest) -> Vec<(PackageName, String)> { + let manifest_packages: HashSet<_> = manifest + .packages + .iter() + .map(|p| (&p.name, &p.version)) + .collect(); + + self.packages + .iter() + .filter(|dep| !manifest_packages.contains(&(&dep.name, &dep.version))) + .map(|dep| (dep.name.clone(), dep.version.clone())) + .collect() + } + + pub fn missing_local_packages<'a>( + &self, + manifest: &'a Manifest, + root: &PackageName, + ) -> Vec<&'a Package> { + manifest + .packages + .iter() + .filter(|p| { + &p.name != root + && !matches!( + self.packages.iter().find(|p2| p2.name == p.name), + Some(Dependency { version, .. }) if &p.version == version, + ) + }) + .collect() + } +} + +impl From<&Manifest> for LocalPackages { + fn from(value: &Manifest) -> Self { + Self { + packages: value + .packages + .iter() + .map(|p| Dependency { + name: p.name.clone(), + version: p.version.clone(), + source: p.source.into(), + }) + .collect(), + } + } +} + pub fn download( event_listener: &T, - new_package: Option<(Vec, bool)>, + new_package: Option>, use_manifest: UseManifest, root_path: &Path, + config: &Config, ) -> Result where T: EventListener, @@ -37,5 +149,77 @@ where build_lock.lock_with_pid().expect("Build locking") } - todo!() + let project_name = config.name.clone(); + + if let Some(packages) = new_package { + for _package in packages { + // config.dependencies.push(Dependency { + // name: (), + // version: (), + // source: package.sour, + // }) + } + } + + let runtime = tokio::runtime::Runtime::new().expect("Unable to start Tokio"); + + let (manifest, changed) = Manifest::load(event_listener)?; + + let local = LocalPackages::load(root_path)?; + + local.remove_extra_packages(&manifest, root_path)?; + + runtime.block_on(fetch_missing_packages( + &manifest, + &local, + project_name, + root_path, + event_listener, + ))?; + + if changed { + manifest.save()?; + } + + LocalPackages::from(&manifest).save(root_path)?; + + Ok(manifest) +} + +async fn fetch_missing_packages( + manifest: &Manifest, + local: &LocalPackages, + project_name: PackageName, + root_path: &Path, + event_listener: &T, +) -> Result<(), Error> +where + T: EventListener, +{ + let mut count = 0; + + let mut missing = local + .missing_local_packages(manifest, &project_name) + .into_iter() + .map(|package| { + count += 1; + package + }) + .peekable(); + + if missing.peek().is_some() { + let start = Instant::now(); + + event_listener.handle_event(Event::DownloadingPackage { + name: "packages".to_string(), + }); + + let downloader = Downloader::new(root_path); + + downloader.download_packages(missing, &project_name).await?; + + event_listener.handle_event(Event::PackagesDownloaded { start, count }); + } + + Ok(()) } diff --git a/crates/project/src/deps/downloader.rs b/crates/project/src/deps/downloader.rs new file mode 100644 index 00000000..937a5b67 --- /dev/null +++ b/crates/project/src/deps/downloader.rs @@ -0,0 +1,78 @@ +use std::path::Path; + +use futures::future; +use reqwest::Client; + +use crate::{config::PackageName, error::Error, paths}; + +use super::manifest::{Package, PackageSource}; + +pub struct Downloader<'a> { + http: Client, + root_path: &'a Path, +} + +impl<'a> Downloader<'a> { + pub fn new(root_path: &'a Path) -> Self { + Self { + http: Client::new(), + root_path, + } + } + + pub async fn download_packages( + &self, + packages: T, + project_name: &PackageName, + ) -> Result<(), Error> + where + T: Iterator, + { + let tasks = packages + .filter(|package| project_name != &package.name) + .map(|package| self.ensure_package_in_build_directory(package)); + + let results = future::try_join_all(tasks).await?; + + Ok(()) + } + + pub async fn ensure_package_in_build_directory( + &self, + package: &Package, + ) -> Result { + self.ensure_package_downloaded(package).await?; + self.extract_package_from_cache(&package.name, &package.version) + } + + pub async fn ensure_package_downloaded(&self, package: &Package) -> Result { + let zipball_path = + paths::package_cache_zipball(&package.name, &package.version.to_string()); + + if zipball_path.is_file() { + return Ok(false); + } + + let url = format!( + "https://api.github.com/repos/{}/{}/zipball/{}", + package.name.owner, package.name.repo, package.version + ); + + let response = self.http.get(url).send().await?; + + let PackageSource::Github { url } = &package.source; + + let zipball = + hexpm::get_package_tarball_response(response, &outer_checksum.0).map_err(|error| { + Error::DownloadPackageError { + package_name: package.name.to_string(), + package_version: package.version.to_string(), + error: error.to_string(), + } + })?; + + tokio::fs::write(&zipball_path, zipball).await?; + + Ok(true) + } +} diff --git a/crates/project/src/deps/manifest.rs b/crates/project/src/deps/manifest.rs index 476ce65c..730ff699 100644 --- a/crates/project/src/deps/manifest.rs +++ b/crates/project/src/deps/manifest.rs @@ -1,17 +1,44 @@ use std::collections::HashMap; +use crate::{ + config::{PackageName, Platform}, + error::Error, + telemetry::EventListener, +}; + pub struct Manifest { pub requirements: HashMap, pub packages: Vec, } +impl Manifest { + pub fn load(event_listener: &T) -> Result<(Self, bool), Error> + where + T: EventListener, + { + todo!() + } + + pub fn save(&self) -> Result<(), Error> { + todo!() + } +} + pub struct Package { - pub name: String, + pub name: PackageName, pub version: String, pub requirements: Vec, pub source: PackageSource, } pub enum PackageSource { - GitHub { url: String }, + Github { url: String }, +} + +impl From for Platform { + fn from(value: PackageSource) -> Self { + match value { + PackageSource::Github { .. } => Self::Github, + } + } } diff --git a/crates/project/src/docs.rs b/crates/project/src/docs.rs index 4517ed03..23cab5c6 100644 --- a/crates/project/src/docs.rs +++ b/crates/project/src/docs.rs @@ -192,7 +192,7 @@ fn generate_module( documentation: render_markdown(&module.ast.docs.iter().join("\n")), modules_prefix: modules_prefix.to_string(), modules, - project_name: &config.name, + project_name: &config.name.to_string(), page_title: &format!("{} - {}", module.name, config.name), module_name: module.name.clone(), project_version: &config.version.to_string(), @@ -285,8 +285,8 @@ fn generate_readme( breadcrumbs: ".", modules_prefix: modules_prefix.to_string(), modules, - project_name: &config.name, - page_title: &config.name, + project_name: &config.name.to_string(), + page_title: &config.name.to_string(), project_version: &config.version.to_string(), content: render_markdown(&content), source, diff --git a/crates/project/src/error.rs b/crates/project/src/error.rs index 49924876..e01472aa 100644 --- a/crates/project/src/error.rs +++ b/crates/project/src/error.rs @@ -33,6 +33,17 @@ pub enum Error { #[error(transparent)] StandardIo(#[from] io::Error), + #[error(transparent)] + Http(#[from] reqwest::Error), + + #[error("Loading toml")] + TomlLoading { + path: PathBuf, + src: String, + named: NamedSource, + location: Option, + }, + #[error("Cyclical module imports")] ImportCycle { modules: Vec }, @@ -156,6 +167,7 @@ impl Error { Error::FileIo { .. } => None, Error::Format { .. } => None, Error::StandardIo(_) => None, + Error::TomlLoading { path, .. } => Some(path.to_path_buf()), Error::ImportCycle { .. } => None, Error::List(_) => None, Error::Parse { path, .. } => Some(path.to_path_buf()), @@ -163,6 +175,7 @@ impl Error { Error::ValidatorMustReturnBool { path, .. } => Some(path.to_path_buf()), Error::WrongValidatorArity { path, .. } => Some(path.to_path_buf()), Error::TestFailure { path, .. } => Some(path.to_path_buf()), + Error::Http(_) => None, } } @@ -172,6 +185,7 @@ impl Error { Error::FileIo { .. } => None, Error::Format { .. } => None, Error::StandardIo(_) => None, + Error::TomlLoading { src, .. } => Some(src.to_string()), Error::ImportCycle { .. } => None, Error::List(_) => None, Error::Parse { src, .. } => Some(src.to_string()), @@ -179,6 +193,7 @@ impl Error { Error::ValidatorMustReturnBool { src, .. } => Some(src.to_string()), Error::WrongValidatorArity { src, .. } => Some(src.to_string()), Error::TestFailure { .. } => None, + Error::Http(_) => None, } } } @@ -216,10 +231,12 @@ impl Diagnostic for Error { Error::Parse { .. } => Some(Box::new("aiken::parser")), Error::Type { .. } => Some(Box::new("aiken::check")), Error::StandardIo(_) => None, + Error::TomlLoading { .. } => Some(Box::new("aiken::loading::toml")), Error::Format { .. } => None, Error::ValidatorMustReturnBool { .. } => Some(Box::new("aiken::scripts")), Error::WrongValidatorArity { .. } => Some(Box::new("aiken::validators")), Error::TestFailure { path, .. } => Some(Box::new(path.to_str().unwrap_or(""))), + Error::Http(_) => Some(Box::new("aiken::deps")), } } @@ -239,6 +256,7 @@ impl Diagnostic for Error { Error::Parse { error, .. } => error.kind.help(), Error::Type { error, .. } => error.help(), Error::StandardIo(_) => None, + Error::TomlLoading { .. } => None, Error::Format { .. } => None, Error::ValidatorMustReturnBool { .. } => Some(Box::new("Try annotating the validator's return type with Bool")), Error::WrongValidatorArity { .. } => Some(Box::new("Validators require a minimum number of arguments please add the missing arguments.\nIf you don't need one of the required arguments use an underscore `_datum`.")), @@ -270,6 +288,7 @@ impl Diagnostic for Error { } } }, + Error::Http(_) => None, } } @@ -282,6 +301,15 @@ impl Diagnostic for Error { Error::Parse { error, .. } => error.labels(), Error::Type { error, .. } => error.labels(), Error::StandardIo(_) => None, + Error::TomlLoading { location, .. } => { + if let Some(location) = location { + Some(Box::new( + vec![LabeledSpan::new_with_span(None, *location)].into_iter(), + )) + } else { + None + } + } Error::Format { .. } => None, Error::ValidatorMustReturnBool { location, .. } => Some(Box::new( vec![LabeledSpan::new_with_span(None, *location)].into_iter(), @@ -290,6 +318,7 @@ impl Diagnostic for Error { vec![LabeledSpan::new_with_span(None, *location)].into_iter(), )), Error::TestFailure { .. } => None, + Error::Http(_) => None, } } @@ -302,10 +331,12 @@ impl Diagnostic for Error { Error::Parse { named, .. } => Some(named), Error::Type { named, .. } => Some(named), Error::StandardIo(_) => None, + Error::TomlLoading { named, .. } => Some(named), Error::Format { .. } => None, Error::ValidatorMustReturnBool { named, .. } => Some(named), Error::WrongValidatorArity { named, .. } => Some(named), Error::TestFailure { .. } => None, + Error::Http(_) => None, } } } diff --git a/crates/project/src/lib.rs b/crates/project/src/lib.rs index 3d286b2c..676aeb1e 100644 --- a/crates/project/src/lib.rs +++ b/crates/project/src/lib.rs @@ -105,7 +105,7 @@ where self.event_listener .handle_event(Event::BuildingDocumentation { root: self.root.clone(), - name: self.config.name.clone(), + name: self.config.name.to_string(), version: self.config.version.clone(), }); self.read_source_files()?; @@ -151,12 +151,18 @@ where } pub fn compile(&mut self, options: Options) -> Result<(), Error> { - let manifest = deps::download(&self.event_listener, None, UseManifest::Yes, &self.root)?; + let manifest = deps::download( + &self.event_listener, + None, + UseManifest::Yes, + &self.root, + &self.config, + )?; self.event_listener .handle_event(Event::StartingCompilation { root: self.root.clone(), - name: self.config.name.clone(), + name: self.config.name.to_string(), version: self.config.version.clone(), }); @@ -249,7 +255,7 @@ where name, path, extra, - package: self.config.name.clone(), + package: self.config.name.to_string(), }; if let Some(first) = self @@ -308,7 +314,7 @@ where .infer( &self.id_gen, kind, - &self.config.name, + &self.config.name.to_string(), &self.module_types, &mut type_warnings, ) diff --git a/crates/project/src/paths.rs b/crates/project/src/paths.rs index 1610eab0..f4414795 100644 --- a/crates/project/src/paths.rs +++ b/crates/project/src/paths.rs @@ -1,5 +1,36 @@ use std::path::PathBuf; +use crate::config::PackageName; + pub fn build() -> PathBuf { PathBuf::from("build") } + +pub fn packages() -> PathBuf { + build().join("packages") +} + +pub fn packages_toml() -> PathBuf { + packages().join("packages.toml") +} + +pub fn build_deps_package(package_name: &PackageName) -> PathBuf { + packages().join(format!("{}-{}", package_name.owner, package_name.repo)) +} + +pub fn package_cache_zipball(package_name: &PackageName, version: &str) -> PathBuf { + packages_cache().join(format!( + "{}-{}-{}.zip", + package_name.owner, package_name.repo, version + )) +} + +fn packages_cache() -> PathBuf { + default_aiken_cache().join("packages") +} + +pub fn default_aiken_cache() -> PathBuf { + dirs::cache_dir() + .expect("Failed to determine user cache directory") + .join("aiken") +} diff --git a/crates/project/src/telemetry.rs b/crates/project/src/telemetry.rs index 84502774..2792c827 100644 --- a/crates/project/src/telemetry.rs +++ b/crates/project/src/telemetry.rs @@ -36,4 +36,11 @@ pub enum Event { tests: Vec, }, WaitingForBuildDirLock, + DownloadingPackage { + name: String, + }, + PackagesDownloaded { + start: tokio::time::Instant, + count: usize, + }, } diff --git a/examples/sample/aiken.toml b/examples/sample/aiken.toml index 289acfc2..4feccc0a 100644 --- a/examples/sample/aiken.toml +++ b/examples/sample/aiken.toml @@ -1,2 +1,6 @@ name = "sample" version = "0.0.1" + +dependencies = [ + { name = "aiken-lang/stdlib", version = "main", source = "Github" }, +]