From 445e0734f42e8a02bf324a3ad91ea71a78b55920 Mon Sep 17 00:00:00 2001 From: TheEdward162 Date: Tue, 12 Mar 2024 17:42:56 +0100 Subject: [PATCH] chore: update Javy dependency * also correct typos in examples --- core/Cargo.lock | 161 +++++++++++++----- core/interpreter_js/Cargo.toml | 2 +- .../communication.send-email.mailchimp.map.js | 2 +- .../src/communication.send-sms.twilio.map.js | 2 +- .../src/communication.send-sms.tyntec.map.js | 2 +- .../src/wasm-sdk.example.localhost.map.js | 2 +- .../comlinks/src/wasm-sdk.example.profile.ts | 4 +- 7 files changed, 130 insertions(+), 45 deletions(-) diff --git a/core/Cargo.lock b/core/Cargo.lock index 66014509..81695387 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -89,17 +89,17 @@ checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bindgen" -version = "0.69.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ "bitflags 2.4.1", "cexpr", "clang-sys", + "itertools", "lazy_static", "lazycell", "log", - "peeking_take_while", "prettyplease", "proc-macro2", "quote", @@ -710,9 +710,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -721,12 +721,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" dependencies = [ "bytes", + "futures-core", "http", + "http-body", "pin-project-lite", ] @@ -736,46 +748,59 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - [[package]] name = "hyper" -version = "0.14.28" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", + "http-body-util", "hyper", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -856,6 +881,15 @@ dependencies = [ "nom", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -1148,9 +1182,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oneclient_core" @@ -1247,18 +1281,32 @@ dependencies = [ "windows-targets", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "percent-encoding" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "pin-project-lite" version = "0.2.13" @@ -1337,25 +1385,28 @@ dependencies = [ [[package]] name = "quickjs-wasm-rs" -version = "3.0.0-alpha.1" -source = "git+https://github.com/superfaceai/javy.git?rev=2d3f56831d4d08ea3bb747b49e679674f9927393#2d3f56831d4d08ea3bb747b49e679674f9927393" +version = "3.1.0-alpha.1" +source = "git+https://github.com/superfaceai/javy.git?rev=9583c8fc728f3920ebc4875964ed1b033f71cc97#9583c8fc728f3920ebc4875964ed1b033f71cc97" dependencies = [ "anyhow", "once_cell", "quickjs-wasm-sys", "serde", + "visibility", ] [[package]] name = "quickjs-wasm-sys" -version = "1.1.2-alpha.1" -source = "git+https://github.com/superfaceai/javy.git?rev=2d3f56831d4d08ea3bb747b49e679674f9927393#2d3f56831d4d08ea3bb747b49e679674f9927393" +version = "1.2.1-alpha.1" +source = "git+https://github.com/superfaceai/javy.git?rev=9583c8fc728f3920ebc4875964ed1b033f71cc97#9583c8fc728f3920ebc4875964ed1b033f71cc97" dependencies = [ "anyhow", "bindgen", "cc", + "http-body-util", "hyper", "hyper-tls", + "hyper-util", "tokio", "walkdir", ] @@ -1660,9 +1711,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" @@ -1799,9 +1850,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "libc", @@ -1833,6 +1884,28 @@ dependencies = [ "tokio", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -1845,6 +1918,7 @@ version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -1999,6 +2073,17 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "visibility" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3fd98999db9227cf28e59d83e1f120f42bc233d4b152e8fab9bc87d5bb1e0f8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "walkdir" version = "2.4.0" diff --git a/core/interpreter_js/Cargo.toml b/core/interpreter_js/Cargo.toml index dde06ffb..a31ca798 100644 --- a/core/interpreter_js/Cargo.toml +++ b/core/interpreter_js/Cargo.toml @@ -12,7 +12,7 @@ sf_std = { path = "../host_to_core_std", package = "host_to_core_std" } map_std = { path = "../core_to_map_std", package = "core_to_map_std" } # quickjs-wasm-rs = "2.0.1" -quickjs-wasm-rs = { git = "https://github.com/superfaceai/javy.git", rev = "2d3f56831d4d08ea3bb747b49e679674f9927393", features = [] } +quickjs-wasm-rs = { git = "https://github.com/superfaceai/javy.git", rev = "9583c8fc728f3920ebc4875964ed1b033f71cc97", features = [] } # quickjs-wasm-rs = { path = "../../../javy/crates/quickjs-wasm-rs", features = [] } serde = { workspace = true } diff --git a/examples/comlinks/src/communication.send-email.mailchimp.map.js b/examples/comlinks/src/communication.send-email.mailchimp.map.js index 0f0429af..1550f595 100644 --- a/examples/comlinks/src/communication.send-email.mailchimp.map.js +++ b/examples/comlinks/src/communication.send-email.mailchimp.map.js @@ -1,4 +1,4 @@ -/// +/// // @ts-check /** @type {UseCase<{ safety: 'unsafe', input: { from: AnyValue, to: AnyValue, subject: AnyValue, text?: AnyValue, html?: AnyValue, attachments?: [{ content: AnyValue, type: AnyValue, filename?: AnyValue }] }, result: { messageId: AnyValue }, error: { title: string, detail: string } }>} */ diff --git a/examples/comlinks/src/communication.send-sms.twilio.map.js b/examples/comlinks/src/communication.send-sms.twilio.map.js index 7a991298..81c58a76 100644 --- a/examples/comlinks/src/communication.send-sms.twilio.map.js +++ b/examples/comlinks/src/communication.send-sms.twilio.map.js @@ -1,4 +1,4 @@ -/// +/// // @ts-check /** @type {UseCase<{ safety: 'unsafe', input: { to?: AnyValue, from?: AnyValue, text?: AnyValue }, result: { messageId: AnyValue }, error: { title: string, detail: string } }>} */ diff --git a/examples/comlinks/src/communication.send-sms.tyntec.map.js b/examples/comlinks/src/communication.send-sms.tyntec.map.js index 7843a91a..b72d7cd5 100644 --- a/examples/comlinks/src/communication.send-sms.tyntec.map.js +++ b/examples/comlinks/src/communication.send-sms.tyntec.map.js @@ -1,4 +1,4 @@ -/// +/// // @ts-check /** @type {UseCase<{ safety: 'unsafe', input: { to?: AnyValue, from?: AnyValue, text?: AnyValue }, result: { messageId: AnyValue }, error: { title: string, detail: string } }>} */ diff --git a/examples/comlinks/src/wasm-sdk.example.localhost.map.js b/examples/comlinks/src/wasm-sdk.example.localhost.map.js index 833718b5..7e6efe82 100644 --- a/examples/comlinks/src/wasm-sdk.example.localhost.map.js +++ b/examples/comlinks/src/wasm-sdk.example.localhost.map.js @@ -1,4 +1,4 @@ -/// +/// /// // @ts-check diff --git a/examples/comlinks/src/wasm-sdk.example.profile.ts b/examples/comlinks/src/wasm-sdk.example.profile.ts index 33680cd3..d6a8e387 100644 --- a/examples/comlinks/src/wasm-sdk.example.profile.ts +++ b/examples/comlinks/src/wasm-sdk.example.profile.ts @@ -2,11 +2,11 @@ type Example = UseCase<{ safety: 'safe' input: { id: AnyValue } - result: { url: AnyValue, method: AnyValue, query: AnyValue, headers: AnyValue, x?: 1, y: true, z: "seven" } + result: { url: AnyValue, method: AnyValue, query: AnyValue, headers: AnyValue } error: { title: AnyValue, detail?: AnyValue, r: boolean } }>; const exampleExamples: Example['examples'] = [ - { input: { id: "a" }, result: { url: 1, method: 2, query: 3, headers: 4, x: 1, y: true, z: 'seven' } }, + { input: { id: "a" }, result: { url: 1, method: 2, query: 3, headers: 4 } }, { input: { id: 1 }, error: { title: "hi", r: true } } ] \ No newline at end of file