Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
fix: modify blocks pb
qinluhe4582413e8966
diff --cc frontend/appflowy_tauri/src-tauri/Cargo.lockindex 93a06be85a,98208cea08..64068f46a7--- a/frontend/appflowy_tauri/src-tauri/Cargo.lock+++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock@@@ -23,7 -23,7 +23,18 @@@ version = "0.7.6source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"dependencies = [-- "getrandom 0.2.8",++ "getrandom 0.2.9",++ "once_cell",++ "version_check",++]++++[[package]]++name = "ahash"++version = "0.8.3"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"++dependencies = [++ "cfg-if","once_cell","version_check",]@@@ -106,9 -106,9 +117,9 @@@ checksum = "8da52d66c7071e2e3fa2a1e5c6d[[package]]name = "async-stream"--version = "0.3.4"++version = "0.3.5"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "ad445822218ce64be7a341abfb0b1ea43b5c23aa83902542a4542e78309d8e5e"++checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"dependencies = ["async-stream-impl","futures-core",@@@ -117,24 -117,24 +128,24 @@@[[package]]name = "async-stream-impl"--version = "0.3.4"++version = "0.3.5"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965"++checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"dependencies = ["proc-macro2","quote",-- "syn 1.0.109",++ "syn 2.0.15",][[package]]name = "async-trait"--version = "0.1.64"++version = "0.1.68"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2"++checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"dependencies = ["proc-macro2","quote",-- "syn 1.0.109",++ "syn 2.0.15",][[package]]@@@ -158,7 -158,7 +169,7 @@@ dependencies ="glib-sys","gobject-sys","libc",-- "system-deps 6.0.3",++ "system-deps 6.0.4",][[package]]@@@ -183,7 -183,7 +194,7 @@@ dependencies ="cc","cfg-if","libc",-- "miniz_oxide",++ "miniz_oxide 0.6.2","object","rustc-demangle",]@@@ -247,28 -247,28 +258,28 @@@ dependencies =[[package]]name = "block-buffer"--version = "0.10.3"++version = "0.10.4"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"++checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"dependencies = ["generic-array",][[package]]name = "borsh"--version = "0.10.2"++version = "0.10.3"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "40f9ca3698b2e4cb7c15571db0abc5551dca417a21ae8140460b50309bb2cc62"++checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b"dependencies = ["borsh-derive",-- "hashbrown",++ "hashbrown 0.13.2",][[package]]name = "borsh-derive"--version = "0.10.2"++version = "0.10.3"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "598b3eacc6db9c3ee57b22707ad8f6a8d2f6d442bfe24ffeb8cbb70ca59e6a35"++checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7"dependencies = ["borsh-derive-internal","borsh-schema-derive-internal",@@@ -279,9 -279,9 +290,9 @@@[[package]]name = "borsh-derive-internal"--version = "0.10.2"++version = "0.10.3"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "186b734fa1c9f6743e90c95d7233c9faab6360d1a96d4ffa19d9cfd1e9350f8a"++checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb"dependencies = ["proc-macro2","quote",@@@ -290,9 -290,9 +301,9 @@@[[package]]name = "borsh-schema-derive-internal"--version = "0.10.2"++version = "0.10.3"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "99b7ff1008316626f485991b960ade129253d4034014616b94f309a15366cc49"++checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd"dependencies = ["proc-macro2","quote",@@@ -312,9 -312,9 +323,9 @@@ dependencies =[[package]]name = "brotli-decompressor"--version = "2.3.2"++version = "2.3.4"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80"++checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744"dependencies = ["alloc-no-stdlib","alloc-stdlib",@@@ -322,9 -322,9 +333,9 @@@[[package]]name = "bstr"--version = "1.1.0"++version = "1.4.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b"++checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09"dependencies = ["memchr","serde",@@@ -332,25 -332,25 +343,26 @@@[[package]]name = "bumpalo"--version = "3.11.1"++version = "3.12.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"++checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"[[package]]name = "bytecheck"--version = "0.6.9"++version = "0.6.10"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "d11cac2c12b5adc6570dad2ee1b87eff4955dac476fe12d81e5fdd352e52406f"++checksum = "13fe11640a23eb24562225322cd3e452b93a3d4091d62fab69c70542fcd17d1f"dependencies = ["bytecheck_derive","ptr_meta",++ "simdutf8",][[package]]name = "bytecheck_derive"--version = "0.6.9"++version = "0.6.10"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf"++checksum = "e31225543cb46f81a7e224762764f4a6a0f097b1db0b175f69e8065efaa42de5"dependencies = ["proc-macro2","quote",@@@ -359,9 -359,9 +371,9 @@@[[package]]name = "bytemuck"--version = "1.12.3"++version = "1.13.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f"++checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"[[package]]name = "byteorder"@@@ -399,7 -399,7 +411,7 @@@ checksum = "3c55d429bef56ac9172d25fecb8dependencies = ["glib-sys","libc",-- "system-deps 6.0.3",++ "system-deps 6.0.4",][[package]]@@@ -409,14 -409,14 +421,14 @@@ source = "registry+https://github.com/rchecksum = "497049e9477329f8f6a559972ee42e117487d01d1e8c2cc9f836ea6fa23a9e1a"dependencies = ["serde",-- "toml",++ "toml 0.5.11",][[package]]name = "cc"--version = "1.0.78"++version = "1.0.79"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"++checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"[[package]]name = "cesu8"@@@ -445,9 -445,9 +457,9 @@@ dependencies =[[package]]name = "cfg-expr"--version = "0.11.0"++version = "0.14.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa"++checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6"dependencies = ["smallvec",]@@@ -475,24 -475,24 +487,24 @@@ dependencies =[[package]]name = "chrono-tz"--version = "0.6.3"++version = "0.6.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "29c39203181991a7dd4343b8005bd804e7a9a37afb8ac070e43771e8c820bbde"++checksum = "58549f1842da3080ce63002102d5bc954c7bc843d4f47818e642abdc36253552"dependencies = ["chrono","chrono-tz-build",-- "phf 0.11.1",++ "phf 0.10.1",][[package]]name = "chrono-tz-build"--version = "0.0.3"++version = "0.0.2"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "6f509c3a87b33437b05e2458750a0700e5bdd6956176773e6c7d6dd15a283a0c"++checksum = "db058d493fb2f65f41861bfed7e3fe6335264a9f0f92710cab5bdf01fef09069"dependencies = ["parse-zoneinfo",-- "phf 0.11.1",-- "phf_codegen 0.11.1",++ "phf 0.10.1",++ "phf_codegen 0.10.0",][[package]]@@@ -538,9 -538,9 +550,9 @@@ dependencies =[[package]]name = "cocoa-foundation"--version = "0.1.0"++version = "0.1.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318"++checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6"dependencies = ["bitflags","block",@@@ -564,7 -564,7 +576,7 @@@ dependencies =[[package]]name = "collab"version = "0.1.0"- source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#9b3f895bb6f8e92830acd90cfb68b69aece83095"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#4ccf3e5cf88ee71f1ce257e587cca54a8173abae"++source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#dd49b08fae2ad008844409c7ce6b8c754446955c"dependencies = ["anyhow","bytes",@@@ -582,7 -582,7 +594,7 @@@[[package]]name = "collab-derive"version = "0.1.0"- source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#9b3f895bb6f8e92830acd90cfb68b69aece83095"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#4ccf3e5cf88ee71f1ce257e587cca54a8173abae"++source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#dd49b08fae2ad008844409c7ce6b8c754446955c"dependencies = ["proc-macro2","quote",@@@ -591,10 -591,26 +603,26 @@@"yrs",]+ [[package]]+ name = "collab-document"+ version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#4ccf3e5cf88ee71f1ce257e587cca54a8173abae"++source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#dd49b08fae2ad008844409c7ce6b8c754446955c"+ dependencies = [+ "anyhow",+ "collab",+ "collab-derive",+ "collab-persistence",+ "nanoid",+ "parking_lot 0.12.1",+ "serde",+ "serde_json",+ "thiserror",+ ]+[[package]]name = "collab-folder"version = "0.1.0"- source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#9b3f895bb6f8e92830acd90cfb68b69aece83095"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#4ccf3e5cf88ee71f1ce257e587cca54a8173abae"++source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#dd49b08fae2ad008844409c7ce6b8c754446955c"dependencies = ["anyhow","collab",@@@ -612,7 -628,7 +640,7 @@@[[package]]name = "collab-persistence"version = "0.1.0"- source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#9b3f895bb6f8e92830acd90cfb68b69aece83095"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#4ccf3e5cf88ee71f1ce257e587cca54a8173abae"++source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab#dd49b08fae2ad008844409c7ce6b8c754446955c"dependencies = ["bincode","chrono",@@@ -686,9 -702,9 +714,9 @@@ dependencies =[[package]]name = "core-foundation-sys"--version = "0.8.3"++version = "0.8.4"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"++checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"[[package]]name = "core-graphics"@@@ -717,9 -733,9 +745,9 @@@ dependencies =[[package]]name = "cpufeatures"--version = "0.2.5"++version = "0.2.6"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"++checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181"dependencies = ["libc",]@@@ -735,9 -751,9 +763,9 @@@ dependencies =[[package]]name = "crossbeam-channel"--version = "0.5.6"++version = "0.5.8"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"++checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"dependencies = ["cfg-if","crossbeam-utils",@@@ -745,9 -761,9 +773,9 @@@[[package]]name = "crossbeam-deque"--version = "0.8.2"++version = "0.8.3"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"++checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"dependencies = ["cfg-if","crossbeam-epoch",@@@ -756,14 -772,14 +784,14 @@@[[package]]name = "crossbeam-epoch"--version = "0.9.13"++version = "0.9.14"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"++checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"dependencies = ["autocfg","cfg-if","crossbeam-utils",-- "memoffset 0.7.1",++ "memoffset","scopeguard",]@@@ -823,17 -839,17 +851,11 @@@ dependencies ="syn 1.0.109",]--[[package]]--name = "cty"--version = "0.2.2"--source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"--[[package]]name = "cxx"--version = "1.0.86"++version = "1.0.94"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579"++checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"dependencies = ["cc","cxxbridge-flags",@@@ -843,9 -859,9 +865,9 @@@[[package]]name = "cxx-build"--version = "1.0.86"++version = "1.0.94"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70"++checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"dependencies = ["cc","codespan-reporting",@@@ -853,24 -869,24 +875,24 @@@"proc-macro2","quote","scratch",-- "syn 1.0.109",++ "syn 2.0.15",][[package]]name = "cxxbridge-flags"--version = "1.0.86"++version = "1.0.94"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c"++checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"[[package]]name = "cxxbridge-macro"--version = "1.0.86"++version = "1.0.94"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"++checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"dependencies = ["proc-macro2","quote",-- "syn 1.0.109",++ "syn 2.0.15",][[package]]@@@ -915,10 -931,10 +937,10 @@@ source = "registry+https://github.com/rchecksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"dependencies = ["cfg-if",-- "hashbrown",++ "hashbrown 0.12.3","lock_api","once_cell",-- "parking_lot_core 0.9.6",++ "parking_lot_core 0.9.7",][[package]]@@@ -953,7 -969,7 +975,7 @@@ dependencies ="convert_case","proc-macro2","quote",-- "rustc_version 0.4.0",++ "rustc_version","syn 1.0.109",]@@@ -1010,7 -1026,7 +1032,7 @@@ version = "0.10.6source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"dependencies = [-- "block-buffer 0.10.3",++ "block-buffer 0.10.4","crypto-common",]@@@ -1043,9 -1059,9 +1065,9 @@@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae[[package]]name = "dissimilar"--version = "1.0.5"++version = "1.0.6"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "bd5f0c7e4bd266b8ab2550e6238d2e74977c23c15536ac7be45e9c95e2e3fbbb"++checksum = "210ec60ae7d710bed8683e333e9d2855a8a56a3e9892b38bad3bb0d4d29b0d5e"[[package]]name = "document-model"@@@ -1079,15 -1095,15 +1101,15 @@@ checksum = "0bd4b30a6560bbd9b4620f4de34[[package]]name = "dyn-clone"--version = "1.0.10"++version = "1.0.11"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60"++checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"[[package]]name = "either"--version = "1.8.0"++version = "1.8.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"++checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"[[package]]name = "embed_plist"@@@ -1103,13 -1119,13 +1125,34 @@@ checksum = "a357d28ed41a50f9c765dbfe56c[[package]]name = "encoding_rs"--version = "0.8.31"++version = "0.8.32"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"++checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"dependencies = ["cfg-if",]++[[package]]++name = "errno"++version = "0.3.1"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"++dependencies = [++ "errno-dragonfly",++ "libc",++ "windows-sys 0.48.0",++]++++[[package]]++name = "errno-dragonfly"++version = "0.1.2"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"++dependencies = [++ "cc",++ "libc",++]++[[package]]name = "error-chain"version = "0.12.0"@@@ -1152,33 -1168,33 +1195,42 @@@ dependencies =[[package]]name = "fastrand"--version = "1.8.0"++version = "1.9.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"++checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"dependencies = ["instant",]++[[package]]++name = "fdeflate"++version = "0.3.0"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"++dependencies = [++ "simd-adler32",++]++[[package]]name = "field-offset"--version = "0.3.4"++version = "0.3.5"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"++checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535"dependencies = [-- "memoffset 0.6.5",-- "rustc_version 0.3.3",++ "memoffset",++ "rustc_version",][[package]]name = "filetime"--version = "0.2.19"++version = "0.2.21"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"++checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"dependencies = ["cfg-if","libc","redox_syscall 0.2.16",-- "windows-sys 0.42.0",++ "windows-sys 0.48.0",][[package]]@@@ -1188,7 -1204,7 +1240,7 @@@ source = "registry+https://github.com/rchecksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"dependencies = ["crc32fast",-- "miniz_oxide",++ "miniz_oxide 0.6.2",][[package]]@@@ -1270,7 -1286,7 +1322,7 @@@ dependencies ="similar","syn 1.0.109","tera",-- "toml",++ "toml 0.5.11","walkdir",]@@@ -1741,9 -1781,9 +1817,9 @@@ dependencies =[[package]]name = "futures"--version = "0.3.26"++version = "0.3.28"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"++checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"dependencies = ["futures-channel","futures-core",@@@ -1756,9 -1796,9 +1832,9 @@@[[package]]name = "futures-channel"--version = "0.3.26"++version = "0.3.28"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"++checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"dependencies = ["futures-core","futures-sink",@@@ -1766,15 -1806,15 +1842,15 @@@[[package]]name = "futures-core"--version = "0.3.26"++version = "0.3.28"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"++checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"[[package]]name = "futures-executor"--version = "0.3.26"++version = "0.3.28"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"++checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"dependencies = ["futures-core","futures-task",@@@ -1783,38 -1823,38 +1859,38 @@@[[package]]name = "futures-io"--version = "0.3.26"++version = "0.3.28"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"++checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"[[package]]name = "futures-macro"--version = "0.3.26"++version = "0.3.28"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"++checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"dependencies = ["proc-macro2","quote",-- "syn 1.0.109",++ "syn 2.0.15",][[package]]name = "futures-sink"--version = "0.3.26"++version = "0.3.28"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"++checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"[[package]]name = "futures-task"--version = "0.3.26"++version = "0.3.28"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"++checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"[[package]]name = "futures-util"--version = "0.3.26"++version = "0.3.28"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"++checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"dependencies = ["futures-channel","futures-core",@@@ -1876,7 -1916,7 +1952,7 @@@ dependencies ="glib-sys","gobject-sys","libc",-- "system-deps 6.0.3",++ "system-deps 6.0.4",][[package]]@@@ -1893,7 -1933,7 +1969,7 @@@ dependencies ="libc","pango-sys","pkg-config",-- "system-deps 6.0.3",++ "system-deps 6.0.4",][[package]]@@@ -1905,28 -1945,28 +1981,28 @@@ dependencies ="gdk-sys","glib-sys","libc",-- "system-deps 6.0.3",++ "system-deps 6.0.4","x11",][[package]]name = "generator"--version = "0.7.2"++version = "0.7.3"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "d266041a359dfa931b370ef684cceb84b166beb14f7f0421f4a6a3d0c446d12e"++checksum = "33a20a288a94683f5f4da0adecdbe095c94a77c295e514cc6484e9394dd8376e"dependencies = ["cc","libc","log","rustversion",-- "windows",++ "windows 0.44.0",][[package]]name = "generic-array"--version = "0.14.6"++version = "0.14.7"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"++checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"dependencies = ["typenum","version_check",@@@ -1957,9 -1997,9 +2033,9 @@@ dependencies =[[package]]name = "getrandom"--version = "0.2.8"++version = "0.2.9"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"++checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"dependencies = ["cfg-if","libc",@@@ -1968,9 -2008,9 +2044,9 @@@[[package]]name = "gimli"--version = "0.27.0"++version = "0.27.2"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793"++checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"[[package]]name = "gio"@@@ -1998,7 -2038,7 +2074,7 @@@ dependencies ="glib-sys","gobject-sys","libc",-- "system-deps 6.0.3",++ "system-deps 6.0.4","winapi",]@@@ -2024,13 -2064,13 +2100,13 @@@ dependencies =[[package]]name = "glib-macros"--version = "0.15.11"++version = "0.15.13"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64"++checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a"dependencies = ["anyhow",-- "heck 0.4.0",-- "proc-macro-crate 1.2.1",++ "heck 0.4.1",++ "proc-macro-crate 1.3.1","proc-macro-error","proc-macro2","quote",@@@ -2044,7 -2084,7 +2120,7 @@@ source = "registry+https://github.com/rchecksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"dependencies = ["libc",-- "system-deps 6.0.3",++ "system-deps 6.0.4",][[package]]@@@ -2085,7 -2125,7 +2161,7 @@@ checksum = "0d57ce44246becd17153bd035abdependencies = ["glib-sys","libc",-- "system-deps 6.0.3",++ "system-deps 6.0.4",][[package]]@@@ -2126,17 -2166,17 +2202,17 @@@ dependencies ="gobject-sys","libc","pango-sys",-- "system-deps 6.0.3",++ "system-deps 6.0.4",][[package]]name = "gtk3-macros"--version = "0.15.4"++version = "0.15.6"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9"++checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d"dependencies = ["anyhow",-- "proc-macro-crate 1.2.1",++ "proc-macro-crate 1.3.1","proc-macro-error","proc-macro2","quote",@@@ -2145,9 -2185,9 +2221,9 @@@[[package]]name = "h2"--version = "0.3.15"++version = "0.3.17"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"++checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f"dependencies = ["bytes","fnv",@@@ -2168,7 -2208,7 +2244,16 @@@ version = "0.12.3source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"dependencies = [-- "ahash",++ "ahash 0.7.6",++]++++[[package]]++name = "hashbrown"++version = "0.13.2"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"++dependencies = [++ "ahash 0.8.3",][[package]]@@@ -2182,9 -2222,9 +2267,9 @@@ dependencies =[[package]]name = "heck"--version = "0.4.0"++version = "0.4.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"++checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"[[package]]name = "hermit-abi"@@@ -2195,6 -2235,6 +2280,12 @@@ dependencies ="libc",]++[[package]]++name = "hermit-abi"++version = "0.3.1"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"++[[package]]name = "html5ever"version = "0.25.2"@@@ -2211,13 -2251,13 +2302,13 @@@ dependencies =[[package]]name = "http"--version = "0.2.8"++version = "0.2.9"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"++checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"dependencies = ["bytes","fnv",-- "itoa 1.0.5",++ "itoa 1.0.6",][[package]]@@@ -2261,15 -2301,15 +2352,18 @@@ checksum = "c4a1e36c821dbe04574f602848a[[package]]name = "humansize"--version = "1.1.1"++version = "2.1.3"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026"++checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7"++dependencies = [++ "libm",++][[package]]name = "hyper"--version = "0.14.23"++version = "0.14.26"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"++checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"dependencies = ["bytes","futures-channel",@@@ -2280,7 -2320,7 +2374,7 @@@"http-body","httparse","httpdate",-- "itoa 1.0.5",++ "itoa 1.0.6","pin-project-lite","socket2","tokio",@@@ -2304,16 -2344,16 +2398,16 @@@ dependencies =[[package]]name = "iana-time-zone"--version = "0.1.53"++version = "0.1.56"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"++checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"dependencies = ["android_system_properties","core-foundation-sys","iana-time-zone-haiku","js-sys","wasm-bindgen",-- "winapi",++ "windows 0.48.0",][[package]]@@@ -2365,10 -2405,10 +2459,11 @@@ dependencies =[[package]]name = "ignore"--version = "0.4.19"++version = "0.4.18"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "a05705bc64e0b66a806c3740bd6578ea66051b157ec42dc219c785cbf185aef3"++checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"dependencies = [++ "crossbeam-utils","globset","lazy_static","log",@@@ -2382,9 -2422,9 +2477,9 @@@[[package]]name = "image"--version = "0.24.5"++version = "0.24.6"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945"++checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"dependencies = ["bytemuck","byteorder",@@@ -2395,20 -2435,20 +2490,20 @@@[[package]]name = "indexmap"--version = "1.9.2"++version = "1.9.3"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"++checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"dependencies = ["autocfg",-- "hashbrown",++ "hashbrown 0.12.3","serde",][[package]]name = "indextree"--version = "4.5.0"++version = "4.6.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "497f036ac2fae75c34224648a77802e5dd4e9cfb56f4713ab6b12b7160a0523b"++checksum = "c40411d0e5c63ef1323c3d09ce5ec6d84d71531e18daed0743fccea279d7deb6"[[package]]name = "infer"@@@ -2428,11 -2468,11 +2523,22 @@@ dependencies ="cfg-if",]++[[package]]++name = "io-lifetimes"++version = "1.0.10"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"++dependencies = [++ "hermit-abi 0.3.1",++ "libc",++ "windows-sys 0.48.0",++]++[[package]]name = "ipnet"--version = "2.7.1"++version = "2.7.2"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"++checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"[[package]]name = "itertools"@@@ -2451,9 -2491,9 +2557,9 @@@ checksum = "b71991ff56294aa922b450139ee[[package]]name = "itoa"--version = "1.0.5"++version = "1.0.6"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"++checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"[[package]]name = "javascriptcore-rs"@@@ -2500,9 -2540,9 +2606,9 @@@ checksum = "8eaf4bc02d17cbdd7ff4c7438ca[[package]]name = "js-sys"--version = "0.3.60"++version = "0.3.61"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"++checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"dependencies = ["wasm-bindgen",]@@@ -2659,9 -2699,9 +2765,15 @@@ dependencies =[[package]]name = "libc"--version = "0.2.139"++version = "0.2.141"+source = "registry+https://github.com/rust-lang/crates.io-index"- checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"++checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"++++[[package]]++name = "libm"++version = "0.2.6"+ source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"++checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"[[package]]name = "libsqlite3-sys"@@@ -2698,6 -2738,6 +2810,12 @@@ version = "0.5.6source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"++[[package]]++name = "linux-raw-sys"++version = "0.3.1"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"++[[package]]name = "lock_api"version = "0.4.9"@@@ -2781,9 -2821,9 +2899,9 @@@ dependencies =[[package]]name = "matches"--version = "0.1.9"++version = "0.1.10"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"++checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"[[package]]name = "md5"@@@ -2799,18 -2839,18 +2917,9 @@@ checksum = "2dffe52ecf27772e601905b7522[[package]]name = "memoffset"--version = "0.6.5"--source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"--dependencies = [-- "autocfg",--]----[[package]]--name = "memoffset"--version = "0.7.1"++version = "0.8.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"++checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"dependencies = ["autocfg",]@@@ -2838,9 -2878,9 +2947,9 @@@ dependencies =[[package]]name = "mime"--version = "0.3.16"++version = "0.3.17"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"++checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"[[package]]name = "miniz_oxide"@@@ -2851,16 -2891,16 +2960,26 @@@ dependencies ="adler",]++[[package]]++name = "miniz_oxide"++version = "0.7.1"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"++dependencies = [++ "adler",++ "simd-adler32",++]++[[package]]name = "mio"--version = "0.8.5"++version = "0.8.6"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"++checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"dependencies = ["libc","log","wasi 0.11.0+wasi-snapshot-preview1",-- "windows-sys 0.42.0",++ "windows-sys 0.45.0",][[package]]@@@ -2987,26 -3027,26 +3106,26 @@@ version = "1.15.0source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"dependencies = [-- "hermit-abi",++ "hermit-abi 0.2.6","libc",][[package]]name = "num_enum"--version = "0.5.7"++version = "0.5.11"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"++checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"dependencies = ["num_enum_derive",][[package]]name = "num_enum_derive"--version = "0.5.7"++version = "0.5.11"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"++checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"dependencies = [-- "proc-macro-crate 1.2.1",++ "proc-macro-crate 1.3.1","proc-macro2","quote","syn 1.0.109",@@@ -3042,9 -3082,9 +3161,9 @@@ dependencies =[[package]]name = "object"--version = "0.30.2"++version = "0.30.3"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "2b8c786513eb403643f2a88c244c2aaa270ef2153f55094587d0c48a3cf22a83"++checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"dependencies = ["memchr",]@@@ -3073,9 -3113,9 +3192,9 @@@ dependencies =[[package]]name = "openssl"--version = "0.10.45"++version = "0.10.50"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"++checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1"dependencies = ["bitflags","cfg-if",@@@ -3088,13 -3128,13 +3207,13 @@@[[package]]name = "openssl-macros"--version = "0.1.0"++version = "0.1.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"++checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"dependencies = ["proc-macro2","quote",-- "syn 1.0.109",++ "syn 2.0.15",][[package]]@@@ -3105,11 -3145,11 +3224,10 @@@ checksum = "ff011a302c396a5197692431fc1[[package]]name = "openssl-sys"--version = "0.9.80"++version = "0.9.85"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"++checksum = "0d3d193fb1488ad46ffe3aaabc912cc931d02ee8518fe2959aea8ef52718b0c0"dependencies = [-- "autocfg","cc","libc","pkg-config",@@@ -3154,7 -3194,7 +3272,7 @@@ dependencies ="glib-sys","gobject-sys","libc",-- "system-deps 6.0.3",++ "system-deps 6.0.4",][[package]]@@@ -3175,7 -3215,7 +3293,7 @@@ source = "registry+https://github.com/rchecksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"dependencies = ["lock_api",-- "parking_lot_core 0.9.6",++ "parking_lot_core 0.9.7",][[package]]@@@ -3194,15 -3234,15 +3312,15 @@@ dependencies =[[package]]name = "parking_lot_core"--version = "0.9.6"++version = "0.9.7"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"++checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"dependencies = ["cfg-if","libc","redox_syscall 0.2.16","smallvec",-- "windows-sys 0.42.0",++ "windows-sys 0.45.0",][[package]]@@@ -3216,9 -3256,9 +3334,9 @@@ dependencies =[[package]]name = "paste"--version = "1.0.11"++version = "1.0.12"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"++checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"[[package]]name = "pathdiff"@@@ -3234,9 -3274,9 +3352,9 @@@ checksum = "478c572c3d73181ff3c2539045f[[package]]name = "pest"--version = "2.5.3"++version = "2.5.7"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "4257b4a04d91f7e9e6290be5d3da4804dd5784fafde3a497d73eb2b4a158c30a"++checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122"dependencies = ["thiserror","ucd-trie",@@@ -3244,9 -3284,9 +3362,9 @@@[[package]]name = "pest_derive"--version = "2.5.3"++version = "2.5.7"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "241cda393b0cdd65e62e07e12454f1f25d57017dcc514b1514cd3c4645e3a0a6"++checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15"dependencies = ["pest","pest_generator",@@@ -3254,22 -3294,22 +3372,22 @@@[[package]]name = "pest_generator"--version = "2.5.3"++version = "2.5.7"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "46b53634d8c8196302953c74d5352f33d0c512a9499bd2ce468fc9f4128fa27c"++checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e"dependencies = ["pest","pest_meta","proc-macro2","quote",-- "syn 1.0.109",++ "syn 2.0.15",][[package]]name = "pest_meta"--version = "2.5.3"++version = "2.5.7"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "0ef4f1332a8d4678b41966bb4cc1d0676880e84183a1ecc3f4b69f03e99c7a51"++checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e"dependencies = ["once_cell","pest",@@@ -3298,15 -3338,15 +3416,6 @@@ dependencies ="proc-macro-hack",]--[[package]]--name = "phf"--version = "0.11.1"--source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"--dependencies = [-- "phf_shared 0.11.1",--]--[[package]]name = "phf_codegen"version = "0.8.0"@@@ -3319,12 -3359,12 +3428,12 @@@ dependencies =[[package]]name = "phf_codegen"--version = "0.11.1"++version = "0.10.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770"++checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"dependencies = [-- "phf_generator 0.11.1",-- "phf_shared 0.11.1",++ "phf_generator 0.10.0",++ "phf_shared 0.10.0",][[package]]@@@ -3347,16 -3387,16 +3456,6 @@@ dependencies ="rand 0.8.5",]--[[package]]--name = "phf_generator"--version = "0.11.1"--source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"--dependencies = [-- "phf_shared 0.11.1",-- "rand 0.8.5",--]--[[package]]name = "phf_macros"version = "0.8.0"@@@ -3399,15 -3439,15 +3498,6 @@@ name = "phf_sharedversion = "0.10.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"--dependencies = [-- "siphasher",--]----[[package]]--name = "phf_shared"--version = "0.11.1"--source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"dependencies = ["siphasher","uncased",@@@ -3453,28 -3493,28 +3543,29 @@@ checksum = "6ac9a59f73473f1b8d852421e59[[package]]name = "plist"--version = "1.3.1"++version = "1.4.3"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225"++checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590"dependencies = [-- "base64 0.13.1",++ "base64 0.21.0","indexmap","line-wrap",++ "quick-xml","serde",-- "time 0.3.17",-- "xml-rs",++ "time 0.3.20",][[package]]name = "png"--version = "0.17.7"++version = "0.17.8"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"++checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa"dependencies = ["bitflags","crc32fast",++ "fdeflate","flate2",-- "miniz_oxide",++ "miniz_oxide 0.7.1",][[package]]@@@ -3495,18 -3535,18 +3586,17 @@@ version = "0.1.5source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"dependencies = [-- "toml",++ "toml 0.5.11",][[package]]name = "proc-macro-crate"--version = "1.2.1"++version = "1.3.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"++checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"dependencies = ["once_cell",-- "thiserror",-- "toml",++ "toml_edit",][[package]]@@@ -3655,6 -3695,6 +3745,15 @@@ dependencies ="syn 1.0.109",]++[[package]]++name = "quick-xml"++version = "0.28.2"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1"++dependencies = [++ "memchr",++]++[[package]]name = "quote"version = "1.0.26"@@@ -3735,7 -3775,7 +3834,7 @@@ version = "0.6.4source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"dependencies = [-- "getrandom 0.2.8",++ "getrandom 0.2.9",][[package]]@@@ -3758,18 -3798,18 +3857,15 @@@ dependencies =[[package]]name = "raw-window-handle"--version = "0.5.0"++version = "0.5.2"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a"--dependencies = [-- "cty",--]++checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"[[package]]name = "rayon"--version = "1.6.1"++version = "1.7.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"++checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"dependencies = ["either","rayon-core",@@@ -3777,9 -3817,9 +3873,9 @@@[[package]]name = "rayon-core"--version = "1.10.1"++version = "1.11.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"++checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"dependencies = ["crossbeam-channel","crossbeam-deque",@@@ -3802,22 -3842,22 +3898,31 @@@ dependencies ="bitflags",]++[[package]]++name = "redox_syscall"++version = "0.3.5"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"++dependencies = [++ "bitflags",++]++[[package]]name = "redox_users"version = "0.4.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"dependencies = [-- "getrandom 0.2.8",++ "getrandom 0.2.9","redox_syscall 0.2.16","thiserror",][[package]]name = "regex"--version = "1.7.1"++version = "1.7.3"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"++checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"dependencies = ["aho-corasick","memchr",@@@ -3835,33 -3875,33 +3940,24 @@@ dependencies =[[package]]name = "regex-syntax"--version = "0.6.28"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"--[[package]]-name = "remove_dir_all"-version = "0.5.3"++version = "0.6.29"source = "registry+https://github.com/rust-lang/crates.io-index"- checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"-- [[package]]- name = "remove_dir_all"- version = "0.5.3"- source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"--dependencies = [-- "winapi",--]++checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"[[package]]name = "rend"--version = "0.3.6"++version = "0.4.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "79af64b4b6362ffba04eef3a4e10829718a4896dac19daa741851c86781edf95"++checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab"dependencies = ["bytecheck",][[package]]name = "reqwest"--version = "0.11.14"++version = "0.11.16"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9"++checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"dependencies = ["base64 0.21.0","bytes",@@@ -3906,12 -3946,12 +4002,12 @@@ dependencies =[[package]]name = "rkyv"--version = "0.7.39"++version = "0.7.41"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "cec2b3485b07d96ddfd3134767b8a447b45ea4eb91448d0a35180ec0ffd5ed15"++checksum = "21499ed91807f07ae081880aabb2ccc0235e9d88011867d984525e9a4c3cfa3e"dependencies = ["bytecheck",-- "hashbrown",++ "hashbrown 0.12.3","ptr_meta","rend","rkyv_derive",@@@ -3920,9 -3960,9 +4016,9 @@@[[package]]name = "rkyv_derive"--version = "0.7.39"++version = "0.7.41"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "6eaedadc88b53e36dd32d940ed21ae4d850d5916f2581526921f553a72ac34c4"++checksum = "ac1c672430eb41556291981f45ca900a0239ad007242d1cb4b4167af842db666"dependencies = ["proc-macro2","quote",@@@ -3931,9 -3971,9 +4027,9 @@@[[package]]name = "rust_decimal"--version = "1.28.1"++version = "1.29.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "e13cf35f7140155d02ba4ec3294373d513a3c7baa8364c162b030e33c61520a8"++checksum = "26bd36b60561ee1fb5ec2817f198b6fd09fa571c897a5e86d1487cfc2b096dfc"dependencies = ["arrayvec 0.7.2","borsh",@@@ -3949,9 -3989,9 +4045,9 @@@[[package]]name = "rust_decimal_macros"--version = "1.27.0"++version = "1.29.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "5a7e2dba1342e9f1166786a4329ba0d6d6b8d9db7e81d702ec9ba3b39591ddff"++checksum = "0e773fd3da1ed42472fdf3cfdb4972948a555bc3d73f5e0bdb99d17e7b54c687"dependencies = ["quote","rust_decimal",@@@ -3959,33 -3999,33 +4055,38 @@@[[package]]name = "rustc-demangle"--version = "0.1.21"++version = "0.1.22"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"++checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b"[[package]]name = "rustc_version"--version = "0.3.3"++version = "0.4.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"++checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"dependencies = [-- "semver 0.11.0",++ "semver",][[package]]--name = "rustc_version"--version = "0.4.0"++name = "rustix"++version = "0.37.11"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"++checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"dependencies = [-- "semver 1.0.16",++ "bitflags",++ "errno",++ "io-lifetimes",++ "libc",++ "linux-raw-sys",++ "windows-sys 0.48.0",][[package]]name = "rustversion"--version = "1.0.11"++version = "1.0.12"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"++checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"[[package]]name = "rusty-money"@@@ -3999,9 -4039,9 +4100,9 @@@ dependencies =[[package]]name = "ryu"--version = "1.0.12"++version = "1.0.13"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"++checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"[[package]]name = "safemem"@@@ -4029,9 -4069,9 +4130,9 @@@ dependencies =[[package]]name = "scheduled-thread-pool"--version = "0.2.6"++version = "0.2.7"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf"++checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19"dependencies = ["parking_lot 0.12.1",]@@@ -4050,9 -4090,9 +4151,9 @@@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f[[package]]name = "scratch"--version = "1.0.3"++version = "1.0.5"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"++checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"[[package]]name = "seahash"@@@ -4062,9 -4102,9 +4163,9 @@@ checksum = "1c107b6f4780854c8b126e228ea[[package]]name = "security-framework"--version = "2.7.0"++version = "2.8.2"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"++checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"dependencies = ["bitflags","core-foundation",@@@ -4075,9 -4115,9 +4176,9 @@@[[package]]name = "security-framework-sys"--version = "2.6.1"++version = "2.8.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"++checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"dependencies = ["core-foundation-sys","libc",@@@ -4105,36 -4145,36 +4206,18 @@@ dependencies =[[package]]name = "semver"--version = "0.11.0"--source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"--dependencies = [-- "semver-parser",--]----[[package]]--name = "semver"--version = "1.0.16"++version = "1.0.17"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"++checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"dependencies = ["serde",]--[[package]]--name = "semver-parser"--version = "0.10.2"--source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"--dependencies = [-- "pest",--]--[[package]]name = "serde"--version = "1.0.159"++version = "1.0.160"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"++checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"dependencies = ["serde_derive",]@@@ -4152,35 -4192,35 +4235,44 @@@ dependencies =[[package]]name = "serde_derive"--version = "1.0.159"++version = "1.0.160"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"++checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"dependencies = ["proc-macro2","quote",-- "syn 2.0.13",++ "syn 2.0.15",][[package]]name = "serde_json"--version = "1.0.95"++version = "1.0.96"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"++checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"dependencies = [-- "itoa 1.0.5",++ "itoa 1.0.6","ryu","serde",][[package]]name = "serde_repr"--version = "0.1.10"++version = "0.1.12"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e"++checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"dependencies = ["proc-macro2","quote",-- "syn 1.0.109",++ "syn 2.0.15",++]++++[[package]]++name = "serde_spanned"++version = "0.6.1"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"++dependencies = [++ "serde",][[package]]@@@ -4190,7 -4230,7 +4282,7 @@@ source = "registry+https://github.com/rchecksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"dependencies = ["form_urlencoded",-- "itoa 1.0.5",++ "itoa 1.0.6","ryu","serde",]@@@ -4284,13 -4324,13 +4376,25 @@@ dependencies =[[package]]name = "signal-hook-registry"--version = "1.4.0"++version = "1.4.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"++checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"dependencies = ["libc",]++[[package]]++name = "simd-adler32"++version = "0.3.5"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"++++[[package]]++name = "simdutf8"++version = "0.1.4"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"++[[package]]name = "similar"version = "1.3.0"@@@ -4305,9 -4345,9 +4409,9 @@@ checksum = "7bd3e3206899af3f8b12af284fa[[package]]name = "slab"--version = "0.4.7"++version = "0.4.8"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"++checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"dependencies = ["autocfg",]@@@ -4354,9 -4394,9 +4458,9 @@@ checksum = "a507befe795404456341dfab10c[[package]]name = "socket2"--version = "0.4.7"++version = "0.4.9"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"++checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"dependencies = ["libc","winapi",@@@ -4413,9 -4453,9 +4517,9 @@@ checksum = "a2eb9349b6444b326872e140eb1[[package]]name = "string_cache"--version = "0.8.4"++version = "0.8.7"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08"++checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"dependencies = ["new_debug_unreachable","once_cell",@@@ -4474,9 -4514,9 +4578,9 @@@ dependencies =[[package]]name = "syn"--version = "2.0.13"++version = "2.0.15"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"++checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"dependencies = ["proc-macro2","quote",@@@ -4492,20 -4532,20 +4596,20 @@@ dependencies ="cfg-expr 0.9.1","heck 0.3.3","pkg-config",-- "toml",++ "toml 0.5.11","version-compare 0.0.11",][[package]]name = "system-deps"--version = "6.0.3"++version = "6.0.4"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff"++checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f"dependencies = [-- "cfg-expr 0.11.0",-- "heck 0.4.0",++ "cfg-expr 0.14.0",++ "heck 0.4.1","pkg-config",-- "toml",++ "toml 0.7.3","version-compare 0.1.1",]@@@ -4549,8 -4589,8 +4653,8 @@@ dependencies ="scopeguard","serde","unicode-segmentation",-- "uuid 1.2.2",-- "windows",++ "uuid 1.3.1",++ "windows 0.39.0","windows-implement","x11-dl",]@@@ -4568,9 -4608,9 +4672,9 @@@ dependencies =[[package]]name = "tauri"--version = "1.2.3"++version = "1.2.4"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "5b48820ee3bb6a5031a83b2b6e11f8630bdc5a2f68cb841ab8ebc7a15a916679"++checksum = "fe7e0f1d535e7cbbbab43c82be4fc992b84f9156c16c160955617e0260ebc449"dependencies = ["anyhow","cocoa",@@@ -4582,7 -4622,7 +4686,7 @@@"glib","glob","gtk",-- "heck 0.4.0",++ "heck 0.4.1","http","ignore","objc",@@@ -4592,7 -4632,7 +4696,7 @@@"rand 0.8.5","raw-window-handle","regex",-- "semver 1.0.16",++ "semver","serde","serde_json","serde_repr",@@@ -4607,10 -4647,10 +4711,10 @@@"thiserror","tokio","url",-- "uuid 1.2.2",++ "uuid 1.3.1","webkit2gtk","webview2-com",-- "windows",++ "windows 0.39.0",][[package]]@@@ -4621,9 -4661,9 +4725,9 @@@ checksum = "8807c85d656b2b93927c19fe5a5dependencies = ["anyhow","cargo_toml",-- "heck 0.4.0",++ "heck 0.4.1","json-patch",-- "semver 1.0.16",++ "semver","serde_json","tauri-utils","winres",@@@ -4644,14 -4684,14 +4748,14 @@@ dependencies ="proc-macro2","quote","regex",-- "semver 1.0.16",++ "semver","serde","serde_json","sha2","tauri-utils","thiserror",-- "time 0.3.17",-- "uuid 1.2.2",++ "time 0.3.20",++ "uuid 1.3.1","walkdir",]@@@ -4661,7 -4701,7 +4765,7 @@@ version = "1.2.1source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075"dependencies = [-- "heck 0.4.0",++ "heck 0.4.1","proc-macro2","quote","syn 1.0.109",@@@ -4684,9 -4724,9 +4788,9 @@@ dependencies ="serde_json","tauri-utils","thiserror",-- "uuid 1.2.2",++ "uuid 1.3.1","webview2-com",-- "windows",++ "windows 0.39.0",][[package]]@@@ -4702,10 -4742,10 +4806,10 @@@ dependencies ="raw-window-handle","tauri-runtime","tauri-utils",-- "uuid 1.2.2",++ "uuid 1.3.1","webkit2gtk","webview2-com",-- "windows",++ "windows 0.39.0","wry",]@@@ -4718,7 -4758,7 +4822,7 @@@ dependencies ="brotli","ctor","glob",-- "heck 0.4.0",++ "heck 0.4.1","html5ever","infer","json-patch",@@@ -4727,28 -4767,28 +4831,27 @@@"phf 0.10.1","proc-macro2","quote",-- "semver 1.0.16",++ "semver","serde","serde_json","serde_with","thiserror","url","walkdir",-- "windows",++ "windows 0.39.0",][[package]]name = "tempfile"--version = "3.3.0"++version = "3.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"++checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"dependencies = ["cfg-if","fastrand",-- "libc",-- "redox_syscall 0.2.16",-- "remove_dir_all",-- "winapi",++ "redox_syscall 0.3.5",++ "rustix",++ "windows-sys 0.45.0",][[package]]@@@ -4764,9 -4804,9 +4867,9 @@@ dependencies =[[package]]name = "tera"--version = "1.17.1"++version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "3df578c295f9ec044ff1c829daf31bb7581d5b3c2a7a3d87419afe1f2531438c"++checksum = "95a665751302f22a03c56721e23094e4dc22b04a80f381e6737a07bf7a7c70c0"dependencies = ["chrono","chrono-tz",@@@ -4781,14 -4821,14 +4884,15 @@@"serde","serde_json","slug",++ "thread_local","unic-segment",][[package]]name = "termcolor"--version = "1.1.3"++version = "1.2.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"++checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"dependencies = ["winapi-util",]@@@ -4826,7 -4866,7 +4930,7 @@@ checksum = "f9456a42c5b0d803c8cd86e73dddependencies = ["proc-macro2","quote",-- "syn 2.0.13",++ "syn 2.0.15",][[package]]@@@ -4862,11 -4902,11 +4966,11 @@@ dependencies =[[package]]name = "time"--version = "0.3.17"++version = "0.3.20"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"++checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"dependencies = [-- "itoa 1.0.5",++ "itoa 1.0.6","serde","time-core","time-macros",@@@ -4880,9 -4920,9 +4984,9 @@@ checksum = "2e153e1f1acaef8acc537e68b44[[package]]name = "time-macros"--version = "0.2.6"++version = "0.2.8"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"++checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"dependencies = ["time-core",]@@@ -4898,20 -4938,20 +5002,19 @@@ dependencies =[[package]]name = "tinyvec_macros"--version = "0.1.0"++version = "0.1.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"++checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"[[package]]name = "tokio"--version = "1.26.0"++version = "1.27.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64"++checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"dependencies = ["autocfg","bytes","libc",-- "memchr","mio","num_cpus","parking_lot 0.12.1",@@@ -4924,20 -4964,20 +5027,20 @@@[[package]]name = "tokio-macros"--version = "1.8.2"++version = "2.0.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"++checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"dependencies = ["proc-macro2","quote",-- "syn 1.0.109",++ "syn 2.0.15",][[package]]name = "tokio-native-tls"--version = "0.3.0"++version = "0.3.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"++checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"dependencies = ["native-tls","tokio",@@@ -4958,9 -4998,9 +5061,9 @@@ dependencies =[[package]]name = "tokio-util"--version = "0.7.4"++version = "0.7.7"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"++checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"dependencies = ["bytes","futures-core",@@@ -4979,6 -5019,6 +5082,40 @@@ dependencies ="serde",]++[[package]]++name = "toml"++version = "0.7.3"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"++dependencies = [++ "serde",++ "serde_spanned",++ "toml_datetime",++ "toml_edit",++]++++[[package]]++name = "toml_datetime"++version = "0.6.1"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"++dependencies = [++ "serde",++]++++[[package]]++name = "toml_edit"++version = "0.19.8"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"++dependencies = [++ "indexmap",++ "serde",++ "serde_spanned",++ "toml_datetime",++ "winnow",++]++[[package]]name = "tower-service"version = "0.3.2"@@@ -5215,15 -5255,15 +5352,15 @@@ dependencies =[[package]]name = "unicode-bidi"--version = "0.3.8"++version = "0.3.13"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"++checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"[[package]]name = "unicode-ident"--version = "1.0.6"++version = "1.0.8"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"++checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"[[package]]name = "unicode-normalization"@@@ -5236,9 -5276,9 +5373,9 @@@ dependencies =[[package]]name = "unicode-segmentation"--version = "1.10.0"++version = "1.10.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"++checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"[[package]]name = "unicode-width"@@@ -5286,11 -5326,11 +5423,11 @@@ checksum = "bc5cf98d8186244414c848017f0[[package]]name = "uuid"--version = "1.2.2"++version = "1.3.1"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"++checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb"dependencies = [-- "getrandom 0.2.8",++ "getrandom 0.2.9",][[package]]@@@ -5340,12 -5380,12 +5477,11 @@@ checksum = "49874b5167b65d7193b8aba1567[[package]]name = "walkdir"--version = "2.3.2"++version = "2.3.3"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"++checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"dependencies = ["same-file",-- "winapi","winapi-util",]@@@ -5379,9 -5419,9 +5515,9 @@@ checksum = "9c8d87e72b64a3b4db28d11ce29[[package]]name = "wasm-bindgen"--version = "0.2.83"++version = "0.2.84"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"++checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"dependencies = ["cfg-if","wasm-bindgen-macro",@@@ -5389,9 -5429,9 +5525,9 @@@[[package]]name = "wasm-bindgen-backend"--version = "0.2.83"++version = "0.2.84"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"++checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"dependencies = ["bumpalo","log",@@@ -5404,9 -5444,9 +5540,9 @@@[[package]]name = "wasm-bindgen-futures"--version = "0.4.33"++version = "0.4.34"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"++checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"dependencies = ["cfg-if","js-sys",@@@ -5416,9 -5456,9 +5552,9 @@@[[package]]name = "wasm-bindgen-macro"--version = "0.2.83"++version = "0.2.84"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"++checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"dependencies = ["quote","wasm-bindgen-macro-support",@@@ -5426,9 -5466,9 +5562,9 @@@[[package]]name = "wasm-bindgen-macro-support"--version = "0.2.83"++version = "0.2.84"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"++checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"dependencies = ["proc-macro2","quote",@@@ -5439,15 -5479,15 +5575,15 @@@[[package]]name = "wasm-bindgen-shared"--version = "0.2.83"++version = "0.2.84"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"++checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"[[package]]name = "web-sys"--version = "0.3.60"++version = "0.3.61"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"++checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"dependencies = ["js-sys","wasm-bindgen",@@@ -5497,7 -5537,7 +5633,7 @@@ dependencies ="pango-sys","pkg-config","soup2-sys",-- "system-deps 6.0.3",++ "system-deps 6.0.4",][[package]]@@@ -5508,7 -5548,7 +5644,7 @@@ checksum = "b4a769c9f1a64a8734bde70caafdependencies = ["webview2-com-macros","webview2-com-sys",-- "windows",++ "windows 0.39.0","windows-implement",]@@@ -5533,16 -5573,16 +5669,16 @@@ dependencies ="serde","serde_json","thiserror",-- "windows",++ "windows 0.39.0","windows-bindgen","windows-metadata",][[package]]name = "which"--version = "4.3.0"++version = "4.4.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"++checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"dependencies = ["either","libc",@@@ -5594,6 -5634,6 +5730,24 @@@ dependencies ="windows_x86_64_msvc 0.39.0",]++[[package]]++name = "windows"++version = "0.44.0"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"++dependencies = [++ "windows-targets 0.42.2",++]++++[[package]]++name = "windows"++version = "0.48.0"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"++dependencies = [++ "windows-targets 0.48.0",++]++[[package]]name = "windows-bindgen"version = "0.39.0"@@@ -5626,13 -5666,13 +5780,13 @@@ version = "0.42.0source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"dependencies = [-- "windows_aarch64_gnullvm",-- "windows_aarch64_msvc 0.42.1",-- "windows_i686_gnu 0.42.1",-- "windows_i686_msvc 0.42.1",-- "windows_x86_64_gnu 0.42.1",-- "windows_x86_64_gnullvm",-- "windows_x86_64_msvc 0.42.1",++ "windows_aarch64_gnullvm 0.42.2",++ "windows_aarch64_msvc 0.42.2",++ "windows_i686_gnu 0.42.2",++ "windows_i686_msvc 0.42.2",++ "windows_x86_64_gnu 0.42.2",++ "windows_x86_64_gnullvm 0.42.2",++ "windows_x86_64_msvc 0.42.2",][[package]]@@@ -5641,22 -5681,22 +5795,46 @@@ version = "0.45.0source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"dependencies = [-- "windows-targets",++ "windows-targets 0.42.2",++]++++[[package]]++name = "windows-sys"++version = "0.48.0"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"++dependencies = [++ "windows-targets 0.48.0",+]++[[package]]+name = "windows-targets"- version = "0.42.1"++version = "0.42.2"+source = "registry+https://github.com/rust-lang/crates.io-index"- checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"++checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"+dependencies = [- "windows_aarch64_gnullvm",- "windows_aarch64_msvc 0.42.1",- "windows_i686_gnu 0.42.1",- "windows_i686_msvc 0.42.1",- "windows_x86_64_gnu 0.42.1",- "windows_x86_64_gnullvm",- "windows_x86_64_msvc 0.42.1",++ "windows_aarch64_gnullvm 0.42.2",++ "windows_aarch64_msvc 0.42.2",++ "windows_i686_gnu 0.42.2",++ "windows_i686_msvc 0.42.2",++ "windows_x86_64_gnu 0.42.2",++ "windows_x86_64_gnullvm 0.42.2",++ "windows_x86_64_msvc 0.42.2",+ ]++ [[package]]+ name = "windows-targets"-version = "0.42.1"++version = "0.48.0"+ source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"++checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"+ dependencies = [- "windows_aarch64_gnullvm",- "windows_aarch64_msvc 0.42.1",- "windows_i686_gnu 0.42.1",- "windows_i686_msvc 0.42.1",- "windows_x86_64_gnu 0.42.1",- "windows_x86_64_gnullvm",- "windows_x86_64_msvc 0.42.1",++ "windows_aarch64_gnullvm 0.48.0",++ "windows_aarch64_msvc 0.48.0",++ "windows_i686_gnu 0.48.0",++ "windows_i686_msvc 0.48.0",++ "windows_x86_64_gnu 0.48.0",++ "windows_x86_64_gnullvm 0.48.0",++ "windows_x86_64_msvc 0.48.0",][[package]]@@@ -5667,9 -5707,9 +5845,15 @@@ checksum = "f838de2fe15fe6bac988e74b798[[package]]name = "windows_aarch64_gnullvm"--version = "0.42.1"++version = "0.42.2"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"++++[[package]]++name = "windows_aarch64_gnullvm"++version = "0.48.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"++checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"[[package]]name = "windows_aarch64_msvc"@@@ -5679,9 -5719,9 +5863,15 @@@ checksum = "ec7711666096bd4096ffa835238[[package]]name = "windows_aarch64_msvc"--version = "0.42.1"++version = "0.42.2"+source = "registry+https://github.com/rust-lang/crates.io-index"- checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"++checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"++++[[package]]++name = "windows_aarch64_msvc"++version = "0.48.0"+ source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"++checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"[[package]]name = "windows_i686_gnu"@@@ -5691,9 -5731,9 +5881,15 @@@ checksum = "763fc57100a5f7042e3057e7e8d[[package]]name = "windows_i686_gnu"--version = "0.42.1"++version = "0.42.2"+source = "registry+https://github.com/rust-lang/crates.io-index"- checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"++checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"++++[[package]]++name = "windows_i686_gnu"++version = "0.48.0"+ source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"++checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"[[package]]name = "windows_i686_msvc"@@@ -5703,9 -5743,9 +5899,15 @@@ checksum = "7bc7cbfe58828921e10a9f446fc[[package]]name = "windows_i686_msvc"--version = "0.42.1"++version = "0.42.2"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"++++[[package]]++name = "windows_i686_msvc"++version = "0.48.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"++checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"[[package]]name = "windows_x86_64_gnu"@@@ -5715,15 -5755,15 +5917,27 @@@ checksum = "6868c165637d653ae1e8dc4d82c[[package]]name = "windows_x86_64_gnu"--version = "0.42.1"++version = "0.42.2"+source = "registry+https://github.com/rust-lang/crates.io-index"- checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"++checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"++++[[package]]++name = "windows_x86_64_gnu"++version = "0.48.0"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"++[[package]]+name = "windows_x86_64_gnullvm"- version = "0.42.1"++version = "0.42.2"source = "registry+https://github.com/rust-lang/crates.io-index"- checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"++checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"++ [[package]]+ name = "windows_x86_64_gnullvm"-version = "0.42.1"++version = "0.48.0"+ source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"++checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"[[package]]name = "windows_x86_64_msvc"@@@ -5733,9 -5773,9 +5947,24 @@@ checksum = "5e4d40883ae9cae962787ca76ba[[package]]name = "windows_x86_64_msvc"--version = "0.42.1"++version = "0.42.2"++source = "registry+https://github.com/rust-lang/crates.io-index"++checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"++++[[package]]++name = "windows_x86_64_msvc"++version = "0.48.0"+source = "registry+https://github.com/rust-lang/crates.io-index"- checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"++checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"++++[[package]]++name = "winnow"++version = "0.4.1"+ source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"++checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"++dependencies = [++ "memchr",++][[package]]name = "winreg"@@@ -5752,7 -5792,7 +5981,7 @@@ version = "0.1.12source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c"dependencies = [-- "toml",++ "toml 0.5.11",][[package]]@@@ -5789,7 -5829,7 +6018,7 @@@ dependencies ="webkit2gtk","webkit2gtk-sys","webview2-com",-- "windows",++ "windows 0.39.0","windows-implement",]@@@ -5806,9 -5846,9 +6035,9 @@@ dependencies =[[package]]name = "x11"--version = "2.20.1"++version = "2.21.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "c2638d5b9c17ac40575fb54bb461a4b1d2a8d1b4ffcc4ff237d254ec59ddeb82"++checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e"dependencies = ["libc","pkg-config",@@@ -5816,12 -5856,12 +6045,12 @@@[[package]]name = "x11-dl"--version = "2.20.1"++version = "2.21.0"source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0"++checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"dependencies = [-- "lazy_static","libc",++ "once_cell","pkg-config",]@@@ -5834,12 -5874,12 +6063,6 @@@ dependencies ="libc",]--[[package]]--name = "xml-rs"--version = "0.8.4"--source = "registry+https://github.com/rust-lang/crates.io-index"--checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"--[[package]]name = "y-sync"version = "0.3.0"diff --cc frontend/appflowy_tauri/src/appflowy_app/components/document/BlockSideTools/BlockSideTools.hooks.tsxindex c707e4c4e1,c707e4c4e1..8e4485a80e--- a/frontend/appflowy_tauri/src/appflowy_app/components/document/BlockSideTools/BlockSideTools.hooks.tsx+++ b/frontend/appflowy_tauri/src/appflowy_app/components/document/BlockSideTools/BlockSideTools.hooks.tsx@@@ -1,4 -1,4 +1,4 @@@--import { BlockType } from '@/appflowy_app/interfaces/document';++import { BlockType, HeadingBlockData } from '@/appflowy_app/interfaces/document';import { useAppSelector } from '@/appflowy_app/stores/store';import { debounce } from '@/appflowy_app/utils/tool';import { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';@@@ -43,9 -43,9 +43,10 @@@ export function useBlockSideTools({ conel.style.zIndex = '1';el.style.top = '1px';if (node?.type === BlockType.HeadingBlock) {-- if (node.data.style?.level === 1) {++ const nodeData = node.data as HeadingBlockData;++ if (nodeData.level === 1) {el.style.top = '8px';-- } else if (node.data.style?.level === 2) {++ } else if (nodeData.level === 2) {el.style.top = '6px';} else {el.style.top = '5px';@@@ -80,16 -80,16 +81,7 @@@ function useController()const parentId = node.parent;if (!parentId || !controller) return;-- controller.transact([-- () => {-- const newNode = {-- id: v4(),-- delta: [],-- type: BlockType.TextBlock,-- };-- controller.insert(newNode, parentId, node.id);-- },-- ]);++ //}, []);return {diff --cc frontend/appflowy_tauri/src/appflowy_app/components/document/DocumentTitle/index.tsxindex 2a7815b536,2a7815b536..b7abbe4ca3--- a/frontend/appflowy_tauri/src/appflowy_app/components/document/DocumentTitle/index.tsx+++ b/frontend/appflowy_tauri/src/appflowy_app/components/document/DocumentTitle/index.tsx@@@ -3,11 -3,11 +3,18 @@@ import { useDocumentTitle } from './Docimport TextBlock from '../TextBlock';export default function DocumentTitle({ id }: { id: string }) {-- const { node, delta } = useDocumentTitle(id);++ const { node } = useDocumentTitle(id);if (!node) return null;return (<div data-block-id={node.id} className='doc-title relative pt-[50px] text-4xl font-bold'>-- <TextBlock placeholder='Untitled' childIds={[]} delta={delta || []} node={node} />++ <TextBlock placeholder='Untitled' childIds={[]} node={{++ ...node,++ data: {++ ...node.data,++ delta: node.data.delta || [],++ }++ }} />++</div>);}diff --cc frontend/appflowy_tauri/src/appflowy_app/components/document/HeadingBlock/index.tsxindex 186d98e51c,186d98e51c..ad2dfcf69d--- a/frontend/appflowy_tauri/src/appflowy_app/components/document/HeadingBlock/index.tsx+++ b/frontend/appflowy_tauri/src/appflowy_app/components/document/HeadingBlock/index.tsx@@@ -11,7 -11,7 +11,7 @@@ const fontSize: Record<string, string>export default function HeadingBlock({ node, delta }: { node: Node; delta: TextDelta[] }) {return (<div className={`${fontSize[node.data.style?.level]} font-semibold `}>-- <TextBlock node={node} childIds={[]} delta={delta} />++ {/*<TextBlock node={node} childIds={[]} delta={delta} />*/}</div>);}diff --cc frontend/appflowy_tauri/src/appflowy_app/components/document/ListBlock/index.tsxindex a33b36cbde,a33b36cbde..5d8671ac44--- a/frontend/appflowy_tauri/src/appflowy_app/components/document/ListBlock/index.tsx+++ b/frontend/appflowy_tauri/src/appflowy_app/components/document/ListBlock/index.tsx@@@ -11,7 -11,7 +11,7 @@@ export default function ListBlock({ nodif (node.data.style?.type === 'column') return <></>;return (<div className='flex-1'>-- <TextBlock delta={delta} node={node} childIds={[]} />++ {/*<TextBlock delta={delta} node={node} childIds={[]} />*/}</div>);}, [node, delta]);diff --cc frontend/appflowy_tauri/src/appflowy_app/components/document/VirtualizedList/VirtualizedList.hooks.tsxindex e9a8513f2e,c0e543bf5f..cd58fa997b--- a/frontend/appflowy_tauri/src/appflowy_app/components/document/VirtualizedList/VirtualizedList.hooks.tsx+++ b/frontend/appflowy_tauri/src/appflowy_app/components/document/VirtualizedList/VirtualizedList.hooks.tsx@@@ -3,10 -3,10 +3,10 @@@ import { useRef } from 'react'const defaultSize = 60;-export function useVirtualizerList(count: number) {+export function useVirtualizedList(count: number) {const parentRef = useRef<HTMLDivElement>(null);- const Virtualize = useVirtualizer({- const rowVirtualizer = useVirtualizer({++ const virtualize = useVirtualizer({count,getScrollElement: () => parentRef.current,estimateSize: () => {@@@ -15,7 -15,7 +15,7 @@@});return {- Virtualize: Virtualize,- rowVirtualizer,++ virtualize,parentRef,};}diff --cc frontend/appflowy_tauri/src/appflowy_app/components/document/VirtualizedList/index.tsxindex 83f2731213,5b3253b299..e418024422--- a/frontend/appflowy_tauri/src/appflowy_app/components/document/VirtualizedList/index.tsx+++ b/frontend/appflowy_tauri/src/appflowy_app/components/document/VirtualizedList/index.tsx@@@ -13,8 -13,9 +13,8 @@@ export default function VirtualizedListnode: Node;renderNode: (nodeId: string) => JSX.Element;}) {- const { Virtualize, parentRef } = useVirtualizedList(childIds.length);- const virtualItems = Virtualize.getVirtualItems();- const { rowVirtualizer, parentRef } = useVirtualizerList(childIds.length);-- const virtualItems = rowVirtualizer.getVirtualItems();++ const { virtualize, parentRef } = useVirtualizedList(childIds.length);++ const virtualItems = virtualize.getVirtualItems();return (<>@@@ -25,7 -26,7 +25,7 @@@<divclassName='doc-body max-w-screen w-[900px] min-w-0'style={{- height: Virtualize.getTotalSize(),- height: rowVirtualizer.getTotalSize(),++ height: virtualize.getTotalSize(),position: 'relative',}}>@@@ -42,7 -43,7 +42,7 @@@{virtualItems.map((virtualRow) => {const id = childIds[virtualRow.index];return (- <div className='p-[1px]' key={id} data-index={virtualRow.index} ref={Virtualize.measureElement}>- <div className='p-[1px]' key={id} data-index={virtualRow.index} ref={rowVirtualizer.measureElement}>++ <div className='p-[1px]' key={id} data-index={virtualRow.index} ref={virtualize.measureElement}>{virtualRow.index === 0 ? <DocumentTitle id={node.id} /> : null}{renderNode(id)}</div>diff --cc frontend/appflowy_tauri/src/appflowy_app/components/tests/TestDocument.tsxindex aad7621e36,aad7621e36..8508232eb9--- a/frontend/appflowy_tauri/src/appflowy_app/components/tests/TestDocument.tsx+++ b/frontend/appflowy_tauri/src/appflowy_app/components/tests/TestDocument.tsx@@@ -8,7 -8,7 +8,7 @@@ async function testCreateDocument()const document = await svc.open().then((result) => result.unwrap());// eslint-disable-next-line @typescript-eslint/no-unused-vars-- const content = JSON.parse(document.content);++ // const content = JSON.parse(document.content);// The initial document content:// {// "document": {diff --cc frontend/appflowy_tauri/src/appflowy_app/interfaces/document.tsindex 9f4198fbc0,0cfefe0d75..f4a0f665f7--- a/frontend/appflowy_tauri/src/appflowy_app/interfaces/document.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/interfaces/document.ts@@@ -10,8 -10,8 +10,19 @@@ export enum BlockTypeDividerBlock = 'divider',MediaBlock = 'media',TableBlock = 'table',- ColumnBlock = 'column'+ ColumnBlock = 'column',}++++export interface HeadingBlockData {++ level: number;++}++++export interface TextBlockData {++ delta: TextDelta[];++}++++export interface PageBlockData extends TextBlockData {}++export interface NestedBlock {id: string;type: BlockType;diff --cc frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_bd_svc.tsindex c582b1f7d2,43c79e09f4..7ec2659139--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_bd_svc.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_bd_svc.ts@@@ -13,18 -24,40 +24,25 @@@ importexport class DocumentBackendService {constructor(public readonly viewId: string) {}-- open = (): Promise<Result<DocumentDataPB, FlowyError>> => {-- const payload = OpenDocumentPayloadPB.fromObject({ document_id: this.viewId, version: DocumentVersionPB.V1 });-- return DocumentEventGetDocument(payload);- };-- applyEdit = (operations: string) => {- const payload = EditPayloadPB.fromObject({ doc_id: this.viewId, operations: operations });- return DocumentEventApplyEdit(payload);- };-- close = () => {- const payload = ViewIdPB.fromObject({ value: this.viewId });- return FolderEventCloseView(payload);- };-- openV2 = (): Promise<Result<DocumentDataPB2, FlowyError>> => {++ open = (): Promise<Result<DocumentDataPB2, FlowyError>> => {+ const payload = OpenDocumentPayloadPBV2.fromObject({+ document_id: this.viewId,+ });+ return DocumentEvent2OpenDocument(payload);};- applyEdit = (operations: string) => {- const payload = EditPayloadPB.fromObject({ doc_id: this.viewId, operations: operations });- return DocumentEventApplyEdit(payload);+ applyActions = (actions: [BlockActionPB]): Promise<Result<void, FlowyError>> => {+ const payload = ApplyActionPayloadPBV2.fromObject({+ document_id: this.viewId,+ actions: actions,+ });+ return DocumentEvent2ApplyAction(payload);};- close = () => {- const payload = ViewIdPB.fromObject({ value: this.viewId });- return FolderEventCloseView(payload);- closeV2 = (): Promise<Result<void, FlowyError>> => {++ close = (): Promise<Result<void, FlowyError>> => {+ const payload = CloseDocumentPayloadPBV2.fromObject({+ document_id: this.viewId,+ });+ return DocumentEvent2CloseDocument(payload);};}diff --cc frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_controller.tsindex 82a24d273b,51f4a73154..2d0b169d26--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_controller.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_controller.ts@@@ -1,6 -1,10 +1,8 @@@--import { DocumentData, BlockType, TextDelta } from '@/appflowy_app/interfaces/document';++import { DocumentData, BlockType } from '@/appflowy_app/interfaces/document';import { createContext } from 'react';import { DocumentBackendService } from './document_bd_svc';-import { Err } from 'ts-results';-import { BlockActionPB, BlockActionPayloadPB, BlockActionTypePB, BlockPB, FlowyError } from '@/services/backend';++import { FlowyError } from '@/services/backend';+ import { DocumentObserver } from './document_observer';-import { nanoid } from 'nanoid';export const DocumentControllerContext = createContext<DocumentController | null>(null);@@@ -9,29 -14,66 +12,50 @@@ export class DocumentControllerconstructor(public readonly viewId: string) {this.backendService = new DocumentBackendService(viewId);+ this.observer = new DocumentObserver(viewId);}-- open = async (): Promise<DocumentData | null> => {- const openDocumentResult = await this.backendService.open();- if (openDocumentResult.ok) {++ open = async (): Promise<DocumentData | FlowyError> => {+ // example:+ await this.observer.subscribe({+ didReceiveUpdate: () => {+ console.log('didReceiveUpdate');+ },+ });+- const document = await this.backendService.openV2();- let root_id = '';++ const document = await this.backendService.open();+ if (document.ok) {- root_id = document.val.page_id;- console.log(document.val.blocks);- }- await this.backendService.applyActions([- BlockActionPB.fromObject({- action: BlockActionTypePB.Insert,- payload: BlockActionPayloadPB.fromObject({- block: BlockPB.fromObject({- id: nanoid(10),- ty: 'text',- parent_id: root_id,- }),- }),- }),- ]);-- const openDocumentResult = await this.backendService.open();- if (openDocumentResult.ok) {++ console.log(document.val);++ const blocks: DocumentData["blocks"] = {};++ document.val.blocks.forEach((block) => {++ blocks[block.id] = {++ id: block.id,++ type: block.ty as BlockType,++ parent: block.parent_id,++ children: block.children_id,++ data: JSON.parse(block.data),++ };++ });++ const childrenMap: Record<string, string[]> = {};++ document.val.meta.children_map.forEach((child, key) => { childrenMap[key] = child.children; });return {-- rootId: '',-- blocks: {},- ytexts: {},- yarrays: {},- };- } else {- return null;++ rootId: document.val.page_id,++ blocks,+ meta: {- childrenMap: {},- },- };- } else {- return null;++ childrenMap++ }++ }}- };++ return document.val;+- insert(- node: {- id: string;- type: BlockType;- delta?: TextDelta[];- },- parentId: string,- prevId: string- ) {- //- }-- transact(actions: (() => void)[]) {- //- }+ };- yTextApply = (yTextId: string, delta: TextDelta[]) => {+ applyActions = (+ actions: {+ type: string;+ payload: any;+ }[]+ ) => {//};diff --cc frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_observer.tsindex 0000000000,908f02ce1b..7c9b2cb002mode 000000,100644..100644--- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_observer.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/document/document_observer.ts@@@ -1,0 -1,36 +1,36 @@@+ import { Ok, Result } from 'ts-results';+ import { ChangeNotifier } from '$app/utils/change_notifier';+ import { FolderNotificationObserver } from '../folder/notifications/observer';+ import { DocumentNotification } from '@/services/backend';+ import { DocumentNotificationObserver } from './notifications/observer';++ export type DidReceiveUpdateCallback = () => void; // todo: add params++ export class DocumentObserver {+ private listener?: DocumentNotificationObserver;++ constructor(public readonly workspaceId: string) {}++ subscribe = async (callbacks: { didReceiveUpdate: DidReceiveUpdateCallback }) => {+ this.listener = new DocumentNotificationObserver({+ viewId: this.workspaceId,+ parserHandler: (notification, result) => {+ switch (notification) {+ case DocumentNotification.DidReceiveUpdate:+ callbacks.didReceiveUpdate();+ // Fixme: ...+ break;+ default:+ break;+ }+ },+ });+ await this.listener.start();+ };++ unsubscribe = async () => {- this.appListNotifier.unsubscribe();- this.workspaceNotifier.unsubscribe();++ // this.appListNotifier.unsubscribe();++ // this.workspaceNotifier.unsubscribe();+ await this.listener?.stop();+ };+ }diff --cc frontend/appflowy_tauri/src/appflowy_app/views/DocumentPage.hooks.tsindex d9016e2586,d9016e2586..ba2a543838--- a/frontend/appflowy_tauri/src/appflowy_app/views/DocumentPage.hooks.ts+++ b/frontend/appflowy_tauri/src/appflowy_app/views/DocumentPage.hooks.ts@@@ -23,7 -23,7 +23,7 @@@ export const useDocument = () =>const res = await c.open();console.log(res)if (!res) return;-- setDocumentData(res)++ // setDocumentData(res)setDocumentId(params.id)})();diff --cc frontend/rust-lib/flowy-document2/src/document.rsindex 0000000000,49b139d7f3..e30cc4ccfcmode 000000,100644..100644--- a/frontend/rust-lib/flowy-document2/src/document.rs+++ b/frontend/rust-lib/flowy-document2/src/document.rs@@@ -1,0 -1,148 +1,148 @@@+ use std::{+ collections::HashMap,+ ops::{Deref, DerefMut},+ sync::Arc,+ vec,+ };++ use collab::preclude::Collab;+ use collab_document::{+ blocks::{Block, DocumentData, DocumentMeta},+ document::Document as InnerDocument,+ };+ use flowy_error::{ErrorCode, FlowyError, FlowyResult};+ use nanoid::nanoid;+ use parking_lot::Mutex;+-use crate::entities::{BlockMapPB, BlockPB, ChildrenPB, DocumentDataPB2, MetaPB};++use crate::entities::{BlockPB, ChildrenPB, DocumentDataPB2, MetaPB};++ #[derive(Clone)]+ pub struct Document(Arc<Mutex<InnerDocument>>);++ impl Document {+ pub fn new(collab: Collab, data: DocumentDataWrapper) -> FlowyResult<Self> {+ let inner = InnerDocument::create(collab, data.0)+ .map_err(|_| FlowyError::from(ErrorCode::DocumentDataInvalid))?;+ Ok(Self(Arc::new(Mutex::new(inner))))+ }+ }++ unsafe impl Sync for Document {}+ unsafe impl Send for Document {}++ impl Deref for Document {+ type Target = Arc<Mutex<InnerDocument>>;++ fn deref(&self) -> &Self::Target {+ &self.0+ }+ }++ impl DerefMut for Document {+ fn deref_mut(&mut self) -> &mut Self::Target {+ &mut self.0+ }+ }++ #[derive(Clone)]+ pub struct DocumentDataWrapper(pub DocumentData);++ impl Deref for DocumentDataWrapper {+ type Target = DocumentData;++ fn deref(&self) -> &Self::Target {+ &self.0+ }+ }++ impl DerefMut for DocumentDataWrapper {+ fn deref_mut(&mut self) -> &mut Self::Target {+ &mut self.0+ }+ }++ impl From<DocumentDataWrapper> for DocumentDataPB2 {+ fn from(data: DocumentDataWrapper) -> Self {+ let blocks = data+ .0+ .blocks+ .into_iter()+ .map(|(id, block)| {+ (+ id,+ BlockPB {+ id: block.id,+ ty: block.ty,+ parent_id: block.parent,+ children_id: block.children,+ data: serde_json::to_string(&block.data).unwrap(),+ },+ )+ })+ .collect::<HashMap<String, BlockPB>>();+ let children_map = data+ .0+ .meta+ .children_map+ .into_iter()+ .map(|(id, children)| {+ (+ id,+ ChildrenPB {+ children: children.into_iter().collect(),+ },+ )+ })+ .collect::<HashMap<String, ChildrenPB>>();+ Self {+ page_id: data.0.page_id,- blocks: BlockMapPB { blocks },++ blocks,+ meta: MetaPB { children_map },+ }+ }+ }++ impl Default for DocumentDataWrapper {+ fn default() -> Self {+ let mut blocks: HashMap<String, Block> = HashMap::new();+ let mut meta: HashMap<String, Vec<String>> = HashMap::new();++ // page block+ let page_id = nanoid!(10);+ let children_id = nanoid!(10);+ let root = Block {+ id: page_id.clone(),+ ty: "page".to_string(),+ parent: "".to_string(),+ children: children_id.clone(),+ external_id: None,+ external_type: None,+ data: HashMap::new(),+ };+ blocks.insert(page_id.clone(), root);++ // text block+ let text_block_id = nanoid!(10);+ let text_0_children_id = nanoid!(10);+ let text_block = Block {+ id: text_block_id.clone(),+ ty: "text".to_string(),+ parent: page_id.clone(),+ children: text_0_children_id.clone(),+ external_id: None,+ external_type: None,+ data: HashMap::new(),+ };+ blocks.insert(text_block_id.clone(), text_block);++ // meta+ meta.insert(children_id, vec![text_block_id]);+ meta.insert(text_0_children_id, vec![]);++ Self(DocumentData {+ page_id,+ blocks,+ meta: DocumentMeta { children_map: meta },+ })+ }+ }diff --cc frontend/rust-lib/flowy-document2/src/entities.rsindex 0000000000,8507189ae7..d93975917dmode 000000,100644..100644--- a/frontend/rust-lib/flowy-document2/src/entities.rs+++ b/frontend/rust-lib/flowy-document2/src/entities.rs@@@ -1,0 -1,110 +1,104 @@@+ use std::collections::HashMap;++ use flowy_derive::{ProtoBuf, ProtoBuf_Enum};++ #[derive(Default, ProtoBuf)]+ pub struct OpenDocumentPayloadPBV2 {+ #[pb(index = 1)]+ pub document_id: String,+ // Support customize initial data+ }++ #[derive(Default, ProtoBuf)]+ pub struct CloseDocumentPayloadPBV2 {+ #[pb(index = 1)]+ pub document_id: String,+ // Support customize initial data+ }++ #[derive(Default, ProtoBuf)]+ pub struct ApplyActionPayloadPBV2 {+ #[pb(index = 1)]+ pub document_id: String,++ #[pb(index = 2)]+ pub actions: Vec<BlockActionPB>,+ }++ #[derive(Default, ProtoBuf)]+ pub struct DocumentDataPB2 {+ #[pb(index = 1)]+ pub page_id: String,++ #[pb(index = 2)]- pub blocks: BlockMapPB,++ pub blocks: HashMap<String, BlockPB>,++ #[pb(index = 3)]+ pub meta: MetaPB,+ }+-#[derive(Default, ProtoBuf)]-pub struct BlockMapPB {- #[pb(index = 1)]- pub blocks: HashMap<String, BlockPB>,-}-+ #[derive(Default, ProtoBuf)]+ pub struct BlockPB {+ #[pb(index = 1)]+ pub id: String,++ #[pb(index = 2)]+ pub ty: String,++ #[pb(index = 3)]+ pub data: String,++ #[pb(index = 4)]+ pub parent_id: String,++ #[pb(index = 5)]+ pub children_id: String,+ }++ #[derive(Default, ProtoBuf)]+ pub struct MetaPB {+ #[pb(index = 1)]+ pub children_map: HashMap<String, ChildrenPB>,+ }++ #[derive(Default, ProtoBuf)]+ pub struct ChildrenPB {+ #[pb(index = 1)]+ pub children: Vec<String>,+ }++ // Actions+ #[derive(Default, ProtoBuf)]+ pub struct BlockActionPB {+ #[pb(index = 1)]+ pub action: BlockActionTypePB,++ #[pb(index = 2)]+ pub payload: BlockActionPayloadPB,+ }++ #[derive(Default, ProtoBuf)]+ pub struct BlockActionPayloadPB {+ #[pb(index = 1)]+ pub block: BlockPB,++ #[pb(index = 2, one_of)]+ pub prev_id: Option<String>,++ #[pb(index = 3, one_of)]+ pub parent_id: Option<String>,+ }++ #[derive(ProtoBuf_Enum)]+ pub enum BlockActionTypePB {+ Insert = 0,+ Update = 1,+ Delete = 2,+ Move = 3,+ }++ impl Default for BlockActionTypePB {+ fn default() -> Self {+ Self::Insert+ }+ }