diff --git a/Cargo.lock b/Cargo.lock index c771ab640..8528093f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -120,6 +120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -290,11 +291,10 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "ast_node" -version = "0.9.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c09c69dffe06d222d072c878c3afe86eee2179806f20503faec97250268b4c24" +checksum = "2ab31376d309dd3bfc9cfb3c11c93ce0e0741bbe0354b20e7f8c60b044730b79" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", @@ -416,6 +416,7 @@ dependencies = [ "auraescript_macros", "client", "deno_ast", + "deno_core", "deno_runtime", "proto", "tokio", @@ -552,6 +553,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +[[package]] +name = "base32" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" + [[package]] name = "base64" version = "0.13.1" @@ -608,6 +615,15 @@ dependencies = [ "scoped-tls", ] +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + [[package]] name = "bit-set" version = "0.5.3" @@ -638,6 +654,18 @@ dependencies = [ "serde", ] +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + [[package]] name = "block" version = "0.1.6" @@ -710,6 +738,12 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" + [[package]] name = "byteorder" version = "1.5.0" @@ -840,7 +874,7 @@ dependencies = [ "serde", "thiserror", "tokio", - "toml 0.7.8", + "toml", "tonic", "tower", "x509-certificate", @@ -857,6 +891,15 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "clipboard-win" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +dependencies = [ + "error-code", +] + [[package]] name = "clone3" version = "0.2.3" @@ -878,20 +921,16 @@ dependencies = [ ] [[package]] -name = "colorchoice" -version = "1.0.1" +name = "color_quant" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "console_static_text" -version = "0.8.1" +name = "colorchoice" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4be93df536dfbcbd39ff7c129635da089901116b88bfc29ec1acb9b56f8ff35" -dependencies = [ - "unicode-width", - "vte", -] +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "const-oid" @@ -974,6 +1013,25 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.19" @@ -1040,9 +1098,9 @@ dependencies = [ [[package]] name = "d3d12" -version = "0.7.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" +checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813" dependencies = [ "bitflags 2.5.0", "libloading 0.8.3", @@ -1121,14 +1179,17 @@ dependencies = [ [[package]] name = "deno_ast" -version = "0.31.6" +version = "0.38.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da7b09db895527a94de1305455338926cd2a7003231ba589b7b7b57e8da344f2" +checksum = "584547d27786a734536fde7088f8429d355569c39410427be44695c300618408" dependencies = [ "anyhow", - "base64 0.13.1", + "base64 0.21.7", "deno_media_type", + "deno_terminal", "dprint-swc-ext", + "once_cell", + "percent-encoding", "serde", "swc_atoms", "swc_common", @@ -1152,14 +1213,16 @@ dependencies = [ "swc_visit", "swc_visit_macros", "text_lines", + "thiserror", + "unicode-width", "url", ] [[package]] name = "deno_broadcast_channel" -version = "0.124.0" +version = "0.147.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68743a346327125f695efb716e2b74f99ef98cf2a526547fc7d39d6fdf8bea3c" +checksum = "da690e382e1dfbe340f015d81c7bc889d01ea2c068ba852b068357823ff79047" dependencies = [ "async-trait", "deno_core", @@ -1169,9 +1232,9 @@ dependencies = [ [[package]] name = "deno_cache" -version = "0.62.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3186fd8492c95cbc101c91fb0b9632de3e2f4dc22aaeda5972a21700c85aa3ae" +checksum = "a0290c49b49658495f4ecb4728a1a69076107de853c05877d99ed16d9e524cef" dependencies = [ "async-trait", "deno_core", @@ -1181,31 +1244,44 @@ dependencies = [ "tokio", ] +[[package]] +name = "deno_canvas" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee874b064cd094dcbaaa63b8dd0a8d25f2f6a684e683c154b6ec993c7f2764c3" +dependencies = [ + "deno_core", + "deno_webgpu", + "image", + "serde", +] + [[package]] name = "deno_console" -version = "0.130.0" +version = "0.153.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d5dc3f086ff92fe030733290a1a9036b5ef00c1857d2f580a50b4d2c402d29" +checksum = "11ec86c49cdaa521e3224db4e60c0841370735665c05aafdcdb0af138a0faf81" dependencies = [ "deno_core", ] [[package]] name = "deno_core" -version = "0.243.0" +version = "0.280.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadc994e8ecacc8b44a60bd26e510a9913d69ff9aa2fca39f9c0378084ba722d" +checksum = "12d26f2d3e243bbbdd0851ab542b20ec48ac1fcf6c64ab06e81133da3113ebdd" dependencies = [ "anyhow", + "bincode", "bit-set", "bit-vec", "bytes", "cooked-waker", + "deno_core_icudata", "deno_ops", - "deno_unsync 0.3.3", + "deno_unsync", "futures", "libc", - "log", "memoffset 0.9.1", "parking_lot", "pin-project", @@ -1213,33 +1289,38 @@ dependencies = [ "serde_json", "serde_v8", "smallvec", - "sourcemap 7.1.1", + "sourcemap", "static_assertions", "tokio", "url", "v8", ] +[[package]] +name = "deno_core_icudata" +version = "0.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" + [[package]] name = "deno_cron" -version = "0.10.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d9566b0d5ddf1eb3ba452f90fb3ab3ff8095ffef3b58087bc67865350b7aeba" +checksum = "5d8374901e85ec0ef02a7b59a9cc5eacc1bf36002882a1da03d8bb009d6fcc99" dependencies = [ "anyhow", "async-trait", "chrono", "deno_core", - "deno_unsync 0.1.1", "saffron", "tokio", ] [[package]] name = "deno_crypto" -version = "0.144.0" +version = "0.167.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f1d4bc307f865a9bbdedc0d6b625a0dcf5013e6cd941f6ba5cacc1d1f4823f" +checksum = "1403655527cb7de76ef5260ac6c44306e0008838acd0485280446accef9c7ab6" dependencies = [ "aes", "aes-gcm", @@ -1256,6 +1337,7 @@ dependencies = [ "once_cell", "p256", "p384", + "p521", "rand", "ring 0.17.8", "rsa", @@ -1265,16 +1347,15 @@ dependencies = [ "sha2", "signature", "spki 0.7.3", - "tokio", "uuid", "x25519-dalek", ] [[package]] name = "deno_fetch" -version = "0.154.0" +version = "0.177.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9797718558fdafc98b9d4eda586be9017d7abea041a2ea8b8dc0c722a47c1e6a" +checksum = "18d41732acba9fea1a2c135978871a610b44d8eb5324ba64ed3b8954d1543071" dependencies = [ "bytes", "data-url", @@ -1282,7 +1363,6 @@ dependencies = [ "deno_tls", "dyn-clone", "http 0.2.12", - "pin-project", "reqwest", "serde", "serde_json", @@ -1292,47 +1372,47 @@ dependencies = [ [[package]] name = "deno_ffi" -version = "0.117.0" +version = "0.140.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff8dc0e2eb87668f12a927900484d3d8e8fc9b1e3cca6b8bf64a8c378aef51" +checksum = "3afb3e304a4d36aa63908b3f513be432668c0eaaeec62c62a0980202ee2003c6" dependencies = [ "deno_core", "dlopen2", "dynasmrt", "libffi", "libffi-sys", + "log", "serde", "serde-value", "serde_json", - "tokio", "winapi", ] [[package]] name = "deno_fs" -version = "0.40.0" +version = "0.63.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8984749a0022f9bd4b9e30e70deaa6e2ebe103efa61c8526f5f9c4357116e447" +checksum = "c391e1dc12707f7d8800e64d60e955e499a6decfef20c10bbec1da8e72273ead" dependencies = [ "async-trait", + "base32", "deno_core", "deno_io", "filetime", - "fs3", + "junction", "libc", - "log", "nix 0.26.2", "rand", + "rayon", "serde", - "tokio", "winapi", ] [[package]] name = "deno_http" -version = "0.127.0" +version = "0.151.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc593d16a1630dbd4642e1ce0b34a6352e380a445109949098dc1430c312f48" +checksum = "00598c49aa6be107f7ce94b02ba3134155810daf5badd35de6c6d36eb708bc49" dependencies = [ "async-compression", "async-trait", @@ -1368,24 +1448,27 @@ dependencies = [ [[package]] name = "deno_io" -version = "0.40.0" +version = "0.63.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500ef1bece55997caf5414e249bc773fe3f9128d183909b4d78b27e91f43ead7" +checksum = "ed3c0790f18984ed6b7fd47c08f1212ea186b9e196a7fe24f4820aaf6b5d8556" dependencies = [ "async-trait", "deno_core", "filetime", "fs3", + "log", "once_cell", + "os_pipe", + "rand", "tokio", "winapi", ] [[package]] name = "deno_kv" -version = "0.38.0" +version = "0.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff96f1df7a606e2e167b2831d1766f309622e2e106961d1d40f9cb77395079a" +checksum = "b45251361663076feb51334533697c13f92d227cdff7dff3a7535e34efade19e" dependencies = [ "anyhow", "async-trait", @@ -1395,24 +1478,18 @@ dependencies = [ "deno_fetch", "deno_node", "deno_tls", - "deno_unsync 0.1.1", "denokv_proto", "denokv_remote", "denokv_sqlite", - "hex", + "faster-hex", "log", "num-bigint", "prost", "prost-build", "rand", - "reqwest", "rusqlite", "serde", - "serde_json", - "termcolor", - "tokio", "url", - "uuid", ] [[package]] @@ -1428,9 +1505,9 @@ dependencies = [ [[package]] name = "deno_napi" -version = "0.60.0" +version = "0.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b507d574be025be32558da40da550ece5189743d485a9c1295648d0a99e55a4" +checksum = "f7d435e2484b7c60fcd9880de4d6599ed5a67fb0f40822013b0c241461b45643" dependencies = [ "deno_core", "libloading 0.7.4", @@ -1451,14 +1528,12 @@ dependencies = [ [[package]] name = "deno_net" -version = "0.122.0" +version = "0.145.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84a41cfb1ff5bb787239d604d3287c363804a5a053da476737df4a7aaca6d40" +checksum = "d05b7de6850ae06496d1cf7eed456f7fd2489713a5742ce776cacf877ff6e8d7" dependencies = [ "deno_core", "deno_tls", - "enum-as-inner", - "log", "pin-project", "rustls-tokio-stream", "serde", @@ -1470,12 +1545,13 @@ dependencies = [ [[package]] name = "deno_node" -version = "0.67.0" +version = "0.90.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3cc7c609d5df329554764d9885c9deb9355af0c6815dd4266163caf92188a5" +checksum = "3b9a217a206abaac68fbd50e69105460f538c6a99ba0549fe05488e40290bf5f" dependencies = [ "aead-gcm-stream", "aes", + "async-trait", "brotli 3.5.0", "bytes", "cbc", @@ -1486,15 +1562,17 @@ dependencies = [ "deno_fs", "deno_media_type", "deno_net", + "deno_permissions", "deno_whoami", "digest", "dsa", "ecb", "elliptic-curve", "errno 0.2.8", + "faster-hex", "h2 0.3.26", - "hex", "hkdf", + "home", "http 0.2.12", "idna 0.3.0", "indexmap 2.2.6", @@ -1504,7 +1582,6 @@ dependencies = [ "libz-sys", "md-5", "md4", - "nix 0.26.2", "num-bigint", "num-bigint-dig", "num-integer", @@ -1523,13 +1600,14 @@ dependencies = [ "ripemd", "rsa", "scrypt", + "sec1", "serde", "sha-1", "sha2", "signature", "simd-json", + "spki 0.7.3", "tokio", - "typenum", "url", "winapi", "windows-sys 0.48.0", @@ -1539,9 +1617,9 @@ dependencies = [ [[package]] name = "deno_ops" -version = "0.119.0" +version = "0.156.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac6a58c4aef86af8a55751cb157c703cd9f21f209026515412e0912ca9c2e4c" +checksum = "8237b272db1a6cb941b8a5a63ba63539004a8263e8b0230a11136d76eea273f9" dependencies = [ "proc-macro-rules", "proc-macro2", @@ -1552,16 +1630,33 @@ dependencies = [ "thiserror", ] +[[package]] +name = "deno_permissions" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40748585d220170dc4ecb0f158b2ef40e7d0e4c486ab882f0a8eb51937d601a5" +dependencies = [ + "deno_core", + "deno_terminal", + "fqdn", + "libc", + "log", + "once_cell", + "serde", + "which 4.4.2", + "winapi", +] + [[package]] name = "deno_runtime" -version = "0.138.0" +version = "0.161.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabaf022e6b4d6d20df402c65937dcba8f823b29b5d754c3326dfc8c974f5b96" +checksum = "9a5057ea992ad16493dfd682117506c47556e060c56df4db9de98bc275a8ed9e" dependencies = [ - "console_static_text", "deno_ast", "deno_broadcast_channel", "deno_cache", + "deno_canvas", "deno_console", "deno_core", "deno_cron", @@ -1575,6 +1670,8 @@ dependencies = [ "deno_napi", "deno_net", "deno_node", + "deno_permissions", + "deno_terminal", "deno_tls", "deno_url", "deno_web", @@ -1585,10 +1682,7 @@ dependencies = [ "dlopen2", "encoding_rs", "fastwebsockets", - "filetime", "flate2", - "fs3", - "fwdansi", "http 1.1.0", "http-body-util", "hyper 0.14.28", @@ -1601,43 +1695,45 @@ dependencies = [ "notify", "ntapi", "once_cell", + "percent-encoding", "regex", - "ring 0.17.8", + "rustyline", "serde", + "signal-hook", "signal-hook-registry", - "termcolor", "tokio", "tokio-metrics", "uuid", - "which", + "which 4.4.2", "winapi", "windows-sys 0.48.0", - "winres", +] + +[[package]] +name = "deno_terminal" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e6337d4e7f375f8b986409a76fbeecfa4bd8a1343e63355729ae4befa058eaf" +dependencies = [ + "once_cell", + "termcolor", ] [[package]] name = "deno_tls" -version = "0.117.0" +version = "0.140.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11cfe0790d2a20e2324f46b883137d335e5e9cab5469326f8ea059526091261" +checksum = "053a261f8005e4aa408fe2e123a22842c0583ab9a4bc535fef83554d1b9dd3d0" dependencies = [ "deno_core", "deno_native_certs", - "once_cell", "rustls", "rustls-pemfile", + "rustls-tokio-stream", "rustls-webpki", "serde", - "webpki-roots", -] - -[[package]] -name = "deno_unsync" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac0984205f25e71ddd1be603d76e70255953c12ff864707359ab195d26dfc7b3" -dependencies = [ "tokio", + "webpki-roots", ] [[package]] @@ -1651,20 +1747,19 @@ dependencies = [ [[package]] name = "deno_url" -version = "0.130.0" +version = "0.153.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabb028f2d765632f84368446a2a80b8a8a5da4f70c67cc84a655bdf40598d60" +checksum = "46f8da2dc0820062a74a6bf51eb0ec9c27078baf1bbd58caccbe01585cd59bfa" dependencies = [ "deno_core", - "serde", "urlpattern", ] [[package]] name = "deno_web" -version = "0.161.0" +version = "0.184.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee0873e217992527b78afebca6c50037d29841685a4b6b80837e42c80cb7679f" +checksum = "b383f260fcf394a0f4a19b6973a5fd19af31d8775d473a86005d18bde88f1df0" dependencies = [ "async-trait", "base64-simd 0.8.0", @@ -1676,37 +1771,36 @@ dependencies = [ "serde", "tokio", "uuid", - "windows-sys 0.48.0", ] [[package]] name = "deno_webgpu" -version = "0.97.0" +version = "0.120.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46b805c95adf0022fc75e0bd877c3827b75581774fe3cf3e7ac6604d9ce43ae6" +checksum = "a5c807cdbad9f5ff0635276419076186afa84b0fe8c2dcaed98c64424c265c69" dependencies = [ "deno_core", + "raw-window-handle", "serde", "tokio", "wgpu-core", - "wgpu-hal", "wgpu-types", ] [[package]] name = "deno_webidl" -version = "0.130.0" +version = "0.153.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84a33be5ba736aae662d142ffbaf3c359eea3b276cd849eecb76d1c1911aa4d" +checksum = "0fb812944890c465c065ae1455904ce13b1d37696e797172dfb5a076972f180c" dependencies = [ "deno_core", ] [[package]] name = "deno_websocket" -version = "0.135.0" +version = "0.158.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e0d3a742323656f5d88cd7cc9221d2fdbb581a8fb70cdc79f9c053f1154cef" +checksum = "e17a336ae05a7948d9824171ec2d9b09686183f62439bba8e46b0e73078c7a56" dependencies = [ "bytes", "deno_core", @@ -1726,14 +1820,13 @@ dependencies = [ [[package]] name = "deno_webstorage" -version = "0.125.0" +version = "0.148.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18b84655f4d9692614f85d14c8cf9cffb93d5f218aa06632c14ea4121f057ad" +checksum = "4768cec014081244837383a85d506807e6399ce0b7b164cfddba145f3ead59ab" dependencies = [ "deno_core", "deno_web", "rusqlite", - "serde", ] [[package]] @@ -1950,13 +2043,21 @@ dependencies = [ "syn 2.0.63", ] +[[package]] +name = "document-features" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +dependencies = [ + "litrs", +] + [[package]] name = "dprint-swc-ext" -version = "0.13.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2f24ce6b89a06ae3eb08d5d4f88c05d0aef1fa58e2eba8dd92c97b84210c25" +checksum = "019d17f2c2457c5a70a7cf4505b1a562ca8ab168c0ac0c005744efbd29fcb8fe" dependencies = [ - "bumpalo", "num-bigint", "rustc-hash", "swc_atoms", @@ -2073,6 +2174,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + [[package]] name = "enum-as-inner" version = "0.5.1" @@ -2122,6 +2229,12 @@ dependencies = [ "libc", ] +[[package]] +name = "error-code" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + [[package]] name = "fallible-iterator" version = "0.2.0" @@ -2144,6 +2257,15 @@ dependencies = [ "regex", ] +[[package]] +name = "faster-hex" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" +dependencies = [ + "serde", +] + [[package]] name = "fastrand" version = "2.1.0" @@ -2169,6 +2291,26 @@ dependencies = [ "utf-8", ] +[[package]] +name = "fd-lock" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" +dependencies = [ + "cfg-if", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + [[package]] name = "ff" version = "0.13.0" @@ -2264,13 +2406,18 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fqdn" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08b1eaa7dfddeab6036292995620bf0435712e619db6d7690605897e76975eb0" + [[package]] name = "from_variant" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ec5dc38ee19078d84a692b1c41181ff9f94331c76cee66ff0208c770b5e54f" +checksum = "fdc9cc75639b041067353b9bce2450d6847e547276c6fbe4487d7407980e07db" dependencies = [ - "pmutil", "proc-macro2", "swc_macros_common", "syn 2.0.63", @@ -2298,14 +2445,20 @@ dependencies = [ [[package]] name = "fslock" -version = "0.1.8" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57eafdd0c16f57161105ae1b98a1238f97645f2f588438b2949c99a2af9616bf" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" dependencies = [ "libc", "winapi", ] +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futures" version = "0.3.30" @@ -2396,16 +2549,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fwdansi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c1f5787fe85505d1f7777268db5103d80a7a374d2316a7ce262e57baf8f208" -dependencies = [ - "memchr", - "termcolor", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -2509,25 +2652,11 @@ dependencies = [ "bitflags 2.5.0", ] -[[package]] -name = "gpu-allocator" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad" -dependencies = [ - "backtrace", - "log", - "presser", - "thiserror", - "winapi", - "windows", -] - [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ "bitflags 2.5.0", "gpu-descriptor-types", @@ -2536,9 +2665,9 @@ dependencies = [ [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ "bitflags 2.5.0", ] @@ -2554,6 +2683,15 @@ dependencies = [ "subtle", ] +[[package]] +name = "gzip-header" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95cc527b92e6029a62960ad99aa8a6660faa4555fe5f731aab13aa6a921795a2" +dependencies = [ + "crc32fast", +] + [[package]] name = "h2" version = "0.3.26" @@ -2876,7 +3014,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core", ] [[package]] @@ -2931,6 +3069,19 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-traits", + "png", +] + [[package]] name = "indexmap" version = "1.9.3" @@ -3071,6 +3222,12 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "js-sys" version = "0.3.69" @@ -3080,6 +3237,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "junction" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be39922b087cecaba4e2d5592dedfc8bda5d4a5a1231f143337cca207950b61d" +dependencies = [ + "scopeguard", + "winapi", +] + [[package]] name = "k256" version = "0.13.3" @@ -3359,6 +3526,12 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "lock_api" version = "0.4.12" @@ -3480,9 +3653,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" dependencies = [ "bitflags 2.5.0", "block", @@ -3512,6 +3685,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", + "simd-adler32", ] [[package]] @@ -3543,10 +3717,11 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "naga" -version = "0.14.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e" +checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" dependencies = [ + "arrayvec", "bit-set", "bitflags 2.5.0", "codespan-reporting", @@ -3562,6 +3737,15 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + [[package]] name = "netif" version = "0.1.6" @@ -3644,6 +3828,15 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + [[package]] name = "nix" version = "0.24.3" @@ -3669,6 +3862,17 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "libc", +] + [[package]] name = "nix" version = "0.28.0" @@ -3851,16 +4055,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", -] - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", ] [[package]] @@ -3921,6 +4115,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "os_pipe" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "outref" version = "0.1.0" @@ -3975,6 +4179,20 @@ dependencies = [ "sha2", ] +[[package]] +name = "p521" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" +dependencies = [ + "base16ct", + "ecdsa", + "elliptic-curve", + "primeorder", + "rand_core", + "sha2", +] + [[package]] name = "parking_lot" version = "0.12.2" @@ -4067,9 +4285,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" @@ -4183,14 +4401,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] -name = "pmutil" -version = "0.6.1" +name = "png" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.63", + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", ] [[package]] @@ -4227,12 +4447,6 @@ dependencies = [ "nix 0.28.0", ] -[[package]] -name = "presser" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" - [[package]] name = "pretty_assertions" version = "1.4.0" @@ -4393,7 +4607,7 @@ dependencies = [ "regex", "syn 1.0.109", "tempfile", - "which", + "which 4.4.2", ] [[package]] @@ -4478,7 +4692,7 @@ dependencies = [ "protobuf-support", "tempfile", "thiserror", - "which", + "which 4.4.2", ] [[package]] @@ -4514,6 +4728,22 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] + [[package]] name = "rand" version = "0.8.5" @@ -4552,9 +4782,29 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "raw-window-handle" -version = "0.5.2" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] [[package]] name = "redox_syscall" @@ -4881,9 +5131,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" +version = "0.21.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" dependencies = [ "log", "ring 0.17.8", @@ -4914,9 +5164,9 @@ dependencies = [ [[package]] name = "rustls-tokio-stream" -version = "0.2.17" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded7a36e8ac05b8ada77a84c5ceec95361942ee9dedb60a82f93f788a791aae8" +checksum = "fd707225bb670bcd2876886bb571753d1ce03a9cedfa2e629a79984ca9a93cfb" dependencies = [ "futures", "rustls", @@ -4940,6 +5190,28 @@ version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" +[[package]] +name = "rustyline" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "clipboard-win", + "fd-lock", + "home", + "libc", + "log", + "memchr", + "nix 0.27.1", + "radix_trie", + "unicode-segmentation", + "unicode-width", + "utf8parse", + "winapi", +] + [[package]] name = "ryu" version = "1.0.18" @@ -5173,12 +5445,10 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.152.0" +version = "0.189.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016d49be02ecb10655486c7e0a3fe2fe9345bc4c7f3cf5c66671ff327115eabe" +checksum = "893c995255d6fbf55c33166b651fd037c4e3cc7864bf82213ea18d0ec94ed165" dependencies = [ - "bytes", - "derive_more", "num-bigint", "serde", "smallvec", @@ -5253,6 +5523,16 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -5281,6 +5561,12 @@ dependencies = [ "outref 0.1.0", ] +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "simd-json" version = "0.13.10" @@ -5378,30 +5664,16 @@ dependencies = [ [[package]] name = "sourcemap" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90" -dependencies = [ - "data-encoding", - "debugid", - "if_chain", - "rustc_version 0.2.3", - "serde", - "serde_json", - "unicode-id", - "url", -] - -[[package]] -name = "sourcemap" -version = "7.1.1" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7768edd06c02535e0d50653968f46e1e0d3aa54742190d35dd9466f59de9c71" +checksum = "208d40b9e8cad9f93613778ea295ed8f3c2b1824217c6cfc7219d3f6f45b96d4" dependencies = [ "base64-simd 0.7.0", + "bitvec", "data-encoding", "debugid", "if_chain", + "rustc-hash", "rustc_version 0.2.3", "serde", "serde_json", @@ -5423,12 +5695,11 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "spirv" -version = "0.2.0+1.5.4" +version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 1.3.2", - "num-traits", + "bitflags 2.5.0", ] [[package]] @@ -5478,11 +5749,10 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "string_enum" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fa4d4f81d7c05b9161f8de839975d3326328b8ba2831164b465524cc2f55252" +checksum = "05e383308aebc257e7d7920224fa055c632478d92744eca77f99be8fa1545b90" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", @@ -5531,9 +5801,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "swc_atoms" -version = "0.6.4" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a9e1b6d97f27b6abe5571f8fe3bdbd2fa987299fc2126450c7cde6214896ef" +checksum = "bb6567e4e67485b3e7662b486f1565bdae54bd5b9d6b16b2ba1a9babb1e42125" dependencies = [ "hstr", "once_cell", @@ -5541,11 +5811,25 @@ dependencies = [ "serde", ] +[[package]] +name = "swc_cached" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83406221c501860fce9c27444f44125eafe9e598b8b81be7563d7036784cd05c" +dependencies = [ + "ahash", + "anyhow", + "dashmap", + "once_cell", + "regex", + "serde", +] + [[package]] name = "swc_common" -version = "0.33.9" +version = "0.33.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ccb656cd57c93614e4e8b33a60e75ca095383565c1a8d2bbe6a1103942831e0" +checksum = "a2f9706038906e66f3919028f9f7a37f3ed552f1b85578e93f4468742e2da438" dependencies = [ "ast_node", "better_scoped_tls", @@ -5558,7 +5842,7 @@ dependencies = [ "rustc-hash", "serde", "siphasher", - "sourcemap 6.4.1", + "sourcemap", "swc_atoms", "swc_eq_ignore_macros", "swc_visit", @@ -5569,23 +5853,24 @@ dependencies = [ [[package]] name = "swc_config" -version = "0.1.7" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba1c7a40d38f9dd4e9a046975d3faf95af42937b34b2b963be4d8f01239584b" +checksum = "7be1a689e146be1eae53139482cb061dcf0fa01dff296bbe7b96fff92d8e2936" dependencies = [ - "indexmap 1.9.3", + "anyhow", + "indexmap 2.2.6", "serde", "serde_json", + "swc_cached", "swc_config_macro", ] [[package]] name = "swc_config_macro" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5b5aaca9a0082be4515f0fbbecc191bf5829cd25b5b9c0a2810f6a2bb0d6829" +checksum = "7c5f56139042c1a95b54f5ca48baa0e0172d369bcc9d3d473dad1de36bae8399" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", @@ -5594,9 +5879,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.110.10" +version = "0.113.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d416121da2d56bcbd1b1623725a68890af4552fef0c6d1e4bfa92776ccd6a" +checksum = "dc1690cc0c9ab60b44ac0225ba1e231ac532f7ba1d754df761c6ee607561afae" dependencies = [ "bitflags 2.5.0", "is-macro", @@ -5607,21 +5892,21 @@ dependencies = [ "string_enum", "swc_atoms", "swc_common", - "unicode-id", + "unicode-id-start", ] [[package]] name = "swc_ecma_codegen" -version = "0.146.32" +version = "0.149.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7b37ef40385cc2e294ece3d42048dcda6392838724dd5f02ff8da3fa105271" +checksum = "4fef147127a2926ca26171c7afcbf028ff86dc543ced87d316713f25620a15b9" dependencies = [ "memchr", "num-bigint", "once_cell", "rustc-hash", "serde", - "sourcemap 6.4.1", + "sourcemap", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -5631,11 +5916,10 @@ dependencies = [ [[package]] name = "swc_ecma_codegen_macros" -version = "0.7.3" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdff076dccca6cc6a0e0b2a2c8acfb066014382bc6df98ec99e755484814384" +checksum = "090e409af49c8d1a3c13b3aab1ed09dd4eda982207eb3e63c2ad342f072b49c8" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", @@ -5644,22 +5928,23 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.45.10" +version = "0.45.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31cf7549feec3698d0110a0a71ae547f31ae272dc92db3285ce126d6dcbdadf3" +checksum = "92c68f934bd2c51f29c4ad0bcae09924e9dc30d7ce0680367d45b42d40338a67" dependencies = [ "anyhow", "pathdiff", "serde", + "swc_atoms", "swc_common", "tracing", ] [[package]] name = "swc_ecma_parser" -version = "0.141.26" +version = "0.144.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9590deff1b29aafbff8901b9d38d00211393f6b17b5cab878562db89a8966d88" +checksum = "0499e69683ae5d67a20ff0279b94bc90f29df7922a46331b54d5dd367bf89570" dependencies = [ "either", "new_debug_unreachable", @@ -5679,13 +5964,13 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.134.42" +version = "0.138.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d74ca42a400257d8563624122813c1849c3d87e7abe3b9b2ed7514c76f64ad2f" +checksum = "eddb95c2bdad1c9c29edf35712e1e0f9b9ddc1cdb5ba2d582fd93468cb075a03" dependencies = [ "better_scoped_tls", "bitflags 2.5.0", - "indexmap 1.9.3", + "indexmap 2.2.6", "once_cell", "phf", "rustc-hash", @@ -5702,9 +5987,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.123.43" +version = "0.127.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e68880cf7d65b93e0446b3ee079f33d94e0eddac922f75b736a6ea7669517c0" +checksum = "53043d81678f3c693604eeb1d1f0fe6ba10f303104a31b954dbeebed9cadf530" dependencies = [ "swc_atoms", "swc_common", @@ -5716,11 +6001,10 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_macros" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8188eab297da773836ef5cf2af03ee5cca7a563e1be4b146f8141452c28cc690" +checksum = "500a1dadad1e0e41e417d633b3d6d5de677c9e0d3159b94ba3348436cdb15aab" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", @@ -5729,9 +6013,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.168.52" +version = "0.172.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e1f409e026be953fabb327923ebc5fdc7c664bcac036b76107834798640ed" +checksum = "7fbc414d6a9c5479cfb4c6e92fcdac504582bd7bc89a0ed7f8808b72dc8bd1f0" dependencies = [ "either", "rustc-hash", @@ -5749,13 +6033,13 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.180.52" +version = "0.184.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa7f368a80f28eeaa0f529cff6fb5d7578ef10a60be25bfd2582cb3f8ff5c9e" +checksum = "565a76c4ca47ce31d78301c0beab878e4c2cb4f624691254d834ec8c0e236755" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", "dashmap", - "indexmap 1.9.3", + "indexmap 2.2.6", "once_cell", "serde", "sha-1", @@ -5773,9 +6057,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.185.52" +version = "0.189.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa2950c85abb4d555e092503ad2fa4f6dec0ee36a719273fb7a7bb29ead9ab6" +checksum = "e209026c1d3c577cafac257d87e7c0d23119282fbdc8ed03d7f56077e95beb90" dependencies = [ "ryu-js", "serde", @@ -5790,11 +6074,11 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.124.32" +version = "0.128.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a4a0baf6cfa490666a9fe23a17490273f843d19ebc1d6ec89d64c3f8ccdb80" +checksum = "fe5242670bc74e0a0b64b9d4912b37be36944517ce0881314162aeb4381272c3" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.2.6", "num_cpus", "once_cell", "rustc-hash", @@ -5808,9 +6092,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.96.10" +version = "0.99.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba962f0becf83bab12a17365dface5a4f636c9e1743d479e292b96910a753743" +checksum = "28a6ce28ad8e591f8d627f1f9cb26b25e5d83052a9bc1b674d95fc28040cfa98" dependencies = [ "num-bigint", "swc_atoms", @@ -5822,11 +6106,10 @@ dependencies = [ [[package]] name = "swc_eq_ignore_macros" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a95d367e228d52484c53336991fdcf47b6b553ef835d9159db4ba40efb0ee8" +checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" dependencies = [ - "pmutil", "proc-macro2", "quote", "syn 2.0.63", @@ -5834,11 +6117,10 @@ dependencies = [ [[package]] name = "swc_macros_common" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a273205ccb09b51fabe88c49f3b34c5a4631c4c00a16ae20e03111d6a42e832" +checksum = "91745f3561057493d2da768437c427c0e979dff7396507ae02f16c981c4a8466" dependencies = [ - "pmutil", "proc-macro2", "quote", "syn 2.0.63", @@ -5846,9 +6128,9 @@ dependencies = [ [[package]] name = "swc_visit" -version = "0.5.7" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c337fbb2d191bf371173dea6a957f01899adb8f189c6c31b122a6cfc98fc3" +checksum = "043d11fe683dcb934583ead49405c0896a5af5face522e4682c16971ef7871b9" dependencies = [ "either", "swc_visit_macros", @@ -5856,12 +6138,11 @@ dependencies = [ [[package]] name = "swc_visit_macros" -version = "0.5.8" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f322730fb82f3930a450ac24de8c98523af7d34ab8cb2f46bcb405839891a99" +checksum = "4ae9ef18ff8daffa999f729db056d2821cd2f790f3a11e46422d19f46bb193e7" dependencies = [ "Inflector", - "pmutil", "proc-macro2", "quote", "swc_macros_common", @@ -5919,6 +6200,12 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tempfile" version = "3.10.1" @@ -6144,15 +6431,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "toml" version = "0.7.8" @@ -6481,9 +6759,9 @@ checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" [[package]] name = "unicode-id-start" -version = "1.1.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f73150333cb58412db36f2aca8f2875b013049705cc77b94ded70a1ab1f5da" +checksum = "02aebfa694eccbbbffdd92922c7de136b9fe764396d2f10e21bce1681477cfc1" [[package]] name = "unicode-ident" @@ -6500,6 +6778,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + [[package]] name = "unicode-width" version = "0.1.12" @@ -6583,14 +6867,17 @@ dependencies = [ [[package]] name = "v8" -version = "0.82.0" +version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f53dfb242f4c0c39ed3fc7064378a342e57b5c9bd774636ad34ffe405b808121" +checksum = "69026e2e8af55a4d2f20c0c17f690e8b31472bf76ab75b1205d3a0fab60c8f84" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "fslock", + "gzip-header", + "home", + "miniz_oxide", "once_cell", - "which", + "which 5.0.0", ] [[package]] @@ -6671,27 +6958,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" -[[package]] -name = "vte" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" -dependencies = [ - "arrayvec", - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2", - "quote", -] - [[package]] name = "walkdir" version = "2.5.0" @@ -6820,18 +7086,23 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "wgpu-core" -version = "0.18.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726" +checksum = "ac6a86eaa5e763e59c73cf9e97d55fffd4dfda69fd8bda19589fcf851ddfef1f" dependencies = [ "arrayvec", "bit-vec", "bitflags 2.5.0", + "cfg_aliases", "codespan-reporting", + "document-features", + "indexmap 2.2.6", "log", "naga", + "once_cell", "parking_lot", "profiling", + "raw-window-handle", "ron", "rustc-hash", "serde", @@ -6844,9 +7115,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.18.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84ecc802da3eb67b4cf3dd9ea6fe45bbb47ef13e6c49c5c3240868a9cc6cdd9" +checksum = "4d71c8ae05170583049b65ee562fd839fdc0b3e9ddb84f4e40c9d5f8ea0d4c8c" dependencies = [ "android_system_properties", "arrayvec", @@ -6854,12 +7125,12 @@ dependencies = [ "bit-set", "bitflags 2.5.0", "block", + "cfg_aliases", "core-graphics-types", "d3d12", "glow", "glutin_wgl_sys", "gpu-alloc", - "gpu-allocator", "gpu-descriptor", "js-sys", "khronos-egl", @@ -6868,6 +7139,7 @@ dependencies = [ "log", "metal", "naga", + "ndk-sys", "objc", "once_cell", "parking_lot", @@ -6885,9 +7157,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd" +checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" dependencies = [ "bitflags 2.5.0", "js-sys", @@ -6907,6 +7179,19 @@ dependencies = [ "rustix 0.38.34", ] +[[package]] +name = "which" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.34", + "windows-sys 0.48.0", +] + [[package]] name = "whoami" version = "1.5.1" @@ -6955,25 +7240,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-core" version = "0.52.0" @@ -7208,12 +7474,12 @@ dependencies = [ ] [[package]] -name = "winres" -version = "0.1.12" +name = "wyz" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ - "toml 0.5.11", + "tap", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 765eb348d..9ec423c75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,22 +29,17 @@ # ---------------------------------------------------------------------------- # [workspace] -members = [ - "aer", - "auraed", - "auraescript", - "client", - "ebpf-shared", - "proto", -] -exclude = [ - "ebpf" -] +members = ["aer", "auraed", "auraescript", "client", "ebpf-shared", "proto"] +exclude = ["ebpf"] resolver = "2" [workspace.dependencies] anyhow = "1.0.72" -chrono = { version = "0.4.26", default-features = false, features = ["clock", "std", "wasmbind"] } # default features except `oldtime` +chrono = { version = "0.4.26", default-features = false, features = [ + "clock", + "std", + "wasmbind", +] } # default features except `oldtime` client = { path = "./client" } clap = { version = "4.3.21", features = ["derive"] } fancy-regex = "0.11.0" @@ -54,13 +49,16 @@ lazy_static = "1.4.0" nix = "0.26.2" proc-macro2 = "1.0" proto = { path = "./proto" } +proto-reader = { path = "./crates/proto-reader" } protobuf = "3.2.0" protobuf-parse = "=3.2.0" # This crate makes no promises of stabilty, so we pin to the exact version quote = "1.0" serial_test = "1.0.0" serde = "1.0.183" serde_json = "1.0.104" -syn = { version = "1.0", features = ["full"] } # used in macros, so full doesn't affect binary size +syn = { version = "1.0", features = [ + "full", +] } # used in macros, so full doesn't affect binary size test-helpers = { path = "./crates/test-helpers" } test-helpers-macros = { path = "./crates/test-helpers-macros" } thiserror = "1.0.44" diff --git a/auraescript/Cargo.toml b/auraescript/Cargo.toml index bff5a42b1..f9f468f86 100644 --- a/auraescript/Cargo.toml +++ b/auraescript/Cargo.toml @@ -42,11 +42,12 @@ path = "src/bin/main.rs" [dependencies] anyhow = { workspace = true } client = { workspace = true } -deno_ast = { version = "0.31.6", features = ["transpiling"] } -deno_runtime = { version = "0.138.0" } +deno_ast = { version = "0.38.2", features = ["transpiling"] } +deno_runtime = "0.161.0" +deno_core = "0.280.0" macros = { package = "auraescript_macros", path = "./macros" } proto = { workspace = true } tokio = { workspace = true, features = ["fs", "rt-multi-thread"] } [build-dependencies] -deno_runtime = "0.138.0" +deno_runtime = "0.161.0" diff --git a/auraescript/build.rs b/auraescript/build.rs index d7efa61b6..5c9bc5ac0 100644 --- a/auraescript/build.rs +++ b/auraescript/build.rs @@ -10,6 +10,7 @@ fn main() { snapshot::create_runtime_snapshot( "gen/runtime.bin".into(), Default::default(), + Vec::new(), ) } diff --git a/auraescript/macros/Cargo.toml b/auraescript/macros/Cargo.toml index c8ec3bd9a..7a8d4390c 100644 --- a/auraescript/macros/Cargo.toml +++ b/auraescript/macros/Cargo.toml @@ -14,6 +14,6 @@ heck = { workspace = true } proc-macro2 = { workspace = true } protobuf = "3.2.0" protobuf-parse = { workspace = true } -proto-reader = { path = "../../crates/proto-reader" } # using workspace isn't working +proto-reader = { workspace = true } quote = { workspace = true } -syn = { workspace = true } \ No newline at end of file +syn = { workspace = true } diff --git a/auraescript/macros/src/ops.rs b/auraescript/macros/src/ops.rs index b7b8dd8ba..b868622bc 100644 --- a/auraescript/macros/src/ops.rs +++ b/auraescript/macros/src/ops.rs @@ -80,25 +80,25 @@ pub(crate) fn ops_generator(input: TokenStream) -> TokenStream { // Magic OpState from deno (https://github.com/denoland/deno/blob/b6ac54815c1bcfa44a45b3f2c1c982829482477f/ops/lib.rs#L295) quote! { - #[::deno_runtime::deno_core::op2(async)] + #[::deno_core::op2(async)] #[serde] pub(crate) async fn #op_ident( op_state: Rc>, // Auto filled by deno macro, call from typescript ignoring this parameter - #[smi] client_rid: Option<::deno_runtime::deno_core::ResourceId>, + #[smi] client_rid: Option<::deno_core::ResourceId>, #[serde] req: ::proto::#module::#input_type, ) -> std::result::Result< ::proto::#module::#output_type, ::anyhow::Error > { let client = match client_rid { - None => ::deno_runtime::deno_core::RcRef::new(::client::Client::default().await?), + None => ::deno_core::RcRef::new(::client::Client::default().await?), Some(client_rid) => { let as_client = { let op_state = &op_state.borrow(); let rt = &op_state.resource_table; // get `ResourceTable` from JsRuntime `OpState` rt.get::(client_rid)?.clone() // get `Client` from its rid }; - ::deno_runtime::deno_core::RcRef::map(as_client, |v| &v.0) + ::deno_core::RcRef::map(as_client, |v| &v.0) } }; let res = ::client::#module::#service_name_in_snake_case::#client_ident::#name( @@ -115,7 +115,7 @@ pub(crate) fn ops_generator(input: TokenStream) -> TokenStream { // generate a OpDecl for each function for conveniently adding to the deno runtime let op_decls: Vec = op_idents.map(|op_ident| { quote! { - #op_ident::DECL + #op_ident() } }).collect(); @@ -128,11 +128,11 @@ pub(crate) fn ops_generator(input: TokenStream) -> TokenStream { let expanded = quote! { use ::std::{rc::Rc, cell::RefCell}; - use ::deno_runtime::deno_core::{self, Op, OpState}; + use ::deno_core::{self, op2, OpState}; #(#(#op_functions)*)* - pub(crate) fn op_decls() -> Vec<::deno_runtime::deno_core::OpDecl> { + pub(crate) fn op_decls() -> Vec<::deno_core::OpDecl> { vec![#(#(#op_decls,)*)*] } }; diff --git a/auraescript/src/bin/main.rs b/auraescript/src/bin/main.rs index 7296eca9f..206e8086e 100644 --- a/auraescript/src/bin/main.rs +++ b/auraescript/src/bin/main.rs @@ -50,7 +50,7 @@ #![warn(clippy::unwrap_used)] use auraescript::init; -use deno_runtime::deno_core::resolve_path; +use deno_core::resolve_path; use std::env::current_dir; #[tokio::main(flavor = "current_thread")] diff --git a/auraescript/src/builtin/auraescript_client.rs b/auraescript/src/builtin/auraescript_client.rs index 5ead09d1f..27d1a610d 100644 --- a/auraescript/src/builtin/auraescript_client.rs +++ b/auraescript/src/builtin/auraescript_client.rs @@ -1,6 +1,8 @@ +#![allow(non_snake_case)] + use anyhow::Result; use client::{AuraeConfig, Client}; -use deno_runtime::deno_core::{self, op2, Op, OpState, Resource, ResourceId}; +use deno_core::{self, op2, OpState, Resource, ResourceId}; use std::{cell::RefCell, rc::Rc}; // `AuraeConfig` `try_default` @@ -64,12 +66,12 @@ pub(crate) async fn as__client_new( Ok(rid) } -pub(crate) fn op_decls() -> Vec<::deno_runtime::deno_core::OpDecl> { +pub(crate) fn op_decls() -> Vec<::deno_core::OpDecl> { vec![ - as__aurae_config__try_default::DECL, - as__aurae_config__from_options::DECL, - as__aurae_config__parse_from_file::DECL, - as__client_new::DECL, + as__aurae_config__try_default(), + as__aurae_config__from_options(), + as__aurae_config__parse_from_file(), + as__client_new(), ] } diff --git a/auraescript/src/cells.rs b/auraescript/src/cells.rs index a0da5d2a6..74a33c192 100644 --- a/auraescript/src/cells.rs +++ b/auraescript/src/cells.rs @@ -28,4 +28,6 @@ * * \* -------------------------------------------------------------------------- */ +#![allow(non_snake_case)] + macros::ops_generator!("../api/v0/cells/cells.proto", cells, CellService); diff --git a/auraescript/src/cri.rs b/auraescript/src/cri.rs index 1e846b145..0a5536f70 100644 --- a/auraescript/src/cri.rs +++ b/auraescript/src/cri.rs @@ -28,6 +28,8 @@ * * \* -------------------------------------------------------------------------- */ +#![allow(non_snake_case)] + // TODO: macro doesn't support streaming. Does deno? macros::ops_generator!( "../api/cri/v1/release-1.26.proto", diff --git a/auraescript/src/discovery.rs b/auraescript/src/discovery.rs index 5b9cacdb9..d43f8e592 100644 --- a/auraescript/src/discovery.rs +++ b/auraescript/src/discovery.rs @@ -28,6 +28,8 @@ * * \* -------------------------------------------------------------------------- */ +#![allow(non_snake_case)] + macros::ops_generator!( "../api/v0/discovery/discovery.proto", discovery, diff --git a/auraescript/src/health.rs b/auraescript/src/health.rs index 3c12ef925..f8231c74d 100644 --- a/auraescript/src/health.rs +++ b/auraescript/src/health.rs @@ -28,6 +28,8 @@ * * \* -------------------------------------------------------------------------- */ +#![allow(non_snake_case)] + // TODO: macro doesn't support streaming. Does deno? macros::ops_generator!( "../api/grpc/health/v1/health.proto", diff --git a/auraescript/src/lib.rs b/auraescript/src/lib.rs index b5732a2e6..978ec9e0f 100644 --- a/auraescript/src/lib.rs +++ b/auraescript/src/lib.rs @@ -65,20 +65,18 @@ #![allow(unused_qualifications)] use anyhow::{anyhow, bail, Error}; -use deno_ast::{MediaType, ParseParams, SourceTextInfo}; +use deno_ast::{EmitOptions, MediaType, ParseParams, SourceTextInfo}; +use deno_core::{ + self, error::AnyError, futures::FutureExt, resolve_import, url::Url, + ModuleLoadResponse, ModuleLoader, ModuleSource, ModuleSourceCode, + ModuleSpecifier, ModuleType, RequestedModuleType, ResolutionKind, +}; use deno_runtime::{ - deno_core::{ - self, error::AnyError, futures::FutureExt, resolve_import, url::Url, - FastString, ModuleLoader, ModuleSource, ModuleSourceCode, - ModuleSourceFuture, ModuleSpecifier, ModuleType, ResolutionKind, - Snapshot, - }, permissions::PermissionsContainer, worker::{MainWorker, WorkerOptions}, BootstrapOptions, WorkerLogLevel, }; -use std::pin::Pin; use std::rc::Rc; mod builtin; @@ -105,7 +103,7 @@ pub fn init(main_module: Url) -> MainWorker { extensions: vec![auraescript::init_ops()], module_loader: Rc::new(TypescriptModuleLoader), get_error_class_fn: Some(&get_error_class_name), - startup_snapshot: Some(Snapshot::Static(RUNTIME_SNAPSHOT)), + startup_snapshot: Some(RUNTIME_SNAPSHOT), bootstrap: BootstrapOptions { args: vec![], cpu_count: 1, @@ -114,7 +112,6 @@ pub fn init(main_module: Url) -> MainWorker { location: None, log_level: WorkerLogLevel::Info, no_color: false, - is_tty: false, unstable: true, user_agent: "".to_string(), inspect: false, @@ -164,9 +161,10 @@ impl ModuleLoader for TypescriptModuleLoader { module_specifier: &ModuleSpecifier, _maybe_referrer: Option<&ModuleSpecifier>, _is_dyn_import: bool, - ) -> Pin> { + _requested_module_type: RequestedModuleType, + ) -> ModuleLoadResponse { let module_specifier = module_specifier.clone(); - async move { + let future = async move { let path = module_specifier .to_file_path() .map_err(|_| anyhow!("Only file: URLs are supported."))?; @@ -192,25 +190,30 @@ impl ModuleLoader for TypescriptModuleLoader { let code = std::fs::read_to_string(&path)?; let code = if should_transpile { let parsed = deno_ast::parse_module(ParseParams { - specifier: module_specifier.to_string(), + specifier: module_specifier.clone(), text_info: SourceTextInfo::from_string(code), media_type, capture_tokens: false, scope_analysis: false, maybe_syntax: None, })?; - parsed.transpile(&Default::default())?.text + parsed + .transpile(&Default::default(), &EmitOptions::default())? + .into_source() + .text } else { code }; let module = ModuleSource::new_with_redirect( module_type, - ModuleSourceCode::String(FastString::Owned(code.into())), + ModuleSourceCode::String(code.into()), &module_specifier, &module_specifier, + None, ); Ok(module) } - .boxed_local() + .boxed_local(); + ModuleLoadResponse::Async(future) } } diff --git a/auraescript/src/observe.rs b/auraescript/src/observe.rs index 9f05d10e4..e8bb431f0 100644 --- a/auraescript/src/observe.rs +++ b/auraescript/src/observe.rs @@ -28,6 +28,8 @@ * * \* -------------------------------------------------------------------------- */ +#![allow(non_snake_case)] + macros::ops_generator!( "../api/v0/observe/observe.proto", observe,