diff --git a/.ghjk/lock.json b/.ghjk/lock.json index a2a9a1adc0..68f6b154f3 100644 --- a/.ghjk/lock.json +++ b/.ghjk/lock.json @@ -1,6 +1,6 @@ { "version": "0", - "platform": "aarch64-darwin", + "platform": "x86_64-linux", "moduleEntries": { "ports": { "version": "0", @@ -455,6 +455,7 @@ "9e72a9f857bd9b14b47702b5b8ee660833828d4b", "cfe6640502ddf9772073889af75888d361b1f2b9", "8e5e02544073c4733d8f2156c404a0dd524cdaaf", + "e05f859f4a734a85fd3439f9b0fc0de1e733bdac", "38285a3b335e394ccce5ac5d59e15f660bfa4cc9", "7bbf00da8e265c56c2bff5bb7d89ba806e2590d2", "14fd3752a984c5d82e1451f7388c73a21fcce705", @@ -920,6 +921,25 @@ }, "packageName": "node-gyp" }, + "e05f859f4a734a85fd3439f9b0fc0de1e733bdac": { + "version": "v2.4.0", + "port": { + "ty": "denoWorker@v1", + "name": "mold_ghrel", + "platforms": [ + "aarch64-linux", + "x86_64-linux" + ], + "version": "0.1.0", + "deps": [ + { + "name": "tar_aa" + } + ], + "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/2725af8/ports/mold.ts" + }, + "replaceLd": false + }, "38285a3b335e394ccce5ac5d59e15f660bfa4cc9": { "version": "3.8.18", "port": { diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 36cf2875ea..baf95da7a8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,7 +68,7 @@ jobs: fail-fast: false matrix: include: - - os: macos-latest + - os: macos-13 target: x86_64-apple-darwin suffix: "" - os: macos-14 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 95ce7d8016..803420276b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -123,7 +123,7 @@ jobs: strategy: matrix: include: - - os: macos-latest + - os: macos-13 activate: "source .venv/bin/activate" - os: macos-14 activate: "source .venv/bin/activate" @@ -234,7 +234,7 @@ jobs: runs-on: - self-hosted # https://check-jsonschema.readthedocs.io/en/latest/faq.html#using-self-hosted-runners - custom-ubuntu-large - timeout-minutes: 60 + timeout-minutes: 80 steps: - uses: actions/checkout@v4 - uses: dsherret/rust-toolchain-file@v1 @@ -321,6 +321,8 @@ jobs: deno run -A dev/update.ts --cache-only || deno run -A dev/update.ts --cache-only cargo build -p meta-cli cargo build -p xtask # xtask and meta-cli are used by the test suite + + ghjk x clean-deno-lock deno run -A dev/test.ts --threads 1 -- --coverage=coverage # FIXME: required due to https://github.com/denoland/deno/issues/21621#issuecomment-1887870712 deno cache --import-map typegate/import_map.json \ diff --git a/.gitignore b/.gitignore index 3718e9139f..3352e89768 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ typegate/codegen typegate/tests/prisma-migrations typegate/tests/e2e/cli/prisma-migrations typegate/tests/importers/copy/ +typegate/tests/**/*.wasm .env typegate/native/bindings.json bindings diff --git a/Cargo.lock b/Cargo.lock index 58619bbbd3..5ce772f2c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -112,7 +112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -225,7 +225,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -236,7 +236,7 @@ checksum = "7c7db3d5a9718568e4cf4a537cfd7070e6e6ff7481510d0237fb529ac850f6d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -581,14 +581,14 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a" dependencies = [ "concurrent-queue", "event-listener 5.3.0", @@ -599,11 +599,11 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e9eabd7a98fe442131a17c316bd9349c43695e49e730c3c8e12cfb5f4da2693" +checksum = "9c90a406b4495d129f00461241616194cb8a032c8d1c53c657f0961d5f8e0498" dependencies = [ - "brotli 5.0.0", + "brotli 6.0.0", "flate2", "futures-core", "memchr", @@ -707,7 +707,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -747,7 +747,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -764,7 +764,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -827,7 +827,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -1147,7 +1147,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", "syn_derive", ] @@ -1164,9 +1164,9 @@ dependencies = [ [[package]] name = "brotli" -version = "5.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19483b140a7ac7174d34b5a581b406c64f84da5409d3e09cf4fff604f9270e67" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1274,9 +1274,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" [[package]] name = "byteorder" @@ -1555,7 +1555,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -1610,7 +1610,7 @@ dependencies = [ "nom 7.1.3", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -1650,7 +1650,7 @@ dependencies = [ [[package]] name = "common" -version = "0.4.0" +version = "0.4.1-0" dependencies = [ "anyhow", "async-trait", @@ -2176,7 +2176,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -2259,7 +2259,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -2292,7 +2292,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -3037,7 +3037,7 @@ dependencies = [ "quote", "strum", "strum_macros", - "syn 2.0.61", + "syn 2.0.63", "thiserror", ] @@ -3427,9 +3427,9 @@ dependencies = [ [[package]] name = "deunicode" -version = "1.4.4" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322ef0094744e63628e6f0eb2295517f79276a5b342a4c2ff3042566ca181d4e" +checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" [[package]] name = "diagnostics" @@ -3566,7 +3566,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -3595,7 +3595,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -3949,7 +3949,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -3970,7 +3970,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -4272,9 +4272,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "filetime" @@ -4371,7 +4371,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -4403,7 +4403,7 @@ checksum = "3a0b11eeb173ce52f84ebd943d42e58813a2ebb78a6a3ff0a243b71c5199cd7b" dependencies = [ "proc-macro2", "swc_macros_common", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -4431,7 +4431,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -4443,7 +4443,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -4455,7 +4455,7 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -4596,7 +4596,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -4697,7 +4697,7 @@ checksum = "9cf62650515830c41553b72bd49ec20fb120226f9277c7f2847f071cf998325b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -5699,7 +5699,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -5963,7 +5963,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -6217,7 +6217,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e01cc93c35479eaa65adbf8b9aa933aa3f400d9e4e2fc553f516d4f822c8b13" dependencies = [ - "syn 2.0.61", + "syn 2.0.63", "thiserror", ] @@ -6463,7 +6463,7 @@ dependencies = [ [[package]] name = "meta-cli" -version = "0.4.0" +version = "0.4.1-0" dependencies = [ "actix", "actix-web", @@ -6527,7 +6527,7 @@ dependencies = [ [[package]] name = "metagen" -version = "0.4.0" +version = "0.4.1-0" dependencies = [ "anyhow", "common", @@ -6852,7 +6852,7 @@ dependencies = [ [[package]] name = "mt_deno" -version = "0.4.0" +version = "0.4.1-0" dependencies = [ "anyhow", "deno", @@ -6975,7 +6975,7 @@ dependencies = [ "quote", "serde 1.0.201", "serde_json", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -7221,7 +7221,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -7394,7 +7394,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -7821,7 +7821,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -7914,7 +7914,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -7952,7 +7952,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -7969,9 +7969,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -8019,7 +8019,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -8295,7 +8295,7 @@ checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f" dependencies = [ "proc-macro-rules-macros", "proc-macro2", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -8307,7 +8307,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -8888,7 +8888,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -9526,7 +9526,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -9835,7 +9835,7 @@ checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -9846,7 +9846,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -9869,7 +9869,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -9957,7 +9957,7 @@ dependencies = [ "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -10478,7 +10478,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -10526,7 +10526,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -10652,7 +10652,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -10737,7 +10737,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -10867,7 +10867,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -11068,7 +11068,7 @@ checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -11104,7 +11104,7 @@ checksum = "50176cfc1cbc8bb22f41c6fe9d1ec53fbe057001219b5954961b8ad0f336fce9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -11128,7 +11128,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -11144,9 +11144,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.61" +version = "2.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" +checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" dependencies = [ "proc-macro2", "quote", @@ -11162,7 +11162,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -11355,7 +11355,7 @@ checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -11515,7 +11515,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -11795,7 +11795,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -11824,7 +11824,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -12049,7 +12049,7 @@ dependencies = [ [[package]] name = "typegate" -version = "0.4.0" +version = "0.4.1-0" dependencies = [ "colored", "env_logger", @@ -12062,7 +12062,7 @@ dependencies = [ [[package]] name = "typegate_engine" -version = "0.4.0" +version = "0.4.1-0" dependencies = [ "anyhow", "base64 0.21.7", @@ -12104,7 +12104,7 @@ dependencies = [ [[package]] name = "typegraph_core" -version = "0.4.0" +version = "0.4.1-0" dependencies = [ "common", "enum_dispatch", @@ -12133,7 +12133,7 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typescript" -version = "0.4.0" +version = "0.4.1-0" dependencies = [ "anyhow", "dprint-plugin-typescript", @@ -12168,7 +12168,7 @@ checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -12559,9 +12559,9 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" @@ -12628,7 +12628,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", "wasm-bindgen-shared", ] @@ -12662,7 +12662,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -12861,7 +12861,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser 0.202.0", @@ -13018,7 +13018,7 @@ checksum = "0d3b70422fdfa915c903f003b8b42554a8ae1aa0c6208429d8314ebf5721f3ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -13284,7 +13284,7 @@ dependencies = [ "proc-macro2", "quote", "shellexpand", - "syn 2.0.61", + "syn 2.0.63", "witx", ] @@ -13296,7 +13296,7 @@ checksum = "b4c31124572ab16401c491c0d4fb5fe5d17dab65fcfcc56d7d8efb1c1e56a3db" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", "wiggle-generate", ] @@ -13668,7 +13668,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", "wit-bindgen-core 0.22.0", "wit-bindgen-rust 0.22.0", ] @@ -13682,7 +13682,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", "wit-bindgen-core 0.24.0", "wit-bindgen-rust 0.24.0", ] @@ -13830,7 +13830,7 @@ checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xtask" -version = "0.4.0" +version = "0.4.1-0" dependencies = [ "anyhow", "clap", @@ -13872,7 +13872,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] @@ -13892,7 +13892,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.63", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index db6fbf9af0..7ac59bfa06 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ exclude = [ "libs/pyrt_wit_wire", ] [workspace.package] -version = "0.4.0" +version = "0.4.1-0" edition = "2021" [workspace.dependencies] diff --git a/dev/cross.Dockerfile b/dev/cross.Dockerfile index 9e869fbeb0..acf59cf472 100644 --- a/dev/cross.Dockerfile +++ b/dev/cross.Dockerfile @@ -30,6 +30,7 @@ RUN set -eux \ git \ curl \ # asdf deps \ + zstd \ xz-utils \ unzip diff --git a/dev/lock.yml b/dev/lock.yml index 3a3fe60d62..9529615636 100644 --- a/dev/lock.yml +++ b/dev/lock.yml @@ -98,7 +98,7 @@ dev: WASMTIME_VERSION: 20.0.0 TYPEGRAPH_VERSION: 0.0.3 PRISMA_VERSION: 5.5.2 - METATYPE_VERSION: 0.4.0 + METATYPE_VERSION: 0.4.1-0 PUBLISHED_VERSION: 0.3.6 WASM_OPT_VERSION: 0.116.0 MOLD_VERSION: v2.4.0 diff --git a/examples/templates/deno/compose.yml b/examples/templates/deno/compose.yml index 3f1e6b06f0..b9e640f727 100644 --- a/examples/templates/deno/compose.yml +++ b/examples/templates/deno/compose.yml @@ -1,6 +1,6 @@ services: typegate: - image: ghcr.io/metatypedev/typegate:v0.4.0 + image: ghcr.io/metatypedev/typegate:v0.4.1-0 restart: always ports: - "7890:7890" diff --git a/examples/templates/node/compose.yml b/examples/templates/node/compose.yml index 3f1e6b06f0..b9e640f727 100644 --- a/examples/templates/node/compose.yml +++ b/examples/templates/node/compose.yml @@ -1,6 +1,6 @@ services: typegate: - image: ghcr.io/metatypedev/typegate:v0.4.0 + image: ghcr.io/metatypedev/typegate:v0.4.1-0 restart: always ports: - "7890:7890" diff --git a/examples/templates/python/compose.yml b/examples/templates/python/compose.yml index 3f1e6b06f0..b9e640f727 100644 --- a/examples/templates/python/compose.yml +++ b/examples/templates/python/compose.yml @@ -1,6 +1,6 @@ services: typegate: - image: ghcr.io/metatypedev/typegate:v0.4.0 + image: ghcr.io/metatypedev/typegate:v0.4.1-0 restart: always ports: - "7890:7890" diff --git a/examples/templates/python/pyproject.toml b/examples/templates/python/pyproject.toml index 48a841ede2..9085110ea5 100644 --- a/examples/templates/python/pyproject.toml +++ b/examples/templates/python/pyproject.toml @@ -1,12 +1,12 @@ [tool.poetry] name = "example" -version = "0.4.0" +version = "0.4.1-0" description = "" authors = [] [tool.poetry.dependencies] python = ">=3.8,<4.0" -typegraph = "0.4.0" +typegraph = "0.4.1-0" [build-system] requires = ["poetry-core"] diff --git a/ghjk.ts b/ghjk.ts index 83df87a614..fbb174cebb 100644 --- a/ghjk.ts +++ b/ghjk.ts @@ -17,7 +17,7 @@ const CMAKE_VERSION = "3.28.0-rc6"; const CARGO_INSTA_VERSION = "1.33.0"; const NODE_VERSION = "20.8.0"; const TEMPORAL_VERSION = "0.10.7"; -const METATYPE_VERSION = "0.4.0"; +const METATYPE_VERSION = "0.4.1-0"; const installs = { python: ports.cpy_bs({ version: PYTHON_VERSION, releaseTag: "20240224" }), diff --git a/libs/common/Cargo.toml b/libs/common/Cargo.toml index e0410172b6..32790b80f0 100644 --- a/libs/common/Cargo.toml +++ b/libs/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "common" -version = "0.4.0" +version = "0.4.1-0" edition = "2021" [dependencies] diff --git a/libs/metagen/src/mdk_rust/stubs.rs b/libs/metagen/src/mdk_rust/stubs.rs index 7f4f5cfc57..7e1ccf1f31 100644 --- a/libs/metagen/src/mdk_rust/stubs.rs +++ b/libs/metagen/src/mdk_rust/stubs.rs @@ -64,7 +64,9 @@ pub fn gen_op_to_mat_map( r#"pub fn op_to_trait_name(op_name: &str) -> &'static str {{ match op_name {{"# )?; - for (op_name, trait_name) in op_to_trait_map { + let mut traits = op_to_trait_map.iter().collect::>(); + traits.sort_by_key(|(key, _)| *key); + for (op_name, trait_name) in traits { writeln!(&mut dest.buf, r#" "{op_name}" => "{trait_name}","#,)?; } writeln!( diff --git a/libs/metagen/tests/mat_rust/Cargo.toml b/libs/metagen/tests/mat_rust/Cargo.toml index 8b164fa56b..f99dfee531 100644 --- a/libs/metagen/tests/mat_rust/Cargo.toml +++ b/libs/metagen/tests/mat_rust/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mat_rust" edition = "2021" -version = "0.4.0" +version = "0.4.1-0" [workspace] members = ["gen"] diff --git a/libs/pyrt_wit_wire/pyproject.toml b/libs/pyrt_wit_wire/pyproject.toml index 8668258a2f..6911050452 100644 --- a/libs/pyrt_wit_wire/pyproject.toml +++ b/libs/pyrt_wit_wire/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyrt_wit_wire" -version = "0.4.0" +version = "0.4.1-0" description = "Wasm component implementing the PythonRuntime host using wit_wire protocol." license = "Elastic-2.0" readme = "README.md" diff --git a/libs/typescript/Cargo.toml b/libs/typescript/Cargo.toml index afbc8b0347..e44c833de2 100644 --- a/libs/typescript/Cargo.toml +++ b/libs/typescript/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "typescript" -version = "0.4.0" +version = "0.4.1-0" edition = "2021" [dependencies] diff --git a/libs/xtask/Cargo.toml b/libs/xtask/Cargo.toml index aea270be6f..83be8003ee 100644 --- a/libs/xtask/Cargo.toml +++ b/libs/xtask/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xtask" -version = "0.4.0" +version = "0.4.1-0" edition = "2021" [dependencies] diff --git a/meta-cli/Cargo.toml b/meta-cli/Cargo.toml index 8af8c47142..9f2b88bab9 100644 --- a/meta-cli/Cargo.toml +++ b/meta-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "meta-cli" -version = "0.4.0" +version = "0.4.1-0" edition = "2021" description = "Declarative API development platform. Build backend components with WASM/Typescript/Python, no matter where and how your (legacy) systems are." diff --git a/meta-lsp/package.json b/meta-lsp/package.json index 12ddd7a581..c749ef7f41 100644 --- a/meta-lsp/package.json +++ b/meta-lsp/package.json @@ -4,7 +4,7 @@ "description": "VSCode extension for Metatype support", "icon": "logo.png", "author": "Metatype Team", - "version": "0.4.0", + "version": "0.4.1-0", "repository": { "type": "git", "url": "https://github.com/metatypedev/metatype" diff --git a/meta-lsp/ts-language-server/package.json b/meta-lsp/ts-language-server/package.json index e5b20e77ce..85679b90c7 100644 --- a/meta-lsp/ts-language-server/package.json +++ b/meta-lsp/ts-language-server/package.json @@ -2,7 +2,7 @@ "name": "typegraph-ts-server", "description": "TypeScript language server for TypeGraph", "author": "Metatype Team", - "version": "0.4.0", + "version": "0.4.1-0", "repository": { "type": "git", "url": "https://github.com/metatypedev/metatype" diff --git a/meta-lsp/vscode-metatype-support/package.json b/meta-lsp/vscode-metatype-support/package.json index 9c2ee38920..4c3dec4c5f 100644 --- a/meta-lsp/vscode-metatype-support/package.json +++ b/meta-lsp/vscode-metatype-support/package.json @@ -2,7 +2,7 @@ "name": "vscode-metatype-support", "description": "VSCode extension for Metatype support", "author": "Metatype Team", - "version": "0.4.0", + "version": "0.4.1-0", "repository": { "type": "git", "url": "https://github.com/metatypedev/metatype" diff --git a/pyproject.toml b/pyproject.toml index 48c2ff78c0..b26343d78d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "metatype" -version = "0.4.0" +version = "0.4.1-0" description = "" authors = [] diff --git a/typegate/deno.lock b/typegate/deno.lock index 703a99645c..7d30e0dbb4 100644 --- a/typegate/deno.lock +++ b/typegate/deno.lock @@ -718,6 +718,117 @@ "https://deno.land/std@0.211.0/bytes/copy.ts": "f29c03168853720dfe82eaa57793d0b9e3543ebfe5306684182f0f1e3bfd422a", "https://deno.land/std@0.211.0/io/buf_reader.ts": "3ee2cf0d6570ec1ede46efd5d0b0701719dc573f103a123d2cf9f4bfbc36af31", "https://deno.land/std@0.211.0/io/buf_writer.ts": "214134bd77bc46e4478cf74b771dfb614b9e23b313df513a34c54aa88df81584", + "https://deno.land/std@0.213.0/assert/assert.ts": "bec068b2fccdd434c138a555b19a2c2393b71dfaada02b7d568a01541e67cdc5", + "https://deno.land/std@0.213.0/assert/assertion_error.ts": "9f689a101ee586c4ce92f52fa7ddd362e86434ffdf1f848e45987dc7689976b8", + "https://deno.land/std@0.213.0/bytes/concat.ts": "9cac3b4376afbef98ff03588eb3cf948e0d1eb6c27cfe81a7651ab6dd3adc54a", + "https://deno.land/std@0.213.0/bytes/copy.ts": "f29c03168853720dfe82eaa57793d0b9e3543ebfe5306684182f0f1e3bfd422a", + "https://deno.land/std@0.213.0/fmt/colors.ts": "aeaee795471b56fc62a3cb2e174ed33e91551b535f44677f6320336aabb54fbb", + "https://deno.land/std@0.213.0/fs/_create_walk_entry.ts": "5d9d2aaec05bcf09a06748b1684224d33eba7a4de24cf4cf5599991ca6b5b412", + "https://deno.land/std@0.213.0/fs/_get_file_info_type.ts": "da7bec18a7661dba360a1db475b826b18977582ce6fc9b25f3d4ee0403fe8cbd", + "https://deno.land/std@0.213.0/fs/_is_same_path.ts": "709c95868345fea051c58b9e96af95cff94e6ae98dfcff2b66dee0c212c4221f", + "https://deno.land/std@0.213.0/fs/_is_subdir.ts": "c68b309d46cc8568ed83c000f608a61bbdba0943b7524e7a30f9e450cf67eecd", + "https://deno.land/std@0.213.0/fs/_to_path_string.ts": "29bfc9c6c112254961d75cbf6ba814d6de5349767818eb93090cecfa9665591e", + "https://deno.land/std@0.213.0/fs/copy.ts": "dc0f68c4b6c3b090bfdb909387e309f6169b746bd713927c9507c9ef545d71f6", + "https://deno.land/std@0.213.0/fs/empty_dir.ts": "4f01e6d56e2aa8d90ad60f20bc25601f516b00f6c3044cdf6863a058791d91aa", + "https://deno.land/std@0.213.0/fs/ensure_dir.ts": "dffff68de0d10799b5aa9e39dec4e327e12bbd29e762292193684542648c4aeb", + "https://deno.land/std@0.213.0/fs/ensure_file.ts": "ac5cfde94786b0284d2c8e9f7f9425269bea1b2140612b4aea1f20b508870f59", + "https://deno.land/std@0.213.0/fs/ensure_link.ts": "d42af2edefeaa9817873ec6e46dc5d209ac4d744f8c69c5ecc2dffade78465b6", + "https://deno.land/std@0.213.0/fs/ensure_symlink.ts": "aee3f1655700f60090b4a3037f5b6c07ab37c36807cccad746ce89987719e6d2", + "https://deno.land/std@0.213.0/fs/eol.ts": "c9807291f78361d49fd986a9be04654610c615c5e2ec63d748976197d30ff206", + "https://deno.land/std@0.213.0/fs/exists.ts": "d2757ef764eaf5c6c5af7228e8447db2de42ab084a2dae540097f905723d83f5", + "https://deno.land/std@0.213.0/fs/expand_glob.ts": "a64e4ab51f62780f764789c9cdeacc862d221e35207fb81170a980ccc22868e3", + "https://deno.land/std@0.213.0/fs/mod.ts": "107f5afa4424c2d3ce2f7e9266173198da30302c69af662c720115fe504dc5ee", + "https://deno.land/std@0.213.0/fs/move.ts": "39e0d7ccb88a566d20b949712020e766b15ef1ec19159573d11f949bd677909c", + "https://deno.land/std@0.213.0/fs/walk.ts": "f04cc83ad3b27b5a5d078c831a01c7406069474bf280d5db015d937149a60128", + "https://deno.land/std@0.213.0/io/_constants.ts": "3c7ad4695832e6e4a32e35f218c70376b62bc78621ef069a4a0a3d55739f8856", + "https://deno.land/std@0.213.0/io/buf_reader.ts": "ccbd43ace0a9eebbd5e1b4765724b79da79d1e28b90c2b08537b99192da4a1f7", + "https://deno.land/std@0.213.0/io/buffer.ts": "79182995c8340ece2fa8763a8da86d282c507e854921d0a4c2ba7425c63609ef", + "https://deno.land/std@0.213.0/io/read_all.ts": "876c1cb20adea15349c72afc86cecd3573335845ae778967aefb5e55fe5a8a4a", + "https://deno.land/std@0.213.0/io/types.ts": "748bbb3ac96abda03594ef5a0db15ce5450dcc6c0d841c8906f8b10ac8d32c96", + "https://deno.land/std@0.213.0/io/write_all.ts": "24aac2312bb21096ae3ae0b102b22c26164d3249dff96dbac130958aa736f038", + "https://deno.land/std@0.213.0/path/_common/assert_path.ts": "2ca275f36ac1788b2acb60fb2b79cb06027198bc2ba6fb7e163efaedde98c297", + "https://deno.land/std@0.213.0/path/_common/basename.ts": "569744855bc8445f3a56087fd2aed56bdad39da971a8d92b138c9913aecc5fa2", + "https://deno.land/std@0.213.0/path/_common/common.ts": "6157c7ec1f4db2b4a9a187efd6ce76dcaf1e61cfd49f87e40d4ea102818df031", + "https://deno.land/std@0.213.0/path/_common/constants.ts": "dc5f8057159f4b48cd304eb3027e42f1148cf4df1fb4240774d3492b5d12ac0c", + "https://deno.land/std@0.213.0/path/_common/dirname.ts": "684df4aa71a04bbcc346c692c8485594fc8a90b9408dfbc26ff32cf3e0c98cc8", + "https://deno.land/std@0.213.0/path/_common/format.ts": "92500e91ea5de21c97f5fe91e178bae62af524b72d5fcd246d6d60ae4bcada8b", + "https://deno.land/std@0.213.0/path/_common/from_file_url.ts": "d672bdeebc11bf80e99bf266f886c70963107bdd31134c4e249eef51133ceccf", + "https://deno.land/std@0.213.0/path/_common/glob_to_reg_exp.ts": "2007aa87bed6eb2c8ae8381adcc3125027543d9ec347713c1ad2c68427330770", + "https://deno.land/std@0.213.0/path/_common/normalize.ts": "684df4aa71a04bbcc346c692c8485594fc8a90b9408dfbc26ff32cf3e0c98cc8", + "https://deno.land/std@0.213.0/path/_common/normalize_string.ts": "dfdf657a1b1a7db7999f7c575ee7e6b0551d9c20f19486c6c3f5ff428384c965", + "https://deno.land/std@0.213.0/path/_common/relative.ts": "faa2753d9b32320ed4ada0733261e3357c186e5705678d9dd08b97527deae607", + "https://deno.land/std@0.213.0/path/_common/strip_trailing_separators.ts": "7024a93447efcdcfeaa9339a98fa63ef9d53de363f1fbe9858970f1bba02655a", + "https://deno.land/std@0.213.0/path/_common/to_file_url.ts": "7f76adbc83ece1bba173e6e98a27c647712cab773d3f8cbe0398b74afc817883", + "https://deno.land/std@0.213.0/path/_interface.ts": "a1419fcf45c0ceb8acdccc94394e3e94f99e18cfd32d509aab514c8841799600", + "https://deno.land/std@0.213.0/path/_os.ts": "8fb9b90fb6b753bd8c77cfd8a33c2ff6c5f5bc185f50de8ca4ac6a05710b2c15", + "https://deno.land/std@0.213.0/path/basename.ts": "5d341aadb7ada266e2280561692c165771d071c98746fcb66da928870cd47668", + "https://deno.land/std@0.213.0/path/common.ts": "03e52e22882402c986fe97ca3b5bb4263c2aa811c515ce84584b23bac4cc2643", + "https://deno.land/std@0.213.0/path/constants.ts": "0c206169ca104938ede9da48ac952de288f23343304a1c3cb6ec7625e7325f36", + "https://deno.land/std@0.213.0/path/dirname.ts": "85bd955bf31d62c9aafdd7ff561c4b5fb587d11a9a5a45e2b01aedffa4238a7c", + "https://deno.land/std@0.213.0/path/extname.ts": "593303db8ae8c865cbd9ceec6e55d4b9ac5410c1e276bfd3131916591b954441", + "https://deno.land/std@0.213.0/path/format.ts": "98fad25f1af7b96a48efb5b67378fcc8ed77be895df8b9c733b86411632162af", + "https://deno.land/std@0.213.0/path/from_file_url.ts": "911833ae4fd10a1c84f6271f36151ab785955849117dc48c6e43b929504ee069", + "https://deno.land/std@0.213.0/path/glob.ts": "04510962905d4b1513b44da9cb195914e0fa46c24359f6feaca20848d797dcb0", + "https://deno.land/std@0.213.0/path/glob_to_regexp.ts": "83c5fd36a8c86f5e72df9d0f45317f9546afa2ce39acaafe079d43a865aced08", + "https://deno.land/std@0.213.0/path/is_absolute.ts": "4791afc8bfd0c87f0526eaa616b0d16e7b3ab6a65b62942e50eac68de4ef67d7", + "https://deno.land/std@0.213.0/path/is_glob.ts": "a65f6195d3058c3050ab905705891b412ff942a292bcbaa1a807a74439a14141", + "https://deno.land/std@0.213.0/path/join.ts": "ae2ec5ca44c7e84a235fd532e4a0116bfb1f2368b394db1c4fb75e3c0f26a33a", + "https://deno.land/std@0.213.0/path/join_globs.ts": "e9589869a33dc3982101898ee50903db918ca00ad2614dbe3934d597d7b1fbea", + "https://deno.land/std@0.213.0/path/mod.ts": "ffeaccb713dbe6c72e015b7c767f753f8ec5fbc3b621ff5eeee486ffc2c0ddda", + "https://deno.land/std@0.213.0/path/normalize.ts": "4155743ccceeed319b350c1e62e931600272fad8ad00c417b91df093867a8352", + "https://deno.land/std@0.213.0/path/normalize_glob.ts": "98ee8268fad271193603271c203ae973280b5abfbdd2cbca1053fd2af71869ca", + "https://deno.land/std@0.213.0/path/parse.ts": "65e8e285f1a63b714e19ef24b68f56e76934c3df0b6e65fd440d3991f4f8aefb", + "https://deno.land/std@0.213.0/path/posix/_util.ts": "1e3937da30f080bfc99fe45d7ed23c47dd8585c5e473b2d771380d3a6937cf9d", + "https://deno.land/std@0.213.0/path/posix/basename.ts": "39ee27a29f1f35935d3603ccf01d53f3d6e0c5d4d0f84421e65bd1afeff42843", + "https://deno.land/std@0.213.0/path/posix/common.ts": "26f60ccc8b2cac3e1613000c23ac5a7d392715d479e5be413473a37903a2b5d4", + "https://deno.land/std@0.213.0/path/posix/constants.ts": "93481efb98cdffa4c719c22a0182b994e5a6aed3047e1962f6c2c75b7592bef1", + "https://deno.land/std@0.213.0/path/posix/dirname.ts": "6535d2bdd566118963537b9dda8867ba9e2a361015540dc91f5afbb65c0cce8b", + "https://deno.land/std@0.213.0/path/posix/extname.ts": "8d36ae0082063c5e1191639699e6f77d3acf501600a3d87b74943f0ae5327427", + "https://deno.land/std@0.213.0/path/posix/format.ts": "185e9ee2091a42dd39e2a3b8e4925370ee8407572cee1ae52838aed96310c5c1", + "https://deno.land/std@0.213.0/path/posix/from_file_url.ts": "951aee3a2c46fd0ed488899d024c6352b59154c70552e90885ed0c2ab699bc40", + "https://deno.land/std@0.213.0/path/posix/glob_to_regexp.ts": "54d3ff40f309e3732ab6e5b19d7111d2d415248bcd35b67a99defcbc1972e697", + "https://deno.land/std@0.213.0/path/posix/is_absolute.ts": "cebe561ad0ae294f0ce0365a1879dcfca8abd872821519b4fcc8d8967f888ede", + "https://deno.land/std@0.213.0/path/posix/is_glob.ts": "8a8b08c08bf731acf2c1232218f1f45a11131bc01de81e5f803450a5914434b9", + "https://deno.land/std@0.213.0/path/posix/join.ts": "aef88d5fa3650f7516730865dbb951594d1a955b785e2450dbee93b8e32694f3", + "https://deno.land/std@0.213.0/path/posix/join_globs.ts": "ee2f4676c5b8a0dfa519da58b8ade4d1c4aa8dd3fe35619edec883ae9df1f8c9", + "https://deno.land/std@0.213.0/path/posix/mod.ts": "563a18c2b3ddc62f3e4a324ff0f583e819b8602a72ad880cb98c9e2e34f8db5b", + "https://deno.land/std@0.213.0/path/posix/normalize.ts": "baeb49816a8299f90a0237d214cef46f00ba3e95c0d2ceb74205a6a584b58a91", + "https://deno.land/std@0.213.0/path/posix/normalize_glob.ts": "65f0138fa518ef9ece354f32889783fc38cdf985fb02dcf1c3b14fa47d665640", + "https://deno.land/std@0.213.0/path/posix/parse.ts": "d5bac4eb21262ab168eead7e2196cb862940c84cee572eafedd12a0d34adc8fb", + "https://deno.land/std@0.213.0/path/posix/relative.ts": "3907d6eda41f0ff723d336125a1ad4349112cd4d48f693859980314d5b9da31c", + "https://deno.land/std@0.213.0/path/posix/resolve.ts": "bac20d9921beebbbb2b73706683b518b1d0c1b1da514140cee409e90d6b2913a", + "https://deno.land/std@0.213.0/path/posix/separator.ts": "c9ecae5c843170118156ac5d12dc53e9caf6a1a4c96fc8b1a0ab02dff5c847b0", + "https://deno.land/std@0.213.0/path/posix/to_file_url.ts": "7aa752ba66a35049e0e4a4be5a0a31ac6b645257d2e031142abb1854de250aaf", + "https://deno.land/std@0.213.0/path/posix/to_namespaced_path.ts": "28b216b3c76f892a4dca9734ff1cc0045d135532bfd9c435ae4858bfa5a2ebf0", + "https://deno.land/std@0.213.0/path/relative.ts": "ab739d727180ed8727e34ed71d976912461d98e2b76de3d3de834c1066667add", + "https://deno.land/std@0.213.0/path/resolve.ts": "a6f977bdb4272e79d8d0ed4333e3d71367cc3926acf15ac271f1d059c8494d8d", + "https://deno.land/std@0.213.0/path/separator.ts": "c6c890507f944a1f5cb7d53b8d638d6ce3cf0f34609c8d84a10c1eaa400b77a9", + "https://deno.land/std@0.213.0/path/to_file_url.ts": "88f049b769bce411e2d2db5bd9e6fd9a185a5fbd6b9f5ad8f52bef517c4ece1b", + "https://deno.land/std@0.213.0/path/to_namespaced_path.ts": "b706a4103b104cfadc09600a5f838c2ba94dbcdb642344557122dda444526e40", + "https://deno.land/std@0.213.0/path/windows/_util.ts": "d5f47363e5293fced22c984550d5e70e98e266cc3f31769e1710511803d04808", + "https://deno.land/std@0.213.0/path/windows/basename.ts": "e2dbf31d1d6385bfab1ce38c333aa290b6d7ae9e0ecb8234a654e583cf22f8fe", + "https://deno.land/std@0.213.0/path/windows/common.ts": "26f60ccc8b2cac3e1613000c23ac5a7d392715d479e5be413473a37903a2b5d4", + "https://deno.land/std@0.213.0/path/windows/constants.ts": "5afaac0a1f67b68b0a380a4ef391bf59feb55856aa8c60dfc01bd3b6abb813f5", + "https://deno.land/std@0.213.0/path/windows/dirname.ts": "33e421be5a5558a1346a48e74c330b8e560be7424ed7684ea03c12c21b627bc9", + "https://deno.land/std@0.213.0/path/windows/extname.ts": "165a61b00d781257fda1e9606a48c78b06815385e7d703232548dbfc95346bef", + "https://deno.land/std@0.213.0/path/windows/format.ts": "bbb5ecf379305b472b1082cd2fdc010e44a0020030414974d6029be9ad52aeb6", + "https://deno.land/std@0.213.0/path/windows/from_file_url.ts": "ced2d587b6dff18f963f269d745c4a599cf82b0c4007356bd957cb4cb52efc01", + "https://deno.land/std@0.213.0/path/windows/glob_to_regexp.ts": "6dcd1242bd8907aa9660cbdd7c93446e6927b201112b0cba37ca5d80f81be51b", + "https://deno.land/std@0.213.0/path/windows/is_absolute.ts": "4a8f6853f8598cf91a835f41abed42112cebab09478b072e4beb00ec81f8ca8a", + "https://deno.land/std@0.213.0/path/windows/is_glob.ts": "8a8b08c08bf731acf2c1232218f1f45a11131bc01de81e5f803450a5914434b9", + "https://deno.land/std@0.213.0/path/windows/join.ts": "e0b3356615c1a75c56ebb6a7311157911659e11fd533d80d724800126b761ac3", + "https://deno.land/std@0.213.0/path/windows/join_globs.ts": "ee2f4676c5b8a0dfa519da58b8ade4d1c4aa8dd3fe35619edec883ae9df1f8c9", + "https://deno.land/std@0.213.0/path/windows/mod.ts": "7d6062927bda47c47847ffb55d8f1a37b0383840aee5c7dfc93984005819689c", + "https://deno.land/std@0.213.0/path/windows/normalize.ts": "78126170ab917f0ca355a9af9e65ad6bfa5be14d574c5fb09bb1920f52577780", + "https://deno.land/std@0.213.0/path/windows/normalize_glob.ts": "179c86ba89f4d3fe283d2addbe0607341f79ee9b1ae663abcfb3439db2e97810", + "https://deno.land/std@0.213.0/path/windows/parse.ts": "b9239edd892a06a06625c1b58425e199f018ce5649ace024d144495c984da734", + "https://deno.land/std@0.213.0/path/windows/relative.ts": "3e1abc7977ee6cc0db2730d1f9cb38be87b0ce4806759d271a70e4997fc638d7", + "https://deno.land/std@0.213.0/path/windows/resolve.ts": "75b2e3e1238d840782cee3d8864d82bfaa593c7af8b22f19c6422cf82f330ab3", + "https://deno.land/std@0.213.0/path/windows/separator.ts": "e51c5522140eff4f8402617c5c68a201fdfa3a1a8b28dc23587cff931b665e43", + "https://deno.land/std@0.213.0/path/windows/to_file_url.ts": "1cd63fd35ec8d1370feaa4752eccc4cc05ea5362a878be8dc7db733650995484", + "https://deno.land/std@0.213.0/path/windows/to_namespaced_path.ts": "4ffa4fb6fae321448d5fe810b3ca741d84df4d7897e61ee29be961a6aac89a4c", + "https://deno.land/std@0.213.0/streams/reader_from_stream_reader.ts": "f981cf94a42133e5c6ace8c3b500565750806c4fc9802262ee63746abc528b0d", + "https://deno.land/std@0.213.0/streams/writer_from_stream_writer.ts": "b0e39ef607dfdc5abdfb627edf61a9672809463e2bb022afcbaf0cd006c40feb", "https://deno.land/std@0.219.0/assert/assert.ts": "bec068b2fccdd434c138a555b19a2c2393b71dfaada02b7d568a01541e67cdc5", "https://deno.land/std@0.219.0/assert/assert_exists.ts": "24a7bf965e634f909242cd09fbaf38bde6b791128ece08e33ab08586a7cc55c9", "https://deno.land/std@0.219.0/assert/assertion_error.ts": "9f689a101ee586c4ce92f52fa7ddd362e86434ffdf1f848e45987dc7689976b8", @@ -1238,6 +1349,46 @@ "https://deno.land/x/convert_bytes@v2.1.1/src/unit.ts": "ebfa749b09d2f6cf16a3a6cae5ab6042ae66667b9780071cbb933fcbdcff9731", "https://deno.land/x/convert_bytes@v2.1.1/src/utility.ts": "a94b4c50286910a23a90c0a0510e8191fa3311dec44d062a6d4fe3d5b7ff8176", "https://deno.land/x/crc32@v0.2.0/mod.ts": "de7a3fa2d4ef24b96fc21e1cc4d2d65d1d2b1dcea92f63960e3e11bfa82df0fa", + "https://deno.land/x/dax@0.39.2/mod.ts": "309f96ce11fa8a1bb244fdfdcb60fa66f092200a72295402094aab88bdf02bdd", + "https://deno.land/x/dax@0.39.2/src/command.ts": "01980353fec193bbc7f1c3690bb87472607d0b1b7d9844d17904920b907cd0de", + "https://deno.land/x/dax@0.39.2/src/command_handler.ts": "a9e40f0f1ec57318e62904b5785fede82dcdf1101922ebb3ebfad8f1c4d9c8df", + "https://deno.land/x/dax@0.39.2/src/commands/args.ts": "a138aef24294e3cbf13cef08f4836d018e8dd99fd06ad82e7e7f08ef680bbc1d", + "https://deno.land/x/dax@0.39.2/src/commands/cat.ts": "ac42675faaf87609fd5d4bff9a7741cef7fd4465d6de709b8ccabe70f7fd4c98", + "https://deno.land/x/dax@0.39.2/src/commands/cd.ts": "32533465933fada680c1fc887e24b65c8d4de3f5f98d0f55950dcead64da445c", + "https://deno.land/x/dax@0.39.2/src/commands/cp_mv.ts": "29a11a0f6c81e9a19b897c9b3178594f06a55a00ca28cb63c17773e154b34299", + "https://deno.land/x/dax@0.39.2/src/commands/echo.ts": "4672ad44a39fdcb3f9d9296a7c5773895bfae0f50a617fd999d1f0ca62a6aa36", + "https://deno.land/x/dax@0.39.2/src/commands/exit.ts": "508a388671240381a2a9a8910d4bf068421ace27ae1cc10c056df48cf9d23334", + "https://deno.land/x/dax@0.39.2/src/commands/export.ts": "c10d1dc6a45fd00e40afa6b19d7ecd29d09333f422b5b0fc75863baf13350969", + "https://deno.land/x/dax@0.39.2/src/commands/mkdir.ts": "28220eae8d7e872dca26b8217ad1b7e15eacf24e92d80277201caacbbecb8232", + "https://deno.land/x/dax@0.39.2/src/commands/printenv.ts": "8e1210b01ef5fcb8de71623f1195aab6ee034dbe684cd08e068ab855f9133ff9", + "https://deno.land/x/dax@0.39.2/src/commands/pwd.ts": "113af521c5dc257310c26815295c691b8f894051249d1eb8ba49a46965e28c68", + "https://deno.land/x/dax@0.39.2/src/commands/rm.ts": "a3441ddf9cb8f07fdf1657cb475caefcae71b71378681f4948e8ada93ef4478d", + "https://deno.land/x/dax@0.39.2/src/commands/sleep.ts": "2ba65ab19ae0f78709070f43d588c8fd3ff76d0299d2485e587aaaed7b86dd51", + "https://deno.land/x/dax@0.39.2/src/commands/test.ts": "336008d64d9737474ee225be9f8bd6fbad3f1c2128ba427e1b42d2c98366554f", + "https://deno.land/x/dax@0.39.2/src/commands/touch.ts": "b8229c2c38b56ebff054dd8dc70109cb85bcef5aaf160193fd80ac93924aa7ad", + "https://deno.land/x/dax@0.39.2/src/commands/unset.ts": "a85e9aca0606fd582114c5fc1f97fd6838a766110bad72dce7bd386172c1fbbb", + "https://deno.land/x/dax@0.39.2/src/common.ts": "7a96f3e4d576f92be12364d520107cff54b3d1a98124b5a88538494c5109c6e6", + "https://deno.land/x/dax@0.39.2/src/console/confirm.ts": "d9128d10b77fcc0a8df2784f71c79df68f5c8e00a34b04547b9ba9ddf1c97f96", + "https://deno.land/x/dax@0.39.2/src/console/logger.ts": "e0ab5025915cef70df03681c756e211f25bb2e4331f82ed4256b17ddd9e794ea", + "https://deno.land/x/dax@0.39.2/src/console/mod.ts": "de8af7d646f6cb222eee6560171993690247941b13ed9d757789d16f019d73ee", + "https://deno.land/x/dax@0.39.2/src/console/multiSelect.ts": "31003744e58f45f720271bd034d8cfba1055c954ba02d77a2f2eb21e4c1ed55a", + "https://deno.land/x/dax@0.39.2/src/console/progress/format.ts": "15ddbb8051580f88ed499281e12ca6f881f875ab73268d7451d7113ee130bd7d", + "https://deno.land/x/dax@0.39.2/src/console/progress/interval.ts": "54ffc8c7501f8ab0b6370e120c00e9e2d3e9b0640fc2dc2989bbf22855172ed0", + "https://deno.land/x/dax@0.39.2/src/console/progress/mod.ts": "dd9330c3edd1790d70808d043f417f0eaf80a4442a945545c38e47ce11e907b6", + "https://deno.land/x/dax@0.39.2/src/console/prompt.ts": "1ad65c8a5a27fb58ce6138f8ebefe2fca4cd12015fea550fbdc62f875d4b31f7", + "https://deno.land/x/dax@0.39.2/src/console/select.ts": "c9d7124d975bf34d52ea1ac88fd610ed39db8ee6505b9bb53f371cef2f56c6ab", + "https://deno.land/x/dax@0.39.2/src/console/utils.ts": "6f2c4d7c98c13d40b0a16af622d654495eace06778343eb1507ecd0f3875d3ab", + "https://deno.land/x/dax@0.39.2/src/deps.ts": "c6f4195419244d38879d4dd14de5190a507818ac62a5a992493c7567a1235f7d", + "https://deno.land/x/dax@0.39.2/src/lib/mod.ts": "7d9d0cf99ecd3ff5c3e5329ea9e456b737581afb4a5c94c3f90244c990b5630d", + "https://deno.land/x/dax@0.39.2/src/lib/rs_lib.generated.js": "0a1a482c4387379106ef0da69534ebc5b0c2a1ec9f6dab76833fe84a7e6bbdf6", + "https://deno.land/x/dax@0.39.2/src/path.ts": "a1ca507225a516336f083432b992d83ad4cddeea9a91eef69abbbebb729721ae", + "https://deno.land/x/dax@0.39.2/src/pipes.ts": "5ed17dc0aea34d219568d59c826c04e319a91497cac2be7c51a99603a3771c70", + "https://deno.land/x/dax@0.39.2/src/request.ts": "21de624bc21155cf6143ea5eddf4de706944e26af10219957da4b8b20c7104ce", + "https://deno.land/x/dax@0.39.2/src/result.ts": "719a9b4bc6bafeec785106744381cd5f37927c973334fcba6a33b6418fb9e7be", + "https://deno.land/x/dax@0.39.2/src/runtimes/process.common.ts": "692afd5fa15f40ce452904fa5ce380462cee56fbee7abe271e509e78da997200", + "https://deno.land/x/dax@0.39.2/src/runtimes/process.deno.ts": "50f85a086a9208b26c10dc2c1406fd9274226401f670d6862fdee05433c9ea4e", + "https://deno.land/x/dax@0.39.2/src/shell.ts": "b95677094cc553c987f0f113a95a45d72f2896ef82754f9831029efbbafea5d5", + "https://deno.land/x/dax@0.39.2/src/vendor/outdent.ts": "4d0283726579688c50b20c4b779e068acd3fa159a8784a4549e5e21bbef0ae64", "https://deno.land/x/deno_cache@0.5.2/auth_tokens.ts": "5d1d56474c54a9d152e44d43ea17c2e6a398dd1e9682c69811a313567c01ee1e", "https://deno.land/x/deno_cache@0.5.2/cache.ts": "92ce8511e1e5c00fdf53a41619aa77d632ea8e0fc711324322e4d5ebf8133911", "https://deno.land/x/deno_cache@0.5.2/deno_dir.ts": "1ea355b8ba11c630d076b222b197cfc937dd81e5a4a260938997da99e8ff93a0", @@ -1363,6 +1514,7 @@ "https://deno.land/x/ts_morph@18.0.0/common/typescript.js": "d5c598b6a2db2202d0428fca5fd79fc9a301a71880831a805d778797d2413c59", "https://deno.land/x/wasmbuild@0.15.0/cache.ts": "89eea5f3ce6035a1164b3e655c95f21300498920575ade23161421f5b01967f4", "https://deno.land/x/wasmbuild@0.15.0/loader.ts": "d98d195a715f823151cbc8baa3f32127337628379a02d9eb2a3c5902dbccfc02", + "https://deno.land/x/which@0.3.0/mod.ts": "3e10d07953c14e4ddc809742a3447cef14202cdfe9be6678a1dfc8769c4487e6", "https://deno.land/x/xhr@0.3.0/mod.ts": "094aacd627fd9635cd942053bf8032b5223b909858fa9dc8ffa583752ff63b20", "https://deno.land/x/zod@v3.22.2/ZodError.ts": "4de18ff525e75a0315f2c12066b77b5c2ae18c7c15ef7df7e165d63536fdf2ea", "https://deno.land/x/zod@v3.22.2/errors.ts": "5285922d2be9700cc0c70c95e4858952b07ae193aa0224be3cbd5cd5567eabef", diff --git a/typegate/import_map.json b/typegate/import_map.json index f9cf1ec6de..4ceedcee36 100644 --- a/typegate/import_map.json +++ b/typegate/import_map.json @@ -23,8 +23,8 @@ "outdent": "https://deno.land/x/outdent@v0.8.0/mod.ts", "json-schema-faker": "npm:json-schema-faker@0.5.3", "ajv": "https://esm.sh/ajv@8.12.0?pin=v131", - "@typegraph/sdk": "npm:@typegraph/sdk@0.4.0", - "@typegraph/sdk/": "npm:/@typegraph/sdk@0.4.0/", + "@typegraph/sdk": "npm:@typegraph/sdk@0.4.1-0", + "@typegraph/sdk/": "npm:/@typegraph/sdk@0.4.1-0/", "@typegate/": "./src/", "test-utils/": "./tests/utils/", "dax": "https://deno.land/x/dax@0.39.2/mod.ts", diff --git a/typegate/src/runtimes/wit_wire/mod.ts b/typegate/src/runtimes/wit_wire/mod.ts index 0134619ce3..e92851a635 100644 --- a/typegate/src/runtimes/wit_wire/mod.ts +++ b/typegate/src/runtimes/wit_wire/mod.ts @@ -4,7 +4,7 @@ import type { WitWireMatInfo } from "../../../engine/runtime.js"; import { ResolverArgs } from "../../types.ts"; -const METATYPE_VERSION = "0.4.0"; +const METATYPE_VERSION = "0.4.1-0"; export class WitWireMessenger { static async init( diff --git a/typegate/tests/runtimes/wasm_reflected/rust.wasm b/typegate/tests/runtimes/wasm_reflected/rust.wasm deleted file mode 100644 index b60e774951..0000000000 Binary files a/typegate/tests/runtimes/wasm_reflected/rust.wasm and /dev/null differ diff --git a/typegate/tests/runtimes/wasm_reflected/rust/Cargo.lock b/typegate/tests/runtimes/wasm_reflected/rust/Cargo.lock index 5a4f8b3b87..c6434e50a3 100644 --- a/typegate/tests/runtimes/wasm_reflected/rust/Cargo.lock +++ b/typegate/tests/runtimes/wasm_reflected/rust/Cargo.lock @@ -90,7 +90,7 @@ dependencies = [ [[package]] name = "rust" -version = "0.3.7-0" +version = "0.4.1-0" dependencies = [ "wit-bindgen", ] diff --git a/typegate/tests/runtimes/wasm_reflected/rust/Cargo.toml b/typegate/tests/runtimes/wasm_reflected/rust/Cargo.toml index 6e257ee3fd..299638452a 100644 --- a/typegate/tests/runtimes/wasm_reflected/rust/Cargo.toml +++ b/typegate/tests/runtimes/wasm_reflected/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rust" -version = "0.4.0" +version = "0.4.1-0" edition = "2021" [lib] diff --git a/typegate/tests/runtimes/wasm_reflected/rust/build.sh b/typegate/tests/runtimes/wasm_reflected/rust/build.sh index d8b71f06ed..3a775d92b1 100755 --- a/typegate/tests/runtimes/wasm_reflected/rust/build.sh +++ b/typegate/tests/runtimes/wasm_reflected/rust/build.sh @@ -2,10 +2,9 @@ set -e -cargo build --target wasm32-unknown-unknown --release -wasm-opt -Oz ./target/wasm32-unknown-unknown/release/rust.wasm -o ./target/rust-component.wasm.opt -wasm-tools component new ./target/rust-component.wasm.opt -o ./target/rust-component.wasm -# debug +cargo build --target wasm32-unknown-unknown # --release +# wasm-opt -Oz ./target/wasm32-unknown-unknown/release/rust.wasm -o ./target/rust-component.wasm.opt +wasm-tools component new ./target/wasm32-unknown-unknown/debug/rust.wasm -o ./target/rust-component.wasm wasm-tools component wit target/rust-component.wasm mv target/rust-component.wasm ../rust.wasm diff --git a/typegate/tests/runtimes/wasm_reflected/wasm_reflected_test.ts b/typegate/tests/runtimes/wasm_reflected/wasm_reflected_test.ts index e260510779..4da05c42cc 100644 --- a/typegate/tests/runtimes/wasm_reflected/wasm_reflected_test.ts +++ b/typegate/tests/runtimes/wasm_reflected/wasm_reflected_test.ts @@ -14,31 +14,30 @@ Meta.test( { name: "Wasm runtime: reflected", }, - async (t) => { - const e = await t.engineFromTgDeployPython( - path.join(cwd, "wasm_reflected.py"), - cwd, - ); + async (metaTest) => { + await metaTest.shell(["bash", "build.sh"], { + currentDir: `${import.meta.dirname!}/rust`, + }); + + { + await using e = await metaTest.engineFromTgDeployPython( + path.join(cwd, "wasm_reflected.py"), + cwd, + ); - await t.should("works", async () => { - await gql` + await metaTest.should("works", async () => { + await gql` query { test(a: 1, b: 2) } ` - .expectData({ - test: 3, - }) - .on(e); - }); - }, -); + .expectData({ + test: 3, + }) + .on(e); + }); + } -Meta.test( - { - name: "Wasm Runtime typescript sdk: reflected", - }, - async (metaTest) => { const port = metaTest.port; const gate = `http://localhost:${port}`; diff --git a/typegate/tests/runtimes/wasm_reflected/wasm_sync_test.ts b/typegate/tests/runtimes/wasm_reflected/wasm_sync_test.ts index 7de3cc13a0..80aaadb643 100644 --- a/typegate/tests/runtimes/wasm_reflected/wasm_sync_test.ts +++ b/typegate/tests/runtimes/wasm_reflected/wasm_sync_test.ts @@ -60,6 +60,10 @@ Meta.test( }, }, async (metaTest) => { + await metaTest.shell(["bash", "build.sh"], { + currentDir: `${import.meta.dirname!}/rust`, + }); + const port = metaTest.port; const gate = `http://localhost:${port}`; diff --git a/typegate/tests/runtimes/wasm_wire/rust.wasm b/typegate/tests/runtimes/wasm_wire/rust.wasm deleted file mode 100644 index 7891ba9327..0000000000 Binary files a/typegate/tests/runtimes/wasm_wire/rust.wasm and /dev/null differ diff --git a/typegate/tests/runtimes/wasm_wire/rust/build.sh b/typegate/tests/runtimes/wasm_wire/rust/build.sh index 144d454112..2f7674d214 100755 --- a/typegate/tests/runtimes/wasm_wire/rust/build.sh +++ b/typegate/tests/runtimes/wasm_wire/rust/build.sh @@ -5,9 +5,9 @@ set -e pushd .. cargo run -p meta-cli -- gen mdk wasm_wire popd -cargo build --target wasm32-unknown-unknown --release -wasm-opt -Oz ./target/wasm32-unknown-unknown/release/rust.wasm -o ./target/rust-component.wasm.opt -wasm-tools component new ./target/rust-component.wasm.opt -o ./target/rust-component.wasm +cargo build --target wasm32-unknown-unknown # --release +# wasm-opt -Oz ./target/wasm32-unknown-unknown/release/rust.wasm -o ./target/rust-component.wasm.opt +wasm-tools component new ./target/wasm32-unknown-unknown/debug/rust.wasm -o ./target/rust-component.wasm # debug wasm-tools component wit target/rust-component.wasm diff --git a/typegate/tests/runtimes/wasm_wire/rust/mdk.rs b/typegate/tests/runtimes/wasm_wire/rust/mdk.rs index b05398bd7c..ad33010df0 100644 --- a/typegate/tests/runtimes/wasm_wire/rust/mdk.rs +++ b/typegate/tests/runtimes/wasm_wire/rust/mdk.rs @@ -109,7 +109,7 @@ impl Router { } pub fn init(&self, args: InitArgs) -> Result { - static MT_VERSION: &str = "0.4.0"; + static MT_VERSION: &str = "0.4.1-0"; if args.metatype_version != MT_VERSION { return Err(InitError::VersionMismatch(MT_VERSION.into())); } @@ -300,9 +300,9 @@ pub mod stubs { } pub fn op_to_trait_name(op_name: &str) -> &'static str { match op_name { + "add" => "Add", "identity" => "Identity", "range" => "Range", - "add" => "Add", "record-creation" => "RecordCreation", _ => panic!("unrecognized op_name: {op_name}"), } diff --git a/typegate/tests/runtimes/wasm_wire/wasm_sync_test.ts b/typegate/tests/runtimes/wasm_wire/wasm_sync_test.ts index fcd20066e6..708d44e9f5 100644 --- a/typegate/tests/runtimes/wasm_wire/wasm_sync_test.ts +++ b/typegate/tests/runtimes/wasm_wire/wasm_sync_test.ts @@ -60,6 +60,10 @@ Meta.test( }, }, async (metaTest) => { + await metaTest.shell(["bash", "build.sh"], { + currentDir: `${import.meta.dirname!}/rust`, + }); + const port = metaTest.port; const gate = `http://localhost:${port}`; diff --git a/typegate/tests/runtimes/wasm_wire/wasm_wire_test.ts b/typegate/tests/runtimes/wasm_wire/wasm_wire_test.ts index 99a3d9fe74..e856f4a77e 100644 --- a/typegate/tests/runtimes/wasm_wire/wasm_wire_test.ts +++ b/typegate/tests/runtimes/wasm_wire/wasm_wire_test.ts @@ -13,31 +13,30 @@ Meta.test( { name: "Wasm runtime: wire", }, - async (t) => { - const e = await t.engineFromTgDeployPython( - path.join(cwd, "wasm_wire.py"), - cwd, - ); + async (metaTest) => { + await metaTest.shell(["bash", "build.sh"], { + currentDir: `${import.meta.dirname!}/rust`, + }); + + { + await using e = await metaTest.engineFromTgDeployPython( + path.join(cwd, "wasm_wire.py"), + cwd, + ); - await t.should("works", async () => { - await gql` + await metaTest.should("works", async () => { + await gql` query { test(a: 1, b: 2) } ` - .expectData({ - test: 3, - }) - .on(e); - }); - }, -); + .expectData({ + test: 3, + }) + .on(e); + }); + } -Meta.test( - { - name: "Wasm Runtime typescript sdk: wire", - }, - async (metaTest) => { const port = metaTest.port; const gate = `http://localhost:${port}`; diff --git a/typegraph/core/Cargo.toml b/typegraph/core/Cargo.toml index f60fdf2e73..6e4c2cf434 100644 --- a/typegraph/core/Cargo.toml +++ b/typegraph/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "typegraph_core" -version = "0.4.0" +version = "0.4.1-0" edition = "2021" [lib] diff --git a/typegraph/core/src/global_store.rs b/typegraph/core/src/global_store.rs index fcaf2a59a0..46cca74e65 100644 --- a/typegraph/core/src/global_store.rs +++ b/typegraph/core/src/global_store.rs @@ -106,7 +106,7 @@ const PREDEFINED_DENO_FUNCTIONS: &[&str] = &["identity", "true"]; thread_local! { pub static STORE: RefCell = RefCell::new(Store::new()); - pub static SDK_VERSION: String = "0.4.0".to_owned(); + pub static SDK_VERSION: String = "0.4.1-0".to_owned(); } fn with_store T>(f: F) -> T { diff --git a/typegraph/node/package.json b/typegraph/node/package.json index 14116669a2..5af1e36f3d 100644 --- a/typegraph/node/package.json +++ b/typegraph/node/package.json @@ -1,6 +1,6 @@ { "name": "metatype", - "version": "0.4.0", + "version": "0.4.1-0", "description": "Declarative API development platform. Build backend components with WASM/Typescript/Python, no matter where and how your (legacy) systems are.", "scripts": { "sdk-build": "cd sdk && pnpm run build", diff --git a/typegraph/node/sdk/package.json b/typegraph/node/sdk/package.json index a4f744b7b8..b520a47041 100644 --- a/typegraph/node/sdk/package.json +++ b/typegraph/node/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@typegraph/sdk", - "version": "0.4.0", + "version": "0.4.1-0", "description": "Declarative API development platform. Build backend components with WASM/Typescript/Python, no matter where and how your (legacy) systems are.", "type": "module", "main": "index.js", diff --git a/typegraph/python/pyproject.toml b/typegraph/python/pyproject.toml index 003bf5f6d8..1ec4f2d960 100644 --- a/typegraph/python/pyproject.toml +++ b/typegraph/python/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "typegraph" -version = "0.4.0" +version = "0.4.1-0" description = "Declarative API development platform. Build backend components with WASM/Typescript/Python, no matter where and how your (legacy) systems are." authors = ["Metatype Contributors "] license = "MPL-2.0" diff --git a/typegraph/python/typegraph/__init__.py b/typegraph/python/typegraph/__init__.py index e4c3a54ef3..d7acc7f3cf 100644 --- a/typegraph/python/typegraph/__init__.py +++ b/typegraph/python/typegraph/__init__.py @@ -5,4 +5,4 @@ from typegraph.policy import Policy # noqa from typegraph import effects as fx # noqa -version = "0.4.0" +version = "0.4.1-0" diff --git a/whiz.yaml b/whiz.yaml index 43c07eade9..62a1452b01 100644 --- a/whiz.yaml +++ b/whiz.yaml @@ -74,6 +74,7 @@ typegraph: rm -rf typegraph/python/typegraph/gen poetry run python -m wasmtime.bindgen $WASM_FILE --out-dir typegraph/python/typegraph/gen + poetry run ruff typegraph/python/typegraph depends_on: - libs