diff --git a/.ghjk/lock.json b/.ghjk/lock.json index b385936c69..f038249500 100644 --- a/.ghjk/lock.json +++ b/.ghjk/lock.json @@ -797,6 +797,103 @@ "buildDepConfigs": {}, "portRef": "protoc_ghrel@0.1.0", "specifiedVersion": true + }, + "bciqh6lifl6dl5jftfpd4qqvb4q4yx4c2jgycqzz5fcg2gsp5zocuedi": { + "version": "v1.46.3", + "buildDepConfigs": {}, + "portRef": "deno_ghrel@0.1.0", + "specifiedVersion": true + }, + "bciqc4tel4mvul3drcx6kljgvy5avxnglgkhzdeo2ri5olbpcwukx4jy": { + "version": "3.6.0", + "buildDepConfigs": { + "cargo_binstall_ghrel": { + "version": "v1.10.2", + "buildDepConfigs": {}, + "portRef": "cargo_binstall_ghrel@0.1.0", + "specifiedVersion": false + }, + "rust_rustup": { + "version": "1.80.1", + "buildDepConfigs": { + "rustup_rustlang": { + "version": "1.27.1", + "buildDepConfigs": { + "git_aa": { + "version": "2.46.0", + "buildDepConfigs": {}, + "portRef": "git_aa@0.1.0", + "specifiedVersion": false + } + }, + "portRef": "rustup_rustlang@0.1.0", + "specifiedVersion": false + } + }, + "portRef": "rust_rustup@0.1.0", + "profile": "minimal", + "specifiedVersion": true + } + }, + "portRef": "cargobi_cratesio@0.1.0", + "crateName": "protobuf-codegen", + "specifiedVersion": true + }, + "bciqdxxrdxv7gdhguk43f7tqbzpamv3evrwffw2c6wujly5ijvanb24q": { + "version": "1.80.1", + "buildDepConfigs": { + "rustup_rustlang": { + "version": "1.27.1", + "buildDepConfigs": { + "git_aa": { + "version": "2.46.0", + "buildDepConfigs": {}, + "portRef": "git_aa@0.1.0", + "specifiedVersion": false + } + }, + "portRef": "rustup_rustlang@0.1.0", + "specifiedVersion": false + } + }, + "portRef": "rust_rustup@0.1.0", + "profile": "minimal", + "specifiedVersion": true + }, + "bciqad6aisdl5shqpoyngeaoclm3akepy6wf7vtbmdhyduegz6yxbjdi": { + "version": "3.5.1", + "buildDepConfigs": { + "cargo_binstall_ghrel": { + "version": "v1.10.2", + "buildDepConfigs": {}, + "portRef": "cargo_binstall_ghrel@0.1.0", + "specifiedVersion": false + }, + "rust_rustup": { + "version": "1.80.1", + "buildDepConfigs": { + "rustup_rustlang": { + "version": "1.27.1", + "buildDepConfigs": { + "git_aa": { + "version": "2.46.0", + "buildDepConfigs": {}, + "portRef": "git_aa@0.1.0", + "specifiedVersion": false + } + }, + "portRef": "rustup_rustlang@0.1.0", + "specifiedVersion": false + } + }, + "portRef": "rust_rustup@0.1.0", + "profile": "minimal", + "specifiedVersion": true + } + }, + "portRef": "cargobi_cratesio@0.1.0", + "crateName": "protobuf-codegen", + "specifiedVersion": true } } }, @@ -815,7 +912,7 @@ "sets": { "ghjkEnvProvInstSet___main": { "installs": [ - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty" + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a" ], "allowedBuildDeps": "bciqek3tmrhm4iohl6tvdzlhxwhv7b52makvvgehltxv52d3l7rbki3y" }, @@ -823,7 +920,7 @@ "installs": [ "bciqfjvqemdy7d6axvwkywcm6v66wogddvk7k6e6rps4e6zidkjvm4fy", "bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty" + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a" ], "allowedBuildDeps": "bciqek3tmrhm4iohl6tvdzlhxwhv7b52makvvgehltxv52d3l7rbki3y" }, @@ -840,7 +937,7 @@ "bciqe33uhsuaesrjk6luzxrbbimwg5ydt6x2lrieelwbr7aft4g2qwsy", "bciqfjvqemdy7d6axvwkywcm6v66wogddvk7k6e6rps4e6zidkjvm4fy", "bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty", + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a", "bciqfpjzi6gguk7dafyicfjpzpwtybgyc2dsnxg2zxkcmyinzy7abpla", "bciqkgncxbauys2qfguplxcz2auxrcyamj4b6htqk2fqvohfm3afd7sa", "bciqihcmo6l5uwzih3e3ujc55curep4arfomo6rzkdsfim74unxexiqy", @@ -859,7 +956,7 @@ "bciqbx637744bfiyvprs77xdnvdt7uuwmtlntfjpwmkda672gklkbpmi", "bciqfjvqemdy7d6axvwkywcm6v66wogddvk7k6e6rps4e6zidkjvm4fy", "bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty", + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a", "bciqojan3zglnfctnmqyxvnxaha46yrnlhj77j3kw4mxadvauqepqdba", "bciqcnbruy2q6trpvia52n2yis4t27taoz4mxkeguqz5aif7ex6rp26y", "bciqpu7gxs3zm7i4gwp3m3cfdxwz27ixvsykdnbxrl5m5mt3xbb3b4la", @@ -872,7 +969,7 @@ "bciqezep4ufkgwesldlm5etyfkgdsiickfudx7cosydcz6xtgeorn2hy", "bciqaixkkacuuligsvtjcfdfgjgl65owtyspiiljb3vmutlgymecsiwq", "bciqlt27ioikxnpkqq37hma7ibn5e5wpzfarbvoh77zwdkarwghtvzxa", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty" + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a" ], "allowedBuildDeps": "bciqek3tmrhm4iohl6tvdzlhxwhv7b52makvvgehltxv52d3l7rbki3y" }, @@ -881,7 +978,7 @@ "bciqfpjzi6gguk7dafyicfjpzpwtybgyc2dsnxg2zxkcmyinzy7abpla", "bciqkgncxbauys2qfguplxcz2auxrcyamj4b6htqk2fqvohfm3afd7sa", "bciqihcmo6l5uwzih3e3ujc55curep4arfomo6rzkdsfim74unxexiqy", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty" + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a" ], "allowedBuildDeps": "bciqek3tmrhm4iohl6tvdzlhxwhv7b52makvvgehltxv52d3l7rbki3y" }, @@ -891,7 +988,7 @@ "bciqcnbruy2q6trpvia52n2yis4t27taoz4mxkeguqz5aif7ex6rp26y", "bciqpu7gxs3zm7i4gwp3m3cfdxwz27ixvsykdnbxrl5m5mt3xbb3b4la", "bciqjme7csfq43oenkrsakdhaha34hgy6vdwkfffki2ank3kf6mjcguq", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty" + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a" ], "allowedBuildDeps": "bciqek3tmrhm4iohl6tvdzlhxwhv7b52makvvgehltxv52d3l7rbki3y" }, @@ -903,7 +1000,7 @@ "bciqe33uhsuaesrjk6luzxrbbimwg5ydt6x2lrieelwbr7aft4g2qwsy", "bciqfjvqemdy7d6axvwkywcm6v66wogddvk7k6e6rps4e6zidkjvm4fy", "bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty", + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a", "bciqfpjzi6gguk7dafyicfjpzpwtybgyc2dsnxg2zxkcmyinzy7abpla", "bciqkgncxbauys2qfguplxcz2auxrcyamj4b6htqk2fqvohfm3afd7sa", "bciqihcmo6l5uwzih3e3ujc55curep4arfomo6rzkdsfim74unxexiqy", @@ -917,11 +1014,20 @@ ], "allowedBuildDeps": "bciqek3tmrhm4iohl6tvdzlhxwhv7b52makvvgehltxv52d3l7rbki3y" }, + "ghjkEnvProvInstSet_______task_env_gen-subs-protoc": { + "installs": [ + "bciqm2rvnfe77sj6jekrm65oayuywt5lbrw33qezqjcg5rzaioc6uszy", + "bciqfjvqemdy7d6axvwkywcm6v66wogddvk7k6e6rps4e6zidkjvm4fy", + "bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y", + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a" + ], + "allowedBuildDeps": "bciqek3tmrhm4iohl6tvdzlhxwhv7b52makvvgehltxv52d3l7rbki3y" + }, "ghjkEnvProvInstSet_______task_env_lint-udeps": { "installs": [ "bciqezkigmtx5tweeflmn27yofgwybmgbat7g6jg4xmxamomsdpvenay", "bciqiknd2vbwhxng2oy5d7qjpor7jq74pulaeijfrywyggv4mw3wngsi", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty" + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a" ], "allowedBuildDeps": "bciqek3tmrhm4iohl6tvdzlhxwhv7b52makvvgehltxv52d3l7rbki3y" }, @@ -930,7 +1036,7 @@ "bciqezep4ufkgwesldlm5etyfkgdsiickfudx7cosydcz6xtgeorn2hy", "bciqaixkkacuuligsvtjcfdfgjgl65owtyspiiljb3vmutlgymecsiwq", "bciqlt27ioikxnpkqq37hma7ibn5e5wpzfarbvoh77zwdkarwghtvzxa", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty", + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a", "bciqfpjzi6gguk7dafyicfjpzpwtybgyc2dsnxg2zxkcmyinzy7abpla", "bciqkgncxbauys2qfguplxcz2auxrcyamj4b6htqk2fqvohfm3afd7sa", "bciqihcmo6l5uwzih3e3ujc55curep4arfomo6rzkdsfim74unxexiqy" @@ -941,7 +1047,7 @@ "installs": [ "bciqfjvqemdy7d6axvwkywcm6v66wogddvk7k6e6rps4e6zidkjvm4fy", "bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty", + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a", "bciqezep4ufkgwesldlm5etyfkgdsiickfudx7cosydcz6xtgeorn2hy", "bciqaixkkacuuligsvtjcfdfgjgl65owtyspiiljb3vmutlgymecsiwq", "bciqlt27ioikxnpkqq37hma7ibn5e5wpzfarbvoh77zwdkarwghtvzxa", @@ -955,7 +1061,7 @@ "installs": [ "bciqfjvqemdy7d6axvwkywcm6v66wogddvk7k6e6rps4e6zidkjvm4fy", "bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty", + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a", "bciqezep4ufkgwesldlm5etyfkgdsiickfudx7cosydcz6xtgeorn2hy", "bciqaixkkacuuligsvtjcfdfgjgl65owtyspiiljb3vmutlgymecsiwq", "bciqlt27ioikxnpkqq37hma7ibn5e5wpzfarbvoh77zwdkarwghtvzxa", @@ -969,7 +1075,7 @@ "installs": [ "bciqfjvqemdy7d6axvwkywcm6v66wogddvk7k6e6rps4e6zidkjvm4fy", "bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty", + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a", "bciqojan3zglnfctnmqyxvnxaha46yrnlhj77j3kw4mxadvauqepqdba", "bciqcnbruy2q6trpvia52n2yis4t27taoz4mxkeguqz5aif7ex6rp26y", "bciqpu7gxs3zm7i4gwp3m3cfdxwz27ixvsykdnbxrl5m5mt3xbb3b4la", @@ -981,7 +1087,7 @@ "installs": [ "bciqfjvqemdy7d6axvwkywcm6v66wogddvk7k6e6rps4e6zidkjvm4fy", "bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty", + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a", "bciqojan3zglnfctnmqyxvnxaha46yrnlhj77j3kw4mxadvauqepqdba", "bciqcnbruy2q6trpvia52n2yis4t27taoz4mxkeguqz5aif7ex6rp26y", "bciqpu7gxs3zm7i4gwp3m3cfdxwz27ixvsykdnbxrl5m5mt3xbb3b4la", @@ -996,7 +1102,7 @@ "installs": [ "bciqfjvqemdy7d6axvwkywcm6v66wogddvk7k6e6rps4e6zidkjvm4fy", "bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty", + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a", "bciqojan3zglnfctnmqyxvnxaha46yrnlhj77j3kw4mxadvauqepqdba", "bciqcnbruy2q6trpvia52n2yis4t27taoz4mxkeguqz5aif7ex6rp26y", "bciqpu7gxs3zm7i4gwp3m3cfdxwz27ixvsykdnbxrl5m5mt3xbb3b4la", @@ -1011,7 +1117,7 @@ "installs": [ "bciqfjvqemdy7d6axvwkywcm6v66wogddvk7k6e6rps4e6zidkjvm4fy", "bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y", - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty", + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a", "bciqfpjzi6gguk7dafyicfjpzpwtybgyc2dsnxg2zxkcmyinzy7abpla", "bciqkgncxbauys2qfguplxcz2auxrcyamj4b6htqk2fqvohfm3afd7sa", "bciqihcmo6l5uwzih3e3ujc55curep4arfomo6rzkdsfim74unxexiqy" @@ -1025,194 +1131,189 @@ "id": "tasks", "config": { "tasks": { - "b": { + "clean-rust": { "ty": "denoFile@v1", - "key": "b", - "envKey": "bciqk7aif25pqtsyncbnbdapte4lixsodypfxvmkepsuey74vgr4zb5q" + "key": "clean-rust", + "desc": "Clean cache of all cargo workspaces in repo.", + "envKey": "bciqp6dugoxl3avklj2uwl77sfbiixbo2vzduaohoeusqjktc63dshzy" }, "version-bump": { "ty": "denoFile@v1", "key": "version-bump", - "envKey": "bciqfoerhfsehob65bmr7v5eka43ml4zbbt3aeot7zz5ijlb4oy2lucq" + "envKey": "bciqipocpp2avwxmyj6rxrkpukmkjgwtzafiwnqwtlum62mho2mtcbgq" }, "version-print": { "ty": "denoFile@v1", "key": "version-print", "desc": "Print $METATYPE_VERSION", - "envKey": "bciqfoerhfsehob65bmr7v5eka43ml4zbbt3aeot7zz5ijlb4oy2lucq" + "envKey": "bciqipocpp2avwxmyj6rxrkpukmkjgwtzafiwnqwtlum62mho2mtcbgq" }, "test-lsp": { "ty": "denoFile@v1", "key": "test-lsp", - "envKey": "bciqclszw6iggx6sevxab56z3k7gh5hne7jzx24clywryxz24qjo5gji" + "envKey": "bciqcm5whsy4tzjafjheomwtxzjxz2avqxwgb6ss5kav6fxmmy3lu4ma" }, "test-rust": { "ty": "denoFile@v1", "key": "test-rust", - "envKey": "bciqov6tmz5jhf6kitm7hptd6b74cw5zb7pt7rxqy3ktmqqn3hvaj4za" + "envKey": "bciqcctzik23xr7nadelnnusqesxpvkau6f5inuhqaggouuczqgevxfq" }, "test-website": { "ty": "denoFile@v1", "key": "test-website", "workingDir": "./docs/metatype.dev", - "envKey": "bciqclszw6iggx6sevxab56z3k7gh5hne7jzx24clywryxz24qjo5gji" + "envKey": "bciqcm5whsy4tzjafjheomwtxzjxz2avqxwgb6ss5kav6fxmmy3lu4ma" }, "test-e2e": { "ty": "denoFile@v1", "key": "test-e2e", "desc": "Shorthand for `tools/test.ts`", - "envKey": "bciqhtsq7g2mld3t64e7xolzrcbguzxihcrkftvuupv6af56prrgfpwy" + "envKey": "bciqniih3pp536jhouqduhilkpdas6uoesz6b2ckvstng6t7rlxz7jjq" }, "lock-sed": { "ty": "denoFile@v1", "key": "lock-sed", "desc": "Update versions", - "envKey": "bciqfoerhfsehob65bmr7v5eka43ml4zbbt3aeot7zz5ijlb4oy2lucq" + "envKey": "bciqipocpp2avwxmyj6rxrkpukmkjgwtzafiwnqwtlum62mho2mtcbgq" }, "lint-deno": { "ty": "denoFile@v1", "key": "lint-deno", - "envKey": "bciqfoerhfsehob65bmr7v5eka43ml4zbbt3aeot7zz5ijlb4oy2lucq" + "envKey": "bciqipocpp2avwxmyj6rxrkpukmkjgwtzafiwnqwtlum62mho2mtcbgq" }, "lint-udeps": { "ty": "denoFile@v1", "key": "lint-udeps", "desc": "Check for unused cargo depenencies", - "envKey": "bciqe5ao7vzfelgdas65p7frjodat2yz6mz7jk2yup2ulv5ycd44afyi" - }, - "install-protobuf-rust": { - "ty": "denoFile@v1", - "key": "install-protobuf-rust", - "desc": "Enable rust codegen for protoc", - "envKey": "bciqfoerhfsehob65bmr7v5eka43ml4zbbt3aeot7zz5ijlb4oy2lucq" + "envKey": "bciqhppphe2gyonum75xce4zlcglvswdte32hlpm6eulnwtuzc665tgq" }, "install-wasi-adapter": { "ty": "denoFile@v1", "key": "install-wasi-adapter", - "envKey": "bciqfoerhfsehob65bmr7v5eka43ml4zbbt3aeot7zz5ijlb4oy2lucq" + "envKey": "bciqipocpp2avwxmyj6rxrkpukmkjgwtzafiwnqwtlum62mho2mtcbgq" }, "install-lsp": { "ty": "denoFile@v1", "key": "install-lsp", - "envKey": "bciqclszw6iggx6sevxab56z3k7gh5hne7jzx24clywryxz24qjo5gji" + "envKey": "bciqcm5whsy4tzjafjheomwtxzjxz2avqxwgb6ss5kav6fxmmy3lu4ma" }, "install-website": { "ty": "denoFile@v1", "key": "install-website", - "envKey": "bciqclszw6iggx6sevxab56z3k7gh5hne7jzx24clywryxz24qjo5gji" + "envKey": "bciqcm5whsy4tzjafjheomwtxzjxz2avqxwgb6ss5kav6fxmmy3lu4ma" }, "install-ts": { "ty": "denoFile@v1", "key": "install-ts", - "envKey": "bciqclszw6iggx6sevxab56z3k7gh5hne7jzx24clywryxz24qjo5gji" + "envKey": "bciqcm5whsy4tzjafjheomwtxzjxz2avqxwgb6ss5kav6fxmmy3lu4ma" }, "install-py": { "ty": "denoFile@v1", "key": "install-py", - "envKey": "bciqjmqirgadtrauceyhuq7gx5fuegiwl6s6x52dumzmwtqkno3srcsi" + "envKey": "bciqea2qrlw3rmfp2edgo2o7utf5ahjpa4r6y4nrw2pbmqm2g2rabviy" }, "install-sys": { "ty": "denoFile@v1", "key": "install-sys", "desc": "Print a command you can use to install system items", - "envKey": "bciqfoerhfsehob65bmr7v5eka43ml4zbbt3aeot7zz5ijlb4oy2lucq" + "envKey": "bciqipocpp2avwxmyj6rxrkpukmkjgwtzafiwnqwtlum62mho2mtcbgq" + }, + "gen-subs-protoc": { + "ty": "denoFile@v1", + "key": "gen-subs-protoc", + "workingDir": "src/substantial", + "desc": "Regenerate substantial types", + "envKey": "bciqpunhgxn3npmv6lwplhckwyn5zls7crj3vodn6we6ihuhu4y7djcy" + }, + "gen-pyrt-bind": { + "ty": "denoFile@v1", + "key": "gen-pyrt-bind", + "envKey": "bciqdpiup27tflfkq26oirbutkz53wrp34entiq423upf47za7zoq4za" + }, + "build-pyrt": { + "ty": "denoFile@v1", + "key": "build-pyrt", + "dependsOn": [ + "gen-pyrt-bind" + ], + "envKey": "bciqdpiup27tflfkq26oirbutkz53wrp34entiq423upf47za7zoq4za" }, "fetch-deno": { "ty": "denoFile@v1", "key": "fetch-deno", "desc": "Cache remote deno modules.", - "envKey": "bciqclszw6iggx6sevxab56z3k7gh5hne7jzx24clywryxz24qjo5gji" - }, - "dev-sub-gen": { - "ty": "denoFile@v1", - "key": "dev-sub-gen", - "workingDir": "src/substantial", - "desc": "Regenerate substantial types", - "envKey": "bciqfoerhfsehob65bmr7v5eka43ml4zbbt3aeot7zz5ijlb4oy2lucq" + "envKey": "bciqcm5whsy4tzjafjheomwtxzjxz2avqxwgb6ss5kav6fxmmy3lu4ma" }, "dev-website": { "ty": "denoFile@v1", "key": "dev-website", "workingDir": "./docs/metatype.dev", "desc": "Launch the website", - "envKey": "bciqn4urah5beauhii24btx3t5eh2gsoqldg6hqiqn7wstpbcuecfj2y" + "envKey": "bciqmkhbtdu3anjuk2oyegq2sb3ogzeljgadytenbtt6izyzfqinxdna" }, "dev-gate6": { "ty": "denoFile@v1", "key": "dev-gate6", "desc": "Launch the typegate from a locally found meta bin.", - "envKey": "bciqizu3vblpk5gaendo6cyg42jzqa7zu6teyiodnfhoajdtbbv7q6za" + "envKey": "bciqd6zbaarkdhf3u74bcxlzvmi2ywirr2sjtrzh7thrbnc3ijz3sq4q" }, "dev-gate5": { "ty": "denoFile@v1", "key": "dev-gate5", "desc": "Launch the typegate from the latests published image.", - "envKey": "bciqizu3vblpk5gaendo6cyg42jzqa7zu6teyiodnfhoajdtbbv7q6za" + "envKey": "bciqd6zbaarkdhf3u74bcxlzvmi2ywirr2sjtrzh7thrbnc3ijz3sq4q" }, "dev-gate4": { "ty": "denoFile@v1", "key": "dev-gate4", "desc": "Launch the typegate from the locally built typegate image.", - "envKey": "bciqizu3vblpk5gaendo6cyg42jzqa7zu6teyiodnfhoajdtbbv7q6za" + "envKey": "bciqd6zbaarkdhf3u74bcxlzvmi2ywirr2sjtrzh7thrbnc3ijz3sq4q" }, "dev-gate3": { "ty": "denoFile@v1", "key": "dev-gate3", "desc": "Launch the typegate from meta-cli cmd.", - "envKey": "bciqizu3vblpk5gaendo6cyg42jzqa7zu6teyiodnfhoajdtbbv7q6za" + "envKey": "bciqd6zbaarkdhf3u74bcxlzvmi2ywirr2sjtrzh7thrbnc3ijz3sq4q" }, "dev-gate2": { "ty": "denoFile@v1", "key": "dev-gate2", "desc": "Launch the typegate in sync mode.", - "envKey": "bciqbyzm7ds7raflxunnt4jwajjwvghuccfzxsf3fzkjkjf22py6rghq" + "envKey": "bciqgjkrsledgw64yjp4hkj2lpf26pnamtuhsyho7bd55742yprtyv4y" }, "dev-gate1": { "ty": "denoFile@v1", "key": "dev-gate1", "desc": "Launch the typegate in single-instance mode.", - "envKey": "bciqizu3vblpk5gaendo6cyg42jzqa7zu6teyiodnfhoajdtbbv7q6za" + "envKey": "bciqd6zbaarkdhf3u74bcxlzvmi2ywirr2sjtrzh7thrbnc3ijz3sq4q" }, "dev-eg-tgraphs": { "ty": "denoFile@v1", "key": "dev-eg-tgraphs", "desc": "meta dev example/typegraphs", - "envKey": "bciqbgzsyj5gpkpixhvd4wihx4oa2qjmyf3ugdvdnemrr356mjxopkyy" + "envKey": "bciqns7jnxsdugrzboolqtwsh4ohiq5u3p46dezn7huqgo5rq4ps2gja" }, "dev-compose": { "ty": "denoFile@v1", "key": "dev-compose", "desc": "Wrapper around docker compose to manage runtime dependencies", - "envKey": "bciqfoerhfsehob65bmr7v5eka43ml4zbbt3aeot7zz5ijlb4oy2lucq" + "envKey": "bciqipocpp2avwxmyj6rxrkpukmkjgwtzafiwnqwtlum62mho2mtcbgq" }, "dev": { "ty": "denoFile@v1", "key": "dev", "desc": "Execute tools/*.ts scripts.", - "envKey": "bciqfoerhfsehob65bmr7v5eka43ml4zbbt3aeot7zz5ijlb4oy2lucq" - }, - "gen-pyrt-bind": { - "ty": "denoFile@v1", - "key": "gen-pyrt-bind", - "envKey": "bciqk7aif25pqtsyncbnbdapte4lixsodypfxvmkepsuey74vgr4zb5q" - }, - "build-pyrt": { - "ty": "denoFile@v1", - "key": "build-pyrt", - "dependsOn": [ - "gen-pyrt-bind" - ], - "envKey": "bciqk7aif25pqtsyncbnbdapte4lixsodypfxvmkepsuey74vgr4zb5q" + "envKey": "bciqipocpp2avwxmyj6rxrkpukmkjgwtzafiwnqwtlum62mho2mtcbgq" }, "build-tgraph-ts-jsr": { "ty": "denoFile@v1", "key": "build-tgraph-ts-jsr", - "envKey": "bciqfoerhfsehob65bmr7v5eka43ml4zbbt3aeot7zz5ijlb4oy2lucq" + "envKey": "bciqipocpp2avwxmyj6rxrkpukmkjgwtzafiwnqwtlum62mho2mtcbgq" }, "build-tgraph-core": { "ty": "denoFile@v1", "key": "build-tgraph-core", - "envKey": "bciqayfl7nvr6g7qgplwj6ymglj7giqb6wz5pjw7tfct66fyrmnpcmwq" + "envKey": "bciqgqffklh7r5setenk7bkrqoyingrbbjbrcj4jka3rttr56ybxruqi" }, "build-tgraph-py": { "ty": "denoFile@v1", @@ -1220,7 +1321,7 @@ "dependsOn": [ "build-tgraph-core" ], - "envKey": "bciqewdms4swk2kufu6idlcha7vc42auzhglynkpuv7ulnfdnpmdul2a" + "envKey": "bciqmqhamsvcr6i7ol37s5kizxnoawcecho4kzqiwxgodztarzdapawa" }, "build-tgraph-ts": { "ty": "denoFile@v1", @@ -1228,7 +1329,7 @@ "dependsOn": [ "build-tgraph-core" ], - "envKey": "bciqkqwta6epy65btclam4d25s5wph3mvhyg7fbxds4jbajx5uumx46q" + "envKey": "bciqp4x2tqplttorqy7ixw4rltvd7i5dknke6f3ba3uzbgymrp3s7aya" }, "build-tgraph-ts-node": { "ty": "denoFile@v1", @@ -1236,7 +1337,7 @@ "dependsOn": [ "build-tgraph-ts" ], - "envKey": "bciqkqwta6epy65btclam4d25s5wph3mvhyg7fbxds4jbajx5uumx46q" + "envKey": "bciqp4x2tqplttorqy7ixw4rltvd7i5dknke6f3ba3uzbgymrp3s7aya" }, "build-tgraph": { "ty": "denoFile@v1", @@ -1245,16 +1346,16 @@ "build-tgraph-py", "build-tgraph-ts-node" ], - "envKey": "bciqfoerhfsehob65bmr7v5eka43ml4zbbt3aeot7zz5ijlb4oy2lucq" + "envKey": "bciqipocpp2avwxmyj6rxrkpukmkjgwtzafiwnqwtlum62mho2mtcbgq" }, "build-sys-tgraphs": { "ty": "denoFile@v1", "key": "build-sys-tgraphs", - "envKey": "bciqhrqahrm3wdnsbfkt3f44hqw53fsolu622osigp5vmnuvp3jbb4wq" + "envKey": "bciqont2hfpi4wf7ul7acfxfdzwt4q4xm4sqpt2x6rvfc3kxxrtguj6i" } }, "tasksNamed": [ - "b", + "clean-rust", "version-bump", "version-print", "test-lsp", @@ -1264,15 +1365,16 @@ "lock-sed", "lint-deno", "lint-udeps", - "install-protobuf-rust", "install-wasi-adapter", "install-lsp", "install-website", "install-ts", "install-py", "install-sys", + "gen-subs-protoc", + "gen-pyrt-bind", + "build-pyrt", "fetch-deno", - "dev-sub-gen", "dev-website", "dev-gate6", "dev-gate5", @@ -1283,8 +1385,6 @@ "dev-eg-tgraphs", "dev-compose", "dev", - "gen-pyrt-bind", - "build-pyrt", "build-tgraph-ts-jsr", "build-tgraph-core", "build-tgraph-py", @@ -1299,13 +1399,13 @@ "id": "envs", "config": { "envs": { - "bciqkx2kodz5dx5pv3hjcc4vpirphyetattk4oks5pucb7dsqrgwzqwa": { + "bciqiaaqxx3azvrkvlj2eknjj6awsczu4gdcohccrvjpwk3vmkrnyfpi": { "desc": "the default default environment.", "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1333,12 +1433,12 @@ } ] }, - "bciqfoerhfsehob65bmr7v5eka43ml4zbbt3aeot7zz5ijlb4oy2lucq": { + "bciqipocpp2avwxmyj6rxrkpukmkjgwtzafiwnqwtlum62mho2mtcbgq": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1366,12 +1466,12 @@ } ] }, - "bciqe5ao7vzfelgdas65p7frjodat2yz6mz7jk2yup2ulv5ycd44afyi": { + "bciqhppphe2gyonum75xce4zlcglvswdte32hlpm6eulnwtuzc665tgq": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1399,12 +1499,12 @@ } ] }, - "bciqk7aif25pqtsyncbnbdapte4lixsodypfxvmkepsuey74vgr4zb5q": { + "bciqdpiup27tflfkq26oirbutkz53wrp34entiq423upf47za7zoq4za": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1432,12 +1532,12 @@ } ] }, - "bciqjmqirgadtrauceyhuq7gx5fuegiwl6s6x52dumzmwtqkno3srcsi": { + "bciqea2qrlw3rmfp2edgo2o7utf5ahjpa4r6y4nrw2pbmqm2g2rabviy": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1465,12 +1565,12 @@ } ] }, - "bciqclszw6iggx6sevxab56z3k7gh5hne7jzx24clywryxz24qjo5gji": { + "bciqcm5whsy4tzjafjheomwtxzjxz2avqxwgb6ss5kav6fxmmy3lu4ma": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1498,12 +1598,12 @@ } ] }, - "bciqn4urah5beauhii24btx3t5eh2gsoqldg6hqiqn7wstpbcuecfj2y": { + "bciqmkhbtdu3anjuk2oyegq2sb3ogzeljgadytenbtt6izyzfqinxdna": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1536,12 +1636,12 @@ } ] }, - "bciqjls65kmsyg36rd3onuorvgqh3xyw7i54yb2civyowpmovnnpbeza": { + "bciqp6dugoxl3avklj2uwl77sfbiixbo2vzduaohoeusqjktc63dshzy": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1569,12 +1669,12 @@ } ] }, - "bciqov6tmz5jhf6kitm7hptd6b74cw5zb7pt7rxqy3ktmqqn3hvaj4za": { + "bciqcctzik23xr7nadelnnusqesxpvkau6f5inuhqaggouuczqgevxfq": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1602,12 +1702,45 @@ } ] }, - "bciqizu3vblpk5gaendo6cyg42jzqa7zu6teyiodnfhoajdtbbv7q6za": { + "bciqpunhgxn3npmv6lwplhckwyn5zls7crj3vodn6we6ihuhu4y7djcy": { + "provides": [ + { + "ty": "posix.envVar", + "key": "RUST_LOG", + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" + }, + { + "ty": "posix.envVar", + "key": "TYPEGRAPH_VERSION", + "val": "0.0.3" + }, + { + "ty": "posix.envVar", + "key": "CLICOLOR_FORCE", + "val": "1" + }, + { + "ty": "posix.envVar", + "key": "CROSS_CONFIG", + "val": "tools/Cross.toml" + }, + { + "ty": "posix.envVar", + "key": "GIT_CLIFF_CONFIG", + "val": "tools/cliff.toml" + }, + { + "ty": "ghjk.ports.InstallSetRef", + "setId": "ghjkEnvProvInstSet_______task_env_gen-subs-protoc" + } + ] + }, + "bciqd6zbaarkdhf3u74bcxlzvmi2ywirr2sjtrzh7thrbnc3ijz3sq4q": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1670,12 +1803,12 @@ } ] }, - "bciqbyzm7ds7raflxunnt4jwajjwvghuccfzxsf3fzkjkjf22py6rghq": { + "bciqgjkrsledgw64yjp4hkj2lpf26pnamtuhsyho7bd55742yprtyv4y": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1773,12 +1906,12 @@ } ] }, - "bciqbgzsyj5gpkpixhvd4wihx4oa2qjmyf3ugdvdnemrr356mjxopkyy": { + "bciqns7jnxsdugrzboolqtwsh4ohiq5u3p46dezn7huqgo5rq4ps2gja": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1806,12 +1939,12 @@ } ] }, - "bciqayfl7nvr6g7qgplwj6ymglj7giqb6wz5pjw7tfct66fyrmnpcmwq": { + "bciqgqffklh7r5setenk7bkrqoyingrbbjbrcj4jka3rttr56ybxruqi": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1844,12 +1977,12 @@ } ] }, - "bciqewdms4swk2kufu6idlcha7vc42auzhglynkpuv7ulnfdnpmdul2a": { + "bciqmqhamsvcr6i7ol37s5kizxnoawcecho4kzqiwxgodztarzdapawa": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1882,12 +2015,12 @@ } ] }, - "bciqkqwta6epy65btclam4d25s5wph3mvhyg7fbxds4jbajx5uumx46q": { + "bciqp4x2tqplttorqy7ixw4rltvd7i5dknke6f3ba3uzbgymrp3s7aya": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1920,12 +2053,12 @@ } ] }, - "bciqhrqahrm3wdnsbfkt3f44hqw53fsolu622osigp5vmnuvp3jbb4wq": { + "bciqont2hfpi4wf7ul7acfxfdzwt4q4xm4sqpt2x6rvfc3kxxrtguj6i": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1953,12 +2086,12 @@ } ] }, - "bciqhtsq7g2mld3t64e7xolzrcbguzxihcrkftvuupv6af56prrgfpwy": { + "bciqniih3pp536jhouqduhilkpdas6uoesz6b2ckvstng6t7rlxz7jjq": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -1986,12 +2119,12 @@ } ] }, - "bciqlx64mqgsltfuryg4hrkc3rigpmrcfoxweppuye2gsvfifmb4762i": { + "bciqcsmfpk6r2kxk4hruhogwj2ddpjmaoftdxu2vtjsfjyawvvb5t5ga": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -2013,18 +2146,23 @@ "key": "GIT_CLIFF_CONFIG", "val": "tools/cliff.toml" }, + { + "ty": "posix.envVar", + "key": "V8_FORCE_DEBUG", + "val": "true" + }, { "ty": "ghjk.ports.InstallSetRef", "setId": "ghjkEnvProvInstSet___dev" } ] }, - "bciqpib7odt7u3wlasgekric54e7rsunltc5wlqppjnt3jq2faq4hbqi": { + "bciqajdl35eujx4j3ufkysnsqzaisaqtu247kaydoi2x7tvsqig6bzmq": { "provides": [ { "ty": "posix.envVar", "key": "RUST_LOG", - "val": "info,deno=warn,swc_ecma_codegen=off,tracing::span=off" + "val": "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off" }, { "ty": "posix.envVar", @@ -2055,21 +2193,21 @@ }, "defaultEnv": "dev", "envsNamed": { - "main": "bciqkx2kodz5dx5pv3hjcc4vpirphyetattk4oks5pucb7dsqrgwzqwa", - "_wasm": "bciqk7aif25pqtsyncbnbdapte4lixsodypfxvmkepsuey74vgr4zb5q", - "_python": "bciqjmqirgadtrauceyhuq7gx5fuegiwl6s6x52dumzmwtqkno3srcsi", - "_ecma": "bciqclszw6iggx6sevxab56z3k7gh5hne7jzx24clywryxz24qjo5gji", - "_rust": "bciqjls65kmsyg36rd3onuorvgqh3xyw7i54yb2civyowpmovnnpbeza", - "ci": "bciqhtsq7g2mld3t64e7xolzrcbguzxihcrkftvuupv6af56prrgfpwy", - "dev": "bciqlx64mqgsltfuryg4hrkc3rigpmrcfoxweppuye2gsvfifmb4762i", - "oci": "bciqpib7odt7u3wlasgekric54e7rsunltc5wlqppjnt3jq2faq4hbqi" + "main": "bciqiaaqxx3azvrkvlj2eknjj6awsczu4gdcohccrvjpwk3vmkrnyfpi", + "_wasm": "bciqdpiup27tflfkq26oirbutkz53wrp34entiq423upf47za7zoq4za", + "_python": "bciqea2qrlw3rmfp2edgo2o7utf5ahjpa4r6y4nrw2pbmqm2g2rabviy", + "_ecma": "bciqcm5whsy4tzjafjheomwtxzjxz2avqxwgb6ss5kav6fxmmy3lu4ma", + "_rust": "bciqp6dugoxl3avklj2uwl77sfbiixbo2vzduaohoeusqjktc63dshzy", + "ci": "bciqniih3pp536jhouqduhilkpdas6uoesz6b2ckvstng6t7rlxz7jjq", + "dev": "bciqcsmfpk6r2kxk4hruhogwj2ddpjmaoftdxu2vtjsfjyawvvb5t5ga", + "oci": "bciqajdl35eujx4j3ufkysnsqzaisaqtu247kaydoi2x7tvsqig6bzmq" } } } ], "blackboard": { - "bciqirg723pselb4g77l6ssuytptohd3rvin4ybnwncidus52tfpu6ty": { - "version": "1.46.1", + "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a": { + "version": "1.46.3", "port": { "ty": "denoWorker@v1", "name": "deno_ghrel", @@ -3079,6 +3217,44 @@ }, "packageName": "@bytecodealliance/jco" }, + "bciqm2rvnfe77sj6jekrm65oayuywt5lbrw33qezqjcg5rzaioc6uszy": { + "version": "3.5.1", + "port": { + "ty": "denoWorker@v1", + "name": "cargobi_cratesio", + "platforms": [ + "x86_64-linux", + "aarch64-linux", + "x86_64-darwin", + "aarch64-darwin", + "x86_64-windows", + "aarch64-windows", + "x86_64-freebsd", + "aarch64-freebsd", + "x86_64-netbsd", + "aarch64-netbsd", + "x86_64-aix", + "aarch64-aix", + "x86_64-solaris", + "aarch64-solaris", + "x86_64-illumos", + "aarch64-illumos", + "x86_64-android", + "aarch64-android" + ], + "version": "0.1.0", + "buildDeps": [ + { + "name": "cargo_binstall_ghrel" + }, + { + "name": "rust_rustup" + } + ], + "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/v0.2.1/ports/cargobi.ts" + }, + "crateName": "protobuf-codegen" + }, "bciqezkigmtx5tweeflmn27yofgwybmgbat7g6jg4xmxamomsdpvenay": { "version": "nightly-2024-05-26", "port": { diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b669cd3c13..9e8ba8b37d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,3 +1,5 @@ +name: Test Suite +run-name: Test Suite for ${{ github.ref }} on: workflow_dispatch: inputs: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b88581176f..3faed9f03f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -82,7 +82,7 @@ repos: - id: check-merge-conflict - id: end-of-file-fixer # exclude all generated files - exclude: (?x)( .ghjk/.* |.*deno.lock |.*\.snap$|typegate/src/typegraphs/.*\.json |website/docs/reference/ |libs/pyrt_wit_wire/pyrt) + exclude: (?x)( .ghjk/.* |.*deno.lock |.*\.snap$|typegate/src/typegraphs/.*\.json |website/docs/reference/ |libs/pyrt_wit_wire/pyrt | migration_lock.toml) - repo: https://github.com/Lucas-C/pre-commit-hooks rev: v1.5.5 hooks: diff --git a/Cargo.lock b/Cargo.lock index bc59a1d19f..9fb70f0ed9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,7 +19,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ed51fb0cfa6f88331d4424a7aca87146b315a3b5bd2bbad298ec855718ef9df" dependencies = [ "erased-serde 0.3.31", - "serde 1.0.204", + "serde", "serde_derive", "serde_json", ] @@ -86,7 +86,16 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli", + "gimli 0.28.1", +] + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli 0.29.0", ] [[package]] @@ -95,6 +104,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aead" version = "0.5.2" @@ -107,9 +122,9 @@ dependencies = [ [[package]] name = "aead-gcm-stream" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a09ecb526d53de2842cc876ee5c9b51161ee60399edeca4cf74892a01b48177" +checksum = "4947a169074c7e038fa43051d1c4e073f4488b0e4b0a30658f1e1a1b06449ce8" dependencies = [ "aead", "aes", @@ -310,9 +325,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" dependencies = [ "backtrace", ] @@ -326,19 +341,13 @@ dependencies = [ "derive_arbitrary", ] -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" dependencies = [ - "serde 1.0.204", + "serde", ] [[package]] @@ -366,7 +375,7 @@ dependencies = [ "asn1-rs-impl", "displaydoc", "nom 7.1.3", - "num-traits 0.2.19", + "num-traits", "rusticata-macros", "thiserror", "time", @@ -397,13 +406,14 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.14" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" +checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d" dependencies = [ "anstyle", "bstr", "doc-comment", + "libc", "predicates", "predicates-core", "predicates-tree", @@ -558,9 +568,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", @@ -593,6 +603,15 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + [[package]] name = "atomic-shim" version = "0.2.0" @@ -657,7 +676,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustversion", - "serde 1.0.204", + "serde", "sync_wrapper 0.1.2", "tower", "tower-layer", @@ -684,7 +703,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustversion", - "serde 1.0.204", + "serde", "sync_wrapper 1.0.1", "tower", "tower-layer", @@ -745,11 +764,11 @@ version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ - "addr2line", + "addr2line 0.21.0", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object 0.32.2", "rustc-demangle", ] @@ -848,7 +867,7 @@ checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" dependencies = [ "num-bigint", "num-integer", - "num-traits 0.2.19", + "num-traits", ] [[package]] @@ -857,7 +876,7 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "serde 1.0.204", + "serde", ] [[package]] @@ -875,7 +894,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", ] @@ -896,7 +915,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.71", "which 4.4.2", @@ -929,7 +948,7 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ - "serde 1.0.204", + "serde", ] [[package]] @@ -1055,11 +1074,11 @@ dependencies = [ "bitvec", "chrono", "hex", - "indexmap 2.4.0", + "indexmap 2.6.0", "js-sys", "once_cell", "rand 0.8.5", - "serde 1.0.204", + "serde", "serde_bytes", "serde_json", "time", @@ -1073,23 +1092,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", - "regex-automata 0.4.7", - "serde 1.0.204", -] - -[[package]] -name = "builtin-psl-connectors" -version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" -dependencies = [ - "connection-string", - "either", - "enumflags2", - "indoc", - "lsp-types 0.91.1", - "once_cell", - "psl-core", - "regex", + "regex-automata 0.4.8", + "serde", ] [[package]] @@ -1143,9 +1147,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bzip2" @@ -1176,9 +1180,9 @@ checksum = "1bf2a5fb3207c12b5d208ebc145f967fea5cac41a021c37417ccc31ba40f39ee" [[package]] name = "cached" -version = "0.51.4" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0feb64151eed3da6107fddd2d717a6ca4b9dbd74e43784c55c841d1abfe5a295" +checksum = "b4d73155ae6b28cf5de4cfc29aeb02b8a1c6dab883cb015d15cd514e42766846" dependencies = [ "ahash 0.8.11", "async-trait", @@ -1186,17 +1190,17 @@ dependencies = [ "cached_proc_macro_types", "futures", "hashbrown 0.14.5", - "instant", "once_cell", "thiserror", "tokio", + "web-time", ] [[package]] name = "cached_proc_macro" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771aa57f3b17da6c8bcacb187bb9ec9bc81c8160e72342e67c329e0e1651a669" +checksum = "2f42a145ed2d10dce2191e1dcf30cfccfea9026660e143662ba5eec4017d5daa" dependencies = [ "darling 0.20.10", "proc-macro2", @@ -1361,8 +1365,8 @@ dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits 0.2.19", - "serde 1.0.204", + "num-traits", + "serde", "wasm-bindgen", "windows-targets 0.52.6", ] @@ -1400,9 +1404,9 @@ dependencies = [ [[package]] name = "clap-verbosity-flag" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63d19864d6b68464c59f7162c9914a0b569ddc2926b4a2d71afe62a9738eff53" +checksum = "e099138e1807662ff75e2cebe4ae2287add879245574489f9b1588eb5e5564ed" dependencies = [ "clap", "log", @@ -1462,8 +1466,8 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" name = "client_rs_static" version = "0.0.1" dependencies = [ - "reqwest 0.12.4", - "serde 1.0.204", + "reqwest", + "serde", "serde_json", ] @@ -1604,15 +1608,15 @@ dependencies = [ "colored", "flate2", "ignore", - "indexmap 2.4.0", + "indexmap 2.6.0", "indoc", "itertools 0.13.0", "proto-parser", "protobuf", - "reqwest 0.11.27", - "serde 1.0.204", + "reqwest", + "serde", "serde_json", - "serde_with 3.9.0", + "serde_with", "tar", "thiserror", "url", @@ -1648,6 +1652,16 @@ dependencies = [ "unicode_categories", ] +[[package]] +name = "concat-idents" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" +dependencies = [ + "quote", + "syn 2.0.71", +] + [[package]] name = "concurrent-queue" version = "2.5.0" @@ -1659,17 +1673,21 @@ dependencies = [ [[package]] name = "config" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369" +checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" dependencies = [ + "async-trait", + "convert_case 0.6.0", + "json5", "lazy_static 1.5.0", - "nom 5.1.3", - "rust-ini 0.13.0", - "serde 1.0.204", - "serde-hjson", + "nom 7.1.3", + "pathdiff", + "ron", + "rust-ini 0.19.0", + "serde", "serde_json", - "toml 0.5.11", + "toml 0.8.15", "yaml-rust", ] @@ -1828,74 +1846,86 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.108.1" +version = "0.112.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29daf137addc15da6bab6eae2c4a11e274b1d270bf2759508e62f6145e863ef6" +checksum = "7b765ed4349e66bedd9b88c7691da42e24c7f62067a6be17ddffa949367b6e17" dependencies = [ "cranelift-entity", ] +[[package]] +name = "cranelift-bitset" +version = "0.112.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eaa2aece6237198afd32bff57699e08d4dccb8d3902c214fc1e6ba907247ca4" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "cranelift-codegen" -version = "0.108.1" +version = "0.112.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de619867d5de4c644b7fd9904d6e3295269c93d8a71013df796ab338681222d4" +checksum = "351824439e59d42f0e4fa5aac1d13deded155120043565769e55cd4ad3ca8ed9" dependencies = [ "bumpalo", "cranelift-bforest", + "cranelift-bitset", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli", + "gimli 0.29.0", "hashbrown 0.14.5", "log", "regalloc2", - "rustc-hash", + "rustc-hash 2.0.0", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.108.1" +version = "0.112.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f5cf277490037d8dae9513d35e0ee8134670ae4a964a5ed5b198d4249d7c10" +checksum = "5a0ce0273d7a493ef8f31f606849a4e931c19187a4923f5f87fc1f2b13109981" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.108.1" +version = "0.112.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3e22ecad1123343a3c09ac6ecc532bb5c184b6fcb7888df0ea953727f79924" +checksum = "0f72016ac35579051913f4f07f6b36c509ed69412d852fd44c8e1d7b7fa6d92a" [[package]] name = "cranelift-control" -version = "0.108.1" +version = "0.112.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ca3ec6d30bce84ccf59c81fead4d16381a3ef0ef75e8403bc1e7385980da09" +checksum = "db28951d21512c4fd0554ef179bfb11e4eb6815062957a9173824eee5de0c46c" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.108.1" +version = "0.112.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eabb8d36b0ca8906bec93c78ea516741cac2d7e6b266fa7b0ffddcc09004990" +checksum = "14ebe592a2f81af9237cf9be29dd3854ecb72108cfffa59e85ef12389bf939e3" dependencies = [ - "serde 1.0.204", + "cranelift-bitset", + "serde", "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.108.1" +version = "0.112.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b42630229e49a8cfcae90bdc43c8c4c08f7a7aa4618b67f79265cd2f996dd2" +checksum = "4437db9d60c7053ac91ded0802740c2ccf123ee6d6898dd906c34f8c530cd119" dependencies = [ "cranelift-codegen", "log", @@ -1905,15 +1935,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.108.1" +version = "0.112.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918d1e36361805dfe0b6cdfd5a5ffdb5d03fa796170c5717d2727cbe623b93a0" +checksum = "230cb33572b9926e210f2ca28145f2bc87f389e1456560932168e2591feb65c1" [[package]] name = "cranelift-native" -version = "0.108.1" +version = "0.112.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75aea85a0d7e1800b14ce9d3f53adf8ad4d1ee8a9e23b0269bdc50285e93b9b3" +checksum = "364524ac7aef7070b1141478724abebeec297d4ea1e87ad8b8986465e91146d9" dependencies = [ "cranelift-codegen", "libc", @@ -1922,9 +1952,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.108.1" +version = "0.112.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac491fd3473944781f0cf9528c90cc899d18ad438da21961a839a3a44d57dfb" +checksum = "0572cbd9d136a62c0f39837b6bce3b0978b96b8586794042bec0c214668fd6f5" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1932,7 +1962,7 @@ dependencies = [ "itertools 0.12.1", "log", "smallvec", - "wasmparser 0.207.0", + "wasmparser 0.217.0", "wasmtime-types", ] @@ -2016,6 +2046,19 @@ version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +[[package]] +name = "crosstarget-utils" +version = "0.1.0" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" +dependencies = [ + "futures", + "js-sys", + "pin-project", + "tokio", + "wasm-bindgen", + "wasm-bindgen-futures", +] + [[package]] name = "crunchy" version = "0.2.2" @@ -2062,12 +2105,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.4" +version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "nix 0.28.0", - "windows-sys 0.52.0", + "nix 0.29.0", + "windows-sys 0.59.0", ] [[package]] @@ -2140,16 +2183,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - [[package]] name = "darling" version = "0.14.4" @@ -2170,20 +2203,6 @@ dependencies = [ "darling_macro 0.20.10", ] -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - [[package]] name = "darling_core" version = "0.14.4" @@ -2212,17 +2231,6 @@ dependencies = [ "syn 2.0.71", ] -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core 0.13.4", - "quote", - "syn 1.0.109", -] - [[package]] name = "darling_macro" version = "0.14.4" @@ -2258,6 +2266,20 @@ dependencies = [ "parking_lot_core 0.9.10", ] +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core 0.9.10", +] + [[package]] name = "data-encoding" version = "2.6.0" @@ -2273,7 +2295,7 @@ checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" [[package]] name = "datamodel-renderer" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "base64 0.13.1", "once_cell", @@ -2293,14 +2315,14 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ - "serde 1.0.204", + "serde", "uuid", ] [[package]] name = "deno" -version = "1.46.1" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "1.46.3" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "anstream", "async-trait", @@ -2315,7 +2337,7 @@ dependencies = [ "clap_complete_fig", "color-print", "console_static_text", - "dashmap", + "dashmap 5.5.3", "data-encoding", "deno_ast", "deno_cache_dir", @@ -2332,6 +2354,7 @@ dependencies = [ "deno_semver", "deno_task_shell", "deno_terminal 0.2.0", + "deno_tower_lsp", "dissimilar", "dotenvy", "dprint-plugin-json", @@ -2351,7 +2374,7 @@ dependencies = [ "http-body-util", "hyper-util", "import_map", - "indexmap 2.4.0", + "indexmap 2.6.0", "jsonc-parser", "junction", "lazy-regex", @@ -2359,7 +2382,7 @@ dependencies = [ "libsui", "libz-sys", "log", - "lsp-types 0.94.1", + "lsp-types 0.97.0", "malva", "markup_fmt", "memmem", @@ -2382,7 +2405,7 @@ dependencies = [ "runtimelib", "rustyline", "rustyline-derive", - "serde 1.0.204", + "serde", "serde_json", "serde_repr", "sha2 0.10.8", @@ -2396,7 +2419,7 @@ dependencies = [ "thiserror", "tokio", "tokio-util 0.7.11", - "tower-lsp", + "tracing", "twox-hash", "typed-arena", "uuid", @@ -2405,10 +2428,21 @@ dependencies = [ "winapi", "winres", "zeromq", - "zip 2.2.0", + "zip", "zstd 0.12.4", ] +[[package]] +name = "deno-tower-lsp-macros" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d59a1cfd445fd86f63616127a434aabca000e03d963b01b03ce813520565b9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + [[package]] name = "deno_ast" version = "0.41.2" @@ -2422,7 +2456,7 @@ dependencies = [ "dprint-swc-ext", "once_cell", "percent-encoding", - "serde 1.0.204", + "serde", "swc_atoms", "swc_bundler", "swc_common", @@ -2455,8 +2489,8 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" -version = "0.160.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.162.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "async-trait", "deno_core", @@ -2466,13 +2500,13 @@ dependencies = [ [[package]] name = "deno_cache" -version = "0.98.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.100.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "async-trait", "deno_core", "rusqlite", - "serde 1.0.204", + "serde", "sha2 0.10.8", "tokio", ] @@ -2484,11 +2518,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9fa4989e4c6b0409438e2a68a91e4e02858b0d8ba6e5bc6860af6b0d0f385e8" dependencies = [ "deno_media_type", - "indexmap 2.4.0", + "indexmap 2.6.0", "log", "once_cell", "parking_lot 0.12.3", - "serde 1.0.204", + "serde", "serde_json", "sha2 0.10.8", "thiserror", @@ -2497,13 +2531,13 @@ dependencies = [ [[package]] name = "deno_canvas" -version = "0.35.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.37.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "deno_core", "deno_webgpu", "image", - "serde 1.0.204", + "serde", ] [[package]] @@ -2518,11 +2552,11 @@ dependencies = [ "glob", "ignore", "import_map", - "indexmap 2.4.0", + "indexmap 2.6.0", "jsonc-parser", "log", "percent-encoding", - "serde 1.0.204", + "serde", "serde_json", "thiserror", "url", @@ -2530,17 +2564,17 @@ dependencies = [ [[package]] name = "deno_console" -version = "0.166.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.168.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "deno_core", ] [[package]] name = "deno_core" -version = "0.306.0" +version = "0.307.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff7e5ec71a92ab026b997ac1315bdfb3eeac6cf89dd20f816c9c02baebccd066" +checksum = "154b0902402807a043579102f949e6dd6f3a09d2d5049929fd710fc3192bf109" dependencies = [ "anyhow", "bincode", @@ -2557,7 +2591,7 @@ dependencies = [ "parking_lot 0.12.3", "percent-encoding", "pin-project", - "serde 1.0.204", + "serde", "serde_json", "serde_v8", "smallvec", @@ -2576,8 +2610,8 @@ checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" [[package]] name = "deno_cron" -version = "0.46.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.48.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "anyhow", "async-trait", @@ -2589,8 +2623,8 @@ dependencies = [ [[package]] name = "deno_crypto" -version = "0.180.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.182.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "aes", "aes-gcm", @@ -2603,7 +2637,7 @@ dependencies = [ "deno_core", "deno_web", "elliptic-curve", - "num-traits 0.2.19", + "num-traits", "once_cell", "p256", "p384", @@ -2611,7 +2645,7 @@ dependencies = [ "rand 0.8.5", "ring 0.17.8", "rsa", - "serde 1.0.204", + "serde", "serde_bytes", "sha1", "sha2 0.10.8", @@ -2623,9 +2657,9 @@ dependencies = [ [[package]] name = "deno_doc" -version = "0.146.0" +version = "0.147.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48063b68a1646ef64811171b683eb2993e08260b33b2bd987649679945099370" +checksum = "d876971414230c7837bb4dc3557be99265558e1f43d2b6092f90e8b5f45e1984" dependencies = [ "ammonia", "anyhow", @@ -2637,11 +2671,11 @@ dependencies = [ "handlebars", "html-escape", "import_map", - "indexmap 2.4.0", + "indexmap 2.6.0", "itoa", "lazy_static 1.5.0", "regex", - "serde 1.0.204", + "serde", "serde_json", "syntect", "termcolor", @@ -2666,8 +2700,8 @@ dependencies = [ [[package]] name = "deno_fetch" -version = "0.190.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.192.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "base64 0.21.7", "bytes", @@ -2685,7 +2719,7 @@ dependencies = [ "ipnet", "percent-encoding", "rustls-webpki 0.102.6", - "serde 1.0.204", + "serde", "serde_json", "tokio", "tokio-rustls 0.26.0", @@ -2698,8 +2732,8 @@ dependencies = [ [[package]] name = "deno_ffi" -version = "0.153.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.155.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "deno_core", "deno_permissions", @@ -2708,7 +2742,7 @@ dependencies = [ "libffi", "libffi-sys", "log", - "serde 1.0.204", + "serde", "serde-value", "serde_json", "winapi", @@ -2716,8 +2750,8 @@ dependencies = [ [[package]] name = "deno_fs" -version = "0.76.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.78.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "async-trait", "base32", @@ -2730,7 +2764,7 @@ dependencies = [ "nix 0.26.2", "rand 0.8.5", "rayon", - "serde 1.0.204", + "serde", "winapi", "windows-sys 0.52.0", ] @@ -2750,13 +2784,13 @@ dependencies = [ "encoding_rs", "futures", "import_map", - "indexmap 2.4.0", + "indexmap 2.6.0", "log", "monch", "once_cell", "parking_lot 0.12.3", "regex", - "serde 1.0.204", + "serde", "serde_json", "sha2 0.10.8", "thiserror", @@ -2766,8 +2800,8 @@ dependencies = [ [[package]] name = "deno_http" -version = "0.164.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.166.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "async-compression", "async-trait", @@ -2794,7 +2828,7 @@ dependencies = [ "pin-project", "ring 0.17.8", "scopeguard", - "serde 1.0.204", + "serde", "smallvec", "thiserror", "tokio", @@ -2803,8 +2837,8 @@ dependencies = [ [[package]] name = "deno_io" -version = "0.76.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.78.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "async-trait", "deno_core", @@ -2825,8 +2859,8 @@ dependencies = [ [[package]] name = "deno_kv" -version = "0.74.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.76.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "anyhow", "async-trait", @@ -2835,7 +2869,6 @@ dependencies = [ "chrono", "deno_core", "deno_fetch", - "deno_node", "deno_permissions", "deno_tls", "denokv_proto", @@ -2850,7 +2883,7 @@ dependencies = [ "prost-build", "rand 0.8.5", "rusqlite", - "serde 1.0.204", + "serde", "url", ] @@ -2862,13 +2895,13 @@ checksum = "e0e6cc8fcb4819dd5e12d640d6fc455217c66bda00e30fd6d46d2844e3e1bdcf" dependencies = [ "anyhow", "deno_ast", - "derive_more", + "derive_more 0.99.17", "if_chain", "log", "once_cell", "phf 0.11.2", "regex", - "serde 1.0.204", + "serde", "serde_json", ] @@ -2878,7 +2911,7 @@ version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04beb67705d894d688e818870a701829223f6f485ef3ce0b8b2a7adac98d9583" dependencies = [ - "serde 1.0.204", + "serde", "serde_json", "thiserror", ] @@ -2890,14 +2923,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8978229b82552bf8457a0125aa20863f023619cfc21ebb007b1e571d68fd85b" dependencies = [ "data-url", - "serde 1.0.204", + "serde", "url", ] [[package]] name = "deno_napi" -version = "0.97.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.99.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "deno_core", "deno_permissions", @@ -2919,25 +2952,25 @@ dependencies = [ [[package]] name = "deno_net" -version = "0.158.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.160.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "deno_core", "deno_permissions", "deno_tls", "pin-project", "rustls-tokio-stream", - "serde 1.0.204", + "serde", "socket2 0.5.7", "tokio", - "trust-dns-proto 0.23.2", - "trust-dns-resolver 0.23.2", + "trust-dns-proto", + "trust-dns-resolver", ] [[package]] name = "deno_node" -version = "0.103.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.105.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "aead-gcm-stream", "aes", @@ -2975,7 +3008,7 @@ dependencies = [ "hyper 1.4.1", "hyper-util", "idna 0.3.0", - "indexmap 2.4.0", + "indexmap 2.6.0", "ipnetwork", "k256", "lazy-regex", @@ -2988,7 +3021,7 @@ dependencies = [ "num-bigint", "num-bigint-dig", "num-integer", - "num-traits 0.2.19", + "num-traits", "once_cell", "p224", "p256", @@ -3004,7 +3037,7 @@ dependencies = [ "rsa", "scrypt", "sec1", - "serde 1.0.204", + "serde", "sha1", "sha2 0.10.8", "sha3", @@ -3036,7 +3069,7 @@ dependencies = [ "futures", "log", "monch", - "serde 1.0.204", + "serde", "serde_json", "thiserror", "url", @@ -3044,9 +3077,9 @@ dependencies = [ [[package]] name = "deno_ops" -version = "0.182.0" +version = "0.183.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "623fee81066617b7a706923bc6364cd4181d35e6438e69d30dc8dd9ec94936f7" +checksum = "9114f9eb6419839f1ab9668f91c463238945bb974e1998629a703f72b4608daf" dependencies = [ "proc-macro-rules", "proc-macro2", @@ -3064,8 +3097,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38cf6ea5cc98ea7ad58b0e84593773bea03fc0431071a296017bed4151e3dc1d" dependencies = [ "deno_semver", - "indexmap 2.4.0", - "serde 1.0.204", + "indexmap 2.6.0", + "serde", "serde_json", "thiserror", "url", @@ -3073,8 +3106,8 @@ dependencies = [ [[package]] name = "deno_permissions" -version = "0.26.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.28.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "deno_core", "deno_terminal 0.2.0", @@ -3082,15 +3115,15 @@ dependencies = [ "libc", "log", "once_cell", - "serde 1.0.204", + "serde", "which 4.4.2", "winapi", ] [[package]] name = "deno_runtime" -version = "0.175.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.177.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "deno_ast", "deno_broadcast_channel", @@ -3138,7 +3171,7 @@ dependencies = [ "percent-encoding", "regex", "rustyline", - "serde 1.0.204", + "serde", "signal-hook", "signal-hook-registry", "tokio", @@ -3158,7 +3191,7 @@ checksum = "56feaf035e29320d11adf89eafa14f5447d3089deb1ce7de61ba7969195f5ff1" dependencies = [ "monch", "once_cell", - "serde 1.0.204", + "serde", "thiserror", "url", ] @@ -3202,8 +3235,8 @@ dependencies = [ [[package]] name = "deno_tls" -version = "0.153.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.155.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "deno_core", "deno_native_certs", @@ -3211,11 +3244,34 @@ dependencies = [ "rustls-pemfile 2.1.2", "rustls-tokio-stream", "rustls-webpki 0.102.6", - "serde 1.0.204", + "serde", "tokio", "webpki-roots 0.26.3", ] +[[package]] +name = "deno_tower_lsp" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afb4d257c084fd889e8cf1ba3ad58db0002428c819cc7717815f996f97777a" +dependencies = [ + "async-trait", + "auto_impl", + "bytes", + "dashmap 5.5.3", + "deno-tower-lsp-macros", + "futures", + "httparse", + "lsp-types 0.97.0", + "memchr", + "serde", + "serde_json", + "tokio", + "tokio-util 0.7.11", + "tower", + "tracing", +] + [[package]] name = "deno_unsync" version = "0.4.1" @@ -3228,8 +3284,8 @@ dependencies = [ [[package]] name = "deno_url" -version = "0.166.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.168.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "deno_core", "urlpattern", @@ -3237,8 +3293,8 @@ dependencies = [ [[package]] name = "deno_web" -version = "0.197.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.199.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "async-trait", "base64-simd 0.8.0", @@ -3248,19 +3304,19 @@ dependencies = [ "encoding_rs", "flate2", "futures", - "serde 1.0.204", + "serde", "tokio", "uuid", ] [[package]] name = "deno_webgpu" -version = "0.133.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.135.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "deno_core", "raw-window-handle", - "serde 1.0.204", + "serde", "tokio", "wgpu-core", "wgpu-types", @@ -3268,16 +3324,16 @@ dependencies = [ [[package]] name = "deno_webidl" -version = "0.166.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.168.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "deno_core", ] [[package]] name = "deno_websocket" -version = "0.171.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.173.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "bytes", "deno_core", @@ -3292,14 +3348,14 @@ dependencies = [ "hyper-util", "once_cell", "rustls-tokio-stream", - "serde 1.0.204", + "serde", "tokio", ] [[package]] name = "deno_webstorage" -version = "0.161.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.163.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "deno_core", "deno_web", @@ -3318,9 +3374,9 @@ dependencies = [ [[package]] name = "denokv_proto" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "114538d2cacd2b219f05faa753d80950f95416e47c77904c7452d5f41e157059" +checksum = "25e4ca7a6388ad11c5b8d8ad2300dbd57cdd1ba20fe7feb25aa5da8ae0ea83fd" dependencies = [ "anyhow", "async-trait", @@ -3328,7 +3384,7 @@ dependencies = [ "futures", "num-bigint", "prost 0.11.9", - "serde 1.0.204", + "serde", "uuid", ] @@ -3349,7 +3405,7 @@ dependencies = [ "log", "prost 0.11.9", "rand 0.8.5", - "serde 1.0.204", + "serde", "serde_json", "tokio", "tokio-util 0.7.11", @@ -3359,9 +3415,9 @@ dependencies = [ [[package]] name = "denokv_sqlite" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "188b792af19082cbfc7b666e71979775300482877d8b80601f4a5a86a80098a3" +checksum = "6e32dcfde2d7b2ed3200e2cdc2f90a6aeee31c83a2dd89425356f509f1238759" dependencies = [ "anyhow", "async-stream", @@ -3404,7 +3460,7 @@ dependencies = [ "displaydoc", "nom 7.1.3", "num-bigint", - "num-traits 0.2.19", + "num-traits", "rusticata-macros", ] @@ -3426,7 +3482,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", - "serde 1.0.204", + "serde", ] [[package]] @@ -3526,6 +3582,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + [[package]] name = "deunicode" version = "1.6.0" @@ -3535,7 +3611,7 @@ checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" [[package]] name = "diagnostics" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "colored", "indoc", @@ -3588,15 +3664,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "directories" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" -dependencies = [ - "dirs-sys 0.3.7", -] - [[package]] name = "directories" version = "5.0.1" @@ -3720,14 +3787,15 @@ dependencies = [ [[package]] name = "dmmf" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "bigdecimal", - "indexmap 1.9.3", - "prisma-models", + "indexmap 2.6.0", + "itertools 0.12.1", "psl", + "query-structure", "schema", - "serde 1.0.204", + "serde", "serde_json", ] @@ -3761,9 +3829,9 @@ dependencies = [ "anyhow", "bumpalo", "hashbrown 0.14.5", - "indexmap 2.4.0", - "rustc-hash", - "serde 1.0.204", + "indexmap 2.6.0", + "rustc-hash 1.1.0", + "serde", "unicode-width", ] @@ -3787,7 +3855,7 @@ dependencies = [ "dprint-core", "dprint-core-macros", "jsonc-parser", - "serde 1.0.204", + "serde", "text_lines", ] @@ -3800,22 +3868,22 @@ dependencies = [ "anyhow", "dprint-core", "jsonc-parser", - "serde 1.0.204", + "serde", "serde_json", ] [[package]] name = "dprint-plugin-markdown" -version = "0.17.6" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef42762177b1a74b52b98fe946cb88fa4a01f149b56208de72b43d2be0a54c6" +checksum = "934a8e33f6f373b2fb66c288a468e3dae9a56a6c66bfecd5504fe566131afd3f" dependencies = [ "anyhow", "dprint-core", "dprint-core-macros", "pulldown-cmark", "regex", - "serde 1.0.204", + "serde", "unicode-width", ] @@ -3830,8 +3898,8 @@ dependencies = [ "dprint-core", "dprint-core-macros", "percent-encoding", - "rustc-hash", - "serde 1.0.204", + "rustc-hash 1.1.0", + "serde", ] [[package]] @@ -3843,7 +3911,7 @@ dependencies = [ "allocator-api2", "bumpalo", "num-bigint", - "rustc-hash", + "rustc-hash 1.1.0", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -3859,7 +3927,7 @@ checksum = "48bc224a9084ad760195584ce5abb3c2c34a225fa312a128ad245a6b412b7689" dependencies = [ "digest 0.10.7", "num-bigint-dig", - "num-traits 0.2.19", + "num-traits", "pkcs8", "rfc6979", "sha2 0.10.8", @@ -3941,7 +4009,7 @@ dependencies = [ "curve25519-dalek", "ed25519", "rand_core 0.6.4", - "serde 1.0.204", + "serde", "sha2 0.10.8", "signature", "subtle", @@ -3955,7 +4023,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48cede2bb1b07dd598d269f973792c43e0cd92686d3b452bd6e01d7a8eb01211" dependencies = [ "debug-ignore", - "indexmap 2.4.0", + "indexmap 2.6.0", "log", "thiserror", "zerocopy", @@ -3974,6 +4042,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", + "base64ct", "crypto-bigint", "digest 0.10.7", "ff", @@ -3984,6 +4053,8 @@ dependencies = [ "pkcs8", "rand_core 0.6.4", "sec1", + "serde_json", + "serdect", "subtle", "zeroize", ] @@ -4094,18 +4165,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" -[[package]] -name = "enum-as-inner" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "enum-as-inner" version = "0.6.0" @@ -4137,7 +4196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", - "serde 1.0.204", + "serde", ] [[package]] @@ -4189,22 +4248,22 @@ dependencies = [ [[package]] name = "envconfig" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea81cc7e21f55a9d9b1efb6816904978d0bfbe31a50347cb24b2e75564bcac9b" +checksum = "3c1d02ec9fdd0a585580bdc8fb7ad01675eee5e3b7336cedbabe3aab4a026dbc" dependencies = [ "envconfig_derive", ] [[package]] name = "envconfig_derive" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfca278e5f84b45519acaaff758ebfa01f18e96998bc24b8f1b722dd804b9bf" +checksum = "d4291f0c7220b67ad15e9d5300ba2f215cee504f0924d60e77c9d1c77e7a69b1" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.71", ] [[package]] @@ -4219,7 +4278,7 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ - "serde 1.0.204", + "serde", ] [[package]] @@ -4228,7 +4287,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" dependencies = [ - "serde 1.0.204", + "serde", "typeid", ] @@ -4295,9 +4354,9 @@ dependencies = [ "deno_npm", "deno_semver", "futures", - "hashlink", - "indexmap 2.4.0", - "serde 1.0.204", + "hashlink 0.8.4", + "indexmap 2.6.0", + "serde", "serde_json", "sha2 0.10.8", "thiserror", @@ -4391,7 +4450,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" dependencies = [ - "serde 1.0.204", + "serde", ] [[package]] @@ -4405,9 +4464,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fastwebsockets" @@ -4467,14 +4526,14 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -4503,13 +4562,13 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -4518,7 +4577,27 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" dependencies = [ - "num-traits 0.2.19", + "num-traits", +] + +[[package]] +name = "fluent-uri" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin 0.9.8", ] [[package]] @@ -4527,6 +4606,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -4772,6 +4857,17 @@ dependencies = [ "futures-util", ] +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot 0.12.3", +] + [[package]] name = "futures-io" version = "0.3.30" @@ -4799,7 +4895,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -4882,15 +4978,15 @@ dependencies = [ "bitflags 2.6.0", "debugid", "fxhash", - "serde 1.0.204", + "serde", "serde_json", ] [[package]] name = "garde" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fa8fb3ffe035745c6194540b2064b2fe275f32367fbb4eb026024b7921e2e5" +checksum = "0a3233677ea1554a48235d81bb59d2a41654969a8e29a1316c48105fd1701693" dependencies = [ "compact_str", "garde_derive", @@ -4899,9 +4995,9 @@ dependencies = [ [[package]] name = "garde_derive" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf62650515830c41553b72bd49ec20fb120226f9277c7f2847f071cf998325b" +checksum = "8796f322e43105351a7ec35148807b32b5b6058a539656dafe4a5b456d5ca41f" dependencies = [ "proc-macro2", "quote", @@ -4958,17 +5054,23 @@ name = "gimli" version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" dependencies = [ "fallible-iterator 0.3.0", - "indexmap 2.4.0", + "indexmap 2.6.0", "stable_deref_trait", ] [[package]] name = "git2" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ "bitflags 2.6.0", "libc", @@ -5005,15 +5107,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick 1.1.3", "bstr", "log", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -5109,9 +5211,9 @@ dependencies = [ [[package]] name = "grep" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2b024ec1e686cb64d78beb852030b0e632af93817f1ed25be0173af0e94939" +checksum = "308ae749734e28d749a86f33212c7b756748568ce332f970ac1d9cd8531f32e6" dependencies = [ "grep-cli", "grep-matcher", @@ -5122,9 +5224,9 @@ dependencies = [ [[package]] name = "grep-cli" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea40788c059ab8b622c4d074732750bfb3bd2912e2dd58eabc11798a4d5ad725" +checksum = "47f1288f0e06f279f84926fa4c17e3fcd2a22b357927a82f2777f7be26e4cec0" dependencies = [ "bstr", "globset", @@ -5145,37 +5247,37 @@ dependencies = [ [[package]] name = "grep-printer" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743c12a03c8aee38b6e5bd0168d8ebb09345751323df4a01c56e792b1f38ceb2" +checksum = "c112110ae4a891aa4d83ab82ecf734b307497d066f437686175e83fbd4e013fe" dependencies = [ "bstr", "grep-matcher", "grep-searcher", "log", - "serde 1.0.204", + "serde", "serde_json", "termcolor", ] [[package]] name = "grep-regex" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d" +checksum = "9edd147c7e3296e7a26bd3a81345ce849557d5a8e48ed88f736074e760f91f7e" dependencies = [ "bstr", "grep-matcher", "log", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] name = "grep-searcher" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54" +checksum = "b9b6c14b3fc2e0a107d6604d3231dec0509e691e62447104bc385a46a7892cda" dependencies = [ "bstr", "encoding_rs", @@ -5218,7 +5320,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.4.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util 0.7.11", @@ -5237,7 +5339,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.4.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util 0.7.11", @@ -5251,7 +5353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" dependencies = [ "hashbrown 0.14.5", - "serde 1.0.204", + "serde", ] [[package]] @@ -5264,7 +5366,7 @@ dependencies = [ "log", "pest", "pest_derive", - "serde 1.0.204", + "serde", "serde_json", "thiserror", ] @@ -5292,9 +5394,6 @@ name = "hashbrown" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.11", -] [[package]] name = "hashbrown" @@ -5304,6 +5403,16 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", + "serde", +] + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "foldhash", ] [[package]] @@ -5315,6 +5424,15 @@ dependencies = [ "hashbrown 0.14.5", ] +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + [[package]] name = "heck" version = "0.3.3" @@ -5369,6 +5487,51 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +[[package]] +name = "hickory-proto" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand 0.8.5", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot 0.12.3", + "rand 0.8.5", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "hkdf" version = "0.12.4" @@ -5428,7 +5591,7 @@ dependencies = [ "new_debug_unreachable", "once_cell", "phf 0.11.2", - "rustc-hash", + "rustc-hash 1.1.0", "triomphe", ] @@ -5616,19 +5779,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper 0.14.30", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "hyper-tls" version = "0.6.0" @@ -5700,17 +5850,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.3.0" @@ -5763,7 +5902,7 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-traits 0.2.19", + "num-traits", "png", ] @@ -5773,10 +5912,10 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373b8288ad259df0d1314e3e8b2fff0e5e63f22e01bc54ecd2c3c7ad77b9200c" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.6.0", "log", "percent-encoding", - "serde 1.0.204", + "serde", "serde_json", "url", ] @@ -5814,18 +5953,18 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde 1.0.204", + "serde", ] [[package]] name = "indexmap" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", - "serde 1.0.204", + "hashbrown 0.15.0", + "serde", ] [[package]] @@ -5879,9 +6018,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.39.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" dependencies = [ "console", "globset", @@ -5946,7 +6085,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" dependencies = [ - "serde 1.0.204", + "serde", ] [[package]] @@ -6083,14 +6222,25 @@ dependencies = [ [[package]] name = "json-rpc-api-build" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "backtrace", "heck 0.3.3", - "serde 1.0.204", + "serde", "toml 0.5.11", ] +[[package]] +name = "json5" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" +dependencies = [ + "pest", + "pest_derive", + "serde", +] + [[package]] name = "jsonc-parser" version = "0.23.0" @@ -6110,7 +6260,7 @@ dependencies = [ "futures-executor", "futures-util", "log", - "serde 1.0.204", + "serde", "serde_derive", "serde_json", ] @@ -6187,21 +6337,21 @@ dependencies = [ [[package]] name = "lade-sdk" -version = "0.11.3" -source = "git+https://github.com/zifeo/lade?branch=fix/loosen-deps#10740e80518b2f6a2041300e86f6ed205a41378d" +version = "0.11.4-beta.1" +source = "git+https://github.com/zifeo/lade?branch=main#d88374201987defb599ae32ff4aa088291f4dd1e" dependencies = [ "access-json", "anyhow", "async-process", "async-trait", - "directories 5.0.1", + "directories", "futures", "itertools 0.13.0", "log", "once_cell", "regex", "rust-ini 0.21.1", - "serde 1.0.204", + "serde", "serde_json", "serde_yaml", "tempfile", @@ -6267,20 +6417,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" dependencies = [ - "lexical-core 0.8.5", -] - -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec 0.5.2", - "bitflags 1.3.2", - "cfg-if", - "ryu", - "static_assertions", + "lexical-core", ] [[package]] @@ -6349,9 +6486,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libffi" @@ -6374,9 +6511,9 @@ dependencies = [ [[package]] name = "libgit2-sys" -version = "0.16.2+1.7.2" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -6418,13 +6555,14 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", + "redox_syscall 0.5.3", ] [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "pkg-config", @@ -6446,9 +6584,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.18" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "cmake", @@ -6495,13 +6633,19 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ - "serde 1.0.204", + "serde", ] [[package]] @@ -6533,12 +6677,12 @@ dependencies = [ [[package]] name = "lsp-types" -version = "0.91.1" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2368312c59425dd133cb9a327afee65be0a633a8ce471d248e2202a48f8f68ae" +checksum = "8e34d33a8e9b006cd3fc4fe69a921affa097bae4bb65f76271f4644f9a334365" dependencies = [ "bitflags 1.3.2", - "serde 1.0.204", + "serde", "serde_json", "serde_repr", "url", @@ -6546,15 +6690,15 @@ dependencies = [ [[package]] name = "lsp-types" -version = "0.94.1" +version = "0.97.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" +checksum = "53353550a17c04ac46c585feb189c2db82154fc84b79c7a66c96c2c644f66071" dependencies = [ "bitflags 1.3.2", - "serde 1.0.204", + "fluent-uri", + "serde", "serde_json", "serde_repr", - "url", ] [[package]] @@ -6651,12 +6795,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "matchit" version = "0.7.3" @@ -6768,10 +6906,10 @@ dependencies = [ "common", "crossbeam-channel", "ctrlc", - "dashmap", - "derive_more", + "dashmap 6.1.0", + "derive_more 1.0.0", "dialoguer", - "directories 5.0.1", + "directories", "enum_dispatch", "filetime", "flate2", @@ -6782,7 +6920,7 @@ dependencies = [ "grep", "ignore", "include_dir", - "indexmap 2.4.0", + "indexmap 2.6.0", "indoc", "itertools 0.13.0", "lade-sdk", @@ -6794,14 +6932,13 @@ dependencies = [ "num_cpus", "once_cell", "pathdiff", - "prisma-models", "process-wrap", "project-root", "rand 0.8.5", - "reqwest 0.11.27", + "reqwest", "self_update", "semver 1.0.23", - "serde 1.0.204", + "serde", "serde_json", "serde_yaml", "shadow-rs", @@ -6828,12 +6965,12 @@ dependencies = [ "futures-lite 2.3.0", "garde", "heck 0.5.0", - "indexmap 2.4.0", + "indexmap 2.6.0", "log", "once_cell", "pretty_assertions", "regex", - "serde 1.0.204", + "serde", "serde_json", "tempfile", "tera", @@ -6845,7 +6982,7 @@ name = "metagen_fdk_rust_static" version = "0.0.1" dependencies = [ "anyhow", - "serde 1.0.204", + "serde", "serde_json", "wit-bindgen", ] @@ -6984,6 +7121,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.8.11" @@ -7023,9 +7169,8 @@ checksum = "b52c1b33ff98142aecea13138bd399b68aa7ab5d9546c300988c345004001eea" [[package]] name = "mongodb" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef206acb1b72389b49bc9985efe7eb1f8a9bb18e5680d262fac26c07f44025f1" +version = "3.0.0" +source = "git+https://github.com/prisma/mongo-rust-driver.git?branch=RUST-1994/happy-eyeballs#31e0356391a7871bec000ae35fe0edc35582449e" dependencies = [ "async-trait", "base64 0.13.1", @@ -7033,36 +7178,37 @@ dependencies = [ "bson", "chrono", "derivative", - "derive_more", + "derive_more 0.99.17", "futures-core", "futures-executor", "futures-io", "futures-util", "hex", + "hickory-proto", + "hickory-resolver", "hmac", - "lazy_static 1.5.0", "md-5", + "mongodb-internal-macros", + "once_cell", "pbkdf2 0.11.0", "percent-encoding", "rand 0.8.5", "rustc_version_runtime", "rustls 0.21.12", "rustls-pemfile 1.0.4", - "serde 1.0.204", + "serde", "serde_bytes", - "serde_with 1.14.0", + "serde_with", "sha-1", "sha2 0.10.8", - "socket2 0.4.10", + "socket2 0.5.7", "stringprep", - "strsim 0.10.0", + "strsim 0.11.1", "take_mut", "thiserror", "tokio", "tokio-rustls 0.24.1", "tokio-util 0.7.11", - "trust-dns-proto 0.21.2", - "trust-dns-resolver 0.21.2", "typed-builder", "uuid", "webpki-roots 0.25.4", @@ -7071,7 +7217,7 @@ dependencies = [ [[package]] name = "mongodb-client" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "mongodb", "once_cell", @@ -7079,10 +7225,20 @@ dependencies = [ "thiserror", ] +[[package]] +name = "mongodb-internal-macros" +version = "3.0.0" +source = "git+https://github.com/prisma/mongo-rust-driver.git?branch=RUST-1994/happy-eyeballs#31e0356391a7871bec000ae35fe0edc35582449e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + [[package]] name = "mongodb-query-connector" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "anyhow", "async-trait", @@ -7090,19 +7246,20 @@ dependencies = [ "bson", "chrono", "cuid", + "derive_more 0.99.17", "futures", - "indexmap 1.9.3", - "itertools 0.10.5", + "indexmap 2.6.0", + "itertools 0.12.1", "mongodb", "mongodb-client", - "prisma-models", "prisma-value", "psl", "query-connector", "query-engine-metrics", - "rand 0.7.3", + "query-structure", + "rand 0.8.5", "regex", - "serde 1.0.204", + "serde", "serde_json", "thiserror", "tokio", @@ -7115,8 +7272,9 @@ dependencies = [ [[package]] name = "mongodb-schema-connector" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ + "bson", "convert_case 0.6.0", "datamodel-renderer", "enumflags2", @@ -7138,11 +7296,12 @@ dependencies = [ [[package]] name = "mongodb-schema-describer" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ + "bson", "futures", "mongodb", - "serde 1.0.204", + "serde", ] [[package]] @@ -7183,7 +7342,7 @@ dependencies = [ "pin-project", "priority-queue", "regex", - "serde 1.0.204", + "serde", "serde_json", "socket2 0.4.10", "thiserror", @@ -7215,12 +7374,12 @@ dependencies = [ "lazy_static 1.5.0", "lexical", "num-bigint", - "num-traits 0.2.19", + "num-traits", "rand 0.8.5", "regex", "rust_decimal", "saturating", - "serde 1.0.204", + "serde", "serde_json", "sha1", "sha2 0.10.8", @@ -7237,16 +7396,16 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bit-set", "bitflags 2.6.0", "codespan-reporting", "hexf-parse", - "indexmap 2.4.0", + "indexmap 2.6.0", "log", - "num-traits 0.2.19", - "rustc-hash", - "serde 1.0.204", + "num-traits", + "rustc-hash 1.1.0", + "serde", "spirv", "termcolor", "thiserror", @@ -7264,11 +7423,11 @@ dependencies = [ [[package]] name = "napi_sym" -version = "0.96.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.98.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "quote", - "serde 1.0.204", + "serde", "serde_json", "syn 2.0.71", ] @@ -7375,8 +7534,8 @@ dependencies = [ [[package]] name = "node_resolver" -version = "0.5.0" -source = "git+https://github.com/metatypedev/deno?branch=v1.46.1-embeddable#dfffb6e46dbed4075fd7b7b3b1528ec22d3bb216" +version = "0.7.0" +source = "git+https://github.com/metatypedev/deno?branch=v1.46.3-embeddable#36fe604eca8559edace8f06bbe6c90dc2242df6b" dependencies = [ "anyhow", "async-trait", @@ -7399,7 +7558,6 @@ version = "5.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" dependencies = [ - "lexical-core 0.7.6", "memchr", "version_check", ] @@ -7416,11 +7574,11 @@ dependencies = [ [[package]] name = "normpath" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5831952a9476f2fed74b77d74182fa5ddc4d21c72ec45a333b250e3ed0272804" +checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7482,7 +7640,7 @@ dependencies = [ "num-integer", "num-iter", "num-rational", - "num-traits 0.2.19", + "num-traits", ] [[package]] @@ -7492,9 +7650,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", - "num-traits 0.2.19", + "num-traits", "rand 0.8.5", - "serde 1.0.204", + "serde", ] [[package]] @@ -7508,9 +7666,9 @@ dependencies = [ "libm", "num-integer", "num-iter", - "num-traits 0.2.19", + "num-traits", "rand 0.8.5", - "serde 1.0.204", + "serde", "smallvec", "zeroize", ] @@ -7521,7 +7679,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ - "num-traits 0.2.19", + "num-traits", ] [[package]] @@ -7536,7 +7694,7 @@ version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "num-traits 0.2.19", + "num-traits", ] [[package]] @@ -7547,7 +7705,7 @@ checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.19", + "num-traits", ] [[package]] @@ -7558,16 +7716,7 @@ checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ "num-bigint", "num-integer", - "num-traits 0.2.19", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.19", + "num-traits", ] [[package]] @@ -7625,13 +7774,13 @@ dependencies = [ [[package]] name = "object" -version = "0.33.0" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8dd6c0cdf9429bce006e1362bfce61fa1bfd8c898a643ed8d2b471934701d3d" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "crc32fast", - "hashbrown 0.14.5", - "indexmap 2.4.0", + "hashbrown 0.15.0", + "indexmap 2.6.0", "memchr", ] @@ -7646,9 +7795,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "onig" @@ -7759,7 +7908,7 @@ dependencies = [ "percent-encoding", "pin-project", "rand 0.8.5", - "serde 1.0.204", + "serde", "thiserror", "tokio", "tokio-stream", @@ -7799,7 +7948,7 @@ checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" dependencies = [ "async-trait", "crossbeam-channel", - "dashmap", + "dashmap 5.5.3", "fnv", "futures-channel", "futures-executor", @@ -7837,16 +7986,26 @@ version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ - "num-traits 0.2.19", + "num-traits", ] [[package]] name = "ordered-float" -version = "4.2.1" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" +checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537" dependencies = [ - "num-traits 0.2.19", + "num-traits", +] + +[[package]] +name = "ordered-multimap" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" +dependencies = [ + "dlv-list", + "hashbrown 0.13.2", ] [[package]] @@ -7872,7 +8031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", - "serde 1.0.204", + "serde", "windows-sys 0.52.0", ] @@ -8028,13 +8187,13 @@ dependencies = [ [[package]] name = "parser-database" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "diagnostics", "either", "enumflags2", - "indexmap 1.9.3", - "rustc-hash", + "indexmap 2.6.0", + "rustc-hash 1.1.0", "schema-ast", ] @@ -8187,7 +8346,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset 0.4.2", - "indexmap 2.4.0", + "indexmap 2.6.0", ] [[package]] @@ -8309,7 +8468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] @@ -8367,7 +8526,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] @@ -8411,13 +8570,13 @@ checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" dependencies = [ "cobs", "embedded-io", - "serde 1.0.204", + "serde", ] [[package]] name = "postgres-native-tls" version = "0.5.0" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" +source = "git+https://github.com/prisma/rust-postgres?rev=54a490bc#54a490bc6afa315abb9867304fb67e8b12a8fbf3" dependencies = [ "native-tls", "tokio", @@ -8428,7 +8587,7 @@ dependencies = [ [[package]] name = "postgres-protocol" version = "0.6.4" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" +source = "git+https://github.com/prisma/rust-postgres?rev=54a490bc#54a490bc6afa315abb9867304fb67e8b12a8fbf3" dependencies = [ "base64 0.13.1", "byteorder", @@ -8445,14 +8604,14 @@ dependencies = [ [[package]] name = "postgres-types" version = "0.2.4" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" +source = "git+https://github.com/prisma/rust-postgres?rev=54a490bc#54a490bc6afa315abb9867304fb67e8b12a8fbf3" dependencies = [ "bit-vec", "bytes", "chrono", "fallible-iterator 0.2.0", "postgres-protocol", - "serde 1.0.204", + "serde", "serde_json", "uuid", ] @@ -8510,9 +8669,9 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" [[package]] name = "pretty_assertions" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" dependencies = [ "diff", "yansi", @@ -8568,34 +8727,17 @@ dependencies = [ "indexmap 1.9.3", ] -[[package]] -name = "prisma-models" -version = "0.0.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" -dependencies = [ - "bigdecimal", - "chrono", - "cuid", - "getrandom 0.2.15", - "itertools 0.10.5", - "nanoid", - "prisma-value", - "psl", - "thiserror", - "uuid", -] - [[package]] name = "prisma-value" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "base64 0.13.1", "bigdecimal", "chrono", "once_cell", "regex", - "serde 1.0.204", + "serde", "serde_json", "uuid", ] @@ -8671,7 +8813,7 @@ version = "8.0.2" source = "git+https://github.com/metatypedev/process-wrap?branch=fix/decrement-tokio-version#5c6aecd60aebcb3390375f9c3a695ee479304db3" dependencies = [ "futures", - "indexmap 2.4.0", + "indexmap 2.6.0", "nix 0.28.0", "tokio", "tracing", @@ -8762,7 +8904,7 @@ dependencies = [ "chrono", "inventory", "prost 0.11.9", - "serde 1.0.204", + "serde", "serde_derive", "serde_json", "typetag", @@ -8794,7 +8936,7 @@ dependencies = [ "prost-wkt", "prost-wkt-build", "regex", - "serde 1.0.204", + "serde", "serde_derive", "serde_json", ] @@ -8805,7 +8947,7 @@ version = "0.1.0" source = "git+https://github.com/metatypedev/proto-parser?branch=main#aa47da5a8eb16f07d28f7aeece77953401cce3a2" dependencies = [ "anyhow", - "indexmap 2.4.0", + "indexmap 2.6.0", "protobuf", "protobuf-support", "thiserror", @@ -8813,9 +8955,9 @@ dependencies = [ [[package]] name = "protobuf" -version = "3.5.1" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bcc343da15609eaecd65f8aa76df8dc4209d325131d8219358c0aaaebab0bf6" +checksum = "3018844a02746180074f621e847703737d27d89d7f0721a7a4da317f88b16385" dependencies = [ "once_cell", "protobuf-support", @@ -8824,9 +8966,9 @@ dependencies = [ [[package]] name = "protobuf-json-mapping" -version = "3.5.1" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07993d14c66dfb74c639dc1b90381773b85cff66ef47bff35bad0778150a3aa" +checksum = "2d77c15a1dfbe22d088e5d31acbd6cae25eb15bd707de9ef00c58b508f11c76a" dependencies = [ "protobuf", "protobuf-support", @@ -8835,9 +8977,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.5.1" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0766e3675a627c327e4b3964582594b0e8741305d628a98a5de75a1d15f99b9" +checksum = "faf96d872914fcda2b66d66ea3fff2be7c66865d31c7bb2790cff32c0e714880" dependencies = [ "thiserror", ] @@ -8845,30 +8987,33 @@ dependencies = [ [[package]] name = "psl" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ - "builtin-psl-connectors", "psl-core", ] [[package]] name = "psl-core" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "bigdecimal", + "cfg-if", "chrono", + "connection-string", "diagnostics", + "either", "enumflags2", + "hex", "indoc", - "itertools 0.10.5", - "lsp-types 0.91.1", + "itertools 0.12.1", + "lsp-types 0.95.1", "once_cell", "parser-database", "prisma-value", "regex", "schema-ast", - "serde 1.0.204", + "serde", "serde_json", "url", ] @@ -8904,16 +9049,16 @@ dependencies = [ [[package]] name = "ptree" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0de80796b316aec75344095a6d2ef68ec9b8f573b9e7adc821149ba3598e270" +checksum = "709c3b241d6a6ccc1933b1c6d7d997fae2b3dff8981f6780eac67df03c32f3ef" dependencies = [ "ansi_term", "atty", "config", - "directories 4.0.1", + "directories", "petgraph 0.6.5", - "serde 1.0.204", + "serde", "serde-value", "tint", ] @@ -8932,7 +9077,7 @@ dependencies = [ [[package]] name = "quaint" version = "0.2.0-alpha.13" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "async-trait", "base64 0.12.3", @@ -8940,11 +9085,16 @@ dependencies = [ "bit-vec", "byteorder", "bytes", + "cfg_aliases 0.2.1", "chrono", + "concat-idents", "connection-string", + "crosstarget-utils", "either", "futures", + "getrandom 0.2.15", "hex", + "itertools 0.12.1", "lru-cache", "metrics 0.18.1", "mobc", @@ -8954,7 +9104,9 @@ dependencies = [ "percent-encoding", "postgres-native-tls", "postgres-types", + "regex", "rusqlite", + "serde", "serde_json", "sqlformat", "thiserror", @@ -8987,17 +9139,17 @@ dependencies = [ [[package]] name = "query-connector" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "anyhow", "async-trait", "chrono", "futures", - "indexmap 1.9.3", - "itertools 0.10.5", - "prisma-models", + "indexmap 2.6.0", + "itertools 0.12.1", "prisma-value", - "serde 1.0.204", + "query-structure", + "serde", "serde_json", "thiserror", "user-facing-errors", @@ -9007,28 +9159,29 @@ dependencies = [ [[package]] name = "query-core" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "async-trait", "bigdecimal", "chrono", "connection-string", "crossbeam-channel", + "crosstarget-utils", "cuid", "enumflags2", "futures", - "indexmap 1.9.3", - "itertools 0.10.5", + "indexmap 2.6.0", + "itertools 0.12.1", "lru 0.7.8", "once_cell", "opentelemetry 0.17.0", "petgraph 0.4.13", - "prisma-models", "psl", "query-connector", "query-engine-metrics", + "query-structure", "schema", - "serde 1.0.204", + "serde", "serde_json", "thiserror", "tokio", @@ -9043,20 +9196,37 @@ dependencies = [ [[package]] name = "query-engine-metrics" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "metrics 0.18.1", "metrics-exporter-prometheus", "metrics-util 0.12.1", "once_cell", "parking_lot 0.12.3", - "serde 1.0.204", + "serde", "serde_json", "tracing", "tracing-futures", "tracing-subscriber", ] +[[package]] +name = "query-structure" +version = "0.0.0" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" +dependencies = [ + "bigdecimal", + "chrono", + "cuid", + "getrandom 0.2.15", + "itertools 0.12.1", + "nanoid", + "prisma-value", + "psl", + "thiserror", + "uuid", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -9070,7 +9240,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1a341ae463320e9f8f34adda49c8a85d81d4e8f34cce4397fb0350481552224" dependencies = [ "chrono", - "indexmap 2.4.0", + "indexmap 2.6.0", "quick-xml 0.31.0", "strip-ansi-escapes", "thiserror", @@ -9334,27 +9504,27 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.9.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" +checksum = "12908dbeb234370af84d0579b9f68258a0f67e201412dd9a2814e6f45b2fc0f0" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.5", "log", - "rustc-hash", + "rustc-hash 2.0.0", "slice-group-by", "smallvec", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick 1.1.3", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -9368,13 +9538,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick 1.1.3", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -9385,9 +9555,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "relative-path" @@ -9407,22 +9577,23 @@ dependencies = [ [[package]] name = "request-handlers" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "bigdecimal", + "cfg_aliases 0.2.1", "connection-string", "dmmf", "futures", "graphql-parser 0.3.0", - "indexmap 1.9.3", - "itertools 0.10.5", + "indexmap 2.6.0", + "itertools 0.12.1", "mongodb-query-connector", "once_cell", - "prisma-models", "psl", "quaint", "query-core", - "serde 1.0.204", + "query-structure", + "serde", "serde_json", "sql-query-connector", "thiserror", @@ -9431,46 +9602,6 @@ dependencies = [ "user-facing-errors", ] -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "hyper-tls 0.5.0", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile 1.0.4", - "serde 1.0.204", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.50.0", -] - [[package]] name = "reqwest" version = "0.12.4" @@ -9488,7 +9619,7 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.4.1", - "hyper-tls 0.6.0", + "hyper-tls", "hyper-util", "ipnet", "js-sys", @@ -9499,7 +9630,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls-pemfile 2.1.2", - "serde 1.0.204", + "serde", "serde_json", "serde_urlencoded", "sync_wrapper 0.1.2", @@ -9610,7 +9741,7 @@ checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", "bitflags 2.6.0", - "serde 1.0.204", + "serde", "serde_derive", ] @@ -9622,7 +9753,7 @@ checksum = "0a542b0253fa46e632d27a1dc5cf7b930de4df8659dc6e720b647fc72147ae3d" dependencies = [ "countme", "hashbrown 0.14.5", - "rustc-hash", + "rustc-hash 1.1.0", "text-size", ] @@ -9636,7 +9767,7 @@ dependencies = [ "digest 0.10.7", "num-bigint-dig", "num-integer", - "num-traits 0.2.19", + "num-traits", "pkcs1", "pkcs8", "rand_core 0.6.4", @@ -9662,7 +9793,7 @@ dependencies = [ "glob", "rand 0.8.5", "ring 0.17.8", - "serde 1.0.204", + "serde", "serde_json", "shellexpand 3.1.0", "tokio", @@ -9672,24 +9803,28 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.29.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" dependencies = [ "bitflags 2.6.0", "chrono", - "fallible-iterator 0.2.0", + "fallible-iterator 0.3.0", "fallible-streaming-iterator", - "hashlink", + "hashlink 0.9.1", "libsqlite3-sys", "smallvec", ] [[package]] name = "rust-ini" -version = "0.13.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" +checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" +dependencies = [ + "cfg-if", + "ordered-multimap 0.6.0", +] [[package]] name = "rust-ini" @@ -9698,7 +9833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f" dependencies = [ "cfg-if", - "ordered-multimap", + "ordered-multimap 0.7.3", "trim-in-place", ] @@ -9708,13 +9843,13 @@ version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "borsh", "bytes", - "num-traits 0.2.19", + "num-traits", "rand 0.8.5", "rkyv", - "serde 1.0.204", + "serde", "serde_json", ] @@ -9730,6 +9865,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.2.3" @@ -9750,12 +9891,12 @@ dependencies = [ [[package]] name = "rustc_version_runtime" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f" +checksum = "2dd18cd2bae1820af0b6ad5e54f4a51d0f3fcc53b05f845675074efcc7af071d" dependencies = [ - "rustc_version 0.2.3", - "semver 0.9.0", + "rustc_version 0.4.0", + "semver 1.0.23", ] [[package]] @@ -9769,9 +9910,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno 0.3.9", @@ -10001,34 +10142,36 @@ dependencies = [ [[package]] name = "schema" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "once_cell", - "prisma-models", "psl", - "rustc-hash", + "query-structure", + "rustc-hash 1.1.0", ] [[package]] name = "schema-ast" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "diagnostics", "pest", "pest_derive", + "serde", + "serde_json", ] [[package]] name = "schema-connector" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "chrono", "enumflags2", "psl", "quaint", - "serde 1.0.204", + "serde", "serde_json", "sha2 0.9.9", "tracing", @@ -10039,7 +10182,7 @@ dependencies = [ [[package]] name = "schema-core" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "async-trait", "chrono", @@ -10049,7 +10192,7 @@ dependencies = [ "mongodb-schema-connector", "psl", "schema-connector", - "serde 1.0.204", + "serde", "serde_json", "sql-schema-connector", "tokio", @@ -10110,6 +10253,7 @@ dependencies = [ "der", "generic-array", "pkcs8", + "serdect", "subtle", "zeroize", ] @@ -10150,25 +10294,25 @@ dependencies = [ [[package]] name = "self_update" -version = "0.39.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a34ad8e4a86884ab42e9b8690e9343abdcfe5fa38a0318cfe1565ba9ad437b4" +checksum = "469a3970061380c19852269f393e74c0fe607a4e23d85267382cf25486aa8de5" dependencies = [ "either", "flate2", - "hyper 0.14.30", + "hyper 1.4.1", "indicatif", "log", "quick-xml 0.23.1", "regex", - "reqwest 0.11.27", + "reqwest", "self-replace", "semver 1.0.23", "serde_json", "tar", "tempfile", "urlencoding", - "zip 0.6.6", + "zip", "zipsign-api", ] @@ -10186,6 +10330,9 @@ name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] [[package]] name = "semver-parser" @@ -10195,13 +10342,13 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "sentry" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00421ed8fa0c995f07cde48ba6c89e80f2b312f74ff637326f392fbfd23abe02" +checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066" dependencies = [ "httpdate", "native-tls", - "reqwest 0.12.4", + "reqwest", "sentry-anyhow", "sentry-backtrace", "sentry-contexts", @@ -10215,9 +10362,9 @@ dependencies = [ [[package]] name = "sentry-anyhow" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddcbce6e6785c2d91e67c55196f60ac561fab5946b6c7d60cc29f498fc126076" +checksum = "d672bfd1ed4e90978435f3c0704edb71a7a9d86403657839d518cd6aa278aff5" dependencies = [ "anyhow", "sentry-backtrace", @@ -10226,9 +10373,9 @@ dependencies = [ [[package]] name = "sentry-backtrace" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a79194074f34b0cbe5dd33896e5928bbc6ab63a889bd9df2264af5acb186921e" +checksum = "40aa225bb41e2ec9d7c90886834367f560efc1af028f1c5478a6cce6a59c463a" dependencies = [ "backtrace", "once_cell", @@ -10238,9 +10385,9 @@ dependencies = [ [[package]] name = "sentry-contexts" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba8870c5dba2bfd9db25c75574a11429f6b95957b0a78ac02e2970dd7a5249a" +checksum = "1a8dd746da3d16cb8c39751619cefd4fcdbd6df9610f3310fd646b55f6e39910" dependencies = [ "hostname 0.4.0", "libc", @@ -10252,22 +10399,22 @@ dependencies = [ [[package]] name = "sentry-core" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a75011ea1c0d5c46e9e57df03ce81f5c7f0a9e199086334a1f9c0a541e0826" +checksum = "161283cfe8e99c8f6f236a402b9ccf726b201f365988b5bb637ebca0abbd4a30" dependencies = [ "once_cell", "rand 0.8.5", "sentry-types", - "serde 1.0.204", + "serde", "serde_json", ] [[package]] name = "sentry-debug-images" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ec2a486336559414ab66548da610da5e9626863c3c4ffca07d88f7dc71c8de8" +checksum = "8fc6b25e945fcaa5e97c43faee0267eebda9f18d4b09a251775d8fef1086238a" dependencies = [ "findshlibs", "once_cell", @@ -10276,9 +10423,9 @@ dependencies = [ [[package]] name = "sentry-panic" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eaa3ecfa3c8750c78dcfd4637cfa2598b95b52897ed184b4dc77fcf7d95060d" +checksum = "bc74f229c7186dd971a9491ffcbe7883544aa064d1589bd30b83fb856cd22d63" dependencies = [ "sentry-backtrace", "sentry-core", @@ -10286,9 +10433,9 @@ dependencies = [ [[package]] name = "sentry-tracing" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f715932bf369a61b7256687c6f0554141b7ce097287e30e3f7ed6e9de82498fe" +checksum = "cd3c5faf2103cd01eeda779ea439b68c4ee15adcdb16600836e97feafab362ec" dependencies = [ "sentry-backtrace", "sentry-core", @@ -10298,14 +10445,14 @@ dependencies = [ [[package]] name = "sentry-types" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4519c900ce734f7a0eb7aba0869dfb225a7af8820634a7dd51449e3b093cfb7c" +checksum = "5d68cdf6bc41b8ff3ae2a9c4671e97426dcdd154cc1d4b6b72813f285d6b163f" dependencies = [ "debugid", "hex", "rand 0.8.5", - "serde 1.0.204", + "serde", "serde_json", "thiserror", "time", @@ -10315,31 +10462,13 @@ dependencies = [ [[package]] name = "serde" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" - -[[package]] -name = "serde" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] -[[package]] -name = "serde-hjson" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8" -dependencies = [ - "lazy_static 1.5.0", - "num-traits 0.1.43", - "regex", - "serde 0.8.23", -] - [[package]] name = "serde-value" version = "0.7.0" @@ -10347,7 +10476,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" dependencies = [ "ordered-float 2.10.1", - "serde 1.0.204", + "serde", ] [[package]] @@ -10356,14 +10485,14 @@ version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ - "serde 1.0.204", + "serde", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -10372,15 +10501,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.6.0", "itoa", "memchr", "ryu", - "serde 1.0.204", + "serde", ] [[package]] @@ -10400,7 +10529,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ - "serde 1.0.204", + "serde", ] [[package]] @@ -10412,17 +10541,17 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.204", + "serde", ] [[package]] name = "serde_v8" -version = "0.215.0" +version = "0.216.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41001c84d438ec3ad2d86413993cd72cb00b4d47aad010fc562bfdbb9aeff71d" +checksum = "1733b8192f123beedd2fc7998efeaf2a0b8bfa35c01537f50b690e786db8024c" dependencies = [ "num-bigint", - "serde 1.0.204", + "serde", "smallvec", "thiserror", "v8", @@ -10430,49 +10559,27 @@ dependencies = [ [[package]] name = "serde_with" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" -dependencies = [ - "serde 1.0.204", - "serde_with_macros 1.5.2", -] - -[[package]] -name = "serde_with" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.4.0", - "serde 1.0.204", + "indexmap 2.6.0", + "serde", "serde_derive", "serde_json", - "serde_with_macros 3.9.0", + "serde_with_macros", "time", ] [[package]] name = "serde_with_macros" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" -dependencies = [ - "darling 0.13.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "serde_with_macros" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling 0.20.10", "proc-macro2", @@ -10486,13 +10593,23 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.6.0", "itoa", "ryu", - "serde 1.0.204", + "serde", "unsafe-libyaml", ] +[[package]] +name = "serdect" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177" +dependencies = [ + "base16ct", + "serde", +] + [[package]] name = "sha-1" version = "0.10.1" @@ -10557,9 +10674,9 @@ dependencies = [ [[package]] name = "shadow-rs" -version = "0.28.0" +version = "0.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d75516bdaee8f640543ad1f6e292448c23ce57143f812c3736ab4b0874383df" +checksum = "2311e39772c00391875f40e34d43efef247b23930143a70ca5fbec9505937420" dependencies = [ "const_format", "git2", @@ -10665,9 +10782,9 @@ checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa" dependencies = [ "getrandom 0.2.15", "halfbrown", - "lexical-core 0.8.5", + "lexical-core", "ref-cast", - "serde 1.0.204", + "serde", "serde_json", "simdutf8", "value-trait", @@ -10746,7 +10863,7 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" dependencies = [ - "serde 1.0.204", + "serde", ] [[package]] @@ -10797,9 +10914,9 @@ dependencies = [ "data-encoding", "debugid", "if_chain", - "rustc-hash", + "rustc-hash 1.1.0", "rustc_version 0.2.3", - "serde 1.0.204", + "serde", "serde_json", "unicode-id-start", "url", @@ -10825,6 +10942,9 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] [[package]] name = "spirv" @@ -10854,12 +10974,12 @@ checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" [[package]] name = "sql-ddl" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" [[package]] name = "sql-query-connector" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "anyhow", "async-trait", @@ -10867,16 +10987,16 @@ dependencies = [ "chrono", "cuid", "futures", - "itertools 0.10.5", + "itertools 0.12.1", "once_cell", "opentelemetry 0.17.0", - "prisma-models", "prisma-value", "psl", "quaint", "query-connector", - "rand 0.7.3", - "serde 1.0.204", + "query-structure", + "rand 0.8.5", + "serde", "serde_json", "thiserror", "tokio", @@ -10890,13 +11010,14 @@ dependencies = [ [[package]] name = "sql-schema-connector" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "chrono", "connection-string", "datamodel-renderer", "either", "enumflags2", + "indexmap 2.6.0", "indoc", "once_cell", "prisma-value", @@ -10904,37 +11025,40 @@ dependencies = [ "quaint", "regex", "schema-connector", - "serde 1.0.204", + "serde", "serde_json", "sql-ddl", "sql-schema-describer", "sqlformat", "sqlparser", + "sqlx-core", + "sqlx-sqlite", "tokio", "tracing", "tracing-futures", "url", "user-facing-errors", "uuid", + "versions", ] [[package]] name = "sql-schema-describer" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "async-trait", "bigdecimal", "either", "enumflags2", - "indexmap 1.9.3", + "indexmap 2.6.0", "indoc", "once_cell", "prisma-value", "psl", "quaint", "regex", - "serde 1.0.204", + "serde", "tracing", "tracing-error", "tracing-futures", @@ -10959,6 +11083,61 @@ dependencies = [ "log", ] +[[package]] +name = "sqlx-core" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e" +dependencies = [ + "atoi", + "byteorder", + "bytes", + "crossbeam-queue", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashbrown 0.14.5", + "hashlink 0.9.1", + "hex", + "indexmap 2.6.0", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "smallvec", + "sqlformat", + "thiserror", + "tracing", + "url", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680" +dependencies = [ + "atoi", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde_urlencoded", + "sqlx-core", + "tracing", + "url", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -10995,7 +11174,7 @@ dependencies = [ "parking_lot 0.12.3", "phf_shared 0.10.0", "precomputed-hash", - "serde 1.0.204", + "serde", ] [[package]] @@ -11094,7 +11273,7 @@ dependencies = [ "chrono", "protobuf", "redis", - "serde 1.0.204", + "serde", "serde_json", "uuid", ] @@ -11114,7 +11293,7 @@ dependencies = [ "bumpalo", "hashbrown 0.14.5", "ptr_meta", - "rustc-hash", + "rustc-hash 1.1.0", "triomphe", ] @@ -11126,8 +11305,8 @@ checksum = "bb6567e4e67485b3e7662b486f1565bdae54bd5b9d6b16b2ba1a9babb1e42125" dependencies = [ "hstr", "once_cell", - "rustc-hash", - "serde 1.0.204", + "rustc-hash 1.1.0", + "serde", ] [[package]] @@ -11138,7 +11317,7 @@ checksum = "e9e0a88398e80a77bd6e1b523698a0f1ab3b12fbddd03c8a69a73963c02d3bbc" dependencies = [ "anyhow", "crc", - "indexmap 2.4.0", + "indexmap 2.6.0", "is-macro", "once_cell", "parking_lot 0.12.3", @@ -11168,10 +11347,10 @@ checksum = "83406221c501860fce9c27444f44125eafe9e598b8b81be7563d7036784cd05c" dependencies = [ "ahash 0.8.11", "anyhow", - "dashmap", + "dashmap 5.5.3", "once_cell", "regex", - "serde 1.0.204", + "serde", ] [[package]] @@ -11188,8 +11367,8 @@ dependencies = [ "new_debug_unreachable", "num-bigint", "once_cell", - "rustc-hash", - "serde 1.0.204", + "rustc-hash 1.1.0", + "serde", "siphasher", "sourcemap", "swc_allocator", @@ -11208,8 +11387,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84b67e115ab136fe0eb03558bb0508ca7782eeb446a96d165508c48617e3fd94" dependencies = [ "anyhow", - "indexmap 2.4.0", - "serde 1.0.204", + "indexmap 2.6.0", + "serde", "serde_json", "swc_cached", "swc_config_macro", @@ -11238,7 +11417,7 @@ dependencies = [ "num-bigint", "phf 0.11.2", "scoped-tls", - "serde 1.0.204", + "serde", "string_enum", "swc_atoms", "swc_common", @@ -11254,7 +11433,7 @@ dependencies = [ "memchr", "num-bigint", "once_cell", - "serde 1.0.204", + "serde", "sourcemap", "swc_allocator", "swc_atoms", @@ -11284,7 +11463,7 @@ checksum = "a201c65ccbaa0c80fbcfd5c90dcc0bfc7ae62ac596f2233651ac715caf5d2c12" dependencies = [ "anyhow", "pathdiff", - "serde 1.0.204", + "serde", "swc_atoms", "swc_common", "tracing", @@ -11299,9 +11478,9 @@ dependencies = [ "either", "new_debug_unreachable", "num-bigint", - "num-traits 0.2.19", + "num-traits", "phf 0.11.2", - "serde 1.0.204", + "serde", "smallvec", "smartstring", "stacker", @@ -11320,11 +11499,11 @@ checksum = "6df81c1cbb920d9c47abe6fb105363b0f78df2c8f6b0910c4fdd2ad7cbdfb23d" dependencies = [ "better_scoped_tls", "bitflags 2.6.0", - "indexmap 2.4.0", + "indexmap 2.6.0", "once_cell", "phf 0.11.2", - "rustc-hash", - "serde 1.0.204", + "rustc-hash 1.1.0", + "serde", "smallvec", "swc_atoms", "swc_common", @@ -11367,11 +11546,11 @@ version = "0.204.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7f9a903d6774d3f9005775badc25817296791ffed560f1b7e38aab62ca37ff" dependencies = [ - "dashmap", - "indexmap 2.4.0", + "dashmap 5.5.3", + "indexmap 2.6.0", "once_cell", "petgraph 0.6.5", - "rustc-hash", + "rustc-hash 1.1.0", "serde_json", "swc_atoms", "swc_common", @@ -11392,8 +11571,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2d84d062b05ae89982a76ff47881a5e15bbd02e9b3c68dc14a3f5eacf48abca" dependencies = [ "either", - "rustc-hash", - "serde 1.0.204", + "rustc-hash 1.1.0", + "serde", "smallvec", "swc_atoms", "swc_common", @@ -11412,10 +11591,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d411add563dd86d50b3db6e74e38def06587fa2fd370b430f71226688bfa6ded" dependencies = [ "base64 0.21.7", - "dashmap", - "indexmap 2.4.0", + "dashmap 5.5.3", + "indexmap 2.6.0", "once_cell", - "serde 1.0.204", + "serde", "sha1", "string_enum", "swc_allocator", @@ -11437,7 +11616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f73c4ae3eb15adc5865dc729c4e111040529cec5a349d56ed0b4a0de1a86242" dependencies = [ "ryu-js", - "serde 1.0.204", + "serde", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -11453,10 +11632,10 @@ version = "0.133.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6148af60d25da893aef037621e4869e9b580eb280e12f5a8d4f87fa5e4cd5da" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.6.0", "num_cpus", "once_cell", - "rustc-hash", + "rustc-hash 1.1.0", "ryu-js", "swc_atoms", "swc_common", @@ -11498,9 +11677,9 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3f854cf8efc290aa927d31dab98b42011ff2341fecb2b27fdc817ef7b30ef3b" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.6.0", "petgraph 0.6.5", - "rustc-hash", + "rustc-hash 1.1.0", "swc_common", ] @@ -11631,8 +11810,8 @@ dependencies = [ "fnv", "once_cell", "onig", - "regex-syntax 0.8.4", - "serde 1.0.204", + "regex-syntax 0.8.5", + "serde", "serde_derive", "serde_json", "thiserror", @@ -11725,20 +11904,21 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.15" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", - "fastrand 2.1.0", + "fastrand 2.1.1", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -11750,7 +11930,7 @@ dependencies = [ "async-trait", "backoff", "derive_builder 0.12.0", - "derive_more", + "derive_more 0.99.17", "futures", "futures-retry", "http 0.2.12", @@ -11775,12 +11955,12 @@ source = "git+https://github.com/temporalio/sdk-core?rev=7f9755b#7f9755b77def197 dependencies = [ "anyhow", "base64 0.21.7", - "derive_more", + "derive_more 0.99.17", "prost 0.11.9", "prost-wkt", "prost-wkt-build", "prost-wkt-types", - "serde 1.0.204", + "serde", "serde_json", "thiserror", "tonic 0.8.3", @@ -11809,7 +11989,7 @@ dependencies = [ "pest", "pest_derive", "regex", - "serde 1.0.204", + "serde", "serde_json", "unic-segment", ] @@ -11851,7 +12031,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fd5828de7deaa782e1dd713006ae96b3bee32d3279b79eb67ecf8072c059bcf" dependencies = [ - "serde 1.0.204", + "serde", ] [[package]] @@ -11867,18 +12047,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -11914,7 +12094,7 @@ dependencies = [ "futures", "futures-sink", "futures-util", - "num-traits 0.2.19", + "num-traits", "once_cell", "opentls", "pin-project-lite", @@ -11939,7 +12119,7 @@ dependencies = [ "num-conv", "num_threads", "powerfmt", - "serde 1.0.204", + "serde", "time-core", "time-macros", ] @@ -12067,7 +12247,7 @@ dependencies = [ [[package]] name = "tokio-postgres" version = "0.7.7" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" +source = "git+https://github.com/prisma/rust-postgres?rev=54a490bc#54a490bc6afa315abb9867304fb67e8b12a8fbf3" dependencies = [ "async-trait", "byteorder", @@ -12133,9 +12313,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -12180,7 +12360,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.204", + "serde", ] [[package]] @@ -12189,7 +12369,7 @@ version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ - "serde 1.0.204", + "serde", "serde_spanned", "toml_datetime", "toml_edit 0.22.16", @@ -12201,7 +12381,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ - "serde 1.0.204", + "serde", ] [[package]] @@ -12210,7 +12390,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.6.0", "toml_datetime", "winnow 0.5.40", ] @@ -12221,8 +12401,8 @@ version = "0.22.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" dependencies = [ - "indexmap 2.4.0", - "serde 1.0.204", + "indexmap 2.6.0", + "serde", "serde_spanned", "toml_datetime", "winnow 0.6.14", @@ -12265,9 +12445,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f6ba989e4b2c58ae83d862d3a3e27690b6e3ae630d0deb59f3697f32aa88ad" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", @@ -12352,40 +12532,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" -[[package]] -name = "tower-lsp" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508" -dependencies = [ - "async-trait", - "auto_impl", - "bytes", - "dashmap", - "futures", - "httparse", - "lsp-types 0.94.1", - "memchr", - "serde 1.0.204", - "serde_json", - "tokio", - "tokio-util 0.7.11", - "tower", - "tower-lsp-macros", - "tracing", -] - -[[package]] -name = "tower-lsp-macros" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - [[package]] name = "tower-service" version = "0.3.2" @@ -12521,35 +12667,10 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" dependencies = [ - "serde 1.0.204", + "serde", "stable_deref_trait", ] -[[package]] -name = "trust-dns-proto" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner 0.4.0", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static 1.5.0", - "log", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "url", -] - [[package]] name = "trust-dns-proto" version = "0.23.2" @@ -12559,7 +12680,7 @@ dependencies = [ "async-trait", "cfg-if", "data-encoding", - "enum-as-inner 0.6.0", + "enum-as-inner", "futures-channel", "futures-io", "futures-util", @@ -12567,7 +12688,7 @@ dependencies = [ "ipnet", "once_cell", "rand 0.8.5", - "serde 1.0.204", + "serde", "smallvec", "thiserror", "tinyvec", @@ -12576,26 +12697,6 @@ dependencies = [ "url", ] -[[package]] -name = "trust-dns-resolver" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static 1.5.0", - "log", - "lru-cache", - "parking_lot 0.12.3", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "trust-dns-proto 0.21.2", -] - [[package]] name = "trust-dns-resolver" version = "0.23.2" @@ -12610,12 +12711,12 @@ dependencies = [ "parking_lot 0.12.3", "rand 0.8.5", "resolv-conf", - "serde 1.0.204", + "serde", "smallvec", "thiserror", "tokio", "tracing", - "trust-dns-proto 0.23.2", + "trust-dns-proto", ] [[package]] @@ -12676,15 +12777,13 @@ dependencies = [ "common", "connection-string", "convert_case 0.6.0", - "dashmap", + "dashmap 6.1.0", "datamodel-renderer", "deno_core", "env_logger 0.11.0", "futures", - "log", "mt_deno", "once_cell", - "prisma-models", "protobuf", "protobuf-json-mapping", "psl", @@ -12695,7 +12794,7 @@ dependencies = [ "request-handlers", "schema-connector", "schema-core", - "serde 1.0.204", + "serde", "shadow-rs", "substantial", "tap", @@ -12704,7 +12803,8 @@ dependencies = [ "temporal-sdk-core-protos", "thiserror", "tokio", - "tonic 0.12.2", + "tonic 0.12.3", + "tracing", "user-facing-errors", "wasmtime", "wasmtime-wasi", @@ -12721,17 +12821,17 @@ dependencies = [ "enum_dispatch", "glob", "graphql-parser 0.4.0", - "indexmap 2.4.0", + "indexmap 2.6.0", "indoc", "insta", "metagen", "once_cell", - "ordered-float 4.2.1", + "ordered-float 4.3.0", "paste", "ptree", "regex", "seahash", - "serde 1.0.204", + "serde", "serde_json", "sha2 0.10.8", "unindent", @@ -12759,7 +12859,7 @@ dependencies = [ "erased-serde 0.4.5", "inventory", "once_cell", - "serde 1.0.204", + "serde", "typetag-impl", ] @@ -13022,7 +13122,7 @@ dependencies = [ "form_urlencoded", "idna 0.4.0", "percent-encoding", - "serde 1.0.204", + "serde", ] [[package]] @@ -13038,7 +13138,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d" dependencies = [ "regex", - "serde 1.0.204", + "serde", "unic-ucd-ident", "url", ] @@ -13046,7 +13146,7 @@ dependencies = [ [[package]] name = "user-facing-error-macros" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "proc-macro2", "quote", @@ -13056,13 +13156,13 @@ dependencies = [ [[package]] name = "user-facing-errors" version = "0.1.0" -source = "git+https://github.com/prisma/prisma-engines?tag=5.6.0#e95e739751f42d8ca026f6b910f5a2dc5adeaeee" +source = "git+https://github.com/metatypedev/prisma-engines?branch=fix/version-compat#a320025a443294499435bde84045b8d20e37f649" dependencies = [ "backtrace", "indoc", - "itertools 0.10.5", + "itertools 0.12.1", "quaint", - "serde 1.0.204", + "serde", "serde_json", "tracing", "user-facing-error-macros", @@ -13093,22 +13193,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom 0.2.15", - "serde 1.0.204", + "serde", "sha1_smol", + "wasm-bindgen", ] [[package]] name = "v8" -version = "0.104.0" +version = "0.105.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "834593934c4b3693706bcbd24d4e2accf02a318a62efd2a4e5e33b5452074882" +checksum = "b3f1b18ae89236d39abfa7136ec712f1d2daab61cddeef00b61a804e8a9b2dee" dependencies = [ "bindgen 0.69.4", "bitflags 2.6.0", "fslock", "gzip-header", "home", - "miniz_oxide", + "miniz_oxide 0.7.4", "once_cell", "paste", "which 6.0.1", @@ -13122,9 +13223,9 @@ checksum = "97599c400fc79925922b58303e98fcb8fa88f573379a08ddb652e72cbd2e70f6" dependencies = [ "bitflags 2.6.0", "encoding_rs", - "indexmap 2.4.0", + "indexmap 2.6.0", "num-bigint", - "serde 1.0.204", + "serde", "thiserror", "wtf8", ] @@ -13159,6 +13260,16 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "versions" +version = "6.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25d498b63d1fdb376b4250f39ab3a5ee8d103957346abacd911e2d8b612c139" +dependencies = [ + "itertools 0.13.0", + "nom 7.1.3", +] + [[package]] name = "void" version = "1.0.2" @@ -13177,7 +13288,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "utf8parse", "vte_generate_state_changes", ] @@ -13319,108 +13430,102 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-encoder" -version = "0.207.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d996306fb3aeaee0d9157adbe2f670df0236caf19f6728b221e92d0f27b3fe17" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasm-encoder" -version = "0.209.1" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4a05336882dae732ce6bd48b7e11fe597293cb72c13da4f35d7d5f8d53b2a7" +checksum = "7b88b0814c9a2b323a9b46c687e726996c255ac8b64aa237dd11c81ed4854760" dependencies = [ "leb128", ] [[package]] name = "wasm-encoder" -version = "0.214.0" +version = "0.219.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff694f02a8d7a50b6922b197ae03883fbf18cdb2ae9fbee7b6148456f5f44041" +checksum = "e2b1b95711b3ad655656a341e301cc64e33cbee94de9a99a1c5a2ab88efab79d" dependencies = [ "leb128", + "wasmparser 0.219.0", ] [[package]] name = "wasm-metadata" -version = "0.209.1" +version = "0.219.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d32029ce424f6d3c2b39b4419fb45a0e2d84fb0751e0c0a32b7ce8bd5d97f46" +checksum = "96132fe00dd17d092d2be289eeed5a0a68ad3cf30b68e8875bc953b96f55f0be" dependencies = [ "anyhow", - "indexmap 2.4.0", - "serde 1.0.204", + "indexmap 2.6.0", + "serde", "serde_derive", "serde_json", "spdx", - "wasm-encoder 0.209.1", - "wasmparser 0.209.1", + "wasm-encoder 0.219.0", + "wasmparser 0.219.0", ] [[package]] name = "wasmparser" -version = "0.207.0" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19bb9f8ab07616da582ef8adb24c54f1424c7ec876720b7da9db8ec0626c92c" +checksum = "ca917a21307d3adf2b9857b94dd05ebf8496bdcff4437a9b9fb3899d3e6c74e7" dependencies = [ "ahash 0.8.11", "bitflags 2.6.0", "hashbrown 0.14.5", - "indexmap 2.4.0", + "indexmap 2.6.0", "semver 1.0.23", + "serde", ] [[package]] name = "wasmparser" -version = "0.209.1" +version = "0.219.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" +checksum = "324b4e56d24439495b88cd81439dad5e97f3c7b1eedc3c7e10455ed1e045e9a2" dependencies = [ "ahash 0.8.11", "bitflags 2.6.0", "hashbrown 0.14.5", - "indexmap 2.4.0", + "indexmap 2.6.0", "semver 1.0.23", ] [[package]] name = "wasmprinter" -version = "0.207.0" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2d8a7b4dabb460208e6b4334d9db5766e84505038b2529e69c3d07ac619115" +checksum = "50dc568b3e0d47e8f96ea547c90790cfa783f0205160c40de894a427114185ce" dependencies = [ "anyhow", - "wasmparser 0.207.0", + "termcolor", + "wasmparser 0.217.0", ] [[package]] name = "wasmtime" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92a1370c66a0022e6d92dcc277e2c84f5dece19569670b8ce7db8162560d8b6" +checksum = "ef01f9cb9636ed42a7ec5a09d785c0643590199dc7372dc22c7e2ba7a31a97d4" dependencies = [ - "addr2line", + "addr2line 0.22.0", "anyhow", "async-trait", + "bitflags 2.6.0", "bumpalo", "cc", "cfg-if", "encoding_rs", "fxprof-processed-profile", - "gimli", + "gimli 0.29.0", "hashbrown 0.14.5", - "indexmap 2.4.0", + "indexmap 2.6.0", "ittapi", "libc", "libm", "log", "mach2", "memfd", - "memoffset 0.9.1", - "object 0.33.0", + "object 0.36.5", "once_cell", "paste", "postcard", @@ -13428,14 +13533,14 @@ dependencies = [ "rayon", "rustix", "semver 1.0.23", - "serde 1.0.204", + "serde", "serde_derive", "serde_json", "smallvec", "sptr", "target-lexicon", - "wasm-encoder 0.207.0", - "wasmparser 0.207.0", + "wasm-encoder 0.217.0", + "wasmparser 0.217.0", "wasmtime-asm-macros", "wasmtime-cache", "wasmtime-component-macro", @@ -13454,18 +13559,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dee8679c974a7f258c03d60d3c747c426ed219945b6d08cbc77fd2eab15b2d1" +checksum = "ba5b20797419d6baf2296db2354f864e8bb3447cacca9d151ce7700ae08b4460" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00103ffaf7ee980f4e750fe272b6ada79d9901659892e457c7ca316b16df9ec" +checksum = "272d5939e989c5b54e3fa83ef420e4a6dba3995c3065626066428b2f73ad1e06" dependencies = [ "anyhow", "base64 0.21.7", @@ -13473,7 +13578,7 @@ dependencies = [ "log", "postcard", "rustix", - "serde 1.0.204", + "serde", "serde_derive", "sha2 0.10.8", "toml 0.8.15", @@ -13483,9 +13588,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cae30035f1cf97dcc6657c979cf39f99ce6be93583675eddf4aeaa5548509c" +checksum = "26593c4b18c76ca3c3fbdd813d6692256537b639b851d8a6fe827e3d6966fc01" dependencies = [ "anyhow", "proc-macro2", @@ -13493,20 +13598,20 @@ dependencies = [ "syn 2.0.71", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser 0.207.0", + "wit-parser 0.217.0", ] [[package]] name = "wasmtime-component-util" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ae611f08cea620c67330925be28a96115bf01f8f393a6cbdf4856a86087134" +checksum = "a2ed562fbb0cbed20a56c369c8de146c1de06a48c19e26ed9aa45f073514ee60" [[package]] name = "wasmtime-cranelift" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2909406a6007e28be964067167890bca4574bd48a9ff18f1fa9f4856d89ea40" +checksum = "f389b789cbcb53a8499131182135dea21d7d97ad77e7fb66830f69479ef0e68c" dependencies = [ "anyhow", "cfg-if", @@ -13516,36 +13621,39 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli", + "gimli 0.29.0", "log", - "object 0.33.0", + "object 0.36.5", + "smallvec", "target-lexicon", "thiserror", - "wasmparser 0.207.0", + "wasmparser 0.217.0", "wasmtime-environ", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-environ" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40e227f9ed2f5421473723d6c0352b5986e6e6044fde5410a274a394d726108f" +checksum = "84b72debe8899f19bedf66f7071310f06ef62de943a1369ba9b373613e77dd3d" dependencies = [ "anyhow", "cpp_demangle", + "cranelift-bitset", "cranelift-entity", - "gimli", - "indexmap 2.4.0", + "gimli 0.29.0", + "indexmap 2.6.0", "log", - "object 0.33.0", + "object 0.36.5", "postcard", "rustc-demangle", - "serde 1.0.204", + "semver 1.0.23", + "serde", "serde_derive", "target-lexicon", - "wasm-encoder 0.207.0", - "wasmparser 0.207.0", + "wasm-encoder 0.217.0", + "wasmparser 0.217.0", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -13553,9 +13661,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42edb392586d07038c1638e854382db916b6ca7845a2e6a7f8dc49e08907acdd" +checksum = "92b8d4d504266ee598204f9e69cea8714499cc7c5aeddaa9b3f76aaace8b0680" dependencies = [ "anyhow", "cc", @@ -13568,11 +13676,11 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b26ef7914af0c0e3ca811bdc32f5f66fbba0fd21e1f8563350e8a7951e3598" +checksum = "48ed7f0bbb9da3252c252b05fcd5fd42672db161e6276aa96e92059500247d8c" dependencies = [ - "object 0.33.0", + "object 0.36.5", "once_cell", "rustix", "wasmtime-versioned-export-macros", @@ -13580,9 +13688,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe088f9b56bb353adaf837bf7e10f1c2e1676719dd5be4cac8e37f2ba1ee5bc" +checksum = "1d930bc1325bc0448be6a11754156d770f56f6c3a61f440e9567f36cd2ea3065" dependencies = [ "anyhow", "cfg-if", @@ -13592,28 +13700,29 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff75cafffe47b04b036385ce3710f209153525b0ed19d57b0cf44a22d446460" +checksum = "055a181b8d03998511294faea14798df436503f14d7fd20edcf7370ec583e80a" [[package]] name = "wasmtime-types" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f2fa462bfea3220711c84e2b549f147e4df89eeb49b8a2a3d89148f6cc4a8b1" +checksum = "c8340d976673ac3fdacac781f2afdc4933920c1adc738c3409e825dab3955399" dependencies = [ + "anyhow", "cranelift-entity", - "serde 1.0.204", + "serde", "serde_derive", "smallvec", - "wasmparser 0.207.0", + "wasmparser 0.217.0", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cedc5bfef3db2a85522ee38564b47ef3b7fc7c92e94cacbce99808e63cdd47" +checksum = "a4b0c1f76891f778db9602ee3fbb4eb7e9a3f511847d1fb1b69eddbcea28303c" dependencies = [ "proc-macro2", "quote", @@ -13622,9 +13731,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbbe94245904d4c96c7c5f7b55bad896cc27908644efd9442063c0748b631fc" +checksum = "ba1497b38341acc97308d6ce784598419fe0131bf6ddc5cda16a91033ef7c66e" dependencies = [ "anyhow", "async-trait", @@ -13653,16 +13762,16 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b27054fed6be4f3800aba5766f7ef435d4220ce290788f021a08d4fa573108" +checksum = "a702ff5eff3b37c11453ec8b54ec444bb9f2c689c7a7af382766c52df86b1e9b" dependencies = [ "anyhow", "cranelift-codegen", - "gimli", - "object 0.33.0", + "gimli 0.29.0", + "object 0.36.5", "target-lexicon", - "wasmparser 0.207.0", + "wasmparser 0.217.0", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -13670,14 +13779,14 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936a52ce69c28de2aa3b5fb4f2dbbb2966df304f04cccb7aca4ba56d915fda0" +checksum = "b2fca2cbb5bb390f65d4434c19bf8d9873dfc60f10802918ebcd6f819a38d703" dependencies = [ "anyhow", "heck 0.4.1", - "indexmap 2.4.0", - "wit-parser 0.207.0", + "indexmap 2.6.0", + "wit-parser 0.217.0", ] [[package]] @@ -13691,24 +13800,24 @@ dependencies = [ [[package]] name = "wast" -version = "214.0.0" +version = "219.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "694bcdb24c49c8709bd8713768b71301a11e823923eee355d530f1d8d0a7f8e9" +checksum = "06880ecb25662bc21db6a83f4fcc27c41f71fbcba4f1980b650c88ada92728e1" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.214.0", + "wasm-encoder 0.219.0", ] [[package]] name = "wat" -version = "1.214.0" +version = "1.219.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347249eb56773fa728df2656cfe3a8c19437ded61a922a0b5e0839d9790e278e" +checksum = "11e56dbf9fc89111b0d97c91e683d7895b1a6e5633a729f2ccad2303724005b6" dependencies = [ - "wast 214.0.0", + "wast 219.0.0", ] [[package]] @@ -13721,6 +13830,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "webpki" version = "0.22.4" @@ -13752,13 +13871,13 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bit-vec", "bitflags 2.6.0", "cfg_aliases 0.1.1", "codespan-reporting", "document-features", - "indexmap 2.4.0", + "indexmap 2.6.0", "log", "naga", "once_cell", @@ -13766,8 +13885,8 @@ dependencies = [ "profiling", "raw-window-handle", "ron", - "rustc-hash", - "serde 1.0.204", + "rustc-hash 1.1.0", + "serde", "smallvec", "thiserror", "web-sys", @@ -13782,7 +13901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222" dependencies = [ "android_system_properties", - "arrayvec 0.7.4", + "arrayvec", "ash", "bit-set", "bitflags 2.6.0", @@ -13808,7 +13927,7 @@ dependencies = [ "profiling", "range-alloc", "raw-window-handle", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen", @@ -13825,7 +13944,7 @@ checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" dependencies = [ "bitflags 2.6.0", "js-sys", - "serde 1.0.204", + "serde", "web-sys", ] @@ -13872,9 +13991,9 @@ checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "wiggle" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89ea6f74ece6d1cfbd089783006b8eb69a0219ca83cad22068f0d9fa9df3f91" +checksum = "e4ebee2be6b561d1fe91b37e960c02baa94cdee29af863f5f26a0637f344f27a" dependencies = [ "anyhow", "async-trait", @@ -13887,9 +14006,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36beda94813296ecaf0d91b7ada9da073fd41865ba339bdd3b7764e2e785b8e9" +checksum = "97c4a32959189041ccb260e6dfa7fcf907e665166e755a6a681c32423c90e45f" dependencies = [ "anyhow", "heck 0.4.1", @@ -13902,9 +14021,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "21.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b47d2b4442ce93106dba5d1a9c59d5f85b5732878bb3d0598d3c93c0d01b16b" +checksum = "6e1c266e16c4b24a29e055ec651e27fce1389c886bb00fbe78b8924a253a439b" dependencies = [ "proc-macro2", "quote", @@ -13958,17 +14077,17 @@ dependencies = [ [[package]] name = "winch-codegen" -version = "0.19.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dc69899ccb2da7daa4df31426dcfd284b104d1a85e1dae35806df0c46187f87" +checksum = "d716f7c87db8ea79f1dc69f7344354b6256451bccca422ac4c3e0d607d144532" dependencies = [ "anyhow", "cranelift-codegen", - "gimli", + "gimli 0.29.0", "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.207.0", + "wasmparser 0.217.0", "wasmtime-cranelift", "wasmtime-environ", ] @@ -14063,6 +14182,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -14249,9 +14377,9 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.26.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84376ff4f74ed07674a1157c0bd19e6627ab01fc90952a27ccefb52a24530f0" +checksum = "7e11ad55616555605a60a8b2d1d89e006c2076f46c465c892cc2c153b20d4b30" dependencies = [ "wit-bindgen-rt", "wit-bindgen-rust-macro", @@ -14259,33 +14387,35 @@ dependencies = [ [[package]] name = "wit-bindgen-core" -version = "0.26.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d4706efb67fadfbbde77955b299b111dd096e6776d8c6561d92f6147941880" +checksum = "163cee59d3d5ceec0b256735f3ab0dccac434afb0ec38c406276de9c5a11e906" dependencies = [ "anyhow", "heck 0.5.0", - "wit-parser 0.209.1", + "wit-parser 0.219.0", ] [[package]] name = "wit-bindgen-rt" -version = "0.26.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c7526379ace8709ee9ab9f2bb50f112d95581063a59ef3097d9c10153886c9" +checksum = "744845cde309b8fa32408d6fb67456449278c66ea4dcd96de29797b302721f02" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "wit-bindgen-rust" -version = "0.26.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514295193d1a2f42e6a948cd7d9fd81e2b8fadc319667dcf19fd7aceaf2113a2" +checksum = "f6919521fc7807f927a739181db93100ca7ed03c29509b84d5f96b27b2e49a9a" dependencies = [ "anyhow", "heck 0.5.0", - "indexmap 2.4.0", + "indexmap 2.6.0", + "prettyplease 0.2.20", + "syn 2.0.71", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -14293,11 +14423,12 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.26.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0409a3356ca02599aff78f717968fd7f12df4bf879f325e2a97b45c84c90fff" +checksum = "c967731fc5d50244d7241ecfc9302a8929db508eea3c601fbc5371b196ba38a5" dependencies = [ "anyhow", + "prettyplease 0.2.20", "proc-macro2", "quote", "syn 2.0.71", @@ -14307,57 +14438,57 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.209.1" +version = "0.219.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a2bb5b039f9cb03425e1d5a6e54b441ca4ca1b1d4fa6a0924db67a55168f99" +checksum = "99a76111c20444a814019de20499d30940ecd219b9512ee296f034a5edb18a2d" dependencies = [ "anyhow", "bitflags 2.6.0", - "indexmap 2.4.0", + "indexmap 2.6.0", "log", - "serde 1.0.204", + "serde", "serde_derive", "serde_json", - "wasm-encoder 0.209.1", + "wasm-encoder 0.219.0", "wasm-metadata", - "wasmparser 0.209.1", - "wit-parser 0.209.1", + "wasmparser 0.219.0", + "wit-parser 0.219.0", ] [[package]] name = "wit-parser" -version = "0.207.0" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c83dab33a9618d86cfe3563cc864deffd08c17efc5db31a3b7cd1edeffe6e1" +checksum = "fb893dcd6d370cfdf19a0d9adfcd403efb8e544e1a0ea3a8b81a21fe392eaa78" dependencies = [ "anyhow", "id-arena", - "indexmap 2.4.0", + "indexmap 2.6.0", "log", "semver 1.0.23", - "serde 1.0.204", + "serde", "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.207.0", + "wasmparser 0.217.0", ] [[package]] name = "wit-parser" -version = "0.209.1" +version = "0.219.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e79b9e3c0b6bb589dec46317e645851e0db2734c44e2be5e251b03ff4a51269" +checksum = "23102e180c0c464f36e293d31a27b524e3ece930d7b5527d2f33f9d2c963de64" dependencies = [ "anyhow", "id-arena", - "indexmap 2.4.0", + "indexmap 2.6.0", "log", "semver 1.0.23", - "serde 1.0.204", + "serde", "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.209.1", + "wasmparser 0.219.0", ] [[package]] @@ -14395,7 +14526,7 @@ checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", "rand_core 0.6.4", - "serde 1.0.204", + "serde", "zeroize", ] @@ -14439,9 +14570,11 @@ version = "0.4.11-rc.0" dependencies = [ "anyhow", "clap", - "env_logger 0.11.0", + "color-eyre", "log", "mt_deno", + "tracing-error", + "tracing-subscriber", "typegate_engine", ] @@ -14466,9 +14599,9 @@ dependencies = [ [[package]] name = "yansi" -version = "0.5.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yoke" @@ -14476,7 +14609,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" dependencies = [ - "serde 1.0.204", + "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -14566,13 +14699,13 @@ dependencies = [ "asynchronous-codec 0.7.0", "bytes", "crossbeam-queue", - "dashmap", + "dashmap 5.5.3", "futures-channel", "futures-io", "futures-task", "futures-util", "log", - "num-traits 0.2.19", + "num-traits", "once_cell", "parking_lot 0.12.3", "rand 0.8.5", @@ -14583,20 +14716,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "byteorder", - "bzip2", - "crc32fast", - "crossbeam-utils", - "flate2", - "time", -] - [[package]] name = "zip" version = "2.2.0" @@ -14604,13 +14723,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ "arbitrary", + "bzip2", "crc32fast", "crossbeam-utils", "displaydoc", "flate2", - "indexmap 2.4.0", + "indexmap 2.6.0", "memchr", "thiserror", + "time", + "zopfli", ] [[package]] @@ -14624,6 +14746,20 @@ dependencies = [ "thiserror", ] +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] + [[package]] name = "zstd" version = "0.12.4" diff --git a/Cargo.toml b/Cargo.toml index 56ab7ba5e6..0444bf3937 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,103 +37,103 @@ typegate_engine = { path = "src/typegate/engine" } # cli clap = "=4.5.13" clap_complete = "=4.5.12" -clap-verbosity-flag = "2.2.1" -colored = "2.0.4" +clap-verbosity-flag = "2.2.2" +colored = "2.1.0" dialoguer = "0.11.0" -self_update = "0.39.0" +self_update = "0.41.0" tabled = "0.15.0" -# FIXME: use main branch when deno move to 1.37 -lade-sdk = { git = "https://github.com/zifeo/lade", branch = "fix/loosen-deps" } -git2 = { version = "0.18.3", default-features = false } +lade-sdk = { git = "https://github.com/zifeo/lade", branch = "main" } +git2 = { version = "0.19.0", default-features = false } # http -reqwest = "0.11" -url = "2.4" +reqwest = "0.12" +# pinned due to deno +url = "=2.4.1" # build -shadow-rs = "0.28.0" +shadow-rs = "0.35.1" # encoding -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.117" -serde_yaml = "0.9.33" # FIXME: deprecated, be on the lookout for alternatives -serde_with = "3.8.1" -flate2 = "1.0.30" +serde = { version = "1.0.210", features = ["derive"] } +serde_json = "1.0.128" +serde_yaml = "0.9.34" # FIXME: deprecated, be on the lookout for alternatives +serde_with = "3.11.0" +flate2 = "1.0.34" tar = "0.4" base64 = "0.22.1" zstd = "0.13" convert_case = "0.6.0" strip-ansi-escapes = "0.2.0" -heck = "0.5.0-rc.1" +heck = "0.5.0" sha2 = "0.10.8" seahash = "4.1.0" # patterns -anyhow = "1.0.86" # FIXME: replace anyhow with eyre +anyhow = "1.0.89" # FIXME: replace anyhow with eyre color-eyre = "0.6.3" eyre = "0.6.12" # NOTE: keep in sync with verison used by color-eyre -thiserror = "1.0.61" +thiserror = "1.0.64" indoc = "2.0.5" unindent = "0.2.3" itertools = "0.13.0" -lazy_static = "1.4.0" # FIXME: replace with Lazy Cell +lazy_static = "1.5.0" # FIXME: replace with Lazy Cell crossbeam-channel = "0.5.13" enum_dispatch = "0.3.13" tap = "1.0.1" -derive_more = "0.99.17" -cached = "0.51.3" # FIXME: replace usage with a Lazy Cell + dashmap -garde = "0.18" +derive_more = { version = "1", features = ["from"] } +cached = "0.53.1" # FIXME: replace usage with a Lazy Cell + dashmap +garde = "0.20" paste = "1.0.15" # os -ctrlc = "3.4.4" +ctrlc = "3.4.5" rand = "0.8.5" # FIXME: go back to published crate when deno move to 1.37 process-wrap = { git = "https://github.com/metatypedev/process-wrap", branch = "fix/decrement-tokio-version" } nix = "0.29.0" # fs -tempfile = "3.10.1" +tempfile = "3.13.0" num_cpus = "1.16.0" -normpath = "1.2.0" +normpath = "1.3.0" directories = "5.0.1" -include_dir = "0.7.3" -grep = "0.3.1" -filetime = "0.2.23" +include_dir = "0.7.4" +grep = "0.3.2" +filetime = "0.2.25" notify-debouncer-mini = { version = "0.4.1", default-features = false } ignore = "0.4.20" glob = "0.3.1" -globset = "0.4.14" +globset = "0.4.15" pathdiff = "0.2.1" textwrap = "0.16.1" project-root = "0.2.2" # data structures -regex = "1.10.4" -once_cell = "1.19.0" -indexmap = { version = "2.2.6", features = ["serde"] } +regex = "1.11.0" +once_cell = "1.20.2" +indexmap = { version = "2.6.0", features = ["serde"] } semver = "1.0.23" -dashmap = "5.5.3" +dashmap = "6.1.0" connection-string = "0.2.0" chrono = { version = "0.4.38", features = ["serde"] } tera = { version = "1.20", default-features = false } -ordered-float = "4.2.0" +ordered-float = "4.3.0" graphql-parser = "0.4.0" uuid = "1.10.0" # wasm -wasmtime = "21.0.0" -wasmtime-wasi = "21.0.0" -wit-bindgen = "0.26.0" +wasmtime = "25.0.2" +wasmtime-wasi = "25.0.2" +wit-bindgen = "0.34.0" # deno # deno = { path = "../deno/cli" } -deno = { git = "https://github.com/metatypedev/deno", branch = "v1.46.1-embeddable" } -deno_core = { version = "=0.306.0" } +deno = { git = "https://github.com/metatypedev/deno", branch = "v1.46.3-embeddable" } +deno_core = { version = "=0.307.0" } # logging env_logger = "=0.11.0" -log = "0.4.20" # FIXME: replace with tracing +log = "0.4.22" # FIXME: replace with tracing tracing = "0.1" # tracing core helper tracing-subscriber = { version = "0.3.18", features = [ @@ -149,38 +149,48 @@ tracing-unwrap = { version = "1.0.1", features = ["log-location"] } tracing-appender = "0.2.3" # async -futures = "0.3.30" +futures = "=0.3.30" # pinned due to bug with .31 with zeromq (deno) futures-concurrency = "7.6" futures-lite = "2.3" -tokio = { version = "1.36.0", features = ["parking_lot"] } -async-trait = "0.1.80" -actix = "0.13.3" +tokio = { version = "1", features = ["parking_lot"] } +async-trait = "0.1.83" +actix = "0.13.5" # temporal temporal-client = { git = "https://github.com/temporalio/sdk-core", rev = "7f9755b" } temporal-sdk-core-protos = { git = "https://github.com/temporalio/sdk-core", rev = "7f9755b" } # prisma -query-core = { git = "https://github.com/prisma/prisma-engines", tag = "5.6.0" } -query-connector = { git = "https://github.com/prisma/prisma-engines", tag = "5.6.0" } -request-handlers = { git = "https://github.com/prisma/prisma-engines", tag = "5.6.0" } -prisma-models = { git = "https://github.com/prisma/prisma-engines", tag = "5.6.0" } -datamodel-renderer = { git = "https://github.com/prisma/prisma-engines", tag = "5.6.0" } -user-facing-errors = { git = "https://github.com/prisma/prisma-engines", tag = "5.6.0" } -query-engine-metrics = { git = "https://github.com/prisma/prisma-engines", tag = "5.6.0" } -schema-core = { git = "https://github.com/prisma/prisma-engines", tag = "5.6.0" } -psl = { git = "https://github.com/prisma/prisma-engines", tag = "5.6.0" } -schema-connector = { git = "https://github.com/prisma/prisma-engines", tag = "5.6.0" } +query-core = { git = "https://github.com/metatypedev/prisma-engines", branch = "fix/version-compat" } +query-connector = { git = "https://github.com/metatypedev/prisma-engines", branch = "fix/version-compat" } +request-handlers = { git = "https://github.com/metatypedev/prisma-engines", features = ["all"], branch = "fix/version-compat" } +datamodel-renderer = { git = "https://github.com/metatypedev/prisma-engines", branch = "fix/version-compat" } +user-facing-errors = { git = "https://github.com/metatypedev/prisma-engines", branch = "fix/version-compat" } +query-engine-metrics = { git = "https://github.com/metatypedev/prisma-engines", branch = "fix/version-compat" } +schema-core = { git = "https://github.com/metatypedev/prisma-engines", branch = "fix/version-compat" } +psl = { git = "https://github.com/metatypedev/prisma-engines", branch = "fix/version-compat" } +schema-connector = { git = "https://github.com/metatypedev/prisma-engines", branch = "fix/version-compat" } + +# query-core = { path = "../prisma-engines/query-engine/core" } +# query-connector = { path = "../prisma-engines/query-engine/connectors/query-connector" } +# request-handlers = { path = "../prisma-engines/query-engine/request-handlers", features = ["all"] } +# ## prisma-models = { git = "https://github.com/prisma/prisma-engines", tag = "5.20.0" } +# datamodel-renderer = { path = "../prisma-engines/schema-engine/datamodel-renderer" } +# user-facing-errors = { path = "../prisma-engines/libs/user-facing-errors" } +# query-engine-metrics = { path = "../prisma-engines/query-engine/metrics" } +# schema-core = { path = "../prisma-engines/schema-engine/core" } +# psl = { path = "../prisma-engines/psl/psl" } +# schema-connector = { path = "../prisma-engines/schema-engine/connectors/schema-connector" } # grpc -tonic = "0.12.1" -bytes = "1.7.1" -protobuf = "3.5.1" -protobuf-json-mapping = "3.5.1" +tonic = "0.12.3" +bytes = "1.7.2" +protobuf = "3.6.0" +protobuf-json-mapping = "3.6.0" proto-parser = { git = "https://github.com/metatypedev/proto-parser", branch = "main" } # test -assert_cmd = "2.0.14" -pretty_assertions = "1.4.0" -insta = "1.39.0" -ptree = "0.4.0" +assert_cmd = "2.0.16" +pretty_assertions = "1.4.1" +insta = "1.40.0" +ptree = "0.5.0" diff --git a/examples/templates/deno/api/example.ts b/examples/templates/deno/api/example.ts index fa469abd37..bbd8e3dd7a 100644 --- a/examples/templates/deno/api/example.ts +++ b/examples/templates/deno/api/example.ts @@ -1,6 +1,6 @@ -import { Policy, t, typegraph } from "jsr:@typegraph/sdk@0.4.10/index.ts"; -import { PythonRuntime } from "jsr:@typegraph/sdk@0.4.10/runtimes/python.ts"; -import { DenoRuntime } from "jsr:@typegraph/sdk@0.4.10/runtimes/deno.ts"; +import { Policy, t, typegraph } from "jsr:@typegraph/sdk@0.4.11-rc.0/index.ts"; +import { PythonRuntime } from "jsr:@typegraph/sdk@0.4.11-rc.0/runtimes/python.ts"; +import { DenoRuntime } from "jsr:@typegraph/sdk@0.4.11-rc.0/runtimes/deno.ts"; await typegraph("example", (g) => { const pub = Policy.public(); diff --git a/ghjk.ts b/ghjk.ts index 73507e6b35..e6b8cb27d6 100644 --- a/ghjk.ts +++ b/ghjk.ts @@ -1,5 +1,6 @@ // @ts-nocheck: Deno file +// -- import { METATYPE_VERSION, PUBLISHED_VERSION } from "./tools/consts.ts"; import { file, ports, sedLock, semver, stdDeps } from "./tools/deps.ts"; import installs from "./tools/installs.ts"; @@ -15,7 +16,8 @@ const { env, task } = ghjk; env("main") .install(installs.deno) .vars({ - RUST_LOG: "info,deno=warn,swc_ecma_codegen=off,tracing::span=off", + RUST_LOG: + "info,typegate=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off", TYPEGRAPH_VERSION: "0.0.3", CLICOLOR_FORCE: "1", CROSS_CONFIG: "tools/Cross.toml", @@ -101,6 +103,9 @@ env("ci") env("dev") .inherit("ci") + // debug v8 to fix MET-633: segementation fault bug with custom deno rt + // doesn't appear in CI so only dev envs get it + .var("V8_FORCE_DEBUG", "true") .install( ports.act(), ports.cargobi({ crateName: "whiz", locked: true }), @@ -161,13 +166,15 @@ task("version-bump", async ($) => { }); task( - "b", - async ($) => { - await $`cargo b --target wasm32-unknown-unknown --package typegraph-ng`; - await $`wasm-tools component new "target/wasm32-unknown-unknown/debug/typegraph_ng.wasm" - -o ./target/ng.wasm - `; - // --adapt wasi_snapshot_preview1=./tmp/wasi_snapshot_preview1.reactor.wasm - }, - { inherit: "_wasm" }, + "clean-rust", + ($) => + $.co([ + $`cargo clean`, + $`cargo clean`.cwd("tests/runtimes/wasm_reflected/rust"), + $`cargo clean`.cwd("tests/runtimes/wasm_wire/rust"), + $`cargo clean`.cwd("tests/metagen/typegraphs/sample/rs"), + $`cargo clean`.cwd("tests/metagen/typegraphs/identities/rs"), + $`cargo clean`.cwd("./examples/typegraphs/metagen/"), + ]), + { inherit: "_rust", desc: "Clean cache of all cargo workspaces in repo." }, ); diff --git a/poetry.lock b/poetry.lock index 90c406e865..e6a9ec73b1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2,13 +2,13 @@ [[package]] name = "anyio" -version = "4.4.0" +version = "4.6.0" description = "High level compatibility layer for multiple asynchronous event loop implementations" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "anyio-4.4.0-py3-none-any.whl", hash = "sha256:c1b2d8f46a8a812513012e1107cb0e68c17159a7a594208005a57dc776e1bdc7"}, - {file = "anyio-4.4.0.tar.gz", hash = "sha256:5aadc6a1bbb7cdb0bede386cac5e2940f5e2ff3aa20277e991cf028e0585ce94"}, + {file = "anyio-4.6.0-py3-none-any.whl", hash = "sha256:c7d2e9d63e31599eeb636c8c5c03a7e108d73b345f064f1c19fdc87b79036a9a"}, + {file = "anyio-4.6.0.tar.gz", hash = "sha256:137b4559cbb034c477165047febb6ff83f390fc3b20bf181c1fc0a728cb8beeb"}, ] [package.dependencies] @@ -18,9 +18,9 @@ sniffio = ">=1.1" typing-extensions = {version = ">=4.1", markers = "python_version < \"3.11\""} [package.extras] -doc = ["Sphinx (>=7)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"] -test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)", "hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"] -trio = ["trio (>=0.23)"] +doc = ["Sphinx (>=7.4,<8.0)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"] +test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)", "hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.21.0b1)"] +trio = ["trio (>=0.26.1)"] [[package]] name = "astunparse" @@ -75,13 +75,13 @@ files = [ [[package]] name = "httpcore" -version = "1.0.5" +version = "1.0.6" description = "A minimal low-level HTTP client." optional = false python-versions = ">=3.8" files = [ - {file = "httpcore-1.0.5-py3-none-any.whl", hash = "sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5"}, - {file = "httpcore-1.0.5.tar.gz", hash = "sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61"}, + {file = "httpcore-1.0.6-py3-none-any.whl", hash = "sha256:27b59625743b85577a8c0e10e55b50b5368a4f2cfe8cc7bcfa9cf00829c2682f"}, + {file = "httpcore-1.0.6.tar.gz", hash = "sha256:73f6dbd6eb8c21bbf7ef8efad555481853f5f6acdeaff1edb0694289269ee17f"}, ] [package.dependencies] @@ -92,7 +92,7 @@ h11 = ">=0.13,<0.15" asyncio = ["anyio (>=4.0,<5.0)"] http2 = ["h2 (>=3,<5)"] socks = ["socksio (==1.*)"] -trio = ["trio (>=0.22.0,<0.26.0)"] +trio = ["trio (>=0.22.0,<1.0)"] [[package]] name = "httpx" @@ -121,24 +121,27 @@ zstd = ["zstandard (>=0.18.0)"] [[package]] name = "idna" -version = "3.8" +version = "3.10" description = "Internationalized Domain Names in Applications (IDNA)" optional = false python-versions = ">=3.6" files = [ - {file = "idna-3.8-py3-none-any.whl", hash = "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac"}, - {file = "idna-3.8.tar.gz", hash = "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"}, + {file = "idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"}, + {file = "idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9"}, ] +[package.extras] +all = ["flake8 (>=7.1.1)", "mypy (>=1.11.2)", "pytest (>=8.3.2)", "ruff (>=0.6.2)"] + [[package]] name = "importlib-resources" -version = "6.4.4" +version = "6.4.5" description = "Read resources from Python packages" optional = false python-versions = ">=3.8" files = [ - {file = "importlib_resources-6.4.4-py3-none-any.whl", hash = "sha256:dda242603d1c9cd836c3368b1174ed74cb4049ecd209e7a1a0104620c18c5c11"}, - {file = "importlib_resources-6.4.4.tar.gz", hash = "sha256:20600c8b7361938dc0bb2d5ec0297802e575df486f5a544fa414da65e13721f7"}, + {file = "importlib_resources-6.4.5-py3-none-any.whl", hash = "sha256:ac29d5f956f01d5e4bb63102a5a19957f1b9175e45649977264a1416783bb717"}, + {file = "importlib_resources-6.4.5.tar.gz", hash = "sha256:980862a1d16c9e147a59603677fa2aa5fd82b87f223b6cb870695bcfce830065"}, ] [package.dependencies] @@ -287,10 +290,10 @@ files = [ [[package]] name = "typegraph" -version = "0.4.10" +version = "0.4.11-rc.0" description = "Declarative API development platform. Build backend components with WASM, Typescript and Python, no matter where and how your (legacy) systems are." optional = false -python-versions = ">=3.8,<4.0" +python-versions = ">=3.9,<4.0" files = [] develop = true @@ -298,7 +301,7 @@ develop = true astunparse = "^1.6.3" python-box = "^7.1.1" typing-extensions = "^4.8.0" -wasmtime = "^21.0.0" +wasmtime = "^25.0.0" [package.source] type = "directory" @@ -317,17 +320,18 @@ files = [ [[package]] name = "wasmtime" -version = "21.0.0" +version = "25.0.0" description = "A WebAssembly runtime powered by Wasmtime" optional = false python-versions = ">=3.8" files = [ - {file = "wasmtime-21.0.0-py3-none-any.whl", hash = "sha256:9b7ee9bb6c14586974d34c92bb7f0723161067769233c5dd8ea99c233759b48d"}, - {file = "wasmtime-21.0.0-py3-none-macosx_10_13_x86_64.whl", hash = "sha256:b10b6ec13fa04fc1d81a4f9b2d244938c67710e9279011e53397bfa071b85b3f"}, - {file = "wasmtime-21.0.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3e245a5c03c1de46cdafcd98da6daa381cadd7bd41aae70d8bef4c8c0ea51798"}, - {file = "wasmtime-21.0.0-py3-none-manylinux1_x86_64.whl", hash = "sha256:6587515be9603f8bb0732f3b508d2034f21d407fd55879c4402032e40e1ddae6"}, - {file = "wasmtime-21.0.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:4b242b065922f65cd40d8cedb3f19269423f28d7955567fe2daca03a44c03446"}, - {file = "wasmtime-21.0.0-py3-none-win_amd64.whl", hash = "sha256:00f929d0caf58a69890df00888f9da12c2aa3ed5af4c8b7b2dca96a4996da731"}, + {file = "wasmtime-25.0.0-py3-none-any.whl", hash = "sha256:22aa59fc6e01deec8a6703046f82466090d5811096a3bb5c169907e36c842af1"}, + {file = "wasmtime-25.0.0-py3-none-macosx_10_13_x86_64.whl", hash = "sha256:13e9a718e9d580c1738782cc19f4dcb9fb068f7e51778ea621fd664f4433525b"}, + {file = "wasmtime-25.0.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:5bdf1214ee3ee78a4a8a92da339f4c4c8c109e65af881b37f4adfc05d02af426"}, + {file = "wasmtime-25.0.0-py3-none-manylinux1_x86_64.whl", hash = "sha256:b4364e14d44e3b7afe6a40bf608e9d0d2c40b09dece441d20f4f6e31906b729c"}, + {file = "wasmtime-25.0.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:a07445073cf36a6e5d1dc28246a897dcbdaa537ba8be8805be65422ecca297eb"}, + {file = "wasmtime-25.0.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:53d5f614348a28aabdf80ae4f6fdfa803031af1f74ada03826fd4fd43aeee6c8"}, + {file = "wasmtime-25.0.0-py3-none-win_amd64.whl", hash = "sha256:f8a2a213b9179965db2d2eedececd69a37e287e902330509afae51c71a3a6842"}, ] [package.dependencies] @@ -352,13 +356,13 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [[package]] name = "zipp" -version = "3.20.1" +version = "3.20.2" description = "Backport of pathlib-compatible object wrapper for zip files" optional = false python-versions = ">=3.8" files = [ - {file = "zipp-3.20.1-py3-none-any.whl", hash = "sha256:9960cd8967c8f85a56f920d5d507274e74f9ff813a0ab8889a5b5be2daf44064"}, - {file = "zipp-3.20.1.tar.gz", hash = "sha256:c22b14cc4763c5a5b04134207736c107db42e9d3ef2d9779d465f5f1bcba572b"}, + {file = "zipp-3.20.2-py3-none-any.whl", hash = "sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350"}, + {file = "zipp-3.20.2.tar.gz", hash = "sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29"}, ] [package.extras] diff --git a/src/meta-cli/Cargo.toml b/src/meta-cli/Cargo.toml index 2118f93055..d74d19c4b9 100644 --- a/src/meta-cli/Cargo.toml +++ b/src/meta-cli/Cargo.toml @@ -110,9 +110,6 @@ tracing-unwrap.workspace = true # tracing-appender.workspace = true color-eyre.workspace = true -# prisma -prisma-models.workspace = true - # os num_cpus.workspace = true ctrlc.workspace = true diff --git a/src/meta-cli/src/cli/gen.rs b/src/meta-cli/src/cli/gen.rs index 1ef36ac8bd..5ee1c8a29e 100644 --- a/src/meta-cli/src/cli/gen.rs +++ b/src/meta-cli/src/cli/gen.rs @@ -130,7 +130,7 @@ async fn load_fdk_template( })); } - let mut entries = HashMap::new(); + let mut entries = indexmap::IndexMap::new(); while let Some(res) = group.next().await { let (file_name, content) = res?; entries.insert(file_name, content); diff --git a/src/meta-cli/src/deploy/actors/task.rs b/src/meta-cli/src/deploy/actors/task.rs index 31c041abac..313e1f2a10 100644 --- a/src/meta-cli/src/deploy/actors/task.rs +++ b/src/meta-cli/src/deploy/actors/task.rs @@ -295,9 +295,10 @@ impl Handler> for TaskActor { addr.do_send(Exit(TaskFinishStatus::::Finished(Default::default()))); } } else { + use std::os::unix::process::ExitStatusExt; console.error(action.get_error_message(&format!( "process failed with code {:?}", - output.status.code() + output.status.code().or_else(|| output.status.signal()) ))); console.error(format!( "(stderr):\n{}", diff --git a/src/metagen/src/client_py/mod.rs b/src/metagen/src/client_py/mod.rs index 369aa9b7e2..7dc401f5de 100644 --- a/src/metagen/src/client_py/mod.rs +++ b/src/metagen/src/client_py/mod.rs @@ -49,13 +49,13 @@ impl Generator { pub const INPUT_TG: &'static str = "tg_name"; pub fn new(config: ClienPyGenConfig) -> Result { use garde::Validate; - config.validate(&())?; + config.validate()?; Ok(Self { config }) } } impl crate::Plugin for Generator { - fn bill_of_inputs(&self) -> HashMap { + fn bill_of_inputs(&self) -> IndexMap { [( Self::INPUT_TG.to_string(), if let Some(tg_name) = &self.config.base.typegraph_name { @@ -77,7 +77,7 @@ impl crate::Plugin for Generator { fn generate( &self, - inputs: HashMap, + inputs: IndexMap, ) -> anyhow::Result { let tg = match inputs .get(Self::INPUT_TG) @@ -87,7 +87,7 @@ impl crate::Plugin for Generator { GeneratorInputResolved::TypegraphFromPath { raw } => raw, _ => bail!("unexpected input type"), }; - let mut out = HashMap::new(); + let mut out = IndexMap::new(); out.insert( self.config.base.path.join("client.py"), GeneratedFile { @@ -273,8 +273,8 @@ fn render_node_metas( dest: &mut GenDestBuf, manifest: &RenderManifest, name_mapper: Rc, -) -> Result<(NameMemo, HashSet)> { - let named_types = Rc::new(std::sync::Mutex::new(HashSet::new())); +) -> Result<(NameMemo, IndexSet)> { + let named_types = Rc::new(std::sync::Mutex::new(IndexSet::new())); let mut renderer = TypeRenderer::new( name_mapper.nodes.clone(), Rc::new(node_metas::PyNodeMetasRenderer { diff --git a/src/metagen/src/client_py/node_metas.rs b/src/metagen/src/client_py/node_metas.rs index 8af65d9a66..4ba688ba8f 100644 --- a/src/metagen/src/client_py/node_metas.rs +++ b/src/metagen/src/client_py/node_metas.rs @@ -10,7 +10,7 @@ use crate::{interlude::*, shared::types::*}; pub struct PyNodeMetasRenderer { pub name_mapper: Rc, - pub named_types: Rc>>, + pub named_types: Rc>>, } impl PyNodeMetasRenderer { diff --git a/src/metagen/src/client_rs/mod.rs b/src/metagen/src/client_rs/mod.rs index dad116b605..03218e045a 100644 --- a/src/metagen/src/client_rs/mod.rs +++ b/src/metagen/src/client_rs/mod.rs @@ -53,13 +53,13 @@ impl Generator { pub const INPUT_TG: &'static str = "tg_name"; pub fn new(config: ClienRsGenConfig) -> Result { use garde::Validate; - config.validate(&())?; + config.validate()?; Ok(Self { config }) } } impl crate::Plugin for Generator { - fn bill_of_inputs(&self) -> HashMap { + fn bill_of_inputs(&self) -> IndexMap { [( Self::INPUT_TG.to_string(), if let Some(tg_name) = &self.config.base.typegraph_name { @@ -81,7 +81,7 @@ impl crate::Plugin for Generator { fn generate( &self, - inputs: HashMap, + inputs: IndexMap, ) -> anyhow::Result { let tg = match inputs .get(Self::INPUT_TG) @@ -91,7 +91,7 @@ impl crate::Plugin for Generator { GeneratorInputResolved::TypegraphFromPath { raw } => raw, _ => bail!("unexpected input type"), }; - let mut out = HashMap::new(); + let mut out = IndexMap::new(); out.insert( self.config.base.path.join("client.rs"), GeneratedFile { @@ -366,8 +366,8 @@ fn render_node_metas( dest: &mut GenDestBuf, manifest: &RenderManifest, name_mapper: Rc, -) -> Result<(NameMemo, HashSet)> { - let named_types = Rc::new(std::sync::Mutex::new(HashSet::new())); +) -> Result<(NameMemo, IndexSet)> { + let named_types = Rc::new(std::sync::Mutex::new(IndexSet::new())); let mut renderer = TypeRenderer::new( name_mapper.nodes.clone(), Rc::new(node_metas::RsNodeMetasRenderer { diff --git a/src/metagen/src/client_rs/node_metas.rs b/src/metagen/src/client_rs/node_metas.rs index 14cea854f9..4de9c22366 100644 --- a/src/metagen/src/client_rs/node_metas.rs +++ b/src/metagen/src/client_rs/node_metas.rs @@ -10,7 +10,7 @@ use crate::{interlude::*, shared::types::*}; pub struct RsNodeMetasRenderer { pub name_mapper: Rc, - pub named_types: Rc>>, + pub named_types: Rc>>, } impl RsNodeMetasRenderer { diff --git a/src/metagen/src/client_rs/static/Cargo.toml b/src/metagen/src/client_rs/static/Cargo.toml index 17c96949c0..460a897676 100644 --- a/src/metagen/src/client_rs/static/Cargo.toml +++ b/src/metagen/src/client_rs/static/Cargo.toml @@ -3,8 +3,8 @@ package.edition = "2021" package.version = "0.0.1" [dependencies] -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.117" +serde = { version = "1.0.210", features = ["derive"] } +serde_json = "1.0.128" reqwest = { version = "0.12", features = ["blocking","json"] } # The options after here are configured for crates intended to be diff --git a/src/metagen/src/client_ts/mod.rs b/src/metagen/src/client_ts/mod.rs index b52d6e2b0c..d859976dc8 100644 --- a/src/metagen/src/client_ts/mod.rs +++ b/src/metagen/src/client_ts/mod.rs @@ -47,13 +47,13 @@ impl Generator { pub const INPUT_TG: &'static str = "tg_name"; pub fn new(config: ClienTsGenConfig) -> Result { use garde::Validate; - config.validate(&())?; + config.validate()?; Ok(Self { config }) } } impl crate::Plugin for Generator { - fn bill_of_inputs(&self) -> HashMap { + fn bill_of_inputs(&self) -> IndexMap { [( Self::INPUT_TG.to_string(), if let Some(tg_name) = &self.config.base.typegraph_name { @@ -75,7 +75,7 @@ impl crate::Plugin for Generator { fn generate( &self, - inputs: HashMap, + inputs: IndexMap, ) -> anyhow::Result { let tg = match inputs .get(Self::INPUT_TG) @@ -85,7 +85,7 @@ impl crate::Plugin for Generator { GeneratorInputResolved::TypegraphFromPath { raw } => raw, _ => bail!("unexpected input type"), }; - let mut out = HashMap::new(); + let mut out = IndexMap::new(); out.insert( self.config.base.path.join("client.ts"), GeneratedFile { @@ -279,8 +279,8 @@ fn render_node_metas( dest: &mut GenDestBuf, manifest: &RenderManifest, name_mapper: Rc, -) -> Result<(NameMemo, HashSet)> { - let named_types = Rc::new(std::sync::Mutex::new(HashSet::new())); +) -> Result<(NameMemo, IndexSet)> { + let named_types = Rc::new(std::sync::Mutex::new(IndexSet::new())); let mut renderer = TypeRenderer::new( name_mapper.nodes.clone(), Rc::new(node_metas::TsNodeMetasRenderer { diff --git a/src/metagen/src/client_ts/node_metas.rs b/src/metagen/src/client_ts/node_metas.rs index 2682cfe24c..f9db07b2ef 100644 --- a/src/metagen/src/client_ts/node_metas.rs +++ b/src/metagen/src/client_ts/node_metas.rs @@ -10,7 +10,7 @@ use crate::{interlude::*, shared::types::*}; pub struct TsNodeMetasRenderer { pub name_mapper: Rc, - pub named_types: Rc>>, + pub named_types: Rc>>, } impl TsNodeMetasRenderer { diff --git a/src/metagen/src/config.rs b/src/metagen/src/config.rs index 6aa13a8565..4a68503e34 100644 --- a/src/metagen/src/config.rs +++ b/src/metagen/src/config.rs @@ -21,7 +21,7 @@ use crate::interlude::*; #[derive(Deserialize, Debug, Clone)] pub struct Config { - pub targets: HashMap, + pub targets: IndexMap, } #[derive(Deserialize, Debug, Clone)] diff --git a/src/metagen/src/fdk_python/mod.rs b/src/metagen/src/fdk_python/mod.rs index 2a3c9d65a5..da40a1e12a 100644 --- a/src/metagen/src/fdk_python/mod.rs +++ b/src/metagen/src/fdk_python/mod.rs @@ -56,9 +56,7 @@ impl Generator { pub fn new(config: FdkPythonGenConfig) -> anyhow::Result { use garde::Validate; - config - .validate(&()) - .context("validating FDK_PYTHON config")?; + config.validate().context("validating FDK_PYTHON config")?; Ok(Self { config }) } } @@ -76,7 +74,7 @@ impl TryFrom for tera::Tera { } impl crate::Plugin for Generator { - fn bill_of_inputs(&self) -> HashMap { + fn bill_of_inputs(&self) -> IndexMap { [( Self::INPUT_TG.to_string(), if let Some(tg_name) = &self.config.base.typegraph_name { @@ -105,11 +103,11 @@ impl crate::Plugin for Generator { fn generate( &self, - mut inputs: HashMap, + mut inputs: IndexMap, ) -> anyhow::Result { // return Ok(GeneratorOutput(Default::default())) let tg = match inputs - .remove(Self::INPUT_TG) + .swap_remove(Self::INPUT_TG) .context("missing generator input")? { GeneratorInputResolved::TypegraphFromTypegate { raw } => raw, @@ -117,7 +115,7 @@ impl crate::Plugin for Generator { _ => unreachable!(), }; - let template: tera::Tera = match inputs.remove("template_dir").unwrap() { + let template: tera::Tera = match inputs.swap_remove("template_dir").unwrap() { GeneratorInputResolved::FdkTemplate { template } => template.try_into()?, _ => unreachable!(), }; @@ -158,7 +156,7 @@ impl crate::Plugin for Generator { } let merged_list = merge_requirements(mergeable_output); - let mut out = HashMap::new(); + let mut out = IndexMap::new(); for merged_req in merged_list { let entry_point_path = merged_req.entry_point_path.clone(); let file_stem = merged_req diff --git a/src/metagen/src/fdk_rust/mod.rs b/src/metagen/src/fdk_rust/mod.rs index 368e70a5dd..bb484cc57d 100644 --- a/src/metagen/src/fdk_rust/mod.rs +++ b/src/metagen/src/fdk_rust/mod.rs @@ -62,7 +62,7 @@ impl From for FdkRustTemplate { fn from(template: FdkTemplate) -> Self { let mut template = template.entries; Self { - mod_rs: template.remove("fdk.rs").unwrap(), + mod_rs: template.swap_remove("fdk.rs").unwrap(), } } } @@ -75,13 +75,13 @@ impl Generator { pub const INPUT_TG: &'static str = "tg_name"; pub fn new(config: FdkRustGenConfig) -> Result { use garde::Validate; - config.validate(&())?; + config.validate()?; Ok(Self { config }) } } impl crate::Plugin for Generator { - fn bill_of_inputs(&self) -> HashMap { + fn bill_of_inputs(&self) -> IndexMap { [( Self::INPUT_TG.to_string(), if let Some(tg_name) = &self.config.base.typegraph_name { @@ -110,11 +110,11 @@ impl crate::Plugin for Generator { fn generate( &self, - mut inputs: HashMap, + mut inputs: IndexMap, ) -> anyhow::Result { // TODO remove code duplication in fdk generators let tg = match inputs - .remove(Self::INPUT_TG) + .swap_remove(Self::INPUT_TG) .context("missing generator input for typegraph")? { GeneratorInputResolved::TypegraphFromTypegate { raw } => raw, @@ -123,14 +123,14 @@ impl crate::Plugin for Generator { }; let template: FdkRustTemplate = match inputs - .remove("template_dir") + .swap_remove("template_dir") .context("missing generator input for template_dir")? { GeneratorInputResolved::FdkTemplate { template } => template.into(), _ => bail!("unexpected generator input variant"), }; - let mut out = HashMap::new(); + let mut out = IndexMap::new(); out.insert( self.config.base.path.join("fdk.rs"), GeneratedFile { diff --git a/src/metagen/src/fdk_rust/static/Cargo.toml b/src/metagen/src/fdk_rust/static/Cargo.toml index aeb63fadb6..d2ed8be24c 100644 --- a/src/metagen/src/fdk_rust/static/Cargo.toml +++ b/src/metagen/src/fdk_rust/static/Cargo.toml @@ -7,7 +7,7 @@ path = "lib.rs" crate-type = ["cdylib", "rlib"] [dependencies] -anyhow = "1.0.86" -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.117" -wit-bindgen = "0.26.0" +anyhow = "1.0.89" +serde = { version = "1.0.210", features = ["derive"] } +serde_json = "1.0.128" +wit-bindgen = "0.34.0" diff --git a/src/metagen/src/fdk_substantial/mod.rs b/src/metagen/src/fdk_substantial/mod.rs index c23d6ed5a0..494d76ee87 100644 --- a/src/metagen/src/fdk_substantial/mod.rs +++ b/src/metagen/src/fdk_substantial/mod.rs @@ -1,6 +1,3 @@ -// Copyright Metatype OÜ, licensed under the Mozilla Public License Version 2.0. -// SPDX-License-Identifier: MPL-2.0 - // TODO: keyword filtering use crate::interlude::*; @@ -34,13 +31,13 @@ impl Generator { pub const INPUT_TG: &'static str = "tg_name"; pub fn new(config: FdkSubstantialGenConfig) -> Result { use garde::Validate; - config.validate(&())?; + config.validate()?; Ok(Self { config }) } } impl crate::Plugin for Generator { - fn bill_of_inputs(&self) -> HashMap { + fn bill_of_inputs(&self) -> IndexMap { [( Self::INPUT_TG.to_string(), if let Some(tg_name) = &self.config.base.typegraph_name { @@ -64,9 +61,9 @@ impl crate::Plugin for Generator { &self, // TODO: enable additionnal parameters for metagen // For example: meta gen --params workflow-name=hello_world - _: HashMap, + _: IndexMap, ) -> anyhow::Result { - let mut files = HashMap::new(); + let mut files = IndexMap::new(); let base = self.config.base.path.clone(); files.insert( base.join("substantial.py"), diff --git a/src/metagen/src/fdk_typescript/mod.rs b/src/metagen/src/fdk_typescript/mod.rs index f9b930173b..6421c8d5d0 100644 --- a/src/metagen/src/fdk_typescript/mod.rs +++ b/src/metagen/src/fdk_typescript/mod.rs @@ -24,7 +24,7 @@ struct FdkTypescriptTemplate { impl From for FdkTypescriptTemplate { fn from(mut fdk_template: FdkTemplate) -> Self { - let fdk_ts = fdk_template.entries.remove("fdk.ts").unwrap(); + let fdk_ts = fdk_template.entries.swap_remove("fdk.ts").unwrap(); Self { fdk_ts: fdk_ts.clone(), } @@ -63,7 +63,7 @@ impl Generator { pub fn new(config: FdkTypescriptGenConfig) -> Result { use garde::Validate; - config.validate(&())?; + config.validate()?; Ok(Self { config }) } } @@ -125,7 +125,7 @@ impl FdkTypescriptTemplate { } impl crate::Plugin for Generator { - fn bill_of_inputs(&self) -> HashMap { + fn bill_of_inputs(&self) -> IndexMap { [( Self::INPUT_TG.to_string(), if let Some(tg_name) = &self.config.base.typegraph_name { @@ -154,22 +154,22 @@ impl crate::Plugin for Generator { fn generate( &self, - mut inputs: HashMap, + mut inputs: IndexMap, ) -> anyhow::Result { let tg = match inputs - .remove(Self::INPUT_TG) + .swap_remove(Self::INPUT_TG) .context("missing generator input")? { GeneratorInputResolved::TypegraphFromTypegate { raw } => raw, GeneratorInputResolved::TypegraphFromPath { raw } => raw, _ => unreachable!(), }; - let template: FdkTypescriptTemplate = match inputs.remove("template_dir").unwrap() { + let template: FdkTypescriptTemplate = match inputs.swap_remove("template_dir").unwrap() { GeneratorInputResolved::FdkTemplate { template } => template.into(), _ => unreachable!(), }; - let mut out = HashMap::new(); + let mut out = IndexMap::new(); out.insert( self.config.base.path.join("fdk.ts"), GeneratedFile { diff --git a/src/metagen/src/lib.rs b/src/metagen/src/lib.rs index ea7ba1f074..6b44ae8e2e 100644 --- a/src/metagen/src/lib.rs +++ b/src/metagen/src/lib.rs @@ -6,7 +6,7 @@ mod interlude { pub use common::typegraph::TypeNode; pub use common::typegraph::Typegraph; - pub use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet}; + pub use std::collections::{BTreeMap, BTreeSet}; pub use std::ops::Deref; pub use std::path::{Path, PathBuf}; pub use std::rc::Rc; @@ -16,7 +16,7 @@ mod interlude { self, self as anyhow, bail, ensure, format_err, ContextCompat, OptionExt, Result, WrapErr, }; pub use futures_concurrency::prelude::*; - pub use indexmap::IndexMap; + pub use indexmap::{IndexMap, IndexSet}; pub use log::{debug, error, info, trace, warn}; pub use pretty_assertions::assert_str_eq; pub use serde::{Deserialize, Serialize}; @@ -106,18 +106,18 @@ pub struct GeneratedFile { } #[derive(Debug)] -pub struct GeneratorOutput(pub HashMap); +pub struct GeneratorOutput(pub IndexMap); /// The core trait any metagen generator modules will implement. trait Plugin: Send + Sync { /// A list of inputs required by an implementatoin to do it's job. /// The [GeneratorInputOrder]s here will be resolved by the /// host's [InputResolver]. - fn bill_of_inputs(&self) -> HashMap; + fn bill_of_inputs(&self) -> IndexMap; fn generate( &self, - inputs: HashMap, + inputs: IndexMap, ) -> anyhow::Result; } @@ -137,7 +137,7 @@ impl GeneratorRunner { impl GeneratorRunner { pub fn get(name: &str) -> Option { thread_local! { - static GENERATORS: HashMap = HashMap::from([ + static GENERATORS: IndexMap = IndexMap::from([ // builtin generatorsFdkPythonGenConfig ( "fdk_rust".to_string(), @@ -249,7 +249,7 @@ pub async fn generate_target( let gen_name: Arc = gen_name[..].into(); group.insert(Box::pin(async move { - let mut inputs = HashMap::new(); + let mut inputs = IndexMap::new(); while let Some(res) = resolve_group.next().await { let (name, input) = res?; inputs.insert(name, input); @@ -258,7 +258,7 @@ pub async fn generate_target( anyhow::Ok((gen_name, out)) })); } - let mut out = HashMap::new(); + let mut out = IndexMap::new(); while let Some(res) = group.next().await { let (gen_name, files) = res?; for (path, buf) in files.0 { @@ -268,7 +268,7 @@ pub async fn generate_target( out.insert(path, (gen_name.clone(), buf)); } } - let out: HashMap = out + let out: IndexMap = out .into_iter() .map(|(path, (_, buf))| (path, buf)) .collect(); @@ -304,7 +304,7 @@ pub fn generate_target_sync( let gen_name: Arc = gen_name[..].into(); generate_set.push(move || { - let mut inputs = HashMap::new(); + let mut inputs = IndexMap::new(); for res in resolve_set { let (name, input) = res?; inputs.insert(name, input?); @@ -314,7 +314,7 @@ pub fn generate_target_sync( }); } - let mut out = HashMap::new(); + let mut out = IndexMap::new(); for res in generate_set { let (gen_name, files) = res()?; for (path, buf) in files.0 { diff --git a/src/metagen/src/shared/client.rs b/src/metagen/src/shared/client.rs index f11934f89d..30ac05e234 100644 --- a/src/metagen/src/shared/client.rs +++ b/src/metagen/src/shared/client.rs @@ -5,12 +5,13 @@ use crate::interlude::*; use super::types::*; use common::typegraph::{EffectType, ListTypeData, OptionalTypeData}; +use indexmap::IndexSet; pub struct RenderManifest { - pub return_types: HashSet, - pub arg_types: HashSet, - pub node_metas: HashSet, - pub selections: HashSet, + pub return_types: IndexSet, + pub arg_types: IndexSet, + pub node_metas: IndexSet, + pub selections: IndexSet, pub root_fns: Vec, } @@ -26,10 +27,10 @@ pub struct RootFn { /// Collect upfront all the items we need to render pub fn get_manifest(tg: &Typegraph) -> Result { let mut root_fns = vec![]; - let mut selections = HashSet::new(); - let mut return_types = HashSet::new(); - let mut node_metas = HashSet::new(); - let mut arg_types = HashSet::new(); + let mut selections = IndexSet::new(); + let mut return_types = IndexSet::new(); + let mut node_metas = IndexSet::new(); + let mut arg_types = IndexSet::new(); let (_root_base, root) = tg.root().map_err(anyhow_to_eyre!())?; for (key, &func_id) in &root.properties { diff --git a/src/metagen/src/shared/mod.rs b/src/metagen/src/shared/mod.rs index 0608aaabce..3ebfb6c7e8 100644 --- a/src/metagen/src/shared/mod.rs +++ b/src/metagen/src/shared/mod.rs @@ -13,7 +13,7 @@ use crate::interlude::*; #[derive(Debug, Clone)] pub struct FdkTemplate { - pub entries: HashMap<&'static str, std::borrow::Cow<'static, str>>, + pub entries: IndexMap<&'static str, std::borrow::Cow<'static, str>>, } pub struct StubbedFunction { @@ -38,7 +38,7 @@ pub fn filter_stubbed_funcs( .map(|idx| (idx as u32, Rc::new(tg.runtimes[idx].clone()))) .with_context(|| format!("runtime {rt_name} not found in typegraph")) }) - .collect::, _>>()?; + .collect::, _>>()?; let stubbed_materializers = tg .materializers .iter() @@ -46,7 +46,7 @@ pub fn filter_stubbed_funcs( // TODO: consider filtering out non "function" mats .filter(|(_, mat)| stubbed_runtimes.contains_key(&mat.runtime)) .map(|(id, _)| id as u32) - .collect::>(); + .collect::>(); let stubbed_funcs = tg .types .iter() diff --git a/src/metagen/src/shared/types.rs b/src/metagen/src/shared/types.rs index cc5736690a..caa8f58dbd 100644 --- a/src/metagen/src/shared/types.rs +++ b/src/metagen/src/shared/types.rs @@ -7,7 +7,7 @@ use common::typegraph::*; use crate::{interlude::*, utils::GenDestBuf}; -pub type VisitedTypePaths = HashMap>>; +pub type VisitedTypePaths = IndexMap>>; #[derive(Debug, Clone)] pub enum RenderedName { @@ -96,7 +96,7 @@ type ReplacementRecords = Vec<(u32, Rc, Box String>)>; pub struct TypeRenderer { dest: GenDestBuf, pub nodes: Vec>, - name_memo: HashMap, + name_memo: IndexMap, render_type: Rc, replacement_records: ReplacementRecords, } diff --git a/src/metagen/src/tests/mod.rs b/src/metagen/src/tests/mod.rs index 38ec1a1e6f..b33d798cb9 100644 --- a/src/metagen/src/tests/mod.rs +++ b/src/metagen/src/tests/mod.rs @@ -11,7 +11,7 @@ use futures_lite::StreamExt as _; #[derive(Clone)] struct TestCtx { - typegraphs: Arc>>, + typegraphs: Arc>>, } impl InputResolver for TestCtx { @@ -56,7 +56,7 @@ async fn load_fdk_template( })); } - let mut entries = HashMap::new(); + let mut entries = IndexMap::new(); while let Some(res) = group.next().await { let (file_name, content) = res?; entries.insert(file_name, content); @@ -74,7 +74,7 @@ pub struct E2eTestCase { pub target: String, pub config: config::Config, pub target_dir: Option, - pub typegraphs: HashMap>, + pub typegraphs: IndexMap>, pub build_fn: fn(BuildArgs) -> BoxFuture>, } diff --git a/src/mt_deno/src/lib.rs b/src/mt_deno/src/lib.rs index 9d2558cb4c..b7c969190e 100644 --- a/src/mt_deno/src/lib.rs +++ b/src/mt_deno/src/lib.rs @@ -21,7 +21,7 @@ use deno_runtime::deno_core as deno_core; // necessary for re-exported macros to use std::path::PathBuf; -const DEFAULT_UNSTABLE_FLAGS: &[&str] = &["worker-options", "net"]; +const DEFAULT_UNSTABLE_FLAGS: &[&str] = &["worker-options", "net", "http"]; const CACHE_BLOCKLIST: &[&str] = &[ "npm:/@typegraph/sdk", "npm:/@typegraph/sdk/", diff --git a/src/substantial/Cargo.toml b/src/substantial/Cargo.toml index 4038c062f8..7c07b23cf0 100644 --- a/src/substantial/Cargo.toml +++ b/src/substantial/Cargo.toml @@ -10,5 +10,6 @@ serde.workspace = true serde_json.workspace = true uuid.workspace = true -protobuf = "3.5.1" -redis = "0.25.4" +protobuf = "3.6.0" +# pinned due to url +redis = "=0.25.4" diff --git a/src/substantial/src/protocol/events.rs b/src/substantial/src/protocol/events.rs index 3ca2887936..91408fe2dc 100644 --- a/src/substantial/src/protocol/events.rs +++ b/src/substantial/src/protocol/events.rs @@ -22,7 +22,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_1; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_6_0; // @@protoc_insertion_point(message:substantial.protos.events.Start) #[derive(PartialEq,Clone,Default,Debug)] diff --git a/src/substantial/src/protocol/metadata.rs b/src/substantial/src/protocol/metadata.rs index 3320fccaaf..01c44cf9a0 100644 --- a/src/substantial/src/protocol/metadata.rs +++ b/src/substantial/src/protocol/metadata.rs @@ -22,7 +22,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_1; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_6_0; // @@protoc_insertion_point(message:substantial.protos.metadata.Info) #[derive(PartialEq,Clone,Default,Debug)] diff --git a/src/typegate/engine/Cargo.toml b/src/typegate/engine/Cargo.toml index 83be531927..6567b7cfb1 100644 --- a/src/typegate/engine/Cargo.toml +++ b/src/typegate/engine/Cargo.toml @@ -14,7 +14,7 @@ futures.workspace = true tokio = { workspace = true, features = ["full"] } # logging -log.workspace = true +tracing.workspace = true # encoding serde.workspace = true @@ -36,7 +36,6 @@ temporal-sdk-core-protos.workspace = true query-core.workspace = true query-connector.workspace = true request-handlers.workspace = true -prisma-models.workspace = true datamodel-renderer.workspace = true user-facing-errors.workspace = true query-engine-metrics.workspace = true diff --git a/src/typegate/engine/src/lib.rs b/src/typegate/engine/src/lib.rs index 32381b3287..5d6ba03fcc 100644 --- a/src/typegate/engine/src/lib.rs +++ b/src/typegate/engine/src/lib.rs @@ -9,7 +9,6 @@ mod typegraph; #[allow(unused_imports)] mod interlude { pub use anyhow::{Context, Result}; - pub use log::{debug, error, info, trace, warn}; pub use mt_deno::deno::{ self, deno_runtime::{ @@ -23,6 +22,7 @@ mod interlude { }; pub use std::{borrow::Cow, cell::RefCell, path::Path, path::PathBuf, rc::Rc, sync::Arc}; pub use tap::prelude::*; + pub use tracing::{debug, error, info, trace, warn}; } pub use deno_core::{resolve_url, resolve_url_or_path}; diff --git a/src/typegate/engine/src/runtimes/prisma.rs b/src/typegate/engine/src/runtimes/prisma.rs index a119633cba..0d70ec4723 100644 --- a/src/typegate/engine/src/runtimes/prisma.rs +++ b/src/typegate/engine/src/runtimes/prisma.rs @@ -33,7 +33,7 @@ impl Ctx { } fn reformat_datamodel(datamodel: &str) -> Option { - prisma_models::psl::reformat(datamodel, 4) + psl::reformat(datamodel, 4) } // register engine @@ -58,7 +58,7 @@ pub async fn op_prisma_register_engine( engine::register_engine(&ctx, datamodel, input.engine_name) .await - .tap_err(|e| log::error!("Error registering engine: {:?}", e)) + .tap_err(|e| error!("Error registering engine: {:?}", e)) } // unregister engine @@ -83,7 +83,7 @@ pub async fn op_prisma_unregister_engine( // query -#[derive(Deserialize)] +#[derive(Deserialize, Debug)] #[serde(crate = "serde")] pub struct PrismaQueryInp { engine_name: String, @@ -92,6 +92,7 @@ pub struct PrismaQueryInp { datamodel: String, } +#[tracing::instrument(ret, level = "debug", skip(state))] #[deno_core::op2(async)] #[string] pub async fn op_prisma_query( @@ -105,7 +106,7 @@ pub async fn op_prisma_query( engine::query(&ctx, input.engine_name, input.query).await } -#[derive(Deserialize)] +#[derive(Deserialize, Debug)] #[serde(crate = "serde")] pub struct PrismaDiffInp { datasource: String, @@ -113,21 +114,17 @@ pub struct PrismaDiffInp { script: bool, } +#[tracing::instrument(ret, level = "debug")] #[deno_core::op2(async)] #[serde] pub async fn op_prisma_diff( - state: Rc>, #[serde] input: PrismaDiffInp, ) -> Result)>> { let datamodel = reformat_datamodel(&input.datamodel).context("Error formatting datamodel")?; - let tmp_dir = { - let state = state.borrow(); - state.borrow::().tmp_dir.clone() - }; - migration::diff(&tmp_dir, input.datasource, datamodel, input.script).await + migration::diff(input.datasource, datamodel, input.script).await } -#[derive(Deserialize)] +#[derive(Deserialize, Debug)] #[serde(crate = "serde")] pub struct PrismaDevInp { pub datasource: String, @@ -136,6 +133,7 @@ pub struct PrismaDevInp { pub reset_database: bool, } +#[tracing::instrument(ret, level = "debug", skip(state))] #[deno_core::op2(async)] #[serde] pub async fn op_prisma_apply( @@ -154,7 +152,7 @@ pub async fn op_prisma_apply( .await } -#[derive(Deserialize)] +#[derive(Deserialize, Debug)] #[serde(crate = "serde")] pub struct PrismaDeployInp { datasource: String, @@ -162,6 +160,7 @@ pub struct PrismaDeployInp { migrations: String, } +#[tracing::instrument(ret, level = "debug", skip(state))] #[deno_core::op2(async)] #[serde] pub async fn op_prisma_deploy( @@ -180,7 +179,7 @@ pub async fn op_prisma_deploy( .await } -#[derive(Deserialize)] +#[derive(Deserialize, Debug)] #[serde(crate = "serde")] pub struct PrismaCreateInp { datasource: String, @@ -190,6 +189,7 @@ pub struct PrismaCreateInp { apply: bool, } +#[tracing::instrument(ret, level = "debug", skip(state))] #[deno_core::op2(async)] #[serde] pub async fn op_prisma_create( @@ -208,6 +208,7 @@ pub async fn op_prisma_create( .await } +#[tracing::instrument(ret, level = "debug", skip(state))] #[deno_core::op2(async)] pub async fn op_prisma_reset( state: Rc>, diff --git a/src/typegate/engine/src/runtimes/prisma/engine.rs b/src/typegate/engine/src/runtimes/prisma/engine.rs index 5c768c53b3..2c15dff5aa 100644 --- a/src/typegate/engine/src/runtimes/prisma/engine.rs +++ b/src/typegate/engine/src/runtimes/prisma/engine.rs @@ -6,6 +6,8 @@ use std::{collections::BTreeMap, path::PathBuf, str::FromStr}; use anyhow::{Context, Result}; use query_core::protocol::EngineProtocol; +pub(super) const CONFIG_DIR: &str = "."; + pub async fn register_engine( ctx: &super::Ctx, datamodel: String, @@ -17,7 +19,7 @@ pub async fn register_engine( log_queries: true, datasource_overrides: BTreeMap::default(), env: serde_json::json!({}), - config_dir: PathBuf::from_str(".")?, + config_dir: PathBuf::from_str(CONFIG_DIR)?, ignore_env_var_errors: false, engine_protocol: Some(EngineProtocol::Json), }; diff --git a/src/typegate/engine/src/runtimes/prisma/engine_import.rs b/src/typegate/engine/src/runtimes/prisma/engine_import.rs index aea1ac76c1..6a33b50930 100644 --- a/src/typegate/engine/src/runtimes/prisma/engine_import.rs +++ b/src/typegate/engine/src/runtimes/prisma/engine_import.rs @@ -19,7 +19,7 @@ use crate::interlude::*; -use psl::diagnostics::Diagnostics; +use psl::diagnostics::{Diagnostics, FileId}; use query_connector::error::ConnectorError; use query_core::CoreError; use query_core::{ @@ -163,7 +163,7 @@ impl QueryEngine { schema .diagnostics .to_result() - .map_err(|err| ApiError::conversion(err, schema.db.source()))?; + .map_err(|err| ApiError::conversion(err, schema.db.source(FileId(0))))?; config .resolve_datasource_urls_query_engine( @@ -171,11 +171,11 @@ impl QueryEngine { |key| env.get(key).map(ToString::to_string), ignore_env_var_errors, ) - .map_err(|err| ApiError::conversion(err, schema.db.source()))?; + .map_err(|err| ApiError::conversion(err, schema.db.source(FileId(0))))?; config .validate_that_one_datasource_is_provided() - .map_err(|errors| ApiError::conversion(errors, schema.db.source()))?; + .map_err(|errors| ApiError::conversion(errors, schema.db.source(FileId(0))))?; // let enable_metrics = config.preview_features().contains(PreviewFeature::Metrics); // let enable_tracing = config.preview_features().contains(PreviewFeature::Tracing); @@ -211,7 +211,9 @@ impl QueryEngine { .load_url_with_config_dir(&builder.config_dir, |key| { builder.env.get(key).map(ToString::to_string) }) - .map_err(|err| ApiError::Conversion(err, builder.schema.db.source().to_owned()))? + .map_err(|err| { + ApiError::Conversion(err, builder.schema.db.source(FileId(0)).to_owned()) + })? }; let engine = async move { @@ -226,10 +228,11 @@ impl QueryEngine { let executor_fut = async { let executor = load_executor( - request_handlers::ConnectorMode::Rust, - data_source, + request_handlers::ConnectorKind::Rust { + url, + datasource: data_source, + }, preview_features, - &url, ) .await?; let connector = executor.primary_connector(); diff --git a/src/typegate/engine/src/runtimes/prisma/migration.rs b/src/typegate/engine/src/runtimes/prisma/migration.rs index 168d3978f3..40f5cebb43 100644 --- a/src/typegate/engine/src/runtimes/prisma/migration.rs +++ b/src/typegate/engine/src/runtimes/prisma/migration.rs @@ -8,18 +8,18 @@ use crate::interlude::*; use anyhow::anyhow; use anyhow::Result; use convert_case::{Case, Casing}; -use log::{error, trace}; use regex::Regex; +use schema_core::json_rpc::types::SchemasContainer; +use schema_core::json_rpc::types::SchemasWithConfigDir; use schema_core::json_rpc::types::{ ApplyMigrationsInput, CreateMigrationInput, DevAction, DevDiagnosticInput, DevDiagnosticOutput, DiffParams, DiffTarget, EvaluateDataLossInput, ListMigrationDirectoriesInput, SchemaContainer, }; use schema_core::{CoreError, CoreResult, GenericApi}; use serde::Serialize; -use std::io::Write; use std::path::Path; use std::sync::{Arc, Mutex}; -use tempfile::{tempdir_in, NamedTempFile, TempDir}; +use tempfile::{tempdir_in, TempDir}; trait FormatError { fn format_error(self) -> Result; @@ -48,7 +48,12 @@ pub async fn loss( let api = schema_core::schema_api(Some(datasource.clone()), None)?; let data_loss = EvaluateDataLossInput { migrations_directory_path: migration_folder.to_string(), - prisma_schema: schema.to_string(), + schema: SchemasContainer { + files: vec![SchemaContainer { + content: schema, + path: "schema.generated.prisma".into(), + }], + }, }; let loss = match api.evaluate_data_loss(data_loss).await { @@ -118,12 +123,17 @@ impl MigrationContext { .await } - fn schema(&self) -> String { - format!("{}{}", self.builder.datasource, self.builder.datamodel) + fn schema(&self) -> SchemasContainer { + SchemasContainer { + files: vec![SchemaContainer { + content: format!("{}{}", self.builder.datasource, self.builder.datamodel), + path: "schema.generated.prisma".into(), + }], + } } } -#[derive(Serialize)] +#[derive(Serialize, Debug)] #[serde(crate = "serde")] pub enum PrismaApplyResult { ResetRequired { @@ -168,7 +178,7 @@ impl MigrationContext { } } -#[derive(Serialize)] +#[derive(Serialize, Debug)] #[serde(crate = "serde")] pub struct PrismaCreateResult { created_migration_name: Option, @@ -185,7 +195,7 @@ impl MigrationContext { draft: !apply, migration_name: name.to_case(Case::Snake), migrations_directory_path: self.migrations_dir.to_string(), - prisma_schema: self.schema(), + schema: self.schema(), }) .await .format_error()?; @@ -222,7 +232,6 @@ impl MigrationContext { } pub async fn diff( - tmp_dir_path: &Path, datasource: String, datamodel: String, script: bool, @@ -236,23 +245,22 @@ pub async fn diff( )))), )?; - let dir = tempdir_in(tmp_dir_path)?; - debug!("diff dir: {dir:?} tmp_dir: {tmp_dir_path:?} script: {script}"); - let mut source_file = NamedTempFile::new_in(&dir)?; - writeln!(source_file, "{datasource}").unwrap(); - - let mut model_file = NamedTempFile::new_in(&dir)?; - writeln!(model_file, "{schema}").unwrap(); - let params = DiffParams { exit_code: None, - from: DiffTarget::SchemaDatasource(SchemaContainer { - schema: source_file.path().display().to_string(), + from: DiffTarget::SchemaDatasource(SchemasWithConfigDir { + config_dir: super::engine::CONFIG_DIR.into(), + files: vec![SchemaContainer { + content: datasource, + path: "schema_diff_from.generated.prisma".into(), + }], }), script, shadow_database_url: None, - to: DiffTarget::SchemaDatamodel(SchemaContainer { - schema: model_file.path().display().to_string(), + to: DiffTarget::SchemaDatamodel(SchemasContainer { + files: vec![SchemaContainer { + content: schema, + path: "schema_diff_to.generated.prisma".into(), + }], }), }; @@ -379,7 +387,7 @@ impl ParsedDiff { } } -#[derive(Serialize)] +#[derive(Serialize, Debug)] #[serde(crate = "serde")] pub struct PrismaDeployOut { migration_count: usize, diff --git a/src/typegate/engine/src/runtimes/wit_wire.rs b/src/typegate/engine/src/runtimes/wit_wire.rs index 369d744fa4..c45c425fdf 100644 --- a/src/typegate/engine/src/runtimes/wit_wire.rs +++ b/src/typegate/engine/src/runtimes/wit_wire.rs @@ -97,7 +97,6 @@ impl Ctx { struct Instance { bindings: wit::WitWire, - _instance: wasmtime::component::Instance, store: wasmtime::Store, preopen_dir: PathBuf, } @@ -378,7 +377,7 @@ pub async fn op_wit_wire_init<'scope>( }, ), ); - let (bindings, instance) = wit::WitWire::instantiate_async(&mut store, &component, &ctx.linker) + let bindings = wit::WitWire::instantiate_async(&mut store, &component, &ctx.linker) .await .map_err(|err| { WitWireInitError::ModuleErr(format!("error tring to make component instance: {err}")) @@ -392,7 +391,6 @@ pub async fn op_wit_wire_init<'scope>( ctx.instances.insert( instance_id, Instance { - _instance: instance, bindings, store, preopen_dir: work_dir, diff --git a/src/typegate/src/log.ts b/src/typegate/src/log.ts index 5d4351cebe..9371866724 100644 --- a/src/typegate/src/log.ts +++ b/src/typegate/src/log.ts @@ -15,7 +15,7 @@ if (!sharedConfig.rust_log) { break; case "DEBUG": set( - "info,native=trace,quaint=warn,sql_schema_connector=warn,tracing=warn,schema_core=warn", + "info,native=trace,sql_schema_connector=warn,tracing=warn,schema_core=warn", ); break; case "WARNING": diff --git a/src/typegate/src/runtimes/prisma/prisma.ts b/src/typegate/src/runtimes/prisma/prisma.ts index 570f53ddcc..eeaea99304 100644 --- a/src/typegate/src/runtimes/prisma/prisma.ts +++ b/src/typegate/src/runtimes/prisma/prisma.ts @@ -35,11 +35,15 @@ interface PrismaError { }; } -type PrismaResult = { - data: Record; -} | { - errors: PrismaError[]; -}; +type PrismaResult = + | { + data: Record; + } + | { + errors: PrismaError[]; + }; + +type BatchPrismaResult = { batchResult: PrismaResult[] }; type PrismaRuntimeData = PrismaRT.DataFinal; @@ -126,7 +130,7 @@ export class PrismaRuntime extends Runtime { datamodel: this.datamodel, }), ); - const result = JSON.parse(res); + const result = JSON.parse(res) as PrismaResult | BatchPrismaResult; if ("errors" in result) { this.logger.error("remote prisma errors", result.errors); @@ -137,7 +141,9 @@ export class PrismaRuntime extends Runtime { } // TODO refactor when we support partial results in GraphQL - const results = isBatchQuery ? result.batchResult : [result]; + const results = isBatchQuery + ? (result as BatchPrismaResult).batchResult + : [result as PrismaResult]; const ret = []; for (const r of results) { if ("errors" in r) { @@ -149,7 +155,7 @@ export class PrismaRuntime extends Runtime { } ret.push(r.data); } - return isBatchQuery ? ret : ret[0]; + return ret; } execute( @@ -157,7 +163,7 @@ export class PrismaRuntime extends Runtime { path: string[], renames: Record, ): Resolver { - return async ({ _: { variables, context, effect, parent }, ..._args }) => { + return async ({ _: { variables, context, effect, parent } }) => { path[0] = renames[path[0]] ?? path[0]; const startTime = performance.now(); @@ -168,7 +174,20 @@ export class PrismaRuntime extends Runtime { `queried prisma in ${(endTime - startTime).toFixed(2)}ms`, ); - return path.reduce((r, field) => r[field], res); + if (path[0] == "queryRaw") { + const rawRes = res[0]; + return rawRes.queryRaw.rows.map( + (row: any[]) => + Object.fromEntries( + row.map( + (val, idx) => [rawRes.queryRaw.columns[idx], val], + ), + ), + ); + } else { + // FIXME: why do we only process the first item?? + return path.reduce((r, field) => r[field], res[0]); + } }; } @@ -304,22 +323,13 @@ export class PrismaRuntime extends Runtime { } else { const resolver: Resolver = ({ _: { parent } }) => { const resolver = parent[field.props.node]; - const rawValue = typeof resolver === "function" - ? resolver() - : resolver; - const matData = stage.props.materializer - ?.data as unknown as PrismaOperationMatData; - - // if queryRaw is used, the result has a type tag - const ret = matData.operation === "queryRaw" - ? rawValue["prisma__value"] - : rawValue; + const ret = typeof resolver === "function" ? resolver() : resolver; // Prisma uses $type tag for formatted strings // eg. `createAt: { "$type": "DateTime", value: "2023-12-05T14:10:21.840Z" }` if ( - !Array.isArray(ret) && typeof ret === "object" && + !Array.isArray(ret) && ret !== null && "$type" in ret // ! ) { diff --git a/src/typegate/src/runtimes/typegate.ts b/src/typegate/src/runtimes/typegate.ts index 2327e07311..c4109f859a 100644 --- a/src/typegate/src/runtimes/typegate.ts +++ b/src/typegate/src/runtimes/typegate.ts @@ -334,14 +334,13 @@ export class TypeGateRuntime extends Runtime { const result = await rt.query(queryObj); const queries = isBatch ? query.batch : [query]; - const resultValues = - ((isBatch ? result : [result]) as Array>) - .map((r, i) => { - const q = queries[i]; - const key = q.action + q.modelName ?? ""; - return r[key]; - }); - + const resultValues = result + .map((r, i) => { + const q = queries[i]; + const key = q.action + q.modelName ?? ""; + console.debug("DEBUG", { q, r, key }); + return r[key]; + }); return JSON.stringify(isBatch ? resultValues : resultValues[0]); }; diff --git a/src/typegate/standalone/Cargo.toml b/src/typegate/standalone/Cargo.toml index ecaa13428a..6df964f3fa 100644 --- a/src/typegate/standalone/Cargo.toml +++ b/src/typegate/standalone/Cargo.toml @@ -5,8 +5,8 @@ version.workspace = true [dependencies] colored = "2.1.0" -envconfig = "0.10.0" -sentry = { version = "0.32.0", features = ["anyhow"] } +envconfig = "0.11.0" +sentry = { version = "0.34.0", features = ["anyhow"] } env_logger.workspace = true log.workspace = true typegate_engine.workspace = true diff --git a/src/typegraph/core/src/utils/metagen_utils.rs b/src/typegraph/core/src/utils/metagen_utils.rs index 42dc5d65f5..4d1bda21e1 100644 --- a/src/typegraph/core/src/utils/metagen_utils.rs +++ b/src/typegraph/core/src/utils/metagen_utils.rs @@ -1,7 +1,7 @@ // Copyright Metatype OÜ, licensed under the Mozilla Public License Version 2.0. // SPDX-License-Identifier: MPL-2.0 -use std::{borrow::Cow, collections::HashMap}; +use std::borrow::Cow; use super::fs::FsContext; use color_eyre::Result; @@ -39,7 +39,7 @@ impl RawTgResolver { default: &[(&'static str, &'static str)], template_dir: Option<&std::path::Path>, ) -> Result { - let mut entries = HashMap::new(); + let mut entries = indexmap::IndexMap::default(); for (file_name, default_content) in default.iter() { let content = if let Some(override_path) = template_dir { let path = override_path.join(file_name); diff --git a/src/typegraph/core/wit/typegraph.wit b/src/typegraph/core/wit/typegraph.wit index 2e86803a05..9039965bb1 100644 --- a/src/typegraph/core/wit/typegraph.wit +++ b/src/typegraph/core/wit/typegraph.wit @@ -91,12 +91,12 @@ interface core { integerb: func(data: type-integer, base: type-base) -> result; record type-float { - min: option, - max: option, - exclusive-minimum: option, - exclusive-maximum: option, - multiple-of: option, - enumeration: option> + min: option, + max: option, + exclusive-minimum: option, + exclusive-maximum: option, + multiple-of: option, + enumeration: option> } floatb: func(data: type-float, base: type-base) -> result; diff --git a/src/typegraph/python/poetry.lock b/src/typegraph/python/poetry.lock index bbd7b44a47..abb7f03a13 100644 --- a/src/typegraph/python/poetry.lock +++ b/src/typegraph/python/poetry.lock @@ -17,13 +17,13 @@ wheel = ">=0.23.0,<1.0" [[package]] name = "importlib-resources" -version = "6.4.4" +version = "6.4.5" description = "Read resources from Python packages" optional = false python-versions = ">=3.8" files = [ - {file = "importlib_resources-6.4.4-py3-none-any.whl", hash = "sha256:dda242603d1c9cd836c3368b1174ed74cb4049ecd209e7a1a0104620c18c5c11"}, - {file = "importlib_resources-6.4.4.tar.gz", hash = "sha256:20600c8b7361938dc0bb2d5ec0297802e575df486f5a544fa414da65e13721f7"}, + {file = "importlib_resources-6.4.5-py3-none-any.whl", hash = "sha256:ac29d5f956f01d5e4bb63102a5a19957f1b9175e45649977264a1416783bb717"}, + {file = "importlib_resources-6.4.5.tar.gz", hash = "sha256:980862a1d16c9e147a59603677fa2aa5fd82b87f223b6cb870695bcfce830065"}, ] [package.dependencies] @@ -96,17 +96,18 @@ files = [ [[package]] name = "wasmtime" -version = "21.0.0" +version = "25.0.0" description = "A WebAssembly runtime powered by Wasmtime" optional = false python-versions = ">=3.8" files = [ - {file = "wasmtime-21.0.0-py3-none-any.whl", hash = "sha256:9b7ee9bb6c14586974d34c92bb7f0723161067769233c5dd8ea99c233759b48d"}, - {file = "wasmtime-21.0.0-py3-none-macosx_10_13_x86_64.whl", hash = "sha256:b10b6ec13fa04fc1d81a4f9b2d244938c67710e9279011e53397bfa071b85b3f"}, - {file = "wasmtime-21.0.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3e245a5c03c1de46cdafcd98da6daa381cadd7bd41aae70d8bef4c8c0ea51798"}, - {file = "wasmtime-21.0.0-py3-none-manylinux1_x86_64.whl", hash = "sha256:6587515be9603f8bb0732f3b508d2034f21d407fd55879c4402032e40e1ddae6"}, - {file = "wasmtime-21.0.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:4b242b065922f65cd40d8cedb3f19269423f28d7955567fe2daca03a44c03446"}, - {file = "wasmtime-21.0.0-py3-none-win_amd64.whl", hash = "sha256:00f929d0caf58a69890df00888f9da12c2aa3ed5af4c8b7b2dca96a4996da731"}, + {file = "wasmtime-25.0.0-py3-none-any.whl", hash = "sha256:22aa59fc6e01deec8a6703046f82466090d5811096a3bb5c169907e36c842af1"}, + {file = "wasmtime-25.0.0-py3-none-macosx_10_13_x86_64.whl", hash = "sha256:13e9a718e9d580c1738782cc19f4dcb9fb068f7e51778ea621fd664f4433525b"}, + {file = "wasmtime-25.0.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:5bdf1214ee3ee78a4a8a92da339f4c4c8c109e65af881b37f4adfc05d02af426"}, + {file = "wasmtime-25.0.0-py3-none-manylinux1_x86_64.whl", hash = "sha256:b4364e14d44e3b7afe6a40bf608e9d0d2c40b09dece441d20f4f6e31906b729c"}, + {file = "wasmtime-25.0.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:a07445073cf36a6e5d1dc28246a897dcbdaa537ba8be8805be65422ecca297eb"}, + {file = "wasmtime-25.0.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:53d5f614348a28aabdf80ae4f6fdfa803031af1f74ada03826fd4fd43aeee6c8"}, + {file = "wasmtime-25.0.0-py3-none-win_amd64.whl", hash = "sha256:f8a2a213b9179965db2d2eedececd69a37e287e902330509afae51c71a3a6842"}, ] [package.dependencies] @@ -131,13 +132,13 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [[package]] name = "zipp" -version = "3.20.1" +version = "3.20.2" description = "Backport of pathlib-compatible object wrapper for zip files" optional = false python-versions = ">=3.8" files = [ - {file = "zipp-3.20.1-py3-none-any.whl", hash = "sha256:9960cd8967c8f85a56f920d5d507274e74f9ff813a0ab8889a5b5be2daf44064"}, - {file = "zipp-3.20.1.tar.gz", hash = "sha256:c22b14cc4763c5a5b04134207736c107db42e9d3ef2d9779d465f5f1bcba572b"}, + {file = "zipp-3.20.2-py3-none-any.whl", hash = "sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350"}, + {file = "zipp-3.20.2.tar.gz", hash = "sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29"}, ] [package.extras] @@ -151,4 +152,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<4.0" -content-hash = "5d43a32f12db9c753683208f912303d29f2a3f08189858469a5d457b213db97f" +content-hash = "bae8760dd91a2c2bd18fa8958b8d85a6a09bb0a20204aefd15f6ccd620fbf05b" diff --git a/src/typegraph/python/pyproject.toml b/src/typegraph/python/pyproject.toml index a842890e90..ff368e350f 100644 --- a/src/typegraph/python/pyproject.toml +++ b/src/typegraph/python/pyproject.toml @@ -15,7 +15,7 @@ classifiers = [ [tool.poetry.dependencies] python = ">=3.9,<4.0" -wasmtime = "^21.0.0" +wasmtime = "^25.0.0" typing-extensions = "^4.8.0" python-box = "^7.1.1" astunparse = "^1.6.3" diff --git a/src/xtask/Cargo.toml b/src/xtask/Cargo.toml index c7bececfa1..9f5665d386 100644 --- a/src/xtask/Cargo.toml +++ b/src/xtask/Cargo.toml @@ -16,4 +16,6 @@ clap = { workspace = true, features = ["derive"] } mt_deno.workspace = true typegate_engine.workspace = true log.workspace = true -env_logger.workspace = true +color-eyre.workspace = true +tracing-subscriber.workspace = true +tracing-error.workspace = true diff --git a/src/xtask/src/main.rs b/src/xtask/src/main.rs index 3d40165b9b..2c2081da0f 100644 --- a/src/xtask/src/main.rs +++ b/src/xtask/src/main.rs @@ -19,7 +19,40 @@ enum Command { } fn main() -> Result<()> { - env_logger::init(); + if std::env::var("RUST_LOG").is_err() { + std::env::set_var("RUST_LOG", "info,actix_server=warn"); + } + if std::env::var("RUST_SPANTRACE").is_err() { + std::env::set_var("RUST_SPANTRACE", "0"); + } + color_eyre::install().unwrap(); + + use tracing_subscriber::prelude::*; + + let fmt = tracing_subscriber::fmt::layer() + .without_time() + .with_writer(std::io::stderr) + // .pretty() + // .with_file(true) + // .with_line_number(true) + .with_target(false); + + #[cfg(test)] + let fmt = fmt.with_test_writer(); + + #[cfg(debug_assertions)] + let fmt = fmt.with_target(true); + + let filter = tracing_subscriber::EnvFilter::from_default_env(); + + tracing_subscriber::registry() + // filter on values from RUST_LOG + .with(filter) + // subscriber that emits to stderr + .with(fmt) + // instrument errors with SpanTraces, used by color-eyre + .with(tracing_error::ErrorLayer::default()) + .init(); let args = Args::parse(); match args.command { diff --git a/tests/e2e/cli/.gitignore b/tests/e2e/cli/.gitignore index 1e0b411e72..9d222d6335 100644 --- a/tests/e2e/cli/.gitignore +++ b/tests/e2e/cli/.gitignore @@ -1 +1 @@ -/migration.py +/migration*.py diff --git a/tests/e2e/cli/deploy_test.ts b/tests/e2e/cli/deploy_test.ts index e9978d70c6..e45312c34a 100644 --- a/tests/e2e/cli/deploy_test.ts +++ b/tests/e2e/cli/deploy_test.ts @@ -9,7 +9,11 @@ import { randomPGConnStr, reset } from "test-utils/database.ts"; const m = new TestModule(import.meta); -const tgName = "migration-failure-test"; +// both dev_test and deploy_test rely on the same typegraph +// we need to do different versions of the typegraph to avoid +// races during testing +const testCode = "dev"; +const tgName = `migration-failure-test-${testCode}`; /** * These tests use different ports for the virtual typegate instance to avoid @@ -17,14 +21,22 @@ const tgName = "migration-failure-test"; */ // TODO custom postgres schema -async function writeTypegraph(version: number | null, target = "migration.py") { +async function writeTypegraph( + version: number | null, + target = `migration_${testCode}.py`, +) { if (version == null) { - await m.shell(["bash", "-c", `cp ./templates/migration.py ${target}`]); + await m.shell([ + "bash", + "-c", + `cat ./templates/migration.py | sed -e "s/migration_failure_test_code/migration_failure_test_${testCode}/" > ${target}`, + ]); } else { await m.shell([ "bash", "select.sh", "templates/migration.py", + testCode, `${version}`, target, ]); @@ -56,7 +68,7 @@ async function deploy({ `--gate=http://localhost:${port}`, ...secretOpts, "-f", - "migration.py", + `migration_${testCode}.py`, "--allow-dirty", ...migrationOpts, "--allow-destructive", @@ -139,8 +151,6 @@ Meta.test( Meta.test( { - // FIXME: - ignore: true, name: "meta deploy: succeeds migration for new columns with default value", }, async (t) => { diff --git a/tests/e2e/cli/dev_test.ts b/tests/e2e/cli/dev_test.ts index dbe8c00d87..fcb959e924 100644 --- a/tests/e2e/cli/dev_test.ts +++ b/tests/e2e/cli/dev_test.ts @@ -12,21 +12,33 @@ import { workspaceDir } from "../../utils/dir.ts"; const m = new TestModule(import.meta); -const tgName = "migration-failure-test"; +// both dev_test and deploy_test rely on the same typegraph +// we need to do different versions of the typegraph to avoid +// races during testing +const testCode = "dev"; +const tgName = `migration-failure-test-${testCode}`; /** * These tests use different ports for the virtual typegate instance to avoid * conflicts with one another when running in parallel. */ -async function writeTypegraph(version: number | null, target = "migration.py") { +async function writeTypegraph( + version: number | null, + target = `migration_${testCode}.py`, +) { if (version == null) { - await m.shell(["bash", "-c", `cp ./templates/migration.py ${target}`]); + await m.shell([ + "bash", + "-c", + `cat ./templates/migration.py | sed -e "s/migration_failure_test_code/migration_failure_test_${testCode}/" > ${target}`, + ]); } else { await m.shell([ "bash", "select.sh", "templates/migration.py", `${version}`, + testCode, target, ]); } @@ -34,8 +46,6 @@ async function writeTypegraph(version: number | null, target = "migration.py") { Meta.test( { - // FIXME: MET-622 - ignore: true, name: "meta dev: choose to reset the database", gitRepo: { content: { @@ -59,7 +69,7 @@ Meta.test( "--target=dev", `--gate=http://localhost:${t.port}`, "--secret", - `migration-failure-test:POSTGRES=postgresql://postgres:password@localhost:5432/db?schema=${schema}`, + `${tgName}:POSTGRES=postgresql://postgres:password@localhost:5432/db?schema=${schema}`, ], // stdout: "piped", stderr: "piped", @@ -77,7 +87,7 @@ Meta.test( await stderr.readWhile((line) => { // console.log("meta dev>", line); return !$.stripAnsi(line).includes( - "successfully deployed typegraph migration-failure-test from migration.py", + `successfully deployed typegraph ${tgName} from migration.py`, ); }); @@ -114,7 +124,7 @@ Meta.test( await stderr.readWhile((line) => { // console.log("meta dev>", line); return !$.stripAnsi(line).includes( - "successfully deployed typegraph migration-failure-test", + `successfully deployed typegraph ${tgName}`, ); }); @@ -160,7 +170,7 @@ Meta.test( }, async (t) => { const schema = randomSchema(); - const tgDefFile = join(t.workingDir, "migration.py"); + const tgDefFile = join(t.workingDir, `migration.py`); await t.should("have no migration file", async () => { await assertRejects(() => @@ -179,7 +189,7 @@ Meta.test( "dev", "--target=dev", `--gate=http://localhost:${t.port}`, - `--secret=migration-failure-test:POSTGRES=postgresql://postgres:password@localhost:5432/db?schema=${schema}`, + `--secret=${tgName}:POSTGRES=postgresql://postgres:password@localhost:5432/db?schema=${schema}`, ], // stdout: "piped", stderr: "piped", @@ -198,7 +208,7 @@ Meta.test( await stderr.readWhile((line) => { console.log("line:", line); return !$.stripAnsi(line).includes( - "successfully deployed typegraph migration-failure-test", + `successfully deployed typegraph ${tgName}`, ); }); @@ -229,7 +239,7 @@ Meta.test( const migrationsDir = resolve( t.workingDir, "prisma-migrations", - "migration-failure-test/main", + `${tgName}/main`, ); console.log("Typegate migration dir", migrationsDir); diff --git a/tests/e2e/cli/select.sh b/tests/e2e/cli/select.sh index ce625423c9..175c753159 100755 --- a/tests/e2e/cli/select.sh +++ b/tests/e2e/cli/select.sh @@ -6,4 +6,4 @@ # # e.g.: ./select.sh templates/migration_failure.py 1 migration_failure.py -cat $1 | sed -e "s/# \([^\#]\+\)\(\# option:$2\)/\1\2/" > $3 +cat $1 | sed -e "s/# \([^\#]\+\)\(\# option:$2\)/\1\2/" | sed -e "s/migration_failure_test_code/migration_failure_test_$3/" > $4 diff --git a/tests/e2e/cli/templates/migration.py b/tests/e2e/cli/templates/migration.py index 83cab7a89b..dbabc8ba0b 100644 --- a/tests/e2e/cli/templates/migration.py +++ b/tests/e2e/cli/templates/migration.py @@ -3,7 +3,7 @@ @typegraph() -def migration_failure_test(g: Graph): +def migration_failure_test_code(g: Graph): db = PrismaRuntime("main", "POSTGRES") record = t.struct( diff --git a/tests/e2e/cli/undeploy_test.ts b/tests/e2e/cli/undeploy_test.ts index 950aa2ec3e..2a2494f2df 100644 --- a/tests/e2e/cli/undeploy_test.ts +++ b/tests/e2e/cli/undeploy_test.ts @@ -7,6 +7,9 @@ import { dropSchema, randomSchema } from "test-utils/database.ts"; const m = new TestModule(import.meta); +const testCode = "undeploy"; +const tgName = `migration-failure-test-${testCode}`; + Meta.test({ name: "meta undeploy", }, async (t) => { @@ -16,13 +19,19 @@ Meta.test({ // no leaked resources error await t.should("free resources", async () => { + const target = `migration_${testCode}.py`; + await m.shell([ + "bash", + "-c", + `cat ./templates/migration.py | sed -e "s/migration_failure_test_code/migration_failure_test_${testCode}/" > ${target}`, + ]); await m.cli( {}, "deploy", "--target=dev", `--gate=http://localhost:${t.port}`, "-f", - "templates/migration.py", + target, "--allow-dirty", ); @@ -32,7 +41,7 @@ Meta.test({ "--target=dev", `--gate=http://localhost:${t.port}`, "--typegraph", - "migration-failure-test", + tgName, ); }); }); diff --git a/tests/e2e/templates/templates_test.ts b/tests/e2e/templates/templates_test.ts index 9c24a32095..b7f2760fa8 100644 --- a/tests/e2e/templates/templates_test.ts +++ b/tests/e2e/templates/templates_test.ts @@ -16,14 +16,14 @@ type LangRuntimeConfig = { const envs = { python: { - RUST_LOG: "trace", + RUST_LOG: "debug", }, deno: { MCLI_LOADER_CMD: "deno run -A {filepath}", - RUST_LOG: "trace", + RUST_LOG: "debug", }, node: { - RUST_LOG: "trace", + RUST_LOG: "debug", }, } as LangRuntimeConfig>; @@ -101,10 +101,12 @@ for (const template of ["python", "deno", "node"] as const) { env: envs[template], }, "deploy", + "-vvvv", "--target", "dev", "--gate", `http://localhost:${t.port}`, + // `http://localhost:7891`, "--allow-dirty", "-f", files[template], diff --git a/tests/e2e/website/website_test.ts b/tests/e2e/website/website_test.ts index 372495f9c2..665fdf0f0c 100644 --- a/tests/e2e/website/website_test.ts +++ b/tests/e2e/website/website_test.ts @@ -120,7 +120,7 @@ for (const name of list) { let pyVersion: string; await t.should("serialize python typegraph", async () => { const { stdout } = await Meta.cli( - { currentDir: "examples", env: { RUST_LOG: "trace" } }, + { currentDir: "examples" }, "serialize", "-f", `typegraphs/${name}.py`, @@ -134,7 +134,6 @@ for (const name of list) { { currentDir: "examples", env: { - RUST_LOG: "trace", MCLI_LOADER_CMD: "deno run -A {filepath}", }, }, diff --git a/tests/metagen/__snapshots__/metagen_test.ts.snap b/tests/metagen/__snapshots__/metagen_test.ts.snap index a1cd742d37..9b2ecbda7a 100644 --- a/tests/metagen/__snapshots__/metagen_test.ts.snap +++ b/tests/metagen/__snapshots__/metagen_test.ts.snap @@ -324,10 +324,10 @@ path = "lib.rs" crate-type = ["cdylib", "rlib"] [dependencies] -anyhow = "1.0.86" -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.117" -wit-bindgen = "0.26.0" +anyhow = "1.0.89" +serde = { version = "1.0.210", features = ["derive"] } +serde_json = "1.0.128" +wit-bindgen = "0.34.0" [profile.release] @@ -1130,10 +1130,10 @@ path = "lib.rs" crate-type = ["cdylib", "rlib"] [dependencies] -anyhow = "1.0.86" -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.117" -wit-bindgen = "0.26.0" +anyhow = "1.0.89" +serde = { version = "1.0.210", features = ["derive"] } +serde_json = "1.0.128" +wit-bindgen = "0.34.0" [profile.release] diff --git a/tests/metagen/typegraphs/sample/py/client.py b/tests/metagen/typegraphs/sample/py/client.py index 918bb48a9a..e976188f26 100644 --- a/tests/metagen/typegraphs/sample/py/client.py +++ b/tests/metagen/typegraphs/sample/py/client.py @@ -620,14 +620,21 @@ def Post(): ) @staticmethod - def RootCompositeArgsFn(): - return_node = NodeDescs.Post() + def User(): + return NodeMeta( + sub_nodes={ + "id": NodeDescs.scalar, + "email": NodeDescs.scalar, + "posts": NodeDescs.Post, + }, + ) + + @staticmethod + def RootGetUserFn(): + return_node = NodeDescs.User() return NodeMeta( sub_nodes=return_node.sub_nodes, variants=return_node.variants, - arg_types={ - "id": "RootScalarArgsFnOutput", - }, ) @staticmethod @@ -638,6 +645,14 @@ def RootGetPostsFn(): variants=return_node.variants, ) + @staticmethod + def RootScalarNoArgsFn(): + return_node = NodeDescs.scalar() + return NodeMeta( + sub_nodes=return_node.sub_nodes, + variants=return_node.variants, + ) + @staticmethod def RootScalarArgsFn(): return_node = NodeDescs.scalar() @@ -652,8 +667,16 @@ def RootScalarArgsFn(): ) @staticmethod - def RootScalarUnionFn(): - return_node = NodeDescs.scalar() + def RootCompositeNoArgsFn(): + return_node = NodeDescs.Post() + return NodeMeta( + sub_nodes=return_node.sub_nodes, + variants=return_node.variants, + ) + + @staticmethod + def RootCompositeArgsFn(): + return_node = NodeDescs.Post() return NodeMeta( sub_nodes=return_node.sub_nodes, variants=return_node.variants, @@ -663,12 +686,13 @@ def RootScalarUnionFn(): ) @staticmethod - def User(): + def RootScalarUnionFn(): + return_node = NodeDescs.scalar() return NodeMeta( - sub_nodes={ - "id": NodeDescs.scalar, - "email": NodeDescs.scalar, - "posts": NodeDescs.Post, + sub_nodes=return_node.sub_nodes, + variants=return_node.variants, + arg_types={ + "id": "RootScalarArgsFnOutput", }, ) @@ -692,22 +716,6 @@ def RootCompositeUnionFn(): }, ) - @staticmethod - def RootCompositeNoArgsFn(): - return_node = NodeDescs.Post() - return NodeMeta( - sub_nodes=return_node.sub_nodes, - variants=return_node.variants, - ) - - @staticmethod - def RootScalarNoArgsFn(): - return_node = NodeDescs.scalar() - return NodeMeta( - sub_nodes=return_node.sub_nodes, - variants=return_node.variants, - ) - @staticmethod def RootMixedUnionFnOutput(): return NodeMeta( @@ -728,14 +736,6 @@ def RootMixedUnionFn(): }, ) - @staticmethod - def RootGetUserFn(): - return_node = NodeDescs.User() - return NodeMeta( - sub_nodes=return_node.sub_nodes, - variants=return_node.variants, - ) - UserIdStringUuid = str @@ -775,14 +775,20 @@ def RootGetUserFn(): total=False, ) +RootScalarUnionFnOutputT1Integer = int + +RootScalarUnionFnOutput = typing.Union[ + RootScalarArgsFnOutput, + RootScalarUnionFnOutputT1Integer, +] + + RootCompositeUnionFnOutput = typing.Union[ Post, User, ] -RootScalarUnionFnOutputT1Integer = int - RootMixedUnionFnOutput = typing.Union[ Post, User, @@ -791,12 +797,6 @@ def RootGetUserFn(): ] -RootScalarUnionFnOutput = typing.Union[ - RootScalarArgsFnOutput, - RootScalarUnionFnOutputT1Integer, -] - - PostSelections = typing.TypedDict( "PostSelections", { diff --git a/tests/metagen/typegraphs/sample/rs/client.rs b/tests/metagen/typegraphs/sample/rs/client.rs index 78cfe98b8f..3aba33fade 100644 --- a/tests/metagen/typegraphs/sample/rs/client.rs +++ b/tests/metagen/typegraphs/sample/rs/client.rs @@ -2182,71 +2182,71 @@ mod node_metas { variants: None, } } - pub fn RootScalarArgsFn() -> NodeMeta { + pub fn Post() -> NodeMeta { NodeMeta { - arg_types: Some( + arg_types: None, + variants: None, + sub_nodes: Some( [ - ("id".into(), "UserIdStringUuid".into()), - ("slug".into(), "PostSlugString".into()), - ("title".into(), "PostSlugString".into()), + ("id".into(), scalar as NodeMetaFn), + ("slug".into(), scalar as NodeMetaFn), + ("title".into(), scalar as NodeMetaFn), ] .into(), ), - ..scalar() } } - pub fn Post() -> NodeMeta { + pub fn User() -> NodeMeta { NodeMeta { arg_types: None, variants: None, sub_nodes: Some( [ ("id".into(), scalar as NodeMetaFn), - ("slug".into(), scalar as NodeMetaFn), - ("title".into(), scalar as NodeMetaFn), + ("email".into(), scalar as NodeMetaFn), + ("posts".into(), Post as NodeMetaFn), ] .into(), ), } } + pub fn RootGetUserFn() -> NodeMeta { + NodeMeta { ..User() } + } pub fn RootGetPostsFn() -> NodeMeta { NodeMeta { ..Post() } } - pub fn RootScalarUnionFn() -> NodeMeta { + pub fn RootScalarNoArgsFn() -> NodeMeta { + NodeMeta { ..scalar() } + } + pub fn RootScalarArgsFn() -> NodeMeta { NodeMeta { - arg_types: Some([("id".into(), "RootScalarArgsFnOutput".into())].into()), + arg_types: Some( + [ + ("id".into(), "UserIdStringUuid".into()), + ("slug".into(), "PostSlugString".into()), + ("title".into(), "PostSlugString".into()), + ] + .into(), + ), ..scalar() } } + pub fn RootCompositeNoArgsFn() -> NodeMeta { + NodeMeta { ..Post() } + } pub fn RootCompositeArgsFn() -> NodeMeta { NodeMeta { arg_types: Some([("id".into(), "RootScalarArgsFnOutput".into())].into()), ..Post() } } - pub fn RootCompositeNoArgsFn() -> NodeMeta { - NodeMeta { ..Post() } - } - pub fn RootScalarNoArgsFn() -> NodeMeta { - NodeMeta { ..scalar() } - } - pub fn User() -> NodeMeta { + pub fn RootScalarUnionFn() -> NodeMeta { NodeMeta { - arg_types: None, - variants: None, - sub_nodes: Some( - [ - ("id".into(), scalar as NodeMetaFn), - ("email".into(), scalar as NodeMetaFn), - ("posts".into(), Post as NodeMetaFn), - ] - .into(), - ), + arg_types: Some([("id".into(), "RootScalarArgsFnOutput".into())].into()), + ..scalar() } } - pub fn RootGetUserFn() -> NodeMeta { - NodeMeta { ..User() } - } pub fn RootCompositeUnionFnOutput() -> NodeMeta { NodeMeta { arg_types: None, @@ -2288,11 +2288,6 @@ mod node_metas { } use types::*; pub mod types { - pub type RootScalarArgsFnOutput = String; - #[derive(Debug, serde::Serialize, serde::Deserialize)] - pub struct RootCompositeArgsFnInputPartial { - pub id: Option, - } pub type UserIdStringUuid = String; pub type PostSlugString = String; #[derive(Debug, serde::Serialize, serde::Deserialize)] @@ -2301,12 +2296,10 @@ pub mod types { pub slug: Option, pub title: Option, } - pub type RootScalarUnionFnOutputT1Integer = i64; + pub type RootScalarArgsFnOutput = String; #[derive(Debug, serde::Serialize, serde::Deserialize)] - #[serde(untagged)] - pub enum RootScalarUnionFnOutput { - RootScalarArgsFnOutput(RootScalarArgsFnOutput), - RootScalarUnionFnOutputT1Integer(RootScalarUnionFnOutputT1Integer), + pub struct RootCompositeArgsFnInputPartial { + pub id: Option, } pub type UserEmailStringEmail = String; pub type UserPostsPostList = Vec; @@ -2316,6 +2309,13 @@ pub mod types { pub email: Option, pub posts: Option, } + pub type RootScalarUnionFnOutputT1Integer = i64; + #[derive(Debug, serde::Serialize, serde::Deserialize)] + #[serde(untagged)] + pub enum RootScalarUnionFnOutput { + RootScalarArgsFnOutput(RootScalarArgsFnOutput), + RootScalarUnionFnOutputT1Integer(RootScalarUnionFnOutputT1Integer), + } #[derive(Debug, serde::Serialize, serde::Deserialize)] #[serde(untagged)] pub enum RootCompositeUnionFnOutput { @@ -2346,22 +2346,22 @@ pub struct UserSelections { } impl_selection_traits!(UserSelections, id, email, posts); #[derive(Default, Debug)] -pub struct RootMixedUnionFnOutputSelections { +pub struct RootCompositeUnionFnOutputSelections { pub post: CompositeSelect, NoAlias>, pub user: CompositeSelect, NoAlias>, } impl_union_selection_traits!( - RootMixedUnionFnOutputSelections, + RootCompositeUnionFnOutputSelections, ("post", post), ("user", user) ); #[derive(Default, Debug)] -pub struct RootCompositeUnionFnOutputSelections { +pub struct RootMixedUnionFnOutputSelections { pub post: CompositeSelect, NoAlias>, pub user: CompositeSelect, NoAlias>, } impl_union_selection_traits!( - RootCompositeUnionFnOutputSelections, + RootMixedUnionFnOutputSelections, ("post", post), ("user", user) ); diff --git a/tests/metagen/typegraphs/sample/ts/client.ts b/tests/metagen/typegraphs/sample/ts/client.ts index c7ee9f6679..4992f54021 100644 --- a/tests/metagen/typegraphs/sample/ts/client.ts +++ b/tests/metagen/typegraphs/sample/ts/client.ts @@ -718,21 +718,6 @@ const nodeMetas = { return {}; }, - RootScalarNoArgsFn(): NodeMeta { - return { - ...nodeMetas.scalar(), - }; - }, - RootScalarArgsFn(): NodeMeta { - return { - ...nodeMetas.scalar(), - argumentTypes: { - id: "UserIdStringUuid", - slug: "PostSlugString", - title: "PostSlugString", - }, - }; - }, Post(): NodeMeta { return { subNodes: [ @@ -761,11 +746,18 @@ const nodeMetas = { ...nodeMetas.Post(), }; }, - RootCompositeArgsFn(): NodeMeta { + RootScalarNoArgsFn(): NodeMeta { return { - ...nodeMetas.Post(), + ...nodeMetas.scalar(), + }; + }, + RootScalarArgsFn(): NodeMeta { + return { + ...nodeMetas.scalar(), argumentTypes: { - id: "RootScalarArgsFnOutput", + id: "UserIdStringUuid", + slug: "PostSlugString", + title: "PostSlugString", }, }; }, @@ -774,17 +766,17 @@ const nodeMetas = { ...nodeMetas.Post(), }; }, - RootMixedUnionFnOutput(): NodeMeta { + RootCompositeArgsFn(): NodeMeta { return { - variants: [ - ["post", nodeMetas.Post], - ["user", nodeMetas.User], - ], + ...nodeMetas.Post(), + argumentTypes: { + id: "RootScalarArgsFnOutput", + }, }; }, - RootMixedUnionFn(): NodeMeta { + RootScalarUnionFn(): NodeMeta { return { - ...nodeMetas.RootMixedUnionFnOutput(), + ...nodeMetas.scalar(), argumentTypes: { id: "RootScalarArgsFnOutput", }, @@ -806,9 +798,17 @@ const nodeMetas = { }, }; }, - RootScalarUnionFn(): NodeMeta { + RootMixedUnionFnOutput(): NodeMeta { return { - ...nodeMetas.scalar(), + variants: [ + ["post", nodeMetas.Post], + ["user", nodeMetas.User], + ], + }; + }, + RootMixedUnionFn(): NodeMeta { + return { + ...nodeMetas.RootMixedUnionFnOutput(), argumentTypes: { id: "RootScalarArgsFnOutput", }, @@ -834,15 +834,15 @@ export type User = { posts: UserPostsPostList; }; export type RootScalarUnionFnOutputT1Integer = number; -export type RootMixedUnionFnOutput = - | (Post) - | (User) +export type RootScalarUnionFnOutput = | (RootScalarArgsFnOutput) | (RootScalarUnionFnOutputT1Integer); export type RootCompositeUnionFnOutput = | (Post) | (User); -export type RootScalarUnionFnOutput = +export type RootMixedUnionFnOutput = + | (Post) + | (User) | (RootScalarArgsFnOutput) | (RootScalarUnionFnOutputT1Integer); @@ -858,12 +858,12 @@ export type UserSelections = { email?: ScalarSelectNoArgs; posts?: CompositeSelectNoArgs; }; -export type RootMixedUnionFnOutputSelections = { +export type RootCompositeUnionFnOutputSelections = { _?: SelectionFlags; "post"?: CompositeSelectNoArgs; "user"?: CompositeSelectNoArgs; }; -export type RootCompositeUnionFnOutputSelections = { +export type RootMixedUnionFnOutputSelections = { _?: SelectionFlags; "post"?: CompositeSelectNoArgs; "user"?: CompositeSelectNoArgs; diff --git a/tests/metatype.yml b/tests/metatype.yml index 3be767ce58..53e2c6ee52 100644 --- a/tests/metatype.yml +++ b/tests/metatype.yml @@ -20,8 +20,12 @@ typegates: POSTGRES: "postgresql://postgres:password@localhost:5432/db?schema=e2e" sample: POSTGRES: "postgresql://postgres:password@localhost:5432/db?schema=sample" - migration-failure-test: + migration-failure-test-deploy: POSTGRES: "postgresql://postgres:password@localhost:5432/db?schema=e2e2" + migration-failure-test-dev: + POSTGRES: "postgresql://postgres:password@localhost:5432/db?schema=e2e3" + migration-failure-test-undeploy: + POSTGRES: "postgresql://postgres:password@localhost:5432/db?schema=e2e4" typegraphs: materializers: diff --git a/tests/prisma-migrations/full-prisma-mapping/prisma/migration_lock.toml b/tests/prisma-migrations/full-prisma-mapping/prisma/migration_lock.toml index 99e4f20090..fbffa92c2b 100644 --- a/tests/prisma-migrations/full-prisma-mapping/prisma/migration_lock.toml +++ b/tests/prisma-migrations/full-prisma-mapping/prisma/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually # It should be added in your version-control system (i.e. Git) -provider = "postgresql" +provider = "postgresql" \ No newline at end of file diff --git a/tests/prisma-migrations/mixed-runtime/prisma/migration_lock.toml b/tests/prisma-migrations/mixed-runtime/prisma/migration_lock.toml index 99e4f20090..fbffa92c2b 100644 --- a/tests/prisma-migrations/mixed-runtime/prisma/migration_lock.toml +++ b/tests/prisma-migrations/mixed-runtime/prisma/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually # It should be added in your version-control system (i.e. Git) -provider = "postgresql" +provider = "postgresql" \ No newline at end of file diff --git a/tests/prisma-migrations/multi-relations/prisma/migration_lock.toml b/tests/prisma-migrations/multi-relations/prisma/migration_lock.toml index 99e4f20090..fbffa92c2b 100644 --- a/tests/prisma-migrations/multi-relations/prisma/migration_lock.toml +++ b/tests/prisma-migrations/multi-relations/prisma/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually # It should be added in your version-control system (i.e. Git) -provider = "postgresql" +provider = "postgresql" \ No newline at end of file diff --git a/tests/prisma-migrations/multiple-runtimes/db1/migration_lock.toml b/tests/prisma-migrations/multiple-runtimes/db1/migration_lock.toml index 99e4f20090..fbffa92c2b 100644 --- a/tests/prisma-migrations/multiple-runtimes/db1/migration_lock.toml +++ b/tests/prisma-migrations/multiple-runtimes/db1/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually # It should be added in your version-control system (i.e. Git) -provider = "postgresql" +provider = "postgresql" \ No newline at end of file diff --git a/tests/prisma-migrations/multiple-runtimes/db2/migration_lock.toml b/tests/prisma-migrations/multiple-runtimes/db2/migration_lock.toml index 99e4f20090..fbffa92c2b 100644 --- a/tests/prisma-migrations/multiple-runtimes/db2/migration_lock.toml +++ b/tests/prisma-migrations/multiple-runtimes/db2/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually # It should be added in your version-control system (i.e. Git) -provider = "postgresql" +provider = "postgresql" \ No newline at end of file diff --git a/tests/prisma-migrations/normal-1-1/prisma/migration_lock.toml b/tests/prisma-migrations/normal-1-1/prisma/migration_lock.toml index 99e4f20090..fbffa92c2b 100644 --- a/tests/prisma-migrations/normal-1-1/prisma/migration_lock.toml +++ b/tests/prisma-migrations/normal-1-1/prisma/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually # It should be added in your version-control system (i.e. Git) -provider = "postgresql" +provider = "postgresql" \ No newline at end of file diff --git a/tests/prisma-migrations/optional-1-1/prisma/migration_lock.toml b/tests/prisma-migrations/optional-1-1/prisma/migration_lock.toml index 99e4f20090..fbffa92c2b 100644 --- a/tests/prisma-migrations/optional-1-1/prisma/migration_lock.toml +++ b/tests/prisma-migrations/optional-1-1/prisma/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually # It should be added in your version-control system (i.e. Git) -provider = "postgresql" +provider = "postgresql" \ No newline at end of file diff --git a/tests/prisma-migrations/optional-1-n/prisma/migration_lock.toml b/tests/prisma-migrations/optional-1-n/prisma/migration_lock.toml index 99e4f20090..fbffa92c2b 100644 --- a/tests/prisma-migrations/optional-1-n/prisma/migration_lock.toml +++ b/tests/prisma-migrations/optional-1-n/prisma/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually # It should be added in your version-control system (i.e. Git) -provider = "postgresql" +provider = "postgresql" \ No newline at end of file diff --git a/tests/prisma-migrations/prisma-edgecases/prisma/migration_lock.toml b/tests/prisma-migrations/prisma-edgecases/prisma/migration_lock.toml index 99e4f20090..fbffa92c2b 100644 --- a/tests/prisma-migrations/prisma-edgecases/prisma/migration_lock.toml +++ b/tests/prisma-migrations/prisma-edgecases/prisma/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually # It should be added in your version-control system (i.e. Git) -provider = "postgresql" +provider = "postgresql" \ No newline at end of file diff --git a/tests/prisma-migrations/prisma_normal/prisma/migration_lock.toml b/tests/prisma-migrations/prisma_normal/prisma/migration_lock.toml index 99e4f20090..fbffa92c2b 100644 --- a/tests/prisma-migrations/prisma_normal/prisma/migration_lock.toml +++ b/tests/prisma-migrations/prisma_normal/prisma/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually # It should be added in your version-control system (i.e. Git) -provider = "postgresql" +provider = "postgresql" \ No newline at end of file diff --git a/tests/prisma-migrations/prisma_opt_1/prisma/migration_lock.toml b/tests/prisma-migrations/prisma_opt_1/prisma/migration_lock.toml index 99e4f20090..fbffa92c2b 100644 --- a/tests/prisma-migrations/prisma_opt_1/prisma/migration_lock.toml +++ b/tests/prisma-migrations/prisma_opt_1/prisma/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually # It should be added in your version-control system (i.e. Git) -provider = "postgresql" +provider = "postgresql" \ No newline at end of file diff --git a/tests/runtimes/prisma/one_to_one_test.ts b/tests/runtimes/prisma/one_to_one_test.ts index 7e9ab901a6..d919d6f032 100644 --- a/tests/runtimes/prisma/one_to_one_test.ts +++ b/tests/runtimes/prisma/one_to_one_test.ts @@ -73,7 +73,7 @@ Meta.test("required 1-1 relationships", async (t) => { } } ` - .expectErrorContains("Foreign key constraint failed") + .expectErrorContains("Foreign key constraint violated") .on(e); }, ); diff --git a/tools/Dockerfile b/tools/Dockerfile index 626bc3219a..aa99c54dc8 100644 --- a/tools/Dockerfile +++ b/tools/Dockerfile @@ -1,6 +1,6 @@ # disable SHELL cmd down below if switching to non-debug ARG RUST_VERSION=1.80.1 -ARG DENO_VERSION=1.46.1 +ARG DENO_VERSION=1.46.3 ARG DISTROLESS_TAG=debug-nonroot # diff --git a/tools/consts.ts b/tools/consts.ts index 7e4960a223..30cd17692d 100644 --- a/tools/consts.ts +++ b/tools/consts.ts @@ -6,11 +6,11 @@ export const PUBLISHED_VERSION = "0.4.10"; export const GHJK_VERSION = "v0.2.1"; export const GHJK_ACTION_VERSION = "318209a9d215f70716a4ac89dbeb9653a2deb8bc"; export const RUST_VERSION = "1.80.1"; -export const DENO_VERSION = "1.46.1"; -export const WASMTIME_VERSION = "21.0.0"; -export const WASMTIME_PY_VERSION = "21.0.0"; +export const DENO_VERSION = "1.46.3"; +export const WASMTIME_VERSION = "25.0.2"; +export const WASMTIME_PY_VERSION = "25.0.0"; export const TYPEGRAPH_VERSION = "0.0.3"; -export const PRISMA_VERSION = "5.6.0"; +export const PRISMA_VERSION = "5.20.0"; export const SDK_PACKAGE_NAME_TS = "@typegraph/sdk"; export const PYTHON_VERSION = "3.9.19"; export const TAGLINE = @@ -92,10 +92,10 @@ export const sedLockLines: Record = { "examples/templates/**/package.json": [ [/(\s*"@typegraph\/sdk"\s*:\s*"\^).+(",?)/, METATYPE_VERSION], ], - "examples/**/*.ts": [ + "examples/templates/**/*.ts": [ [ /(import\s+.+\s+from "jsr:@typegraph\/sdk@)[^\/]+(\/.+";)/, - PUBLISHED_VERSION, + METATYPE_VERSION, ], ], "CONTRIBUTING.md": [[/(GHJK_VERSION=").*(")/, GHJK_VERSION]], diff --git a/tools/tasks/build.ts b/tools/tasks/build.ts index bdec473e99..b285c7918c 100644 --- a/tools/tasks/build.ts +++ b/tools/tasks/build.ts @@ -78,16 +78,6 @@ export default { "build-tgraph": { dependsOn: ["build-tgraph-py", "build-tgraph-ts-node"], }, - - "gen-pyrt-bind": { - inherit: "_wasm", - async fn($) { - await $.removeIfExists("./src/pyrt_wit_wire/wit_wire"); - await $`componentize-py -d ../wit/wit-wire.wit bindings .`.cwd( - "./src/pyrt_wit_wire", - ); - }, - }, "build-pyrt": { inherit: "_wasm", dependsOn: "gen-pyrt-bind", diff --git a/tools/tasks/dev.ts b/tools/tasks/dev.ts index 73ce16f8bb..cdaeadcb5f 100644 --- a/tools/tasks/dev.ts +++ b/tools/tasks/dev.ts @@ -73,7 +73,7 @@ export default { desc: "meta dev example/typegraphs", inherit: ["_rust", "_ecma", "_python"], fn: ($) => - $`cargo run -p meta-cli -- -C examples/typegraphs dev --run-destructive-migrations`, + $`cargo run -p meta-cli -- -C examples/typegraphs dev --run-destructive-migrations ${$.argv}`, }, "dev-gate1": { @@ -164,15 +164,4 @@ export default { }, fn: ($) => $`pnpm start --no-open`, }, - - // Note: make sure to call `ghjk x install-protobuf-rust` if not present - "dev-sub-gen": { - desc: "Regenerate substantial types", - workingDir: "src/substantial", - fn: ($) => { - // https://github.com/protocolbuffers/protobuf/issues/13346 - const protoFiles = ["protocol/events.proto", "protocol/metadata.proto"]; - return $`protoc --proto_path=. ${protoFiles} --rust_out=src/protocol`; - }, - }, } satisfies Record; diff --git a/tools/tasks/gen.ts b/tools/tasks/gen.ts new file mode 100644 index 0000000000..79af794885 --- /dev/null +++ b/tools/tasks/gen.ts @@ -0,0 +1,33 @@ +// Copyright Metatype OÜ, licensed under the Elastic License 2.0. +// SPDX-License-Identifier: Elastic-2.0 + +import type { DenoTaskDefArgs } from "../deps.ts"; +import { ports } from "../deps.ts"; + +export default { + "gen-pyrt-bind": { + inherit: "_wasm", + async fn($) { + await $.removeIfExists("./src/pyrt_wit_wire/wit_wire"); + await $`componentize-py -d ../wit/wit-wire.wit bindings .`.cwd( + "./src/pyrt_wit_wire", + ); + }, + }, + "gen-subs-protoc": { + desc: "Regenerate substantial types", + workingDir: "src/substantial", + inherit: "_rust", + installs: [ + ports.cargobi({ crateName: "protobuf-codegen", version: "3.5.1" }), + ], + fn: ($) => { + // https://github.com/protocolbuffers/protobuf/issues/13346 + const protoFiles = [ + "protocol/events.proto", + "protocol/metadata.proto", + ]; + return $`protoc --proto_path=. ${protoFiles} --rust_out=src/protocol --rust_opt=experimental-codegen=enabled,kernel=cpp`; + }, + }, +} satisfies Record; diff --git a/tools/tasks/install.ts b/tools/tasks/install.ts index 778b130157..4e39e033b5 100644 --- a/tools/tasks/install.ts +++ b/tools/tasks/install.ts @@ -106,11 +106,4 @@ export default { }); }, }, - // "install-protobuf-compiler": { - // fn: ($) => $`sudo apt install protobuf-compiler`, - // }, - "install-protobuf-rust": { - desc: "Enable rust codegen for protoc", - fn: ($) => $`cargo binstall protobuf-codegen@3.5.1`, - }, } satisfies Record; diff --git a/tools/tasks/mod.ts b/tools/tasks/mod.ts index 84faf94351..dd0274222f 100644 --- a/tools/tasks/mod.ts +++ b/tools/tasks/mod.ts @@ -3,17 +3,19 @@ import type { DenoTaskDefArgs } from "../deps.ts"; import tasksBuild from "./build.ts"; import tasksDev from "./dev.ts"; import tasksFetch from "./fetch.ts"; +import tasksGen from "./gen.ts"; import tasksInstall from "./install.ts"; import tasksLint from "./lint.ts"; import tasksLock from "./lock.ts"; import tasksTest from "./test.ts"; export default { - ...tasksBuild, - ...tasksDev, - ...tasksFetch, - ...tasksInstall, - ...tasksLint, - ...tasksLock, - ...tasksTest, + ...tasksBuild, + ...tasksDev, + ...tasksFetch, + ...tasksGen, + ...tasksInstall, + ...tasksLint, + ...tasksLock, + ...tasksTest, } satisfies Record; diff --git a/tools/test.ts b/tools/test.ts index cc32e1b898..2f616b621f 100755 --- a/tools/test.ts +++ b/tools/test.ts @@ -134,7 +134,7 @@ export async function testE2e(args: { CLICOLOR_FORCE: "1", // RUST_LOG: "trace", RUST_LOG: - "info,xtask=debug,meta=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off", + "info,xtask=debug,meta=debug,deno=warn,swc_ecma_codegen=off,tracing::span=off,typegate=trace", RUST_SPANTRACE: "1", // "RUST_BACKTRACE": "short", RUST_MIN_STACK: "8388608", @@ -215,9 +215,8 @@ export async function testE2e(args: { $.logStep(`${prefix} Building xtask and meta-cli...`); await $`cargo build -p meta-cli -F typegate --profile ${buildProfile} && mv target/${profile}/meta target/${profile}/meta-full - && cargo build -p xtask -p meta-cli --profile ${buildProfile}`.cwd( - wd, - ); + && cargo build -p xtask -p meta-cli --profile ${buildProfile}` + .cwd(wd); $.logStep(`Discovered ${queue.length} test files to run`);