diff --git a/Cargo.lock b/Cargo.lock index fe4211c98..b62919aff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,7 +57,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -172,7 +172,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -358,12 +358,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.101" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea" -dependencies = [ - "backtrace", -] +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" [[package]] name = "ar_archive_writer" @@ -460,7 +457,7 @@ checksum = "0a184645bcc6f52d69d8e7639720699c6a99efb711f886e251ed1d16db8dd90e" dependencies = [ "quote", "swc_macros_common", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -513,7 +510,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -535,7 +532,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -546,7 +543,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -563,7 +560,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -791,7 +788,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.116", + "syn 2.0.117", "which 4.4.2", ] @@ -810,7 +807,7 @@ dependencies = [ "regex", "rustc-hash 2.1.1", "shlex", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -830,7 +827,7 @@ dependencies = [ "regex", "rustc-hash 2.1.1", "shlex", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -933,7 +930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17d4f95e880cfd28c4ca5a006cf7f6af52b4bcb7b5866f573b2faa126fb7affb" dependencies = [ "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -990,7 +987,7 @@ dependencies = [ [[package]] name = "builder" -version = "0.30.3" +version = "0.30.4" dependencies = [ "cc", "codemap", @@ -1025,9 +1022,9 @@ checksum = "f4ad8f11f288f48ca24471bbd51ac257aaeaaa07adae295591266b792902ae64" [[package]] name = "bumpalo" -version = "3.20.1" +version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6f81257d10a0f602a294ae4182251151ff97dbb504ef9afcdda4a64b24d9b4" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" dependencies = [ "allocator-api2", ] @@ -1049,7 +1046,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -1161,7 +1158,7 @@ dependencies = [ "io-lifetimes", "ipnet", "maybe-owned", - "rustix 1.1.3", + "rustix 1.1.4", "rustix-linux-procfs", "windows-sys 0.59.0", "winx", @@ -1186,7 +1183,7 @@ dependencies = [ "cap-primitives", "io-extras", "io-lifetimes", - "rustix 1.1.3", + "rustix 1.1.4", ] [[package]] @@ -1199,7 +1196,7 @@ dependencies = [ "cap-primitives", "iana-time-zone", "once_cell", - "rustix 1.1.3", + "rustix 1.1.4", "winx", ] @@ -1222,7 +1219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b4a6cae9efc04cc6cbb8faf338d2c497c165c83e74509cf4dbedea948bbf6e5" dependencies = [ "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -1290,9 +1287,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.43" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118" +checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" dependencies = [ "iana-time-zone", "js-sys", @@ -1325,9 +1322,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.59" +version = "4.5.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5caf74d17c3aec5495110c34cc3f78644bfa89af6c8993ed4de2790e49b6499" +checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a" dependencies = [ "clap_builder", "clap_derive", @@ -1335,9 +1332,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.59" +version = "4.5.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "370daa45065b80218950227371916a1633217ae42b2715b2287b606dcd618e24" +checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876" dependencies = [ "anstream", "anstyle", @@ -1354,7 +1351,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -1365,7 +1362,7 @@ checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831" [[package]] name = "cli" -version = "0.30.3" +version = "0.30.4" dependencies = [ "anyhow", "async-recursion", @@ -1482,7 +1479,7 @@ dependencies = [ "nom 7.1.3", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -1518,7 +1515,7 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" [[package]] name = "common" -version = "0.30.3" +version = "0.30.4" dependencies = [ "anyhow", "async-graphql-value", @@ -1713,7 +1710,7 @@ dependencies = [ [[package]] name = "core-model" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-graphql-parser", "async-graphql-value", @@ -1724,7 +1721,7 @@ dependencies = [ [[package]] name = "core-model-builder" -version = "0.30.3" +version = "0.30.4" dependencies = [ "codemap", "codemap-diagnostic", @@ -1736,7 +1733,7 @@ dependencies = [ [[package]] name = "core-plugin-interface" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "built", @@ -1750,7 +1747,7 @@ dependencies = [ [[package]] name = "core-plugin-shared" -version = "0.30.3" +version = "0.30.4" dependencies = [ "base16ct 0.3.0", "bincode 2.0.1", @@ -1767,7 +1764,7 @@ dependencies = [ [[package]] name = "core-resolver" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-graphql-parser", "async-graphql-value", @@ -1799,11 +1796,11 @@ dependencies = [ [[package]] name = "core-rest-model" -version = "0.30.3" +version = "0.30.4" [[package]] name = "core-router" -version = "0.30.3" +version = "0.30.4" dependencies = [ "core-plugin-interface", "core-plugin-shared", @@ -2175,7 +2172,7 @@ dependencies = [ "document-features", "mio 1.1.1", "parking_lot", - "rustix 1.1.3", + "rustix 1.1.4", "signal-hook", "signal-hook-mio", "winapi", @@ -2273,7 +2270,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -2368,7 +2365,7 @@ checksum = "26bf8fc351c5ed29b5c2f0cbbac1b209b74f60ecd62e675a998df72c49af5204" [[package]] name = "deno-builder" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "core-model-builder", @@ -2379,7 +2376,7 @@ dependencies = [ [[package]] name = "deno-graphql-builder" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "codemap", @@ -2398,7 +2395,7 @@ dependencies = [ [[package]] name = "deno-graphql-model" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-graphql-parser", "bincode 2.0.1", @@ -2410,7 +2407,7 @@ dependencies = [ [[package]] name = "deno-graphql-resolver" -version = "0.30.3" +version = "0.30.4" dependencies = [ "anyhow", "async-graphql-parser", @@ -2435,7 +2432,7 @@ dependencies = [ [[package]] name = "deno-resolver" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "core-plugin-interface", @@ -2758,7 +2755,7 @@ checksum = "409f265785bd946d3006756955aaf40b0e4deb25752eae6a990afe54a31cfd83" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -3192,7 +3189,7 @@ dependencies = [ "stringcase", "strum 0.27.2", "strum_macros 0.27.2", - "syn 2.0.116", + "syn 2.0.117", "thiserror 2.0.18", ] @@ -3778,14 +3775,14 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] name = "deranged" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc3dc5ad92c2e2d1c193bbbbdf2ea477cb81331de4f3103f267ca18368b988c4" +checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" dependencies = [ "powerfmt", ] @@ -3817,7 +3814,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -3839,7 +3836,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.116", + "syn 2.0.117", "unicode-xid", ] @@ -3870,7 +3867,7 @@ dependencies = [ "diplomat_core", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -3890,7 +3887,7 @@ dependencies = [ "serde", "smallvec 1.15.1", "strck", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -3934,7 +3931,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -3975,7 +3972,7 @@ checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -4212,7 +4209,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -4272,7 +4269,7 @@ checksum = "31ae425815400e5ed474178a7a22e275a9687086a12ca63ec793ff292d8fdae8" [[package]] name = "exo-deno" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "ctor", @@ -4298,7 +4295,7 @@ dependencies = [ [[package]] name = "exo-env" -version = "0.30.3" +version = "0.30.4" dependencies = [ "dotenvy", "thiserror 2.0.18", @@ -4306,7 +4303,7 @@ dependencies = [ [[package]] name = "exo-sql" -version = "0.30.3" +version = "0.30.4" dependencies = [ "bincode 2.0.1", "bytes", @@ -4348,7 +4345,7 @@ dependencies = [ [[package]] name = "exo-wasm" -version = "0.30.3" +version = "0.30.4" dependencies = [ "anyhow", "serde_json", @@ -4430,7 +4427,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78" dependencies = [ "cfg-if 1.0.4", - "rustix 1.1.3", + "rustix 1.1.4", "windows-sys 0.59.0", ] @@ -4574,7 +4571,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -4611,7 +4608,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "308530a56b099da144ebc5d8e179f343ad928fa2b3558d1eb3db9af18d6eff43" dependencies = [ "swc_macros_common", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -4621,7 +4618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94e7099f6313ecacbe1256e8ff9d617b75d1bcb16a6fddef94866d225a01a14a" dependencies = [ "io-lifetimes", - "rustix 1.1.3", + "rustix 1.1.4", "windows-sys 0.59.0", ] @@ -4723,7 +4720,7 @@ checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -4965,7 +4962,7 @@ dependencies = [ [[package]] name = "graphql-router" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-graphql-parser", "async-stream", @@ -5844,7 +5841,7 @@ dependencies = [ [[package]] name = "introspection-resolver" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-graphql-parser", "async-graphql-value", @@ -5859,7 +5856,7 @@ dependencies = [ [[package]] name = "introspection-util" -version = "0.30.3" +version = "0.30.4" dependencies = [ "anyhow", "ctor", @@ -5933,7 +5930,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -6025,9 +6022,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.85" +version = "0.3.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" +checksum = "c7e709f3e3d22866f9c25b3aff01af289b18422cc8b4262fb19103ee80fe513d" dependencies = [ "once_cell", "wasm-bindgen", @@ -6199,7 +6196,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -6351,9 +6348,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "linux-raw-sys" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" @@ -6396,7 +6393,7 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "lsp" -version = "0.30.3" +version = "0.30.4" dependencies = [ "anyhow", "builder", @@ -6487,7 +6484,7 @@ checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" [[package]] name = "mcp-bridge" -version = "0.30.3" +version = "0.30.4" dependencies = [ "anyhow", "clap", @@ -6501,7 +6498,7 @@ dependencies = [ [[package]] name = "mcp-router" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-graphql-parser", "async-stream", @@ -6558,7 +6555,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad38eb12aea514a0466ea40a80fd8cc83637065948eb4a426e4aa46261175227" dependencies = [ - "rustix 1.1.3", + "rustix 1.1.4", ] [[package]] @@ -6741,7 +6738,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -6756,7 +6753,7 @@ dependencies = [ "openssl-probe 0.2.1", "openssl-sys", "schannel", - "security-framework 3.6.0", + "security-framework 3.7.0", "security-framework-sys", "tempfile", ] @@ -7333,7 +7330,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -7676,7 +7673,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -7752,7 +7749,7 @@ dependencies = [ "phf_shared 0.11.3", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -7790,7 +7787,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -7851,7 +7848,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "playground-router" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "common", @@ -7933,7 +7930,7 @@ dependencies = [ [[package]] name = "postgres-builder" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "builder", @@ -7954,7 +7951,7 @@ dependencies = [ [[package]] name = "postgres-builder-dynamic" -version = "0.30.3" +version = "0.30.4" dependencies = [ "core-plugin-interface", "postgres-builder", @@ -7962,7 +7959,7 @@ dependencies = [ [[package]] name = "postgres-core-builder" -version = "0.30.3" +version = "0.30.4" dependencies = [ "builder", "codemap", @@ -7991,7 +7988,7 @@ dependencies = [ [[package]] name = "postgres-core-model" -version = "0.30.3" +version = "0.30.4" dependencies = [ "bincode 2.0.1", "builder", @@ -8011,7 +8008,7 @@ dependencies = [ [[package]] name = "postgres-core-resolver" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "base64 0.22.1", @@ -8035,7 +8032,7 @@ dependencies = [ [[package]] name = "postgres-graphql-builder" -version = "0.30.3" +version = "0.30.4" dependencies = [ "core-model", "core-model-builder", @@ -8049,7 +8046,7 @@ dependencies = [ [[package]] name = "postgres-graphql-model" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-graphql-parser", "async-graphql-value", @@ -8064,7 +8061,7 @@ dependencies = [ [[package]] name = "postgres-graphql-resolver" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-graphql-parser", "async-graphql-value", @@ -8114,7 +8111,7 @@ dependencies = [ [[package]] name = "postgres-resolver" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "common", @@ -8136,7 +8133,7 @@ dependencies = [ [[package]] name = "postgres-resolver-dynamic" -version = "0.30.3" +version = "0.30.4" dependencies = [ "core-plugin-interface", "postgres-resolver", @@ -8144,7 +8141,7 @@ dependencies = [ [[package]] name = "postgres-rest-builder" -version = "0.30.3" +version = "0.30.4" dependencies = [ "core-model-builder", "core-plugin-shared", @@ -8155,7 +8152,7 @@ dependencies = [ [[package]] name = "postgres-rest-model" -version = "0.30.3" +version = "0.30.4" dependencies = [ "bincode 2.0.1", "common", @@ -8171,7 +8168,7 @@ dependencies = [ [[package]] name = "postgres-rest-resolver" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "common", @@ -8184,7 +8181,7 @@ dependencies = [ [[package]] name = "postgres-rpc-builder" -version = "0.30.3" +version = "0.30.4" dependencies = [ "core-model-builder", "core-plugin-shared", @@ -8195,7 +8192,7 @@ dependencies = [ [[package]] name = "postgres-rpc-model" -version = "0.30.3" +version = "0.30.4" dependencies = [ "bincode 2.0.1", "core-model", @@ -8207,7 +8204,7 @@ dependencies = [ [[package]] name = "postgres-rpc-resolver" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "common", @@ -8302,7 +8299,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -8322,7 +8319,7 @@ checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f" dependencies = [ "proc-macro-rules-macros", "proc-macro2", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -8334,7 +8331,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -8372,7 +8369,7 @@ dependencies = [ "itertools 0.14.0", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -8405,7 +8402,7 @@ checksum = "752233a382efa1026438aa8409c72489ebaa7ed94148bfabdf5282dc864276ef" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -8622,7 +8619,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b" dependencies = [ "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -8671,7 +8668,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -8790,7 +8787,7 @@ checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" [[package]] name = "rest-router" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "common", @@ -8860,7 +8857,7 @@ dependencies = [ [[package]] name = "rpc-router" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-stream", "async-trait", @@ -8967,14 +8964,14 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ "bitflags 2.11.0", "errno", "libc", - "linux-raw-sys 0.11.0", + "linux-raw-sys 0.12.1", "windows-sys 0.61.2", ] @@ -8985,7 +8982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fc84bf7e9aa16c4f2c758f27412dc9841341e16aa682d9c7ac308fe3ee12056" dependencies = [ "once_cell", - "rustix 1.1.3", + "rustix 1.1.4", ] [[package]] @@ -9026,7 +9023,7 @@ dependencies = [ "openssl-probe 0.2.1", "rustls-pki-types", "schannel", - "security-framework 3.6.0", + "security-framework 3.7.0", ] [[package]] @@ -9240,9 +9237,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d17b898a6d6948c3a8ee4372c17cb384f90d2e6e912ef00895b14fd7ab54ec38" +checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ "bitflags 2.11.0", "core-foundation 0.10.1", @@ -9253,9 +9250,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.16.0" +version = "2.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321c8673b092a9a42605034a9879d73cb79101ed5fd117bc9a597b89b4e9e61a" +checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" dependencies = [ "core-foundation-sys", "libc", @@ -9487,7 +9484,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -9523,7 +9520,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -9586,7 +9583,7 @@ dependencies = [ [[package]] name = "server-actix" -version = "0.30.3" +version = "0.30.4" dependencies = [ "actix-web", "common", @@ -9604,7 +9601,7 @@ dependencies = [ [[package]] name = "server-aws-lambda" -version = "0.30.3" +version = "0.30.4" dependencies = [ "builder", "common", @@ -9625,7 +9622,7 @@ dependencies = [ [[package]] name = "server-cf-worker" -version = "0.30.3" +version = "0.30.4" dependencies = [ "common", "console_error_panic_hook", @@ -9650,7 +9647,7 @@ dependencies = [ [[package]] name = "server-common" -version = "0.30.3" +version = "0.30.4" dependencies = [ "common", "core-plugin-interface", @@ -10002,7 +9999,7 @@ checksum = "ae36a4951ca7bd1cfd991c241584a9824a70f6aff1e7d4f693fb3f2465e4030e" dependencies = [ "quote", "swc_macros_common", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -10056,7 +10053,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -10068,12 +10065,12 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] name = "subsystem-model-builder-util" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "builder", @@ -10090,7 +10087,7 @@ dependencies = [ [[package]] name = "subsystem-model-util" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-graphql-parser", "core-model", @@ -10177,7 +10174,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -10232,7 +10229,7 @@ checksum = "e276dc62c0a2625a560397827989c82a93fd545fcf6f7faec0935a82cc4ddbb8" dependencies = [ "proc-macro2", "swc_macros_common", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -10333,7 +10330,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -10438,7 +10435,7 @@ checksum = "c16ce73424a6316e95e09065ba6a207eba7765496fed113702278b7711d4b632" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -10449,7 +10446,7 @@ checksum = "aae1efbaa74943dc5ad2a2fb16cbd78b77d7e4d63188f3c5b4df2b4dcd2faaae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -10494,9 +10491,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.116" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df424c70518695237746f84cede799c9c58fcb37450d7b23716568cc8bc69cb" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -10532,7 +10529,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -10556,7 +10553,7 @@ checksum = "181f22127402abcf8ee5c83ccd5b408933fec36a6095cf82cda545634692657e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -10577,7 +10574,7 @@ dependencies = [ [[package]] name = "system-router" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "common", @@ -10622,7 +10619,7 @@ dependencies = [ "fastrand", "getrandom 0.4.1", "once_cell", - "rustix 1.1.3", + "rustix 1.1.4", "windows-sys 0.61.2", ] @@ -10673,12 +10670,12 @@ checksum = "be35209fd0781c5401458ab66e4f98accf63553e8fae7425503e92fdd319783b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] name = "testing" -version = "0.30.3" +version = "0.30.4" dependencies = [ "anyhow", "async-graphql-parser", @@ -10743,7 +10740,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -10754,7 +10751,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -10852,7 +10849,7 @@ checksum = "2d2e76690929402faae40aebdda620a2c0e25dd6d3b9afe48867dfd95991f4bd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -10890,7 +10887,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -11186,7 +11183,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -11228,7 +11225,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -11791,7 +11788,7 @@ dependencies = [ "io-extras", "io-lifetimes", "log", - "rustix 1.1.3", + "rustix 1.1.4", "system-interface", "thiserror 2.0.18", "tracing", @@ -11835,9 +11832,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.108" +version = "0.2.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" +checksum = "ec1adf1535672f5b7824f817792b1afd731d7e843d2d04ec8f27e8cb51edd8ac" dependencies = [ "cfg-if 1.0.4", "once_cell", @@ -11848,9 +11845,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.58" +version = "0.4.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f" +checksum = "fe88540d1c934c4ec8e6db0afa536876c5441289d7f9f9123d4f065ac1250a6b" dependencies = [ "cfg-if 1.0.4", "futures-util", @@ -11862,9 +11859,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.108" +version = "0.2.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" +checksum = "19e638317c08b21663aed4d2b9a2091450548954695ff4efa75bff5fa546b3b1" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -11872,31 +11869,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.108" +version = "0.2.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" +checksum = "2c64760850114d03d5f65457e96fc988f11f01d38fbaa51b254e4ab5809102af" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.108" +version = "0.2.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" +checksum = "60eecd4fe26177cfa3339eb00b4a36445889ba3ad37080c2429879718e20ca41" dependencies = [ "unicode-ident", ] [[package]] name = "wasm-bindgen-test" -version = "0.3.58" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45649196a53b0b7a15101d845d44d2dda7374fc1b5b5e2bbf58b7577ff4b346d" +checksum = "6f9483e929b4ae6889bc7c62b314abda7d0bd286a8d82b21235855d5327e4eb4" dependencies = [ "async-trait", "cast", @@ -11916,24 +11913,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.58" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f579cdd0123ac74b94e1a4a72bd963cf30ebac343f2df347da0b8df24cdebed2" +checksum = "30f8b972c5c33f97917c9f418535f3175e464d48db15f5226d124c648a1b4036" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] name = "wasm-bindgen-test-shared" -version = "0.2.108" +version = "0.2.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8145dd1593bf0fb137dbfa85b8be79ec560a447298955877804640e40c2d6ea" +checksum = "0000397743a3b549ddba01befd1a26020eff98a028429630281c4203b4cc538d" [[package]] name = "wasm-builder" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "core-model-builder", @@ -11944,7 +11941,7 @@ dependencies = [ [[package]] name = "wasm-builder-dynamic" -version = "0.30.3" +version = "0.30.4" dependencies = [ "core-plugin-interface", "wasm-builder", @@ -12003,7 +12000,7 @@ dependencies = [ [[package]] name = "wasm-graphql-builder" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "core-model", @@ -12016,7 +12013,7 @@ dependencies = [ [[package]] name = "wasm-graphql-model" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-graphql-parser", "bincode 2.0.1", @@ -12028,7 +12025,7 @@ dependencies = [ [[package]] name = "wasm-graphql-resolver" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-graphql-parser", "async-trait", @@ -12056,7 +12053,7 @@ dependencies = [ [[package]] name = "wasm-resolver" -version = "0.30.3" +version = "0.30.4" dependencies = [ "async-trait", "core-plugin-interface", @@ -12070,7 +12067,7 @@ dependencies = [ [[package]] name = "wasm-resolver-dynamic" -version = "0.30.3" +version = "0.30.4" dependencies = [ "core-plugin-interface", "wasm-resolver", @@ -12175,7 +12172,7 @@ dependencies = [ "postcard", "pulley-interpreter", "rayon", - "rustix 1.1.3", + "rustix 1.1.4", "semver 1.0.27", "serde", "serde_derive", @@ -12241,7 +12238,7 @@ dependencies = [ "directories-next", "log", "postcard", - "rustix 1.1.3", + "rustix 1.1.4", "serde", "serde_derive", "sha2", @@ -12259,7 +12256,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", "wasmtime-internal-component-util", "wasmtime-internal-wit-bindgen", "wit-parser 0.240.0", @@ -12309,7 +12306,7 @@ dependencies = [ "cc", "cfg-if 1.0.4", "libc", - "rustix 1.1.3", + "rustix 1.1.4", "wasmtime-internal-versioned-export-macros", "windows-sys 0.60.2", ] @@ -12322,7 +12319,7 @@ checksum = "2add04119fa43ce6e57f2638ab978a17adafbba738a2aa66f29c5bb528bd030b" dependencies = [ "cc", "object", - "rustix 1.1.3", + "rustix 1.1.4", "wasmtime-internal-versioned-export-macros", ] @@ -12374,7 +12371,7 @@ checksum = "47f6bf5957ba823cb170996073edf4596b26d5f44c53f9e96b586c64fa04f7e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -12441,9 +12438,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.85" +version = "0.3.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598" +checksum = "9d6bb20ed2d9572df8584f6dc81d68a41a625cadc6f15999d649a70ce7e3597a" dependencies = [ "js-sys", "wasm-bindgen", @@ -12623,7 +12620,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3fabb953106c3c8eea8306e4393700d7657561cb43122571b172bbfb7c7ba1d" dependencies = [ "env_home", - "rustix 1.1.3", + "rustix 1.1.4", "winsafe", ] @@ -12681,7 +12678,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", "witx", ] @@ -12693,7 +12690,7 @@ checksum = "885e44efc8547387700b4bdf9caa66a9d04364f394e31bd3aa240cbce2d47296" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", "wiggle-generate", ] @@ -12801,7 +12798,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -12812,7 +12809,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -12823,7 +12820,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -12834,7 +12831,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -13173,7 +13170,7 @@ dependencies = [ "heck 0.5.0", "indexmap 2.13.0", "prettyplease", - "syn 2.0.116", + "syn 2.0.117", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -13189,7 +13186,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -13317,7 +13314,7 @@ dependencies = [ "async-trait", "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", "wasm-bindgen", "wasm-bindgen-futures", "wasm-bindgen-macro-support", @@ -13441,7 +13438,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", "synstructure 0.13.2", ] @@ -13453,7 +13450,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", "synstructure 0.13.2", ] @@ -13474,7 +13471,7 @@ checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -13494,7 +13491,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", "synstructure 0.13.2", ] @@ -13515,7 +13512,7 @@ checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] @@ -13549,7 +13546,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.116", + "syn 2.0.117", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 06dee010f..6ea763b9c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.30.3" +version = "0.30.4" edition = "2024" # See https://github.com/mozilla/application-services/blob/main/Cargo.toml for the reasons why we use this structure diff --git a/crates/deno-subsystem/deno-graphql-builder/src/system_builder.rs b/crates/deno-subsystem/deno-graphql-builder/src/system_builder.rs index 1bbdd11a7..df0d8a0d8 100644 --- a/crates/deno-subsystem/deno-graphql-builder/src/system_builder.rs +++ b/crates/deno-subsystem/deno-graphql-builder/src/system_builder.rs @@ -43,14 +43,19 @@ const DENO_BUNDLE_WARNING: &[u8] = b"is experimental and subject to changes"; async fn bundle_source(module_fs_path: &Path) -> Result { let deno_path = download_deno_if_needed().await?; - let output = tokio::process::Command::new(deno_path) + let mut command = tokio::process::Command::new(deno_path); + command .arg("bundle") .arg("--allow-import") .arg("--quiet") .arg("--node-modules-dir=auto") - .arg(module_fs_path.to_string_lossy().as_ref()) - .output() - .await; + .arg(module_fs_path.to_string_lossy().as_ref()); + + if let Some(config_path) = find_deno_config(module_fs_path) { + command.arg("--config").arg(config_path); + } + + let output = command.output().await; fn simplify_error(output: &[u8]) -> String { // remove the "experimental" warning by looking for DENO_BUNDLE_WARNING and stripping that out @@ -94,6 +99,48 @@ async fn bundle_source(module_fs_path: &Path) -> Result Option { + if let Ok(explicit) = std::env::var("EXO_DENO_CONFIG") { + let path = PathBuf::from(explicit); + if path.exists() { + return Some(path); + } + } + if let Ok(explicit) = std::env::var("DENO_CONFIG") { + let path = PathBuf::from(explicit); + if path.exists() { + return Some(path); + } + } + + if let Ok(cwd) = std::env::current_dir() { + let json = cwd.join("deno.json"); + if json.exists() { + return Some(json); + } + let jsonc = cwd.join("deno.jsonc"); + if jsonc.exists() { + return Some(jsonc); + } + } + + let mut current = module_fs_path.parent()?.to_path_buf(); + loop { + let json = current.join("deno.json"); + if json.exists() { + return Some(json); + } + let jsonc = current.join("deno.jsonc"); + if jsonc.exists() { + return Some(jsonc); + } + if !current.pop() { + break; + } + } + None +} + async fn download_deno_if_needed() -> Result { let deno_executable = if env::consts::OS == "windows" { "deno.exe" diff --git a/crates/postgres-subsystem/postgres-core-builder/src/computed_script.rs b/crates/postgres-subsystem/postgres-core-builder/src/computed_script.rs index 6a605a8ff..bdafcfa09 100644 --- a/crates/postgres-subsystem/postgres-core-builder/src/computed_script.rs +++ b/crates/postgres-subsystem/postgres-core-builder/src/computed_script.rs @@ -76,15 +76,20 @@ async fn bundle_source(module_fs_path: &Path) -> Result String { let output = output @@ -124,6 +129,48 @@ async fn bundle_source(module_fs_path: &Path) -> Result Option { + if let Ok(explicit) = std::env::var("EXO_DENO_CONFIG") { + let path = PathBuf::from(explicit); + if path.exists() { + return Some(path); + } + } + if let Ok(explicit) = std::env::var("DENO_CONFIG") { + let path = PathBuf::from(explicit); + if path.exists() { + return Some(path); + } + } + + if let Ok(cwd) = std::env::current_dir() { + let json = cwd.join("deno.json"); + if json.exists() { + return Some(json); + } + let jsonc = cwd.join("deno.jsonc"); + if jsonc.exists() { + return Some(jsonc); + } + } + + let mut current = module_fs_path.parent()?.to_path_buf(); + loop { + let json = current.join("deno.json"); + if json.exists() { + return Some(json); + } + let jsonc = current.join("deno.jsonc"); + if jsonc.exists() { + return Some(jsonc); + } + if !current.pop() { + break; + } + } + None +} + async fn download_deno_if_needed() -> Result { let deno_executable = if env::consts::OS == "windows" { "deno.exe"